diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f27759f089..671eeda8c7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -64,23 +64,6 @@ variables:
     -Dgst-omx:target=generic
     -Ddoc=disabled
 
-  MESON_GST_WERROR: >
-    -Dgstreamer:werror=true
-    -Dgst-plugins-base:werror=true
-    -Dgst-plugins-good:werror=true
-    -Dgst-plugins-ugly:werror=true
-    -Dgst-plugins-bad:werror=true
-    -Dgst-rtsp-server:werror=true
-    -Dgst-libav:werror=true
-    -Dgst-examples:werror=true
-    -Dgst-editing-services:werror=true
-    -Dgst-docs:werror=true
-    -Dgst-omx:werror=true
-    -Dgst-devtools:werror=true
-    -Dgst-python:werror=true
-    -Dgstreamer-vaapi:werror=true
-    -Dgstreamer-sharp:werror=true
-
 workflow:
   # https://docs.gitlab.com/ee/ci/yaml/index.html#switch-between-branch-pipelines-and-merge-request-pipelines
   rules:
@@ -269,7 +252,7 @@ commitlint:
   - export ARGS="--default-library=${BUILD_TYPE:-both} -Dgstreamer:gst_debug=${BUILD_GST_DEBUG:-true} ${MESON_ARGS}"
   - |-
     if [ $GST_WERROR == "true" ]; then
-      export ARGS="$ARGS $MESON_GST_WERROR"
+      export ARGS="$ARGS --native-file ./ci/meson/gst-werror.ini"
     fi
   - echo $ARGS
   - date -R
diff --git a/ci/meson/gst-werror.ini b/ci/meson/gst-werror.ini
new file mode 100644
index 0000000000..ebd9ca2e42
--- /dev/null
+++ b/ci/meson/gst-werror.ini
@@ -0,0 +1,44 @@
+[gstreamer:built-in options]
+werror = true
+
+[gst-plugins-base:built-in options]
+werror = true
+
+[gst-plugins-good:built-in options]
+werror = true
+
+[gst-plugins-ugly:built-in options]
+werror = true
+
+[gst-plugins-bad:built-in options]
+werror = true
+
+[gst-rtsp-server:built-in options]
+werror = true
+
+[gst-libav:built-in options]
+werror = true
+
+[gst-examples:built-in options]
+werror = true
+
+[gst-editing-services:built-in options]
+werror = true
+
+[gst-docs:built-in options]
+werror = true
+
+[gst-omx:built-in options]
+werror = true
+
+[gst-devtools:built-in options]
+werror = true
+
+[gst-python:built-in options]
+werror = true
+
+[gstreamer-vaapi:built-in options]
+werror = true
+
+[gstreamer-sharp:built-in options]
+werror = true