diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a87e6e7fec..10cd6ecfcd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,6 +19,8 @@ variables:
   CONFIGURE: ./configure
   SCAN_BUILD: scan-build-9
 
+  CFLAGS_COMMON: -fno-omit-frame-pointer -fno-optimize-sibling-calls -O1 -g -Wall -Wextra 
+
 stages:
   - precheck
   - build
@@ -349,7 +351,7 @@ push:docs:sid:amd64:
 gcc:alpine3.10:amd64:
   variables:
     CC: gcc
-    CFLAGS: "-Wall -Wextra -O2 -g"
+    CFLAGS: "${CFLAGS_COMMON}"
     EXTRA_CONFIGURE: "--enable-dnstap"
   <<: *alpine_3_10_amd64_image
   <<: *build_job
@@ -373,7 +375,7 @@ unit:gcc:alpine3.10:amd64:
 gcc:centos6:amd64:
   variables:
     CC: gcc
-    CFLAGS: "-Wall -Wextra -O2 -g"
+    CFLAGS: "${CFLAGS_COMMON}"
     EXTRA_CONFIGURE: "--with-libidn2 --disable-warn-error"
   <<: *centos_centos6_amd64_image
   <<: *build_job
@@ -397,7 +399,7 @@ unit:gcc:centos6:amd64:
 gcc:centos7:amd64:
   variables:
     CC: gcc
-    CFLAGS: "-Wall -Wextra -O2 -g"
+    CFLAGS: "${CFLAGS_COMMON}"
     EXTRA_CONFIGURE: "--enable-dnstap --with-libidn2"
   <<: *centos_centos7_amd64_image
   <<: *build_job
@@ -421,7 +423,7 @@ unit:gcc:centos7:amd64:
 gcc:centos8:amd64:
   variables:
     CC: gcc
-    CFLAGS: "-Wall -Wextra -O2 -g"
+    CFLAGS: "${CFLAGS_COMMON}"
     EXTRA_CONFIGURE: "--with-libidn2"
   <<: *centos_centos8_amd64_image
   <<: *build_job
@@ -445,7 +447,7 @@ unit:gcc:centos8:amd64:
 gcc:jessie:amd64:
   variables:
     CC: gcc
-    CFLAGS: "-Wall -Wextra -O2 -g"
+    CFLAGS: "${CFLAGS_COMMON} -O2"
     EXTRA_CONFIGURE: "--without-cmocka --with-python --disable-geoip"
   <<: *debian_jessie_amd64_image
   <<: *build_job
@@ -469,7 +471,7 @@ unit:gcc:jessie:amd64:
 gcc:stretch:amd64:
   variables:
     CC: gcc
-    CFLAGS: "-Wall -Wextra -O2 -g"
+    CFLAGS: "${CFLAGS_COMMON} -O2"
   <<: *debian_stretch_amd64_image
   <<: *build_job
 
@@ -492,7 +494,7 @@ unit:gcc:stretch:amd64:
 gcc:buster:amd64:
   variables:
     CC: gcc
-    CFLAGS: "-Wall -Wextra -O2 -g"
+    CFLAGS: "${CFLAGS_COMMON}"
   <<: *debian_buster_amd64_image
   <<: *build_job
 
@@ -526,7 +528,7 @@ scan-build:buster:amd64:
   stage: postcheck
   variables:
     CC: clang-9
-    CFLAGS: "-Wall -Wextra -O2 -g"
+    CFLAGS: "${CFLAGS_COMMON}"
     CONFIGURE: "${SCAN_BUILD} ./configure"
     EXTRA_CONFIGURE: "--enable-dnstap --with-libidn2"
   script:
@@ -547,7 +549,7 @@ scan-build:buster:amd64:
 gcc:sid:amd64:
   variables:
     CC: gcc
-    CFLAGS: "-Wall -Wextra -O3 -g"
+    CFLAGS: "${CFLAGS_COMMON} -O3"
     EXTRA_CONFIGURE: "--enable-dnstap --with-libidn2"
     RUN_MAKE_INSTALL: 1
     MAKE: bear make
@@ -580,7 +582,7 @@ cppcheck:gcc:sid:amd64:
 gcc:sid:i386:
   variables:
     CC: gcc
-    CFLAGS: "-Wall -Wextra -O3 -g"
+    CFLAGS: "${CFLAGS_COMMON}"
     EXTRA_CONFIGURE: "--enable-dnstap --with-libidn2 --without-python"
   <<: *debian_sid_i386_image
   <<: *build_job
@@ -604,7 +606,7 @@ unit:gcc:sid:i386:
 gcc:fedora30:amd64:
   variables:
     CC: gcc
-    CFLAGS: "-Wall -Wextra -O2 -g"
+    CFLAGS: "${CFLAGS_COMMON} -O1"
     EXTRA_CONFIGURE: "--with-libidn2"
   <<: *fedora_30_amd64_image
   <<: *build_job
@@ -628,7 +630,7 @@ unit:gcc:fedora30:amd64:
 gcc:xenial:amd64:
   variables:
     CC: gcc
-    CFLAGS: "-Wall -Wextra -O2 -g"
+    CFLAGS: "${CFLAGS_COMMON} -O2"
     EXTRA_CONFIGURE: "--disable-geoip"
   <<: *ubuntu_xenial_amd64_image
   <<: *build_job
@@ -652,7 +654,7 @@ unit:gcc:xenial:amd64:
 gcc:bionic:amd64:
   variables:
     CC: gcc
-    CFLAGS: "-Wall -Wextra -O2 -g"
+    CFLAGS: "${CFLAGS_COMMON} -Og"
     EXTRA_CONFIGURE: "--with-libidn2"
   <<: *ubuntu_bionic_amd64_image
   <<: *build_job
@@ -677,7 +679,7 @@ asan:sid:amd64:
   variables:
     CC: gcc
     ASAN_OPTIONS: "detect_leaks=0"
-    CFLAGS: "-Wall -Wextra -O2 -g -fsanitize=address,undefined -DISC_MEM_USE_INTERNAL_MALLOC=0"
+    CFLAGS: "${CFLAGS_COMMON} -fsanitize=address,undefined -DISC_MEM_USE_INTERNAL_MALLOC=0"
     LDFLAGS: "-fsanitize=address,undefined"
     EXTRA_CONFIGURE: "--with-libidn2"
   <<: *debian_sid_amd64_image
@@ -700,7 +702,7 @@ unit:asan:sid:amd64:
 rwlock:sid:amd64:
   variables:
     CC: gcc
-    CFLAGS: "-Wall -Wextra -O2 -g -DISC_MEM_USE_INTERNAL_MALLOC=0"
+    CFLAGS: "${CFLAGS_COMMON} -Wall -Wextra -O2 -g -DISC_MEM_USE_INTERNAL_MALLOC=0"
     EXTRA_CONFIGURE: "--with-libidn2 --enable-pthread-rwlock"
   <<: *debian_sid_amd64_image
   <<: *build_job
@@ -723,7 +725,7 @@ unit:rwlock:sid:amd64:
 mutexatomics:sid:amd64:
   variables:
     CC: gcc
-    CFLAGS: "-Wall -Wextra -O2 -g -DISC_MEM_USE_INTERNAL_MALLOC=0"
+    CFLAGS: "${CFLAGS_COMMON} -DISC_MEM_USE_INTERNAL_MALLOC=0"
     EXTRA_CONFIGURE: "--with-libidn2 --enable-mutex-atomics"
   <<: *debian_sid_amd64_image
   <<: *build_job
@@ -748,7 +750,7 @@ mutexatomics:sid:amd64:
 clang:stretch:amd64:
   variables:
     CC: clang
-    CFLAGS: "-Wall -Wextra -Wenum-conversion -O2 -g"
+    CFLAGS: "${CFLAGS_COMMON} -Wenum-conversion"
     EXTRA_CONFIGURE: "--with-python=python3"
   <<: *debian_stretch_amd64_image
   <<: *build_job
@@ -765,7 +767,7 @@ unit:clang:stretch:amd64:
 clang:stretch:i386:
   variables:
     CC: clang
-    CFLAGS: "-Wall -Wextra -Wenum-conversion -O2 -g"
+    CFLAGS: "${CFLAGS_COMMON} -Wenum-conversion"
     EXTRA_CONFIGURE: "--with-python=python2"
   <<: *debian_stretch_i386_image
   <<: *build_job
@@ -775,7 +777,7 @@ clang:stretch:i386:
 pkcs11:sid:amd64:
   variables:
     CC: gcc
-    CFLAGS: "-Wall -Wextra -O2 -g"
+    CFLAGS: "${CFLAGS_COMMON}"
     EXTRA_CONFIGURE: "--enable-native-pkcs11 --with-pkcs11=/usr/lib/softhsm/libsofthsm2.so"
   <<: *debian_sid_amd64_image
   <<: *build_job
@@ -798,7 +800,7 @@ unit:pkcs11:sid:amd64:
 
 clang:freebsd11.3:amd64:
   variables:
-    CFLAGS: "-Wall -Wextra -O2 -g"
+    CFLAGS: "${CFLAGS_COMMON}"
   <<: *freebsd_amd64
   <<: *build_job
 
@@ -820,7 +822,7 @@ unit:clang:freebsd11.3:amd64:
 
 clang:freebsd12.0:amd64:
   variables:
-    CFLAGS: "-Wall -Wextra -O2 -g"
+    CFLAGS: "${CFLAGS_COMMON}"
     EXTRA_CONFIGURE: "--enable-dnstap"
   <<: *freebsd_amd64
   <<: *build_job
@@ -862,7 +864,7 @@ system:clang:openbsd6.5:amd64:
 nolibtool:sid:amd64:
   variables:
     CC: gcc
-    CFLAGS: "-Wall -Wextra -Og -g"
+    CFLAGS: "${CFLAGS_COMMON}"
     EXTRA_CONFIGURE: "--with-libidn2 --without-libtool --with-dlopen"
   <<: *debian_sid_amd64_image
   <<: *build_job