diff --git a/.drone.star b/.drone.star
index 34ed79b..95cd84f 100644
--- a/.drone.star
+++ b/.drone.star
@@ -209,7 +209,7 @@ def publishSteps(ctx):
                 "from_secret": "github_token",
             },
             "files": [
-                "%s-%s.zip" % (app, version),
+                "apps/%s-%s.zip" % (app, version),
             ],
             "checksum": [
                 "md5",
@@ -235,7 +235,7 @@ def dockerImageSteps(ctx):
     return [{
         "name": "docker",
         "image": PLUGINS_DOCKER,
-        "depends_on": ["package-%s" % app],
+        "depends_on": ["build-%s" % app],
         "settings": {
             "username": {
                 "from_secret": "docker_username",
@@ -250,7 +250,8 @@ def dockerImageSteps(ctx):
                 "%s-latest" % app,
             ],
             "build_args": [
-                "app_path=%s-%s.zip" % (app, version),
+                "app_path=./apps/%s" % app,
+                "app_name=%s" % app,
             ],
         },
         "when": {
@@ -276,8 +277,8 @@ def appBuilds(ctx):
             "commands": [
                 "cd 'packages/web-app-%s'" % app,
                 "pnpm build",
-                "mkdir -p ../../assets/extensions",
-                "mv dist ../../assets/extensions/%s" % app,
+                "mkdir ../../apps",
+                "mv dist ../../apps/%s" % app,
             ],
         })
 
@@ -287,8 +288,8 @@ def appBuilds(ctx):
             "depends_on": ["build-%s" % app],
             "commands": [
                 "apk add zip",
-                "cd assets/extensions",
-                "zip -r ../../%s-%s.zip %s/" % (app, release_version, app),
+                "cd apps",
+                "zip -r %s-%s.zip %s/" % (app, release_version, app),
             ],
             "when": {
                 "ref": [
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 8f2c77d..254ba93 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -11,10 +11,11 @@ LABEL maintainer="ownCloud GmbH <devops@owncloud.com>" \
   org.opencontainers.image.source="https://github.com/owncloud/web-extensions"
 
 ARG app_path
+ARG app_name
 
 RUN rm -f /var/lib/nginx/html/*
 
-ADD $app_path /var/lib/nginx/html
+ADD $app_path /var/lib/nginx/html/$app_name
 RUN find /var/lib/nginx/html
 
 EXPOSE 8080