diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 81d072b..d52966e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -83,7 +83,7 @@ variables:
   artifacts:
     paths:
       - _build/test/test-suite.log
-      - builddir/meson-logs/testlog*.txt
+      - $MESON_BUILDDIR/meson-logs/
     expire_in: 1 week
     when: on_failure
     reports:
@@ -105,10 +105,10 @@ variables:
   extends:
     - .default_artifacts
   script:
-    - meson builddir $MESON_ARGS
-    - ninja -C builddir $NINJA_ARGS
+    - meson "$MESON_BUILDDIR" $MESON_ARGS
+    - ninja -C "$MESON_BUILDDIR" $NINJA_ARGS
     - if ! [[ -z '$MESON_TEST_ARGS' ]]; then
-        meson test -C builddir $MESON_TEST_ARGS;
+        meson test -C "$MESON_BUILDDIR" $MESON_TEST_ARGS;
       fi
 
 #################################################################
diff --git a/.gitlab-ci/gitlab-ci.tmpl b/.gitlab-ci/gitlab-ci.tmpl
index c54eb06..2165a67 100644
--- a/.gitlab-ci/gitlab-ci.tmpl
+++ b/.gitlab-ci/gitlab-ci.tmpl
@@ -83,7 +83,7 @@ variables:
   artifacts:
     paths:
       - _build/test/test-suite.log
-      - builddir/meson-logs/testlog*.txt
+      - $MESON_BUILDDIR/meson-logs/
     expire_in: 1 week
     when: on_failure
     reports:
@@ -105,10 +105,10 @@ variables:
   extends:
     - .default_artifacts
   script:
-    - meson builddir $MESON_ARGS
-    - ninja -C builddir $NINJA_ARGS
+    - meson "$MESON_BUILDDIR" $MESON_ARGS
+    - ninja -C "$MESON_BUILDDIR" $NINJA_ARGS
     - if ! [[ -z '$MESON_TEST_ARGS' ]]; then
-        meson test -C builddir $MESON_TEST_ARGS;
+        meson test -C "$MESON_BUILDDIR" $MESON_TEST_ARGS;
       fi
 
 #################################################################