diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5540c9c6..090203f0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,11 +6,8 @@ variables:
 
 stages:
     - build
-    - LPDDR4
-    - DDR3
-    - DDR4
-    - HBM2
-    - Coverage
+    - tests
+    - coverage
 
 build:
     stage: build
@@ -39,7 +36,7 @@ build:
             - coverage/
         
 coverage:
-    stage: Coverage
+    stage: coverage
     coverage: '/Total:\|(\d+\.?\d+\%)/'
     script:
         # delete all empty files since they produce errors 
diff --git a/DRAMSys/tests/DDR4/ci.yml b/DRAMSys/tests/DDR4/ci.yml
index 94dc5d4c..b17d09fb 100644
--- a/DRAMSys/tests/DDR4/ci.yml
+++ b/DRAMSys/tests/DDR4/ci.yml
@@ -1,6 +1,6 @@
 # DDR4 with 4 bank groups, flexible rankwise refresh and FrFcfs scheduler:
-example_ddr4:
-    stage: DDR4
+example_DDR4:
+    stage: tests
     script:
         - export GCOV_PREFIX=$(pwd)
         - export GCOV_PREFIX_STRIP=$(pwd | awk -F"/" '{print NF-1}')
@@ -25,5 +25,4 @@ example_ddr4:
         paths:
           - build/simulator/ddr4-bankgrp_ddr4_ch0.tdb
           - coverage/${CI_JOB_NAME}.out
-        expire_in: 2 days
-
+        expire_in: 2 days
\ No newline at end of file
diff --git a/DRAMSys/tests/HBM2/ci.yml b/DRAMSys/tests/HBM2/ci.yml
index 1f34b6d1..9141ddd8 100644
--- a/DRAMSys/tests/HBM2/ci.yml
+++ b/DRAMSys/tests/HBM2/ci.yml
@@ -1,25 +1,25 @@
 example_HBM2: 
-  artifacts: 
-    expire_in: "2 days"
-    paths: 
-      - build/simulator/hbm2-example_hbm2_ch0.tdb
-      - "coverage/${CI_JOB_NAME}.out"
-  cache: 
-    key: build
-    paths: 
-      - build/
-    policy: pull
-  script: 
-    - "export GCOV_PREFIX=$(pwd)"
-    - "export GCOV_PREFIX_STRIP=$(pwd | awk -F\"/\" '{print NF-1}')"
-    - "cd build/simulator"
-    - "./DRAMSys ../../DRAMSys/tests/HBM2/simulations/hbm2-example.json ../../DRAMSys/tests/HBM2/"
-    - "ls -lah"
-    - "ls -lah ../../DRAMSys/tests/HBM2/expected/"
-    - "sqldiff ../../DRAMSys/tests/HBM2/expected/hbm2-example_hbm2_ch0.tdb hbm2-example_hbm2_ch0.tdb"
-    - "perl -e 'if(`sqldiff ../../DRAMSys/tests/HBM2/expected/hbm2-example_hbm2_ch0.tdb hbm2-example_hbm2_ch0.tdb` eq \"\") {exit(0)} else {exit(-1)}'"
-    - "sqldiff ../../DRAMSys/tests/HBM2/expected/hbm2-example_hbm2_ch1.tdb hbm2-example_hbm2_ch1.tdb"
-    - "perl -e 'if(`sqldiff ../../DRAMSys/tests/HBM2/expected/hbm2-example_hbm2_ch1.tdb hbm2-example_hbm2_ch1.tdb` eq \"\") {exit(0)} else {exit(-1)}'"
-    - "lcov -q -c --rc geninfo_adjust_src_path=$GCOV_PREFIX -d ${CI_PROJECT_DIR}/build/ -o ${CI_PROJECT_DIR}/coverage/${CI_JOB_NAME}.out"
-  stage: HBM2
-
+    stage: tests
+    script: 
+        - "export GCOV_PREFIX=$(pwd)"
+        - "export GCOV_PREFIX_STRIP=$(pwd | awk -F\"/\" '{print NF-1}')"
+        - "cd build/simulator"
+        - "./DRAMSys ../../DRAMSys/tests/HBM2/simulations/hbm2-example.json ../../DRAMSys/tests/HBM2/"
+        - "ls -lah"
+        - "ls -lah ../../DRAMSys/tests/HBM2/expected/"
+        - "sqldiff ../../DRAMSys/tests/HBM2/expected/hbm2-example_hbm2_ch0.tdb hbm2-example_hbm2_ch0.tdb"
+        - "perl -e 'if(`sqldiff ../../DRAMSys/tests/HBM2/expected/hbm2-example_hbm2_ch0.tdb hbm2-example_hbm2_ch0.tdb` eq \"\") {exit(0)} else {exit(-1)}'"
+        - "sqldiff ../../DRAMSys/tests/HBM2/expected/hbm2-example_hbm2_ch1.tdb hbm2-example_hbm2_ch1.tdb"
+        - "perl -e 'if(`sqldiff ../../DRAMSys/tests/HBM2/expected/hbm2-example_hbm2_ch1.tdb hbm2-example_hbm2_ch1.tdb` eq \"\") {exit(0)} else {exit(-1)}'"
+        - "lcov -q -c --rc geninfo_adjust_src_path=$GCOV_PREFIX -d ${CI_PROJECT_DIR}/build/ -o ${CI_PROJECT_DIR}/coverage/${CI_JOB_NAME}.out"
+    cache: 
+        key: build
+        paths: 
+            - build/
+        policy: pull
+  
+    artifacts: 
+        paths: 
+            - build/simulator/hbm2-example_hbm2_ch0.tdb
+            - "coverage/${CI_JOB_NAME}.out"
+        expire_in: "2 days"
\ No newline at end of file
diff --git a/DRAMSys/tests/ddr3_multirank/ci.yml b/DRAMSys/tests/ddr3_multirank/ci.yml
index 254c0e62..879c825f 100644
--- a/DRAMSys/tests/ddr3_multirank/ci.yml
+++ b/DRAMSys/tests/ddr3_multirank/ci.yml
@@ -1,6 +1,6 @@
 # DDR3 Dual Rank Test with Staggered Power Down Policy and Scheduler FrFcfsGrp
-example_ddr3:
-    stage: DDR3
+example_DDR3:
+    stage: tests
     script:
         - export GCOV_PREFIX=$(pwd)
         - export GCOV_PREFIX_STRIP=$(pwd | awk -F"/" '{print NF-1}')
@@ -25,5 +25,4 @@ example_ddr3:
         paths:
           - build/simulator/ddr3-dual-rank_ddr3_ch0.tdb
           - coverage/${CI_JOB_NAME}.out
-        expire_in: 2 days
-
+        expire_in: 2 days
\ No newline at end of file
diff --git a/DRAMSys/tests/lpddr4/ci.yml b/DRAMSys/tests/lpddr4/ci.yml
index ff811142..fc3364f8 100644
--- a/DRAMSys/tests/lpddr4/ci.yml
+++ b/DRAMSys/tests/lpddr4/ci.yml
@@ -1,6 +1,6 @@
 # LPDDR4 with Bankwise Flexible Refresh and FIFO Scheduler:
-example_lpddr4:
-    stage: LPDDR4
+example_LPDDR4:
+    stage: tests
     script:
         - export GCOV_PREFIX=$(pwd)
         - export GCOV_PREFIX_STRIP=$(pwd | awk -F"/" '{print NF-1}')
@@ -25,4 +25,4 @@ example_lpddr4:
         paths:
           - build/simulator/lpddr4-example_lpddr4_ch0.tdb
           - coverage/${CI_JOB_NAME}.out
-        expire_in: 2 days
+        expire_in: 2 days
\ No newline at end of file