diff --git a/.circleci/config.yml b/.circleci/config.yml
index e1dc522eb..58db62db3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -203,14 +203,13 @@ workflows:
        - test_all_models_singularity:
            matrix:
              parameters:
-               num_of_shards: [12]
-               shard_id: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] #TODO: Switch back to 4
+               num_of_shards: [4]
+               shard_id: [0, 1, 2, 3]
            filters:
              branches:
                only:
                  - master
                  - test_all
-                 - add-singularity-tests
        - test_all_models_common_env:
            filters:
              branches: