diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 25571f3..9472e5e 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -26,7 +26,7 @@ jobs:
         context: .
         file: ./container/base/Dockerfile
         push: true
-        tags: code.cozy.town/codeforleipzig/stadtratmonitor:latest-base
+        tags: code.cozy.town/codeforleipzig/stadtratmonitor/base:latest
 
     - name: Build and push Deploy image
       uses: docker/build-push-action@v2
@@ -34,7 +34,7 @@ jobs:
         context: .
         file: ./container/deploy/Dockerfile
         push: true
-        tags: code.cozy.town/codeforleipzig/stadtratmonitor:latest-deploy
+        tags: code.cozy.town/codeforleipzig/stadtratmonitor/deploy:latest
 
     - name: Build and push Develop image
       uses: docker/build-push-action@v2
@@ -42,7 +42,7 @@ jobs:
         context: .
         file: ./container/develop/Dockerfile
         push: true
-        tags: code.cozy.town/codeforleipzig/stadtratmonitor:latest-develop
+        tags: code.cozy.town/codeforleipzig/stadtratmonitor/develop:latest
 
     - name: Build and push Test image
       uses: docker/build-push-action@v2
@@ -50,4 +50,4 @@ jobs:
         context: .
         file: ./container/test/Dockerfile
         push: true
-        tags: code.cozy.town/codeforleipzig/stadtratmonitor:latest-test
\ No newline at end of file
+        tags: code.cozy.town/codeforleipzig/stadtratmonitor/test:latest
\ No newline at end of file
diff --git a/container/deploy/Dockerfile b/container/deploy/Dockerfile
index 23b4284..4b682c6 100755
--- a/container/deploy/Dockerfile
+++ b/container/deploy/Dockerfile
@@ -8,4 +8,4 @@ WORKDIR /home/srm/app/
 
 USER srm
 EXPOSE 3000
-CMD bundle exec puma -C /home/srm/app/config/puma.rb
\ No newline at end of file
+CMD bundle exec puma -C /app/config/puma.rb
\ No newline at end of file
diff --git a/container/develop/Dockerfile b/container/develop/Dockerfile
index 7006de5..a1ebbed 100755
--- a/container/develop/Dockerfile
+++ b/container/develop/Dockerfile
@@ -11,4 +11,4 @@ RUN bundle install
 WORKDIR /home/srm/app/
 
 EXPOSE 3000
-CMD bundle exec puma -C /home/srm/app/config/puma.rb
\ No newline at end of file
+CMD bundle exec puma -C /app/config/puma.rb
\ No newline at end of file
diff --git a/container/test/Dockerfile b/container/test/Dockerfile
index 60579b8..5287196 100755
--- a/container/test/Dockerfile
+++ b/container/test/Dockerfile
@@ -10,4 +10,4 @@ RUN bundle install
 WORKDIR /home/srm/app/
 
 EXPOSE 3000
-CMD bundle exec puma -C /home/srm/app/config/puma.rb
\ No newline at end of file
+CMD bundle exec puma -C /app/config/puma.rb
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index a7af840..15b8fe1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,7 @@
 version: "3.7"
 services:
   web:
-    image: ---WIP---
-    user: srm
+    image: code.cozy.town/codeforleipzig/stadtratmonitor:latest-develop
     volumes:
       - .:/app/
     ports:
@@ -13,7 +12,7 @@ services:
       - ELASTICSEARCH_URL=${ELASTICSEARCH_URL:-http://elasticsearch:9200}
       - APPLICATION_HOST=${APPLICATION_HOST:-localhost}
       - SHARED_IMPORT_SECRET=$SHARED_IMPORT_SECRET
-    command: ls -lah /home/srm/
+    #command: ls -lah /home/srm/
   elasticsearch:
     user: elasticsearch
     build: ./docker/elasticsearch