diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9011e4ab..800215b0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,9 +6,10 @@ variables:
 
 stages:
     - build
-    - dramsys-gem5-build
-    - WIDEIO
+    - LPDDR4
     - DDR3
+    - DDR4
+    - HBM2
     - Coverage
 
 build:
@@ -51,6 +52,8 @@ coverage:
            
 
 include:
-    - '/DRAMSys/tests/DDR3/ci.yml'
-    - '/DRAMSys/tests/WIDEIO/ci.yml'
+    - '/DRAMSys/tests/lpddr4/ci.yml'
+    - '/DRAMSys/tests/ddr3_multirank/ci.yml'
+    - '/DRAMSys/tests/DDR4/ci.yml'
+    - '/DRAMSys/tests/HBM2/ci.yml'
     #- '/DRAMSys/tests/dramsys-gem5/ci.yml' # Should be activated again when a new gitlab runner with right dependencies is used
diff --git a/.gitlab-ci_old.yml b/.gitlab-ci_old.yml
deleted file mode 100644
index 9011e4ab..00000000
--- a/.gitlab-ci_old.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-# vim: set ts=4 sw=4 expandtab:
-image: gcc
-
-variables:
-  GIT_STRATEGY: clone
-
-stages:
-    - build
-    - dramsys-gem5-build
-    - WIDEIO
-    - DDR3
-    - Coverage
-
-build:
-    stage: build
-    script:
-        - git submodule sync
-        - git submodule update --init --recursive
-        - rm -rf build
-        - mkdir -p build
-        - cd build
-        - cmake ../DRAMSys
-        - make -j16
-        - find . -name "*.o" -type f -delete
-        - rm -rf ${CI_PROJECT_DIR}/coverage
-        - mkdir -p ${CI_PROJECT_DIR}/coverage
-
-    cache:
-        key: build
-        paths:
-            - build/
-        policy: push
-
-    artifacts:
-        paths:
-            - coverage/
-
-coverage:
-    stage: Coverage
-    coverage: '/Total:\|(\d+\.?\d+\%)/'
-    script:
-        # delete all empty files since they produce errors 
-        - find coverage -size 0 -type f -delete
-        - ls coverage/ -lah
-        - lcov `find coverage -type f -exec echo "-a {}" \;` -o coverage/final.out
-        - lcov --list coverage/final.out
-
-    artifacts:
-        paths:
-            - coverage/final.out
-           
-
-include:
-    - '/DRAMSys/tests/DDR3/ci.yml'
-    - '/DRAMSys/tests/WIDEIO/ci.yml'
-    #- '/DRAMSys/tests/dramsys-gem5/ci.yml' # Should be activated again when a new gitlab runner with right dependencies is used