diff --git a/container/deploy/Dockerfile b/container/deploy/Dockerfile
index 4b682c6..0d7f98d 100755
--- a/container/deploy/Dockerfile
+++ b/container/deploy/Dockerfile
@@ -2,7 +2,7 @@
 # ~~~ DEPLOY IMAGE ~~~
 # ~~~~~~~~~~~~~~~~~~~~
 
-FROM code.cozy.town/codeforleipzig/stadtratmonitor:latest-base
+FROM code.cozy.town/codeforleipzig/stadtratmonitor/base:latest
 
 WORKDIR /home/srm/app/
 
diff --git a/container/develop/Dockerfile b/container/develop/Dockerfile
index a1ebbed..de6726d 100755
--- a/container/develop/Dockerfile
+++ b/container/develop/Dockerfile
@@ -2,7 +2,7 @@
 # ~~~ DEVELOP IMAGE ~~~
 # ~~~~~~~~~~~~~~~~~~~~~
 
-FROM code.cozy.town/codeforleipzig/stadtratmonitor:latest-base
+FROM code.cozy.town/codeforleipzig/stadtratmonitor/base:latest
 
 RUN bundle config without test
 RUN bundle update
diff --git a/container/test/Dockerfile b/container/test/Dockerfile
index 5287196..249218a 100755
--- a/container/test/Dockerfile
+++ b/container/test/Dockerfile
@@ -2,7 +2,7 @@
 # ~~~ TEST IMAGE ~~~
 # ~~~~~~~~~~~~~~~~~~~~~
 
-FROM code.cozy.town/codeforleipzig/stadtratmonitor:latest-base
+FROM code.cozy.town/codeforleipzig/stadtratmonitor/base:latest
 
 RUN bundle update
 RUN bundle install
diff --git a/docker-compose.yml b/docker-compose.yml
index 15b8fe1..af91740 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3.7"
 services:
   web:
-    image: code.cozy.town/codeforleipzig/stadtratmonitor:latest-develop
+    image: code.cozy.town/codeforleipzig/stadtratmonitor/develop:latest
     volumes:
       - .:/app/
     ports: