diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 10946bbfce12da47d478c2ab9a9015bb78e8b08f..4ee7396fd724e5d8a378b6ca4650b345db9fb552 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,7 +78,7 @@ tf-apply:
     - | 
       if [ -z $TF_VAR_image_ohpc ];
       then
-      XDMOD_IMAGES=($(openstack image list --sort-column Name --sort-descending -f value -c Name -c ID | grep -P ' xdmod-\d{14}$' | awk '{print $2}'))
+      XDMOD_IMAGES=($(openstack image list --sort-column Name --sort-descending -f value -c Name -c ID | grep -P ' xdmod-$TARGET_ENV-\d{14}$' | awk '{print $2}'))
       export TF_VAR_image_ohpc="${XDMOD_IMAGES[0]}"
       echo $TF_VAR_image_ohpc
       else