diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f051ca39..36b696fb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,9 +9,9 @@ stages:
     - DDR3
     - Coverage
 
-cache:
-    paths:
-        - build/
+#cache:
+#    paths:
+#        - build/
 
 build:
     stage: build
@@ -24,6 +24,11 @@ build:
         - qmake ../DRAMSys/DRAMSys.pro
         - make -j4
         - find . -name "*.o" -type f -delete
+    cache:
+        key: build
+        paths:
+            - build/
+        policy: push
         
 coverage:
     stage: Coverage
diff --git a/DRAMSys/tests/DDR3/ci.yml b/DRAMSys/tests/DDR3/ci.yml
index 4d7b4d25..6829d561 100644
--- a/DRAMSys/tests/DDR3/ci.yml
+++ b/DRAMSys/tests/DDR3/ci.yml
@@ -13,10 +13,16 @@ example_ddr3:
         # Run Code Coverage
         - mkdir -p ${CI_PROJECT_DIR}/coverage
         - lcov -q -c -d ${CI_PROJECT_DIR}/build/ -o ${CI_PROJECT_DIR}/coverage/${CI_JOB_NAME}.out
-    after_script:
-        - cd build/
+#    after_script:
+#        - cd build/
 #        - find . -name "*.gcno" -type f -delete
-        - find . -name "*.gcda" -type f -delete
+#        - find . -name "*.gcda" -type f -delete
+ 
+    cache:
+        key: build
+        paths:
+            - build/
+        policy: pull
     
     artifacts:
         paths:
@@ -39,10 +45,16 @@ fr_fcfs:
         # Run Code Coverage
         - mkdir -p ${CI_PROJECT_DIR}/coverage
         - lcov -q -c -d ${CI_PROJECT_DIR}/build/ -o ${CI_PROJECT_DIR}/coverage/${CI_JOB_NAME}.out
-    after_script:
-        - cd build/
+#    after_script:
+#        - cd build/
 #        - find . -name "*.gcno" -type f -delete
-        - find . -name "*.gcda" -type f -delete
+#        - find . -name "*.gcda" -type f -delete
+
+    cache:
+        key: build
+        paths:
+            - build/
+        policy: pull
 
     allow_failure: true # TODO should be removed after first tests
 
@@ -62,10 +74,16 @@ protocol_checker:
         # Run Code Coverage
         - mkdir -p ${CI_PROJECT_DIR}/coverage
         - lcov -q -c -d ${CI_PROJECT_DIR}/build/ -o ${CI_PROJECT_DIR}/coverage/${CI_JOB_NAME}.out
-    after_script:
-        - cd build/
+#    after_script:
+#        - cd build/
 #        - find . -name "*.gcno" -type f -delete
-        - find . -name "*.gcda" -type f -delete
+#        - find . -name "*.gcda" -type f -delete
+
+    cache:
+        key: build
+        paths:
+            - build/
+        policy: pull
 
     artifacts:
         paths: