diff --git a/src/_static/docker-compose-22.4.yml b/src/_static/docker-compose-22.4.yml
index 04107ef6..c422805c 100644
--- a/src/_static/docker-compose-22.4.yml
+++ b/src/_static/docker-compose-22.4.yml
@@ -1,28 +1,28 @@
 services:
   vulnerability-tests:
-    image: registry.community.greenbone.net/communityvulnerability-tests
+    image: registry.community.greenbone.net/community/vulnerability-tests
     environment:
       STORAGE_PATH: /var/lib/openvas/22.04/vt-data/nasl
     volumes:
       - vt_data_vol:/mnt
 
   notus-data:
-    image: registry.community.greenbone.net/communitynotus-data
+    image: registry.community.greenbone.net/community/notus-data
     volumes:
       - notus_data_vol:/mnt
 
   scap-data:
-    image: registry.community.greenbone.net/communityscap-data
+    image: registry.community.greenbone.net/community/scap-data
     volumes:
       - scap_data_vol:/mnt
 
   cert-bund-data:
-    image: registry.community.greenbone.net/communitycert-bund-data
+    image: registry.community.greenbone.net/community/cert-bund-data
     volumes:
       - cert_data_vol:/mnt
 
   dfn-cert-data:
-    image: registry.community.greenbone.net/communitydfn-cert-data
+    image: registry.community.greenbone.net/community/dfn-cert-data
     volumes:
       - cert_data_vol:/mnt
     depends_on:
@@ -34,7 +34,7 @@ services:
       - data_objects_vol:/mnt
 
   report-formats:
-    image: registry.community.greenbone.net/communityreport-formats
+    image: registry.community.greenbone.net/community/report-formats
     volumes:
       - data_objects_vol:/mnt
     depends_on:
@@ -52,7 +52,7 @@ services:
       - redis_socket_vol:/run/redis/
 
   pg-gvm:
-    image: registry.community.greenbone.net/communitypg-gvm
+    image: registry.community.greenbone.net/community/pg-gvm
     restart: on-failure
     volumes:
       - psql_data_vol:/var/lib/postgresql
@@ -98,7 +98,7 @@ services:
   # and changes log output to /var/log/openvas instead /var/log/gvm
   # to reduce likelyhood of unwanted log interferences
   configure-openvas:
-    image: registry.community.greenbone.net/communityopenvas-scanner
+    image: registry.community.greenbone.net/community/openvas-scanner
     volumes:
       - openvas_data_vol:/mnt
       - openvas_log_data_vol:/var/log/openvas
@@ -115,7 +115,7 @@ services:
 
   # shows logs of openvas
   openvas:
-    image: registry.community.greenbone.net/communityopenvas-scanner
+    image: registry.community.greenbone.net/community/openvas-scanner
     restart: on-failure
     volumes:
       - openvas_data_vol:/etc/openvas