diff --git a/.circleci/config.yml b/.circleci/config.yml
index 564f3be..650ee09 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -618,10 +618,6 @@ workflows:
           type: approval
           requires:
             - build_base
-# Keep this for debugging functional_tests for nightly jobs
-#      - functional_tests:
-#          requires:
-#            - e2e_approval
       - build_gym_env:
           requires:
             - e2e_approval
@@ -640,9 +636,6 @@ workflows:
       - golden_test_mujoco:
           requires:
             - build_mujoco_env
-#      - golden_test_starcraft:
-#          requires:
-#            - build_starcraft_env
       - update_gym_approval:
           type: approval
           requires:
@@ -673,9 +666,6 @@ workflows:
       - trace_test_mujoco:
           requires:
             - build_mujoco_env
-#      - trace_test_starcraft:
-#          requires:
-#            - starcraft_approval
       - container_deploy:
           requires:
             - unit_tests
@@ -728,26 +718,26 @@ workflows:
               only:
                 - master
     jobs:
-      - unit_tests
-      - integration_tests
-      - functional_tests
       - build_gym_env
       - build_doom_env
       - build_mujoco_env
-      #  Starcraft is running too long for evaluation on nightly runs. Consider running in weekly test.
-      #- build_starcraft_env
+      - build_base
+      - unit_tests:
+          requires:
+            - build_base
+      - integration_tests:
+          requires:
+            - build_base
+      - functional_tests:
+          requires:
+            - build_base
       - functional_test_doom:
-            requires:
-              - build_doom_env
+          requires:
+            - build_doom_env
       - functional_test_mujoco:
-            requires:
-              - build_mujoco_env
-              - functional_test_doom
-      #  Starcraft is running too long for evaluation on nightly runs. Consider running in weekly test.
-      #- functional_test_starcraft:
-      #      requires:
-      #        - build_starcraft_env
-      #        - functional_test_mujoco
+          requires:
+            - build_mujoco_env
+            - functional_test_doom
       - golden_test_gym:
           requires:
             - build_gym_env
@@ -759,23 +749,3 @@ workflows:
           requires:
             - build_mujoco_env
             - golden_test_doom
-      #  Starcraft is running too long for evaluation on nightly runs. Consider running in weekly test.
-      #- golden_test_starcraft:
-      #    requires:
-      #      - build_starcraft_env
-      #      - golden_test_mujoco
-      # - trace_test_gym:
-      #    requires:
-      #      - build_gym_env
-      # - trace_test_doom:
-      #    requires:
-      #      - build_doom_env
-      #      - trace_test_gym
-      # - trace_test_mujoco:
-      #    requires:
-      #      - build_mujoco_env
-      #      - trace_test_doom
-      # - trace_test_starcraft:
-      #    requires:
-      #      - build_mujoco_env
-      #      - trace_test_mujoco