diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 272dc3715ce90ac860bac8bdd62eb8c6925caa84..0ca7d1a236ca5324ee1ed9e8fb4c8d532fa26f5a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,8 +17,8 @@ config:bionic:
   image: keckj/hysop:bionic
   stage: configure
   script: 
-      - "bash ci/scripts/config.sh $CI_PROJECT_DIR/build/gcc-8   $CI_PROJECT_DIR/install/gcc-8   gcc-8   g++-8     gfortran-8"
-      - "bash ci/scripts/config.sh $CI_PROJECT_DIR/build/clang-8 $CI_PROJECT_DIR/install/clang-8 clang-8 clang++-8 gfortran-8"
+      - "bash ci/scripts/config.sh $CI_PROJECT_DIR/build/gcc-7   $CI_PROJECT_DIR/install/gcc-7   gcc-7   g++-7     gfortran-7"
+      - "bash ci/scripts/config.sh $CI_PROJECT_DIR/build/clang-7 $CI_PROJECT_DIR/install/clang-7 clang-7 clang++-7 gfortran-7"
   dependencies:
     - env:bionic
   artifacts:
@@ -29,8 +29,8 @@ build:bionic:
   image: keckj/hysop:bionic
   stage: build
   script: 
-      - "bash ci/scripts/build.sh $CI_PROJECT_DIR/build/gcc-8   gcc-8   g++-8     gfortran-8"
-      - "bash ci/scripts/build.sh $CI_PROJECT_DIR/build/clang-8 clang-8 clang++-8 gfortran-8"
+      - "bash ci/scripts/build.sh $CI_PROJECT_DIR/build/gcc-7   gcc-7   g++-7     gfortran-7"
+      - "bash ci/scripts/build.sh $CI_PROJECT_DIR/build/clang-7 clang-7 clang++-7 gfortran-7"
   dependencies:
     - config:bionic
   artifacts:
@@ -41,7 +41,7 @@ install:bionic:
   image: keckj/hysop:bionic
   stage: install
   script: 
-      - "bash ci/scripts/install.sh $CI_PROJECT_DIR/build/gcc-8 $CI_PROJECT_DIR/install/gcc-8"
+      - "bash ci/scripts/install.sh $CI_PROJECT_DIR/build/gcc-7 $CI_PROJECT_DIR/install/gcc-7"
   dependencies:
     - build:bionic
   artifacts:
@@ -52,7 +52,7 @@ test:bionic:
   image: keckj/hysop:bionic
   stage: test
   script:
-    - "bash ci/scripts/test.sh $CI_PROJECT_DIR/install/gcc-8 $CI_PROJECT_DIR/hysop $CI_PROJECT_DIR/cache"
+    - "bash ci/scripts/test.sh $CI_PROJECT_DIR/install/gcc-7 $CI_PROJECT_DIR/hysop $CI_PROJECT_DIR/cache"
   dependencies:
     - install:bionic
   cache:
diff --git a/hysop/backend/device/opencl/opencl_env.py b/hysop/backend/device/opencl/opencl_env.py
index ed84e0f6843ac5654d7b24090764d0dfdfb294df..f85f5a7e913b9c6e84e0e49a7f4c264ebf71bbed 100644
--- a/hysop/backend/device/opencl/opencl_env.py
+++ b/hysop/backend/device/opencl/opencl_env.py
@@ -566,13 +566,14 @@ Dumped OpenCL Kernel '{}'
         if not os.path.exists(dump_folder) and (main_rank == 0):
             os.makedirs(dump_folder)
 
-        if DEBUG:
+        if DEBUG and True:
             # dump kernel source while in debug mode
             dump_file=dump_folder+'/rk{}_{}_dump.cl'.format(
                 main_rank, kernel_name)
             print 'Dumping kernel src at \'{}\'.'.format(dump_file)
             with open(dump_file, 'w+') as f:
                 f.write(gpu_src)
+            build_opts += ['-g', '-s {}'.format(dump_file)]
         s_build_opts = ' '.join(build_opts)
 
         if VERBOSE: