diff --git a/etc/docker/dev/docker-compose.yml b/etc/docker/dev/docker-compose.yml
index 83079f217d..5dd7e3fbba 100644
--- a/etc/docker/dev/docker-compose.yml
+++ b/etc/docker/dev/docker-compose.yml
@@ -134,7 +134,7 @@ services:
       - ./oracle_setup.sh:/container-entrypoint-initdb.d/oracle_setup.sh:Z
   fts:
     container_name: dev_fts_1
-    image: docker.io/rucio/fts
+    image: docker.io/rucio/test-fts
     platform: linux/amd64
     profiles:
       - storage
@@ -163,7 +163,7 @@ services:
       - MYSQL_ROOT_PASSWORD=fts
       - MYSQL_DATABASE=fts
   xrd1:
-    image: docker.io/rucio/xrootd
+    image: docker.io/rucio/test-xrootd
     platform: linux/amd64
     profiles:
       - storage
@@ -179,7 +179,7 @@ services:
         soft: 10240
         hard: 10240
   xrd2:
-    image: docker.io/rucio/xrootd
+    image: docker.io/rucio/test-xrootd
     platform: linux/amd64
     profiles:
       - storage
@@ -195,7 +195,7 @@ services:
         soft: 10240
         hard: 10240
   xrd3:
-    image: docker.io/rucio/xrootd
+    image: docker.io/rucio/test-xrootd
     platform: linux/amd64
     profiles:
       - storage
@@ -211,7 +211,7 @@ services:
         soft: 10240
         hard: 10240
   xrd4:
-    image: docker.io/rucio/xrootd
+    image: docker.io/rucio/test-xrootd
     platform: linux/amd64
     profiles:
       - storage
@@ -227,7 +227,7 @@ services:
         soft: 10240
         hard: 10240
   xrd5:
-    image: docker.io/rucio/xrootd
+    image: docker.io/rucio/test-xrootd
     platform: linux/amd64
     profiles:
       - storage
@@ -250,7 +250,7 @@ services:
         soft: 10240
         hard: 10240
   web1:
-    image: rucio/webdav
+    image: rucio/test-webdav
     platform: linux/amd64
     environment:
       - QBITTORRENT_UI_USERNAME=rucio
@@ -277,7 +277,7 @@ services:
       - ../../certs/hostcert_minio.key.pem:/root/.minio/certs/private.key:Z
     command: ["server", "/data"]
   ssh1:
-    image: docker.io/rucio/ssh
+    image: docker.io/rucio/test-ssh
     platform: linux/amd64
     profiles:
       - storage
diff --git a/tests/test_conveyor.py b/tests/test_conveyor.py
index aaffc94010..6466cfc4ae 100644
--- a/tests/test_conveyor.py
+++ b/tests/test_conveyor.py
@@ -1252,7 +1252,7 @@ def test_overwrite_hops(overwrite_on_tape_topology, caches_mock, did_factory, fi
     else:
         # FTS only recently introduced the overwrite_hops parameter. It will be ignored on old
         # fts versions and the first hop will fail with the  file exists error
-        # TODO: remove this else after FTS 3.12 release and after updating rucio/fts container with the new release
+        # TODO: remove this else after FTS 3.12 release and after updating rucio/test-fts container with the new release
         request = __wait_for_state_transition(dst_rse_id=rse2_id, **did1)
         assert request['state'] == RequestState.FAILED
         assert 'Destination file exists and overwrite is not enabled' in request['err_msg']