diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 060bfac..3732beb 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -81,7 +81,7 @@ jobs:
         run: sudo apt-get update && sudo apt-get install -y git zsh curl tarantool-common vim build-essential cmake 
 
       - name: Get Tendermint
-        run: wget https://github.com/tendermint/tendermint/releases/download/v0.34.15/tendermint_0.34.15_linux_amd64.tar.gz && tar zxf tendermint_0.34.15_linux_amd64.tar.gz
+        run: wget https://github.com/tendermint/tendermint/releases/download/v0.34.24/tendermint_0.34.24_linux_amd64.tar.gz && tar zxf tendermint_0.34.24_linux_amd64.tar.gz
 
       - name: Setup poetry
         uses: Gr1N/setup-poetry@v8
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19c88d8..e7a8414 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,9 @@ For reference, the possible headings are:
 * **Known Issues**
 * **Notes**
 
+## [2.5.0] - 2023-21-06
+* **Changed** Upgraded ABCI compatbility to Tendermint v0.34.24 and CometBFT v0.34.29
+
 ## [2.4.7] - 2023-24-05
 * **Fixed** wrong referencing of planetmint-transactions object and variable
 
diff --git a/Dockerfile-all-in-one b/Dockerfile-all-in-one
index aa633a7..1189bf9 100644
--- a/Dockerfile-all-in-one
+++ b/Dockerfile-all-in-one
@@ -1,7 +1,7 @@
 FROM python:3.9-slim
 LABEL maintainer "contact@ipdb.global"
 
-ARG TM_VERSION=0.34.15
+ARG TM_VERSION=0.34.24
 RUN mkdir -p /usr/src/app
 ENV HOME /root
 COPY . /usr/src/app/
diff --git a/config/test_config_utils.py b/config/test_config_utils.py
index c72fce6..5168038 100644
--- a/config/test_config_utils.py
+++ b/config/test_config_utils.py
@@ -207,7 +207,7 @@ def test_autoconfigure_read_both_from_file_and_env(monkeypatch, request):
             "advertised_port": WSSERVER_ADVERTISED_PORT,
         },
         "database": database_mongodb,
-        "tendermint": {"host": "localhost", "port": 26657, "version": "v0.34.15"},
+        "tendermint": {"host": "localhost", "port": 26657, "version": "v0.34.24"},
         "log": {
             "file": LOG_FILE,
             "level_console": "debug",
diff --git a/docker-compose.yml b/docker-compose.yml
index 525e031..2339adb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -65,7 +65,7 @@ services:
     restart: always
   
   tendermint:
-    image: tendermint/tendermint:v0.34.15
+    image: tendermint/tendermint:v0.34.24
     # volumes:
     #   - ./tmdata:/tendermint
     entrypoint: ''
diff --git a/docs/root/source/contributing/dev-setup-coding-and-contribution-process/run-node-as-processes.md b/docs/root/source/contributing/dev-setup-coding-and-contribution-process/run-node-as-processes.md
index ba60915..5addcf6 100644
--- a/docs/root/source/contributing/dev-setup-coding-and-contribution-process/run-node-as-processes.md
+++ b/docs/root/source/contributing/dev-setup-coding-and-contribution-process/run-node-as-processes.md
@@ -30,9 +30,9 @@ The version of Planetmint Server described in these docs only works well with Te
 
 ```bash
 $ sudo apt install -y unzip
-$ wget https://github.com/tendermint/tendermint/releases/download/v0.34.15/tendermint_v0.34.15_linux_amd64.zip
-$ unzip tendermint_v0.34.15_linux_amd64.zip
-$ rm tendermint_v0.34.15_linux_amd64.zip
+$ wget https://github.com/tendermint/tendermint/releases/download/v0.34.24/tendermint_v0.34.24_linux_amd64.zip
+$ unzip tendermint_v0.34.24_linux_amd64.zip
+$ rm tendermint_v0.34.24_linux_amd64.zip
 $ sudo mv tendermint /usr/local/bin
 ```
 
diff --git a/docs/root/source/network-setup/k8s-deployment-template/workflow.rst b/docs/root/source/network-setup/k8s-deployment-template/workflow.rst
index 1d0148f..e2a7dc0 100644
--- a/docs/root/source/network-setup/k8s-deployment-template/workflow.rst
+++ b/docs/root/source/network-setup/k8s-deployment-template/workflow.rst
@@ -60,7 +60,7 @@ you can do this:
 .. code::
 
    $ mkdir $(pwd)/tmdata
-   $ docker run --rm -v $(pwd)/tmdata:/tendermint/config tendermint/tendermint:v0.34.15 init
+   $ docker run --rm -v $(pwd)/tmdata:/tendermint/config tendermint/tendermint:v0.34.24 init
    $ cat $(pwd)/tmdata/genesis.json
 
 You should see something that looks like:
diff --git a/k8s/planetmint/tendermint_container/Dockerfile b/k8s/planetmint/tendermint_container/Dockerfile
index 91230fc..378d38a 100644
--- a/k8s/planetmint/tendermint_container/Dockerfile
+++ b/k8s/planetmint/tendermint_container/Dockerfile
@@ -1,4 +1,4 @@
-FROM tendermint/tendermint:v0.34.15
+FROM tendermint/tendermint:v0.34.24
 LABEL maintainer "contact@ipdb.global"
 WORKDIR /
 USER root
diff --git a/pkg/configuration/roles/tendermint/files/Dockerfile b/pkg/configuration/roles/tendermint/files/Dockerfile
index b33d0f9..72425ac 100644
--- a/pkg/configuration/roles/tendermint/files/Dockerfile
+++ b/pkg/configuration/roles/tendermint/files/Dockerfile
@@ -1,4 +1,4 @@
-ARG tm_version=v0.31.5
+ARG tm_version=v0.34.24
 FROM tendermint/tendermint:${tm_version}
 LABEL maintainer "contact@ipdb.global"
 WORKDIR /
diff --git a/pkg/scripts/stack.sh b/pkg/scripts/stack.sh
index ea774a0..4295435 100755
--- a/pkg/scripts/stack.sh
+++ b/pkg/scripts/stack.sh
@@ -17,7 +17,7 @@ stack_size=${STACK_SIZE:=4}
 stack_type=${STACK_TYPE:="docker"}
 stack_type_provider=${STACK_TYPE_PROVIDER:=""}
 # NOTE versions prior v0.28.0 have different priv_validator format!
-tm_version=${TM_VERSION:="v0.34.15"}
+tm_version=${TM_VERSION:="v0.34.24"}
 mongo_version=${MONGO_VERSION:="3.6"}
 stack_vm_memory=${STACK_VM_MEMORY:=2048}
 stack_vm_cpus=${STACK_VM_CPUS:=2}
diff --git a/pkg/scripts/unstack.sh b/pkg/scripts/unstack.sh
index 9a285ac..cf12dbc 100755
--- a/pkg/scripts/unstack.sh
+++ b/pkg/scripts/unstack.sh
@@ -16,7 +16,7 @@ stack_repo=${STACK_REPO:="planetmint/planetmint"}
 stack_size=${STACK_SIZE:=4}
 stack_type=${STACK_TYPE:="docker"}
 stack_type_provider=${STACK_TYPE_PROVIDER:=""}
-tm_version=${TM_VERSION:="0.31.5"}
+tm_version=${TM_VERSION:="0.34.24"}
 mongo_version=${MONGO_VERSION:="3.6"}
 stack_vm_memory=${STACK_VM_MEMORY:=2048}
 stack_vm_cpus=${STACK_VM_CPUS:=2}
diff --git a/planetmint/config.py b/planetmint/config.py
index c938e58..3f1fb3c 100644
--- a/planetmint/config.py
+++ b/planetmint/config.py
@@ -86,7 +86,7 @@ class Config(metaclass=Singleton):
             "tendermint": {
                 "host": "localhost",
                 "port": 26657,
-                "version": "v0.34.15",  # look for __tm_supported_versions__
+                "version": "v0.34.24",  # look for __tm_supported_versions__
             },
             "database": self.__private_database_map,
             "log": {
diff --git a/planetmint/version.py b/planetmint/version.py
index c3bf372..ec58cb0 100644
--- a/planetmint/version.py
+++ b/planetmint/version.py
@@ -3,8 +3,8 @@
 # SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
 # Code is Apache-2.0 and docs are CC-BY-4.0
 
-__version__ = "2.4.7"
-__short_version__ = "2.4"
+__version__ = "2.5.0"
+__short_version__ = "2.5"
 
 # Supported Tendermint versions
-__tm_supported_versions__ = ["0.34.15"]
+__tm_supported_versions__ = ["0.34.24"]
diff --git a/poetry.lock b/poetry.lock
index 328f86e..ca5dff4 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -12,25 +12,6 @@ files = [
     {file = "aafigure-0.6.tar.gz", hash = "sha256:49f2c1fd2b579c1fffbac1386a2670b3f6f475cc7ff6cc04d8b984888c2d9e1e"},
 ]
 
-[[package]]
-name = "abci"
-version = "0.8.3"
-description = "Python based ABCI Server for Tendermint"
-category = "main"
-optional = false
-python-versions = ">=3.9"
-files = [
-    {file = "abci-0.8.3-py3-none-any.whl", hash = "sha256:9f6b9d9a28ccb90bc158572fd05d7a196e09cbe774c72053a18a7b5f602e406f"},
-    {file = "abci-0.8.3.tar.gz", hash = "sha256:2c85c7aa78b7a1785b72e6af789ca9f132088b2ba63d90e85af114d65b609fb3"},
-]
-
-[package.dependencies]
-colorlog = ">=3.1.4"
-protobuf = ">=3.6.1"
-
-[package.extras]
-dev = ["black", "build", "pytest", "pytest-cov", "twine"]
-
 [[package]]
 name = "aiohttp"
 version = "3.8.4"
@@ -1921,6 +1902,25 @@ files = [
 [package.extras]
 testing = ["pytest", "pytest-cov"]
 
+[[package]]
+name = "planetmint-abci"
+version = "0.8.4"
+description = "Python based ABCI Server for Tendermint"
+category = "main"
+optional = false
+python-versions = ">=3.9"
+files = [
+    {file = "planetmint-abci-0.8.4.tar.gz", hash = "sha256:1e969da0a10d0e5ceb82993645d0cd92076c2a7df03b701fd17837c63ace1f57"},
+]
+
+[package.dependencies]
+certifi = ">=2022.12.7"
+colorlog = ">=3.1.4"
+protobuf = ">=3.18.3"
+
+[package.extras]
+dev = ["black", "build", "pytest", "pytest-cov", "twine"]
+
 [[package]]
 name = "planetmint-cryptoconditions"
 version = "1.2.2"
@@ -3568,4 +3568,4 @@ testing = ["func-timeout", "jaraco.itertools", "pytest (>=6)", "pytest-black (>=
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.9"
-content-hash = "98c4577730a35fdda7b853c1921860cd298abcead332e443fed8497544022429"
+content-hash = "561ce2e416ff69aaf64732fcffe4870f6bef2317c881c1e595a49c824c65fa27"
diff --git a/pyproject.toml b/pyproject.toml
index 8a0bd85..f13dca0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "planetmint"
-version = "2.4.7"
+version = "2.5.0"
 description = "Planetmint: The Blockchain Database"
 authors = ["Planetmint contributors"]
 license = "AGPLv3"
@@ -47,7 +47,7 @@ pyasn1 = ">=0.4.8"
 python-decouple = "^3.7"
 planetmint-transactions = ">=0.8.1"
 asynctnt = "^2.0.1"
-abci = "^0.8.3"
+planetmint-abci = "^0.8.4"
 
 [tool.poetry.group.dev.dependencies]
 aafigure = "0.6"