diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9cf7965d4c1029639c5e4c94c05944f8d83993a6..6a06aca03a7ebccc34167375401dc3d3b05aaca6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -177,7 +177,7 @@ jug_dev:default:
     - cp -r spack.yaml containers/jug/spack/spack.yaml
     ## now build our image
     - docker build -t ${CI_REGISTRY_IMAGE}/${BUILD_IMAGE}:${INTERNAL_TAG} 
-                   -f containers/jug/Dockerfile.dev
+                   -f containers/jug/dev.Dockerfile
                    --build-arg SPACK_VERSION=${SPACK_VERSION}
                    --build-arg CACHE_BUST=${PACKAGE_HASH}
                    --build-arg INTERNAL_TAG=${INTERNAL_TAG}
@@ -195,7 +195,7 @@ jug_xl:default:
     BUILD_IMAGE: "jug_xl"
   script:
     - docker build -t ${CI_REGISTRY_IMAGE}/${BUILD_IMAGE}:${INTERNAL_TAG} 
-                   -f containers/jug/Dockerfile.xl
+                   -f containers/jug/xl.Dockerfile
                    --build-arg INTERNAL_TAG=${INTERNAL_TAG}
                    --build-arg JUGGLER_VERSION=${JUGGLER_VERSION}
                    --build-arg NPDET_VERSION=${NPDET_VERSION}
@@ -222,7 +222,7 @@ jug_xl:nightly:
     BUILD_IMAGE: "jug_xl"
   script:
     - docker build -t ${CI_REGISTRY_IMAGE}/${BUILD_IMAGE}:${NIGHTLY_TAG} 
-                   -f containers/jug/Dockerfile.xl
+                   -f containers/jug/xl.Dockerfile
                    --build-arg INTERNAL_TAG=${INTERNAL_TAG}
                    --build-arg JUG_VERSION=nightly-$(date +%Y-%m-%d_%H-%M-%S)-$(git rev-parse HEAD)
                    containers/jug
diff --git a/containers/jug/Dockerfile.dev b/containers/jug/dev.Dockerfile
similarity index 100%
rename from containers/jug/Dockerfile.dev
rename to containers/jug/dev.Dockerfile
diff --git a/containers/jug/eic-env.sh b/containers/jug/eic-env.sh
index 27d2dadc8ae82d6dff94f36d77fc31c19714e0c0..2475ddca1586bc71ab8c156df98d01aa50844f33 100755
--- a/containers/jug/eic-env.sh
+++ b/containers/jug/eic-env.sh
@@ -6,7 +6,6 @@ done
 
 export PS1='eic-shell> \[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
 export LS_COLORS='rs=0:di=01;34:ln=01;36:mh=00:pi=40;33'
-export GREP_OPTIONS='--color=auto'
 
 ## redefine ls and less as functions, as this is something we
 ## can import into our plain bash --norc --noprofile session
diff --git a/containers/jug/Dockerfile.xl b/containers/jug/xl.Dockerfile
similarity index 100%
rename from containers/jug/Dockerfile.xl
rename to containers/jug/xl.Dockerfile