diff --git a/.circleci/config.yml b/.circleci/config.yml
index be39e21a..4ee84ced 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -241,40 +241,12 @@ jobs:
                 group-key: "group-cores"
                 project-key: "chipyard-ariane"
                 timeout: "30m"
-    chipyard-sodor-stage1-run-tests:
+    chipyard-sodor-run-tests:
         executor: main-env
         steps:
             - run-tests:
                 group-key: "group-cores"
-                project-key: "chipyard-sodor-stage1"
-                timeout: "30m"
-    chipyard-sodor-stage2-run-tests:
-        executor: main-env
-        steps:
-            - run-tests:
-                group-key: "group-cores"
-                project-key: "chipyard-sodor-stage2"
-                timeout: "30m"
-    chipyard-sodor-stage3-run-tests:
-        executor: main-env
-        steps:
-            - run-tests:
-                group-key: "group-cores"
-                project-key: "chipyard-sodor-stage3"
-                timeout: "30m"
-    chipyard-sodor-stage5-run-tests:
-        executor: main-env
-        steps:
-            - run-tests:
-                group-key: "group-cores"
-                project-key: "chipyard-sodor-stage5"
-                timeout: "30m"
-    chipyard-sodor-ucode-run-tests:
-        executor: main-env
-        steps:
-            - run-tests:
-                group-key: "group-cores"
-                project-key: "chipyard-sodor-ucode"
+                project-key: "chipyard-sodor"
                 timeout: "30m"
     chipyard-dmirocket-run-tests:
         executor: main-env
@@ -462,22 +434,9 @@ workflows:
             - chipyard-ariane-run-tests:
                 requires:
                     - prepare-chipyard-cores
-            - chipyard-sodor-stage1-run-tests:
+            - chipyard-sodor-run-tests:
                 requires:
                     - prepare-chipyard-cores
-            - chipyard-sodor-stage2-run-tests:
-                requires:
-                    - prepare-chipyard-cores
-            - chipyard-sodor-stage3-run-tests:
-                requires:
-                    - prepare-chipyard-cores
-            - chipyard-sodor-stage5-run-tests:
-                requires:
-                    - prepare-chipyard-cores
-            - chipyard-sodor-ucode-run-tests:
-                requires:
-                    - prepare-chipyard-cores
-
             - chipyard-dmirocket-run-tests:
                 requires:
                     - prepare-chipyard-peripherals
diff --git a/.circleci/defaults.sh b/.circleci/defaults.sh
index 75101884..e3318d87 100755
--- a/.circleci/defaults.sh
+++ b/.circleci/defaults.sh
@@ -79,8 +79,4 @@ mapping["firesim-multiclock"]="SCALA_TEST=firesim.firesim.RocketMulticlockF1Test
 mapping["fireboom"]="SCALA_TEST=firesim.firesim.BoomF1Tests"
 mapping["icenet"]="SUB_PROJECT=icenet"
 mapping["testchipip"]="SUB_PROJECT=testchipip"
-mapping["chipyard-sodor-stage1"]="SUB_PROJEET=Sodor1StageConfig"
-mapping["chipyard-sodor-stage2"]="SUB_PROJEET=Sodor2StageConfig"
-mapping["chipyard-sodor-stage3"]="SUB_PROJEET=Sodor3StageSinglePortConfig"
-mapping["chipyard-sodor-stage5"]="SUB_PROJEET=Sodor5StageConfig"
-mapping["chipyard-sodor-ucode"]="SUB_PROJEET=SodorUCodeConfig"
+mapping["chipyard-sodor"]="CONFIG=Sodor5StageConfig"
diff --git a/.circleci/run-tests.sh b/.circleci/run-tests.sh
index 37b22b70..da5029b5 100755
--- a/.circleci/run-tests.sh
+++ b/.circleci/run-tests.sh
@@ -94,19 +94,7 @@ case $1 in
     chipyard-ariane)
         make run-binary-fast -C $LOCAL_SIM_DIR ${mapping[$1]} BINARY=$RISCV/riscv64-unknown-elf/share/riscv-tests/benchmarks/multiply.riscv
         ;;
-    chipyard-sodor-stage1)
-        run_asm ${mapping[$1]}
-        ;;
-    chipyard-sodor-stage2)
-        run_asm ${mapping[$1]}
-        ;;
-    chipyard-sodor-stage3)
-        run_asm ${mapping[$1]}
-        ;;
-    chipyard-sodor-stage5)
-        run_asm ${mapping[$1]}
-        ;;
-    chipyard-sodor-ucode)
+    chipyard-sodor)
         run_asm ${mapping[$1]}
         ;;
     chipyard-nvdla)