diff --git a/LICENSES.md b/LICENSES.md
index c5b2a5d9..6e817636 100644
--- a/LICENSES.md
+++ b/LICENSES.md
@@ -15,7 +15,7 @@ For the licenses on all other BigchainDB-related code (i.e. in other repositorie
 
 ## Documentation Licenses
 
-The official BigchainDB documentation, _except for the short code snippets embedded within it_, is licensed under a Creative Commons Attribution-ShareAlike 4.0 International license, the full text of which can be found at [http://creativecommons.org/licenses/by-sa/4.0/legalcode](http://creativecommons.org/licenses/by-sa/4.0/legalcode).
+The official BigchainDB documentation, _except for the short code snippets embedded within it_, is licensed under a Creative Commons Attribution 4.0 International license, the full text of which can be found at [http://creativecommons.org/licenses/by/4.0/legalcode](http://creativecommons.org/licenses/by/4.0/legalcode).
 
 ## Exceptions
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 9201e12c..9c8fa3a7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -44,7 +44,7 @@ services:
       retries: 3
     command: '.ci/entrypoint.sh'
   tendermint:
-    image: tendermint/tendermint:0.22.3
+    image: tendermint/tendermint:0.22.8
     # volumes:
     #   - ./tmdata:/tendermint
     entrypoint: ''
diff --git a/docs/contributing/source/dev-setup-coding-and-contribution-process/run-dev-network-stack.md b/docs/contributing/source/dev-setup-coding-and-contribution-process/run-dev-network-stack.md
index cb8555f3..b4719128 100644
--- a/docs/contributing/source/dev-setup-coding-and-contribution-process/run-dev-network-stack.md
+++ b/docs/contributing/source/dev-setup-coding-and-contribution-process/run-dev-network-stack.md
@@ -32,7 +32,7 @@ $ curl -fOL https://raw.githubusercontent.com/bigchaindb/bigchaindb/${GIT_BRANCH
 
 ## Quick Start
 If you run `stack.sh` out of the box i.e. without any configuration changes, you will be able to deploy a 4 node
-BigchainDB network with Docker containers, created from `master` branch of `bigchaindb/bigchaindb` repo and Tendermint version `0.22.3`.
+BigchainDB network with Docker containers, created from `master` branch of `bigchaindb/bigchaindb` repo and Tendermint version `0.22.8`.
 
 **Note**: Run `stack.sh` with either root or non-root user with sudo enabled.
 
@@ -90,7 +90,7 @@ $ bash stack.sh -h
         variable. (default: master)
 
     ENV[TM_VERSION]
-        (Optional) Tendermint version to use for the setup. (default: 0.22.3)
+        (Optional) Tendermint version to use for the setup. (default: 0.22.8)
 
     ENV[MONGO_VERSION]
         (Optional) MongoDB version to use with the setup. (default: 3.6)
@@ -171,8 +171,8 @@ $ export STACK_REPO=bigchaindb/bigchaindb
 # Default: master
 $ export STACK_BRANCH=master
 
-#Optional, since 0.22.3 is the default tendermint version.
-$ export TM_VERSION=0.22.3
+#Optional, since 0.22.8 is the default tendermint version.
+$ export TM_VERSION=0.22.8
 
 #Optional, since 3.6 is the default MongoDB version.
 $ export MONGO_VERSION=3.6
@@ -222,8 +222,8 @@ $ export STACK_REPO=bigchaindb/bigchaindb
 # Default: master
 $ export STACK_BRANCH=master
 
-#Optional, since 0.22.3 is the default tendermint version
-$ export TM_VERSION=0.22.3
+#Optional, since 0.22.8 is the default tendermint version
+$ export TM_VERSION=0.22.8
 
 #Optional, since 3.6 is the default MongoDB version.
 $ export MONGO_VERSION=3.6
diff --git a/docs/contributing/source/dev-setup-coding-and-contribution-process/run-node-as-processes.md b/docs/contributing/source/dev-setup-coding-and-contribution-process/run-node-as-processes.md
index 2c739555..4c98578a 100644
--- a/docs/contributing/source/dev-setup-coding-and-contribution-process/run-node-as-processes.md
+++ b/docs/contributing/source/dev-setup-coding-and-contribution-process/run-node-as-processes.md
@@ -19,13 +19,13 @@ After the installation of MongoDB is complete, run MongoDB using `sudo mongod`
 
 ### Installing a Tendermint Executable
 
-Find [the version number of the latest Tendermint release](https://github.com/tendermint/tendermint/releases) and install it using the following, where 0.22.3 should be replaced by the latest released version number:
+Find [the version number of the latest Tendermint release](https://github.com/tendermint/tendermint/releases) and install it using the following, where 0.22.8 should be replaced by the latest released version number:
 
 ```bash
 $ sudo apt install -y unzip
-$ wget https://github.com/tendermint/tendermint/releases/download/v0.22.3/tendermint_0.22.3_linux_amd64.zip
-$ unzip tendermint_0.22.3_linux_amd64.zip
-$ rm tendermint_0.22.3_linux_amd64.zip
+$ wget https://github.com/tendermint/tendermint/releases/download/v0.22.8-autodraft/tendermint_0.22.8_linux_amd64.zip
+$ unzip tendermint_0.22.8_linux_amd64.zip
+$ rm tendermint_0.22.8_linux_amd64.zip
 $ sudo mv tendermint /usr/local/bin
 ```
 
diff --git a/docs/server/source/production-deployment-template/workflow.rst b/docs/server/source/production-deployment-template/workflow.rst
index 197cd231..61b499ee 100644
--- a/docs/server/source/production-deployment-template/workflow.rst
+++ b/docs/server/source/production-deployment-template/workflow.rst
@@ -44,7 +44,7 @@ you can do this:
 .. code::
 
    $ mkdir $(pwd)/tmdata
-   $ docker run --rm -v $(pwd)/tmdata:/tendermint/config tendermint/tendermint:0.22.3 init
+   $ docker run --rm -v $(pwd)/tmdata:/tendermint/config tendermint/tendermint:0.22.8 init
    $ cat $(pwd)/tmdata/genesis.json
 
 You should see something that looks like:
diff --git a/docs/server/source/simple-network-setup.md b/docs/server/source/simple-network-setup.md
index d1403a08..e7d828c9 100644
--- a/docs/server/source/simple-network-setup.md
+++ b/docs/server/source/simple-network-setup.md
@@ -75,13 +75,13 @@ Note: The `mongodb` package is _not_ the official MongoDB package from MongoDB t
 
 #### Install Tendermint
 
-Install a [recent version of Tendermint][tendermint:releases]. BigchainDB Server requires version 0.22.3 or newer.
+Install a [recent version of Tendermint][tendermint:releases]. BigchainDB Server requires version 0.22.8 or newer.
 
 ```
 sudo apt install -y unzip
-wget https://github.com/tendermint/tendermint/releases/download/v0.22.3/tendermint_0.22.3_linux_amd64.zip
-unzip tendermint_0.22.3_linux_amd64.zip
-rm tendermint_0.22.3_linux_amd64.zip
+wget https://github.com/tendermint/tendermint/releases/download/v0.22.8/tendermint_0.22.8_linux_amd64.zip
+unzip tendermint_0.22.8_linux_amd64.zip
+rm tendermint_0.22.8_linux_amd64.zip
 sudo mv tendermint /usr/local/bin
 ```
 
diff --git a/k8s/bigchaindb/tendermint_container/Dockerfile b/k8s/bigchaindb/tendermint_container/Dockerfile
index 25a523c0..1c66e38d 100644
--- a/k8s/bigchaindb/tendermint_container/Dockerfile
+++ b/k8s/bigchaindb/tendermint_container/Dockerfile
@@ -1,4 +1,4 @@
-FROM tendermint/tendermint:0.22.3
+FROM tendermint/tendermint:0.22.8
 LABEL maintainer "dev@bigchaindb.com"
 WORKDIR /
 USER root
diff --git a/k8s/nginx-openresty/LICENSE.md b/k8s/nginx-openresty/LICENSE.md
index 7451bedf..254565ca 100644
--- a/k8s/nginx-openresty/LICENSE.md
+++ b/k8s/nginx-openresty/LICENSE.md
@@ -15,13 +15,11 @@ The derived files (`nginx.conf.template` and `nginx.lua.template`), along with
 the other files in this directory, are _also_ licensed under an MIT License,
 the text of which can be found below.
 
+## Documentation Licenses
 
-# Documentation Licenses
-
-The documentation in this directory is licensed under a Creative Commons Attribution-ShareAlike
+The documentation in this directory is licensed under a Creative Commons Attribution
 4.0 International license, the full text of which can be found at 
-[http://creativecommons.org/licenses/by-sa/4.0/legalcode](http://creativecommons.org/licenses/by-sa/4.0/legalcode).
-
+[http://creativecommons.org/licenses/by/4.0/legalcode](http://creativecommons.org/licenses/by/4.0/legalcode).
 
 <hr>
 
@@ -47,7 +45,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
-
 <hr>
 
 The MIT License
@@ -71,4 +68,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-
diff --git a/pkg/configuration/roles/tendermint/files/Dockerfile b/pkg/configuration/roles/tendermint/files/Dockerfile
index 68dab41c..8269a351 100644
--- a/pkg/configuration/roles/tendermint/files/Dockerfile
+++ b/pkg/configuration/roles/tendermint/files/Dockerfile
@@ -1,4 +1,4 @@
-ARG tm_version=0.22.3
+ARG tm_version=0.22.8
 FROM tendermint/tendermint:${tm_version}
 LABEL maintainer "dev@bigchaindb.com"
 WORKDIR /
diff --git a/pkg/scripts/stack.sh b/pkg/scripts/stack.sh
index 25292065..0e24033d 100755
--- a/pkg/scripts/stack.sh
+++ b/pkg/scripts/stack.sh
@@ -11,7 +11,7 @@ stack_repo=${STACK_REPO:="bigchaindb/bigchaindb"}
 stack_size=${STACK_SIZE:=4}
 stack_type=${STACK_TYPE:="docker"}
 stack_type_provider=${STACK_TYPE_PROVIDER:=""}
-tm_version=${TM_VERSION:="0.22.3"}
+tm_version=${TM_VERSION:="0.22.8"}
 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 2c5359d9..9c67315c 100755
--- a/pkg/scripts/unstack.sh
+++ b/pkg/scripts/unstack.sh
@@ -11,7 +11,7 @@ stack_repo=${STACK_REPO:="bigchaindb/bigchaindb"}
 stack_size=${STACK_SIZE:=4}
 stack_type=${STACK_TYPE:="docker"}
 stack_type_provider=${STACK_TYPE_PROVIDER:=""}
-tm_version=${TM_VERSION:="0.22.3"}
+tm_version=${TM_VERSION:="0.22.8"}
 mongo_version=${MONGO_VERSION:="3.6"}
 stack_vm_memory=${STACK_VM_MEMORY:=2048}
 stack_vm_cpus=${STACK_VM_CPUS:=2}
diff --git a/tests/tendermint/test_lib.py b/tests/tendermint/test_lib.py
index e6aa8f07..82d6e1e2 100644
--- a/tests/tendermint/test_lib.py
+++ b/tests/tendermint/test_lib.py
@@ -382,8 +382,16 @@ def test_get_spent_transaction_critical_double_spend(b, alice, bob, carol):
                                         asset_id=tx.id)\
                               .sign([alice.private_key])
 
+    same_input_double_spend = Transaction.transfer(tx.to_inputs() + tx.to_inputs(),
+                                                   [([bob.public_key], 1)],
+                                                   asset_id=tx.id)\
+                                         .sign([alice.private_key])
+
     b.store_bulk_transactions([tx])
 
+    with pytest.raises(DoubleSpend):
+        same_input_double_spend.validate(b)
+
     assert b.get_spent(tx.id, tx_transfer.inputs[0].fulfills.output, [tx_transfer])
 
     with pytest.raises(DoubleSpend):