diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index de956e17b..22526a735 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -55,6 +55,7 @@ jobs:
       # NEO4J ##################################################################
       ##########################################################################
       - name: Neo4J | Build `community` image
+        # TODO build and push "latest-base" and "latest-code"
         run: docker build --target community -t "ocelotsocialnetwork/neo4j:latest" -t "ocelotsocialnetwork/neo4j:community" -t "ocelotsocialnetwork/neo4j:${VERSION}" -t "ocelotsocialnetwork/neo4j:${BUILD_VERSION}" --build-arg BBUILD_DATE=$BUILD_DATE --build-arg BBUILD_VERSION=$BUILD_VERSION --build-arg BBUILD_COMMIT=$BUILD_COMMIT neo4j/
       - name: Neo4J | Save docker image 
         run: docker save "ocelotsocialnetwork/neo4j" > /tmp/neo4j.tar
@@ -92,6 +93,7 @@ jobs:
       # BUILD BACKEND DOCKER IMAGE (production) ################################
       ##########################################################################
       - name: Backend | Build `production` image
+        # TODO build and push "latest-base" and "latest-code"
         run: docker build --target production -t "ocelotsocialnetwork/backend:latest" -t "ocelotsocialnetwork/backend:${VERSION}" -t "ocelotsocialnetwork/backend:${BUILD_VERSION}" --build-arg BBUILD_DATE=$BUILD_DATE --build-arg BBUILD_VERSION=$BUILD_VERSION --build-arg BBUILD_COMMIT=$BUILD_COMMIT backend/
       - name: Backend | Save docker image
         run: docker save "ocelotsocialnetwork/backend" > /tmp/backend.tar
@@ -129,6 +131,7 @@ jobs:
       # BUILD WEBAPP DOCKER IMAGE (build) ######################################
       ##########################################################################
       - name: Webapp | Build `production` image
+        # TODO build and push "latest-base" and "latest-code"
         run: docker build --target production -t "ocelotsocialnetwork/webapp:latest" -t "ocelotsocialnetwork/webapp:${VERSION}" -t "ocelotsocialnetwork/webapp:${BUILD_VERSION}" --build-arg BBUILD_DATE=$BUILD_DATE --build-arg BBUILD_VERSION=$BUILD_VERSION --build-arg BBUILD_COMMIT=$BUILD_COMMIT webapp/
       - name: Webapp | Save docker image
         run: docker save "ocelotsocialnetwork/webapp" > /tmp/webapp.tar
@@ -166,6 +169,7 @@ jobs:
       # BUILD MAINTENANCE DOCKER IMAGE (build) #################################
       ##########################################################################
       - name: Maintenance | Build `production` image
+        # TODO build and push "latest-base" and "latest-code"
         run: docker build --target production -t "ocelotsocialnetwork/maintenance:latest" -t "ocelotsocialnetwork/maintenance:${VERSION}" -t "ocelotsocialnetwork/maintenance:${BUILD_VERSION}" --build-arg BBUILD_DATE=$BUILD_DATE --build-arg BBUILD_VERSION=$BUILD_VERSION --build-arg BBUILD_COMMIT=$BUILD_COMMIT webapp/ -f webapp/Dockerfile.maintenance
       - name: Maintenance | Save docker image
         run: docker save "ocelotsocialnetwork/maintenance" > /tmp/maintenance.tar
diff --git a/backend/Dockerfile b/backend/Dockerfile
index c632f8803..9c1561ac9 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,5 +1,5 @@
 ##################################################################################
-# BASE ###########################################################################
+# BASE (Is pushed to DockerHub for rebranding) ###################################
 ##################################################################################
 FROM node:12.19.0-alpine3.10 as base
 
@@ -59,12 +59,18 @@ FROM base as development
 CMD /bin/sh -c "yarn install && yarn run dev"
 
 ##################################################################################
-# BUILD (Does contain all files and is therefore bloated) ########################
+# CODE (Does contain all code files and is pushed to DockerHub for rebranding) ###
 ##################################################################################
-FROM base as build
+FROM base as code
 
-# Copy everything
+# copy everything, but do not build.
 COPY . .
+
+##################################################################################
+# BUILD (Does contain all files and the compilate and is therefore bloated) ######
+##################################################################################
+FROM code as build
+
 # yarn install
 RUN yarn install --production=false --frozen-lockfile --non-interactive
 # yarn build
@@ -86,7 +92,7 @@ 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 static files
+# Copy static files # Wolle comment overfluid here?
 # 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
@@ -94,4 +100,4 @@ COPY --from=build ${DOCKER_WORKDIR}/public/providers.json ./public/providers.jso
 COPY --from=build ${DOCKER_WORKDIR}/package.json ./package.json
 
 # Run command
-CMD /bin/sh -c "yarn run start"
\ No newline at end of file
+CMD /bin/sh -c "yarn run start"
diff --git a/webapp/Dockerfile b/webapp/Dockerfile
index 75d43bf59..a086a4b2a 100644
--- a/webapp/Dockerfile
+++ b/webapp/Dockerfile
@@ -1,5 +1,5 @@
 ##################################################################################
-# BASE ###########################################################################
+# BASE (Is pushed to DockerHub for rebranding) ###################################
 ##################################################################################
 FROM node:12.19.0-alpine3.10 as base
 
@@ -59,12 +59,18 @@ FROM base as development
 CMD /bin/sh -c "yarn install && yarn run dev"
 
 ##################################################################################
-# BUILD (Does contain all files and is therefore bloated) ########################
+# CODE (Does contain all code files and is pushed to DockerHub for rebranding) ###
 ##################################################################################
-FROM base as build
+FROM base as code
 
-# Copy everything
+# copy everything, but do not build.
 COPY . .
+
+##################################################################################
+# BUILD (Does contain all files and the compilate and is therefore bloated) ######
+##################################################################################
+FROM code as build
+
 # yarn install
 RUN yarn install --production=false --frozen-lockfile --non-interactive
 # yarn build
@@ -83,11 +89,13 @@ CMD /bin/sh -c "yarn run dev"
 ##################################################################################
 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
@@ -97,4 +105,4 @@ COPY --from=build ${DOCKER_WORKDIR}/locales ./locales
 COPY --from=build ${DOCKER_WORKDIR}/package.json ./package.json
 
 # Run command
-CMD /bin/sh -c "yarn run start"
\ No newline at end of file
+CMD /bin/sh -c "yarn run start"
diff --git a/webapp/Dockerfile.maintenance b/webapp/Dockerfile.maintenance
index 0a7616240..b0210511f 100644
--- a/webapp/Dockerfile.maintenance
+++ b/webapp/Dockerfile.maintenance
@@ -48,11 +48,12 @@ WORKDIR ${DOCKER_WORKDIR}
 CMD ["yarn", "run", "start"]
 
 ##################################################################################
-# BUILD ### TODO # TODO # TODO # TODO # TODO # TODO # TODO # TODO # TODO # TODO ##
+# CODE (Does contain all code files and is pushed to DockerHub for rebranding) ###
 ##################################################################################
-FROM base as build
+FROM base as code
 
 COPY package.json yarn.lock ./
+# yarn install
 RUN yarn install --production=false --frozen-lockfile --non-interactive
 
 COPY assets assets
@@ -70,7 +71,12 @@ COPY config/ config/
 # this will also ovewrite the existing package.json
 COPY maintenance/source ./
 
+##################################################################################
+# BUILD ### TODO # TODO # TODO # TODO # TODO # TODO # TODO # TODO # TODO # TODO ##
+##################################################################################
+FROM code as build
 
+# yarn generate
 RUN yarn run generate
 
 ##################################################################################