diff --git a/backend/Dockerfile b/backend/Dockerfile
index 1a28b2e0d..ecfd63f74 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -90,14 +90,13 @@ CMD /bin/sh -c "yarn run dev"
 FROM base as production
 
 # Copy "binary"-files from build image
-COPY --from=build ${DOCKER_WORKDIR}/dist ./dist
-# COPY --from=build ${DOCKER_WORKDIR}/node_modules ./node_modules
+COPY --from=build ./dist ./dist
 # Copy static files
 # TODO - externalize the uploads so we can copy the whole folder
-COPY --from=build ${DOCKER_WORKDIR}/public/img/ ./public/img/
-COPY --from=build ${DOCKER_WORKDIR}/public/providers.json ./public/providers.json
+COPY --from=build ./public/img/ ./public/img/
+COPY --from=build ./public/providers.json ./public/providers.json
 # Copy package.json for script definitions (lock file should not be needed)
-COPY --from=build ${DOCKER_WORKDIR}/package.json ./package.json
+COPY --from=build ./package.json ./package.json
 
 # Run command
 CMD /bin/sh -c "yarn run start"
diff --git a/webapp/Dockerfile b/webapp/Dockerfile
index a086a4b2a..3e3b5765a 100644
--- a/webapp/Dockerfile
+++ b/webapp/Dockerfile
@@ -91,18 +91,11 @@ FROM base as production
 
 # TODO - do all copying with one COPY command to have one layer
 # Copy "binary"-files from build image
-COPY --from=build ${DOCKER_WORKDIR}/.nuxt ./.nuxt
-COPY --from=build ${DOCKER_WORKDIR}/node_modules ./node_modules
-COPY --from=build ${DOCKER_WORKDIR}/nuxt.config.js ./nuxt.config.js
-# Copy static files
-# TODO - this seems not be needed anymore for the new rebranding
-# TODO - this should be one Folder containign all stuff needed to be copied
-COPY --from=build ${DOCKER_WORKDIR}/config/ ./config/
-COPY --from=build ${DOCKER_WORKDIR}/constants ./constants
-COPY --from=build ${DOCKER_WORKDIR}/static ./static
-COPY --from=build ${DOCKER_WORKDIR}/locales ./locales
+COPY --from=build ./.nuxt ./.nuxt
+COPY --from=build ./node_modules ./node_modules
+COPY --from=build ./nuxt.config.js ./nuxt.config.js
 # Copy package.json for script definitions (lock file should not be needed)
-COPY --from=build ${DOCKER_WORKDIR}/package.json ./package.json
+COPY --from=build ./package.json ./package.json
 
 # Run command
 CMD /bin/sh -c "yarn run start"