diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 04fdd89e..83ae3ce9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,8 +20,9 @@ build:
         - rm -rf build
         - mkdir -p build
         - cd build
+        - export COVERAGE=true
         - cmake ../DRAMSys
-        - make -j4
+        - make -j 24
         - find . -name "*.o" -type f -delete
         # Create Base file to cover all lines
         - mkdir -p ${CI_PROJECT_DIR}/coverage
diff --git a/DRAMSys/CMakeLists.txt b/DRAMSys/CMakeLists.txt
index ec99b946..ccb2df9f 100644
--- a/DRAMSys/CMakeLists.txt
+++ b/DRAMSys/CMakeLists.txt
@@ -38,11 +38,13 @@ project(DRAMSys)
 # Configuration:
 set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ Version")
 set(DCMAKE_SH "CMAKE_SH-NOTFOUND" CACHE STRING "Ignore sh.exe error on Windows")
-SET(GCC_COVERAGE_COMPILE_FLAGS "-g -O0 -coverage -fprofile-arcs -ftest-coverage")
-SET(GCC_COVERAGE_LINK_FLAGS    "-coverage -lgcov")
-SET( CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS}" )
-SET( CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} ${GCC_COVERAGE_LINK_FLAGS}")
-
+if(DEFINED ENV{COVERAGE})
+    set(GCC_COVERAGE_COMPILE_FLAGS "-g -O0 -coverage -fprofile-arcs -ftest-coverage")
+    set(GCC_COVERAGE_LINK_FLAGS "-coverage -lgcov")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS}")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GCC_COVERAGE_LINK_FLAGS}")
+    message("-- Coverage check enabled")
+endif()
 
 # Add DRAMSysLibrary:
 add_subdirectory(library)
diff --git a/DRAMSys/library/CMakeLists.txt b/DRAMSys/library/CMakeLists.txt
index a8301da7..a84e0f29 100644
--- a/DRAMSys/library/CMakeLists.txt
+++ b/DRAMSys/library/CMakeLists.txt
@@ -38,12 +38,12 @@ project(DRAMSysLibrary)
 # Configuration:
 set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ Version")
 set(DCMAKE_SH="CMAKE_SH-NOTFOUND")
-SET(GCC_COVERAGE_COMPILE_FLAGS "-g -O0 -coverage -fprofile-arcs -ftest-coverage")
-SET(GCC_COVERAGE_LINK_FLAGS    "-coverage -lgcov")
-SET( CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS}" )
-SET( CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} ${GCC_COVERAGE_LINK_FLAGS}")
-
-
+if(DEFINED ENV{COVERAGE})
+    set(GCC_COVERAGE_COMPILE_FLAGS "-g -O0 -coverage -fprofile-arcs -ftest-coverage")
+    set(GCC_COVERAGE_LINK_FLAGS "-coverage -lgcov")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS}")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GCC_COVERAGE_LINK_FLAGS}")
+endif()
 
 # Add DRAMPower:
 add_subdirectory(src/common/third_party/DRAMPower)
diff --git a/DRAMSys/simulator/CMakeLists.txt b/DRAMSys/simulator/CMakeLists.txt
index fad8af38..3018a14f 100644
--- a/DRAMSys/simulator/CMakeLists.txt
+++ b/DRAMSys/simulator/CMakeLists.txt
@@ -38,11 +38,12 @@ project(DRAMSysSimulator)
 # Configuration:
 set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ Version")
 set(DCMAKE_SH="CMAKE_SH-NOTFOUND")
-SET(GCC_COVERAGE_COMPILE_FLAGS "-g -O0 -coverage -fprofile-arcs -ftest-coverage")
-SET(GCC_COVERAGE_LINK_FLAGS    "-coverage -lgcov")
-SET( CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS}" )
-SET( CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} ${GCC_COVERAGE_LINK_FLAGS}")
-
+if(DEFINED ENV{COVERAGE})
+    set(GCC_COVERAGE_COMPILE_FLAGS "-g -O0 -coverage -fprofile-arcs -ftest-coverage")
+    set(GCC_COVERAGE_LINK_FLAGS "-coverage -lgcov")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS}")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GCC_COVERAGE_LINK_FLAGS}")
+endif()
 
 if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/../library/src/simulation/DRAMSysRecordable.cpp)
     add_definitions(-DRECORDING)
diff --git a/DRAMSys/tests/ddr3_multirank/ci.yml b/DRAMSys/tests/ddr3_multirank/ci.yml
index ea32584e..254c0e62 100644
--- a/DRAMSys/tests/ddr3_multirank/ci.yml
+++ b/DRAMSys/tests/ddr3_multirank/ci.yml
@@ -23,7 +23,7 @@ example_ddr3:
 
     artifacts:
         paths:
-          - build/simulator/ddr3_multirank_ddr3_ch0.tdb
+          - build/simulator/ddr3-dual-rank_ddr3_ch0.tdb
           - coverage/${CI_JOB_NAME}.out
         expire_in: 2 days