diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fecab0e5a092b15bf84bdee8d469acbc70dfe78e..322879da7866951518e3f8bba16f0ca9de72bc8e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -272,7 +272,7 @@ oneapi_jug_xl:default:
   script:
     - cp containers/jug/setup_detectors.py containers/oneapi
     - cp detectors.yaml containers/oneapi
-    -  docker build -t ${CI_REGISTRY_IMAGE}/${BUILD_IMAGE}:${INTERNAL_TAG} 
+    - docker build -t ${CI_REGISTRY_IMAGE}/${BUILD_IMAGE}:${INTERNAL_TAG} 
                    -f containers/jug/xl.Dockerfile 
                    --build-arg INTERNAL_TAG=${INTERNAL_TAG}
                    --build-arg BASEIMAGE="oneapi_jug_dev"
@@ -300,10 +300,11 @@ oneapi_jug_xl:nightly:
     BUILD_IMAGE: "oneapi_jug_xl"
   script:
     - cp containers/jug/setup_detectors.py containers/oneapi
-    - cp detectors.yaml containers/oneapi
-    - sed 's/^FROM.*$/FROM ${DOCKER_REGISTRY}oneapi_jug_dev:${INTERNAL_TAG}/' containers/jug/xl.Dockerfile |  
-      docker build \- -t ${CI_REGISTRY_IMAGE}/${BUILD_IMAGE}:${NIGHTLY_TAG}
+    - cp detectors.yaml containers/oneapi 
+    - docker build -t ${CI_REGISTRY_IMAGE}/${BUILD_IMAGE}:${NIGHTLY_TAG}
+                   -f containers/jug/xl.Dockerfile 
                    --build-arg INTERNAL_TAG=${INTERNAL_TAG}
+                   --build-arg BASEIMAGE="oneapi_jug_dev"
                    --build-arg JUG_VERSION=nightly-$(date +%Y-%m-%d_%H-%M-%S)-${INTERNAL_TAG}-$(git rev-parse HEAD)
                    --build-arg NIGHTLY=1
                     containers/oneapi
diff --git a/containers/jug/xl.Dockerfile b/containers/jug/xl.Dockerfile
index b069b5c6a4fbd1fecc04af421de11106d98f1925..d98af1b9e2279a6db176b89a6fe109cc63b6a417 100644
--- a/containers/jug/xl.Dockerfile
+++ b/containers/jug/xl.Dockerfile
@@ -1,12 +1,13 @@
 #syntax=docker/dockerfile:1.2
 ARG DOCKER_REGISTRY="eicweb.phy.anl.gov:4567/containers/eic_container/"
-ARG INTERNAL_TAG="testing" 
+ARG INTERNAL_TAG="testing"
+ARG BASEIMAGE="jug_dev"
 
 ## ========================================================================================
 ## STAGE1: spack builder image
 ## EIC builder image with spack
 ## ========================================================================================
-FROM ${DOCKER_REGISTRY}jug_dev:${INTERNAL_TAG}
+FROM ${DOCKER_REGISTRY}${BASEIMAGE}:${INTERNAL_TAG}
 
 ARG EICWEB="https://eicweb.phy.anl.gov/api/v4/projects"
 ARG JUGGLER_VERSION="master"