diff --git a/.circleci/config.yml b/.circleci/config.yml
index 77ffdbb..b99109b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -68,7 +68,7 @@ orbs:
               name: "Load tss image from archive"
               command: docker load -i ./workspace/tss.tar.gz
       save_docker_logs:
-        description: "A very simple command for demonstration purposes"
+        description: "Save docker logs"
         parameters:
           validator:
             type: integer
@@ -78,13 +78,34 @@ orbs:
               name: "Saving validator<< parameters.validator >> logs"
               command: |
                 mkdir -p ./artifacts/logs/validator<< parameters.validator >>
-                docker logs validator<< parameters.validator >>_rabbitmq_1 ./artifacts/logs/validator<< parameters.validator >>/rabbitmq.log
-                docker logs validator<< parameters.validator >>_redis_1 ./artifacts/logs/validator<< parameters.validator >>/redis.log
-                docker logs validator<< parameters.validator >>_proxy_1 ./artifacts/logs/validator<< parameters.validator >>/proxy.log
-                docker logs validator<< parameters.validator >>_eth-watcher_1 ./artifacts/logs/validator<< parameters.validator >>/eth-watcher.log
-                docker logs validator<< parameters.validator >>_bnc-watcher_1 ./artifacts/logs/validator<< parameters.validator >>/bnc-watcher.log
-                docker logs validator<< parameters.validator >>_signer_1 ./artifacts/logs/validator<< parameters.validator >>/signer.log
-                docker logs validator<< parameters.validator >>_keygen_1 ./artifacts/logs/validator<< parameters.validator >>/keygen.log
+                docker logs validator<< parameters.validator >>_rabbitmq_1 > ./artifacts/logs/validator<< parameters.validator >>/rabbitmq.log
+                docker logs validator<< parameters.validator >>_redis_1 > ./artifacts/logs/validator<< parameters.validator >>/redis.log
+                docker logs validator<< parameters.validator >>_proxy_1 >./artifacts/logs/validator<< parameters.validator >>/proxy.log
+                docker logs validator<< parameters.validator >>_eth-watcher_1 > ./artifacts/logs/validator<< parameters.validator >>/eth-watcher.log
+                docker logs validator<< parameters.validator >>_bnc-watcher_1 > ./artifacts/logs/validator<< parameters.validator >>/bnc-watcher.log
+                docker logs validator<< parameters.validator >>_signer_1 > ./artifacts/logs/validator<< parameters.validator >>/signer.log
+                docker logs validator<< parameters.validator >>_keygen_1 > ./artifacts/logs/validator<< parameters.validator >>/keygen.log
+              when: always
+      save_artifacts:
+        description: "Save and upload tests results, save validator logs to artifacts"
+        steps:
+          - run:
+              name: "Save tests results"
+              command: |
+                mkdir -p ./artifacts/test_results/mocha
+                docker cp "tests:/tests/results.xml" "./artifacts/test_results/mocha/results.xml"
+              when: always
+          - store_test_results:
+              path: ./artifacts/test_results/mocha
+              when: always
+          - save_docker_logs:
+              validator: 1
+          - save_docker_logs:
+              validator: 2
+          - save_docker_logs:
+              validator: 3
+          - store_artifacts:
+              path: ./artifacts
               when: always
 jobs:
   init_tss:
@@ -134,13 +155,19 @@ jobs:
             N=1 ./demo/validator-demo.sh -d
             N=2 ./demo/validator-demo.sh -d
             N=3 ./demo/validator-demo.sh -d
+            docker ps
       - run:
           name: "Wait until validator nodes are ready"
           command: |
-            docker run --network validator1_test_network --entrypoint ash appropriate/curl:latest -c "until curl -X GET http://proxy:8002/info > /dev/null 2>&1; do sleep 1; done"
-            docker run --network validator2_test_network --entrypoint ash appropriate/curl:latest -c "until curl -X GET http://proxy:8002/info > /dev/null 2>&1; do sleep 1; done"
-            docker run --network validator3_test_network --entrypoint ash appropriate/curl:latest -c "until curl -X GET http://proxy:8002/info > /dev/null 2>&1; do sleep 1; done"
+            mkdir ./clogs
+            docker run --network validator1_test_network --entrypoint ash appropriate/curl:latest -c "until curl -X GET http://proxy:8002/info > ./clogs/clog1 2>&1; do sleep 1; done"
+            docker run --network validator2_test_network --entrypoint ash appropriate/curl:latest -c "until curl -X GET http://proxy:8002/info > ./clogs/clog2 2>&1; do sleep 1; done"
+            docker run --network validator3_test_network --entrypoint ash appropriate/curl:latest -c "until curl -X GET http://proxy:8002/info > ./clogs/clog3 2>&1; do sleep 1; done"
           no_output_timeout: 3m
+      - store_artifacts:
+          path: ./clogs
+          destination: curl-logs
+          when: always
       - run:
           name: "Build and prepare tests container"
           command: |
@@ -154,24 +181,7 @@ jobs:
       - run:
           name: "Run tests"
           command: docker start -a tests
-      - run:
-          name: "Save tests results"
-          command: |
-            mkdir -p ./artifacts/test_results/mocha
-            docker cp "tests:/tests/results.xml" "./artifacts/test_results/mocha/results.xml"
-          when: always
-      - store_test_results:
-          path: ./artifacts/test_results/mocha
-          when: always
-      - bridge/save_docker_logs:
-          validator: 1
-      - bridge/save_docker_logs:
-          validator: 2
-      - bridge/save_docker_logs:
-          validator: 3
-      - store_artifacts:
-          path: ./artifacts
-          when: always
+      - bridge/save_artifacts
 workflows:
   version: 2
   main: