diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b4205d29f04f7098f2ab349933a96c4b0a2a600..634f6cd340991923598f492b43daa2ba5c4f5f51 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,6 +11,7 @@ variables:
   BUILD_PROCESSES: "" # Empty string: builds all processes
   BUILD_TESTS: "true"
   BUILD_CTEST: "true"
+  CPU_TARGET: sandybridge
 
 workflow:
   rules:
diff --git a/scripts/ci/jobs/container.yml b/scripts/ci/jobs/container.yml
index 37fa423bc597c14cf85a00f10a8344213111242c..9dad0fb35ecc75d193a2b44846b5eaf50341b2b1 100644
--- a/scripts/ci/jobs/container.yml
+++ b/scripts/ci/jobs/container.yml
@@ -25,14 +25,16 @@ container:
       poetry run ogscm compiler.py ogs.py -B -C -R --ogs ../..
       --build_args ' --progress=plain'
       --cvode --ccache --mfront
-      --cmake_args ' -DOGS_CPU_ARCHITECTURE=sandybridge -DOGS_BUILD_TESTING=OFF'
+      --cpu-target $CPU_TARGET
+      --cmake_args ' -DOGS_CPU_ARCHITECTURE=OFF -DOGS_BUILD_TESTING=OFF'
       $DOCKER_TAG_SERIAL
     # petsc container
     - >
       poetry run ogscm compiler.py mpi.py ogs.py -B -C -R --ogs ../..
       --build_args ' --progress=plain'
       --cvode --ccache
-      --cmake_args ' -DOGS_CPU_ARCHITECTURE=sandybridge -DOGS_BUILD_TESTING=OFF'
+      --cpu-target $CPU_TARGET
+      --cmake_args ' -DOGS_CPU_ARCHITECTURE=OFF -DOGS_BUILD_TESTING=OFF'
       --base_image 'centos:8' --ompi 4.0.5 --mpi_benchmarks
     # test ogs can run in container
     - |
@@ -44,7 +46,8 @@ container:
       poetry run ogscm compiler.py ogs.py -B -C -R --ogs ../..
       --build_args ' --progress=plain'
       --cvode --ccache
-      --cmake_args ' -DOGS_CPU_ARCHITECTURE=sandybridge -DOGS_BUILD_CLI=OFF -DOGS_BUILD_UTILS=OFF -DOGS_BUILD_TESTING=OFF'
+      --cpu-target $CPU_TARGET
+      --cmake_args ' -DOGS_CPU_ARCHITECTURE=OFF -DOGS_BUILD_CLI=OFF -DOGS_BUILD_UTILS=OFF -DOGS_BUILD_TESTING=OFF'
       --gui
   artifacts:
     name: container
diff --git a/scripts/ci/jobs/jupyter.yml b/scripts/ci/jobs/jupyter.yml
index 9b69ebac98fb46f49754b1470c33f877a4835450..8cfcba7e5f155c62f6650b53c4af6b5db704fcc3 100644
--- a/scripts/ci/jobs/jupyter.yml
+++ b/scripts/ci/jobs/jupyter.yml
@@ -19,7 +19,7 @@ build jupyter:
       poetry run ogscm compiler.py ogs.py ogs_jupyter.py -B -R --ogs ../..
       --build_args ' --progress=plain'
       --cvode --ccache --mfront
-      --cpu-target sandybridge
+      --cpu-target $CPU_TARGET
       --cmake_args ' -DOGS_CPU_ARCHITECTURE=OFF -DOGS_BUILD_TESTING=OFF'
       --runtime_base_image 'jupyter/base-notebook'
       --tag $DOCKER_TAG_JUPYTER