diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f68226e47101879610edfb511f8fb049030297be..af39d9347d77c759a43806401c9a838c4be1eb23 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,6 +51,18 @@ common:setup:
         echo "JUGGLER_DETECTOR=$JUGGLER_DETECTOR" >> juggler.env
         echo "JUGGLER_DETECTOR_VERSION=$JUGGLER_DETECTOR_VERSION" >> juggler.env
         echo "COMMON_BENCH_VERSION=$COMMON_BENCH_VERSION" >> juggler.env
+      else 
+        if [[ "${JUGGLER_DETECTOR}" == "" ]] ; then
+          export JUGGLER_DETECTOR="athena" 
+        fi
+        if [[ "${JUGGLER_DETECTOR_VERSION}" == "" ]] ; then
+          export JUGGLER_DETECTOR_VERSION="master" 
+        fi
+        echo "JUGGLER_DETECTOR         = ${JUGGLER_DETECTOR}"
+        echo "JUGGLER_DETECTOR_VERSION = ${JUGGLER_DETECTOR_VERSION}"
+        echo "JUGGLER_DETECTOR=$JUGGLER_DETECTOR" >> juggler.env
+        echo "JUGGLER_DETECTOR_VERSION=$JUGGLER_DETECTOR_VERSION" >> juggler.env
+        echo "COMMON_BENCH_VERSION=$COMMON_BENCH_VERSION" >> juggler.env
       fi
     - source setup/bin/env.sh && ./setup/bin/install_common.sh