diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b73da905b76a062f29fefd2ff5b01a7b6d1d5157..4948547a3c9372c563db5d9a3b484dcbd9012f6b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,10 +54,10 @@ checks:
 
 automated_test:
   variables:
-    OUT_FOLDER: /gpfs/exfel/data/scratch/xcaltst/test/
-    REFERENCE_FOLDER: /gpfs/exfel/data/scratch/xcaltst/test/
-    DETECTOR_TYPE: epix100
-    CALIBRATION_TYPE: dark
+    OUTPUT: /gpfs/exfel/data/scratch/xcaltst/test/
+    REFERENCE: /gpfs/exfel/data/scratch/xcaltst/test/
+    DETECTOR: epix100
+    CALIBRATION: dark
   stage: automated_test
   only: [merge_requests]
   when: manual
@@ -67,8 +67,8 @@ automated_test:
     - export LANG=C  # Hopefully detect anything relying on locale
     - python3 -m pip install ".[automated_test]"
     - echo "Running automated test. This can take sometime to finish depending on the test data."
-    - echo "Given variables are REFERENCE_FOLDER=$REFERENCE_FOLDER, OUT_FOLDER=$OUT_FOLDER, DETECTOR_TYPE=$DETECTOR_TYPE, CALIBRATION_TYPE=$CALIBRATION_TYPE"
-    - python3 -m pytest ./tests/test_reference_runs --color yes --verbose --release-test --reference-folder $REFERENCE_FOLDER --out-folder $OUT_FOLDER  --detectors $DETECTOR_TYPE --calibration $CALIBRATION_TYPE
+    - echo "Given variables are REFERENCE=$REFERENCE, OUTPUT=$OUTPUT, DETECTOR=$DETECTOR, CALIBRATION=$CALIBRATION"
+    - python3 -m pytest ./tests/test_reference_runs --color yes --verbose --release-test --reference-folder $REFERENCE --out-folder $OUTPUT  --detectors $DETECTOR --calibration $CALIBRATION
 
 # cython-editable-install-test:
 #   stage: test