diff --git a/.circleci/config.yml b/.circleci/config.yml
index 363d09c6e..7bbe60f24 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -157,6 +157,7 @@ jobs:
           name: run integration tests
           command: |
             python3 rl_coach/tests/test_eks.py  -c coach-test -bn ${CIRCLE_BUILD_NUM} -tn integration-test -tc 'make integration_tests_without_docker' -i 316971102342.dkr.ecr.us-west-2.amazonaws.com/coach:$(git describe --tags --always --dirty) -cpu 2048 -mem 4096
+          no_output_timeout: 20m
       - run:
           name: cleanup
           command: |
@@ -389,9 +390,24 @@ workflows:
     jobs:
       - unit_tests
       - integration_tests
-      - golden_test_gym
-      - golden_test_doom
-      - golden_test_mujoco
-      # - trace_test_gym
-      # - trace_test_doom
-      # - trace_test_mujoco
+      - build_gym_env
+      - build_doom_env
+      - build_mujoco_env
+      - golden_test_gym:
+          requires:
+            - build_gym_env
+      - golden_test_doom:
+          requires:
+            - build_doom_env
+      - golden_test_mujoco:
+          requires:
+            - build_mujoco_env
+      # - trace_test_gym:
+      #    requires:
+      #      - build_gym_env
+      # - trace_test_doom:
+      #    requires:
+      #      - build_doom_env
+      # - trace_test_mujoco:
+      #    requires:
+      #      - build_mujoco_env