diff --git a/.github/workflows/build-app.yml b/.github/workflows/docker-publish.yml
similarity index 95%
rename from .github/workflows/build-app.yml
rename to .github/workflows/docker-publish.yml
index ee990ed..18b4126 100644
--- a/.github/workflows/build-app.yml
+++ b/.github/workflows/docker-publish.yml
@@ -80,7 +80,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ env.REGISTRY }}/${{ github.repository }}/${{ matrix.service }}
+          images: ${{ env.REGISTRY }}/${{ github.repository }}${{ matrix.service == 'jupyter' && '/jupyter' || '' }}
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
diff --git a/docker-compose.yaml b/docker-compose.yaml
index e966e3f..2fbfb4d 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -68,7 +68,7 @@ services:
   # nomad worker (processing)
   worker:
     restart: unless-stopped
-    image: ghcr.io/fairmat-nfdi/nomad-distribution-template/app:main
+    image: ghcr.io/fairmat-nfdi/nomad-distribution-template:main
     container_name: nomad_oasis_worker
     environment:
       NOMAD_SERVICE: nomad_oasis_worker
@@ -91,7 +91,7 @@ services:
   # nomad app (api + proxy)
   app:
     restart: unless-stopped
-    image: ghcr.io/fairmat-nfdi/nomad-distribution-template/app:main
+    image: ghcr.io/fairmat-nfdi/nomad-distribution-template:main
     container_name: nomad_oasis_app
     environment:
       NOMAD_SERVICE: nomad_oasis_app
@@ -130,7 +130,7 @@ services:
   # nomad remote tools hub (JupyterHUB, e.g. for AI Toolkit)
   north:
     restart: unless-stopped
-    image: ghcr.io/fairmat-nfdi/nomad-distribution-template/app:main
+    image: ghcr.io/fairmat-nfdi/nomad-distribution-template:main
     container_name: nomad_oasis_north
     environment:
       NOMAD_SERVICE: nomad_oasis_north
@@ -165,7 +165,7 @@ services:
   # to enable the logtransfer service run "docker compose --profile with_logtransfer up"
   logtransfer:
     restart: unless-stopped
-    image: ghcr.io/fairmat-nfdi/nomad-distribution-template/app:main
+    image: ghcr.io/fairmat-nfdi/nomad-distribution-template:main
     container_name: nomad_oasis_logtransfer
     environment:
       NOMAD_SERVICE: nomad_oasis_logtransfer