diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bd92aa5366f621f31c22d022ee4539e20c75d3bf..76626d19787f337bab4f833de80e15f490d7cb0d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -385,11 +385,12 @@ cleanup_knightly:
   tags:
     - build
   script:
+    - OS_PROJECT_ID=$(openstack application credential show $OS_APPLICATION_CREDENTIAL_ID -f value -c project_id)
     - >
       SERVER_TO_BE_DELETE=($(openstack server list --name $OOD_INSTANCE_NAME --sort-column Image --sort-descending -f value -c ID
       | awk -v NSTK=$NUM_SERVER_TO_KEEP '{count++}
       {if (count>NSTK) print}'))
-    - openstack image list --sort-column Name --sort-descending -f value -c Name -c ID > images.txt
+    - openstack image list --sort-column Name --sort-descending -f value -c Name -c ID --property owner=$OS_PROJECT_ID > images.txt
     - >
       OOD_IMAGE_TO_BE_DELETE=($(cat images.txt
       | awk -v NITK=$NUM_IMAGE_TO_KEEP -v REGEX=ood-$TIMESTAMP_REGEX
@@ -439,8 +440,9 @@ cleanup_mr:
   tags:
     - build
   script:
+    - OS_PROJECT_ID=$(openstack application credential show $OS_APPLICATION_CREDENTIAL_ID -f value -c project_id)
     - >
-      IMAGE_TO_BE_DELETE=($(openstack image list --sort-column Name --sort-descending -f value -c Name -c ID
+      IMAGE_TO_BE_DELETE=($(openstack image list --sort-column Name --sort-descending -f value -c Name -c ID --property owner=$OS_PROJECT_ID
       | awk -v REGEX="(ood|base|compute|gpu)-PR-$CI_MERGE_REQUEST_IID" '{if ($0 ~ REGEX) print $1}'))
     - |
       for img in ${IMAGE_TO_BE_DELETE[@]}; do