diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 762610bc..2dad4cf4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -73,6 +73,8 @@ test-e2e:
     - docker info
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
+    - docker stop $(docker ps -a -q)
+    - docker rm $(docker ps -aq)
     - git clone https://gitlab.com/PBSA/tools-libs/peerplays-utils.git
     - pwd
     - cd peerplays-utils/peerplays-qa-environment
@@ -81,28 +83,28 @@ test-e2e:
     - python3 -m venv venv
     - source venv/bin/activate
     - pip3 install -r requirements.txt
-    - docker ps -a
+    - docker ps -a -q
     - python3 main.py --stop
-    - docker ps -a
+    - docker ps -a -q
     - python3 main.py --start btc hive eth
-    - docker ps -a
+    - docker ps -a -q
     - python3 -m pytest test_btc_init_state.py test_hive_inital_state.py
     - docker pull registry.gitlab.com/pbsa/peerplays/mainnet/feature-python-e2e-tests:943e02cdcd9fb8a90137851635b998cf1b4f622c
     - ls -la $FULL_PWD/peerplays/config.ini
     - ls -la $FULL_PWD/peerplays/genesis.json
     - ls -la $FULL_PWD/peerplays/init-network.sh
-    - docker run --name pp -d registry.gitlab.com/pbsa/peerplays/mainnet/feature-python-e2e-tests:943e02cdcd9fb8a90137851635b998cf1b4f622c tail -f /dev/null
-    - docker cp $FULL_PWD/e2e-tests/peerplays-utils/peerplays-qa-environment/peerplays/config.ini pp:/home/peerplays/peerplays-network/witness_node_data_dir/config.ini
-    - docker cp $FULL_PWD/e2e-tests/peerplays-utils/peerplays-qa-environment/peerplays/genensis.json pp:/home/peerplays/peerplays-network/witness_node_data_dir/genensis.json
-    - docker cp $FULL_PWD/e2e-tests/peerplays-utils/peerplays-qa-environment/peerplays/init-network.sh pp:/home/peerplays/peerplays-network/init-network.sh
+    - PP_CONTAINER_ID=$(docker run --name pp -d registry.gitlab.com/pbsa/peerplays/mainnet/feature-python-e2e-tests:943e02cdcd9fb8a90137851635b998cf1b4f622c tail -f /dev/null)
+    - docker cp $FULL_PWD/e2e-tests/peerplays-utils/peerplays-qa-environment/peerplays/config.ini $PP_CONTAINER_ID:/home/peerplays/peerplays-network/witness_node_data_dir/config.ini
+    - docker cp $FULL_PWD/e2e-tests/peerplays-utils/peerplays-qa-environment/peerplays/genensis.json $PP_CONTAINER_ID:/home/peerplays/peerplays-network/witness_node_data_dir/genensis.json
+    - docker cp $FULL_PWD/e2e-tests/peerplays-utils/peerplays-qa-environment/peerplays/init-network.sh $PP_CONTAINER_ID:/home/peerplays/peerplays-network/init-network.sh
     - docker exec -c pp ./init-network.sh
-    - docker ps -a
+    - docker ps -a -q
     - docker exec pp sh -c ./witness_node -d ./witness_node_data_dir --replay-blockchain
     - docker exec pp sh -c ./init-network.sh
     - python3 -m pytest test_pp_inital_state.py
     - ./main.py --stop
     - deactivate
-    - docker ps -a
+    - docker ps -a -q
   tags:
     - python-tests