diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 24350a81a..de956e17b 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -55,9 +55,9 @@ jobs:
       # NEO4J ##################################################################
       ##########################################################################
       - name: Neo4J | Build `community` image
-        run: |
-          docker build --target community -t "ocelotsocialnetwork/neo4j:latest" -t "ocelotsocialnetwork/neo4j:community" -t "ocelotsocialnetwork/neo4j:${VERSION}" -t "ocelotsocialnetwork/neo4j:${BUILD_VERSION}" neo4j/
-          docker save "ocelotsocialnetwork/neo4j" > /tmp/neo4j.tar
+        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
       - name: Upload Artifact
         uses: actions/upload-artifact@v2
         with:
@@ -91,10 +91,10 @@ jobs:
       ##########################################################################
       # BUILD BACKEND DOCKER IMAGE (production) ################################
       ##########################################################################
-      - name: backend | Build `production` image
-        run: |
-          docker build --target production -t "ocelotsocialnetwork/backend:latest" -t "ocelotsocialnetwork/backend:${VERSION}" -t "ocelotsocialnetwork/backend:${BUILD_VERSION}" backend/
-          docker save "ocelotsocialnetwork/backend" > /tmp/backend.tar
+      - name: Backend | Build `production` image
+        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
       - name: Upload Artifact
         uses: actions/upload-artifact@v2
         with:
@@ -128,10 +128,10 @@ jobs:
       ##########################################################################
       # BUILD WEBAPP DOCKER IMAGE (build) ######################################
       ##########################################################################
-      - name: webapp | Build `production` image
-        run: |
-          docker build --target production -t "ocelotsocialnetwork/webapp:latest" -t "ocelotsocialnetwork/webapp:${VERSION}" -t "ocelotsocialnetwork/webapp:${BUILD_VERSION}" webapp/
-          docker save "ocelotsocialnetwork/webapp" > /tmp/webapp.tar
+      - name: Webapp | Build `production` image
+        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
       - name: Upload Artifact
         uses: actions/upload-artifact@v2
         with:
@@ -165,11 +165,10 @@ jobs:
       ##########################################################################
       # BUILD MAINTENANCE DOCKER IMAGE (build) #################################
       ##########################################################################
-      - name: maintenance | Build `production` image
-        # TODO: --target production
-        run: |
-          docker build -t "ocelotsocialnetwork/maintenance:latest" -t "ocelotsocialnetwork/maintenance:${VERSION}" -t "ocelotsocialnetwork/maintenance:${BUILD_VERSION}" webapp/ -f webapp/Dockerfile.maintenance
-          docker save "ocelotsocialnetwork/maintenance" > /tmp/maintenance.tar
+      - name: Maintenance | Build `production` image
+        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
       - name: Upload Artifact
         uses: actions/upload-artifact@v2
         with:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9b8025ea3..9c67126e2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -253,7 +253,6 @@ jobs:
       ##########################################################################
       # COVERAGE REPORT FRONTEND ################################################
       ##########################################################################
-      # TODO: Maybe remove this later on to avoid spam?
       #- name: frontend | Coverage report
       #  uses: romeovs/lcov-reporter-action@v0.2.21
       #  with:
diff --git a/backend/Dockerfile b/backend/Dockerfile
index 2f2b70f04..c632f8803 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -3,15 +3,18 @@
 ##################################################################################
 FROM node:12.19.0-alpine3.10 as base
 
-# ENVs (available in production aswell, can be overwritten by commandline or env file)
+# ENVs
 ## DOCKER_WORKDIR would be a classical ARG, but that is not multi layer persistent - shame
 ENV DOCKER_WORKDIR="/app"
 ## We Cannot do `$(date -u +'%Y-%m-%dT%H:%M:%SZ')` here so we use unix timestamp=0
-ENV BUILD_DATE="1970-01-01T00:00:00.00Z"
+ARG BBUILD_DATE="1970-01-01T00:00:00.00Z"
+ENV BUILD_DATE=$BBUILD_DATE
 ## We cannot do $(yarn run version)-${BUILD_NUMBER} here so we default to 0.0.0-0
-ENV BUILD_VERSION="0.0.0-0"
+ARG BBUILD_VERSION="0.0.0-0"
+ENV BUILD_VERSION=$BBUILD_VERSION
 ## We cannot do `$(git rev-parse --short HEAD)` here so we default to 0000000
-ENV BUILD_COMMIT="0000000"
+ARG BBUILD_COMMIT="0000000"
+ENV BUILD_COMMIT=$BBUILD_COMMIT
 ## SET NODE_ENV
 ENV NODE_ENV="production"
 ## App relevant Envs
diff --git a/neo4j/Dockerfile b/neo4j/Dockerfile
index e7931378a..4bdc4ef1f 100644
--- a/neo4j/Dockerfile
+++ b/neo4j/Dockerfile
@@ -3,13 +3,16 @@
 ##################################################################################
 FROM neo4j:3.5.14 as community
 
-# ENVs (available in production aswell, can be overwritten by commandline or env file)
+# ENVs
 ## We Cannot do `$(date -u +'%Y-%m-%dT%H:%M:%SZ')` here so we use unix timestamp=0
-ENV BUILD_DATE="1970-01-01T00:00:00.00Z"
+ARG BBUILD_DATE="1970-01-01T00:00:00.00Z"
+ENV BUILD_DATE=$BBUILD_DATE
 ## We cannot do $(yarn run version)-${BUILD_NUMBER} here so we default to 0.0.0-0
-ENV BUILD_VERSION="0.0.0-0"
+ARG BBUILD_VERSION="0.0.0-0"
+ENV BUILD_VERSION=$BBUILD_VERSION
 ## We cannot do `$(git rev-parse --short HEAD)` here so we default to 0000000
-ENV BUILD_COMMIT="0000000"
+ARG BBUILD_COMMIT="0000000"
+ENV BUILD_COMMIT=$BBUILD_COMMIT
 
 # Labels
 LABEL org.label-schema.build-date="${BUILD_DATE}"
diff --git a/webapp/Dockerfile b/webapp/Dockerfile
index eda437920..75d43bf59 100644
--- a/webapp/Dockerfile
+++ b/webapp/Dockerfile
@@ -3,15 +3,18 @@
 ##################################################################################
 FROM node:12.19.0-alpine3.10 as base
 
-# ENVs (available in production aswell, can be overwritten by commandline or env file)
+# ENVs
 ## DOCKER_WORKDIR would be a classical ARG, but that is not multi layer persistent - shame
 ENV DOCKER_WORKDIR="/app"
 ## We Cannot do `$(date -u +'%Y-%m-%dT%H:%M:%SZ')` here so we use unix timestamp=0
-ENV BUILD_DATE="1970-01-01T00:00:00.00Z"
+ARG BBUILD_DATE="1970-01-01T00:00:00.00Z"
+ENV BUILD_DATE=$BBUILD_DATE
 ## We cannot do $(yarn run version)-${BUILD_NUMBER} here so we default to 0.0.0-0
-ENV BUILD_VERSION="0.0.0-0"
+ARG BBUILD_VERSION="0.0.0-0"
+ENV BUILD_VERSION=$BBUILD_VERSION
 ## We cannot do `$(git rev-parse --short HEAD)` here so we default to 0000000
-ENV BUILD_COMMIT="0000000"
+ARG BBUILD_COMMIT="0000000"
+ENV BUILD_COMMIT=$BBUILD_COMMIT
 ## SET NODE_ENV
 ENV NODE_ENV="production"
 ## App relevant Envs
diff --git a/webapp/Dockerfile.maintenance b/webapp/Dockerfile.maintenance
index b02fe352b..0a7616240 100644
--- a/webapp/Dockerfile.maintenance
+++ b/webapp/Dockerfile.maintenance
@@ -1,18 +1,56 @@
-FROM node:12.19.0-alpine3.10 as build
-LABEL Description="Maintenance page of the Social Network ocelot.social" Vendor="ocelot.social Community" Version="0.0.1" Maintainer="ocelot.social Community (devops@ocelot.social)"
+##################################################################################
+# BASE ###########################################################################
+##################################################################################
+FROM node:12.19.0-alpine3.10 as base
+
+# ENVs
+## DOCKER_WORKDIR would be a classical ARG, but that is not multi layer persistent - shame
+ENV DOCKER_WORKDIR="/app"
+## We Cannot do `$(date -u +'%Y-%m-%dT%H:%M:%SZ')` here so we use unix timestamp=0
+ARG BBUILD_DATE="1970-01-01T00:00:00.00Z"
+ENV BUILD_DATE=$BBUILD_DATE
+## We cannot do $(yarn run version)-${BUILD_NUMBER} here so we default to 0.0.0-0
+ARG BBUILD_VERSION="0.0.0-0"
+ENV BUILD_VERSION=$BBUILD_VERSION
+## We cannot do `$(git rev-parse --short HEAD)` here so we default to 0000000
+ARG BBUILD_COMMIT="0000000"
+ENV BUILD_COMMIT=$BBUILD_COMMIT
+## SET NODE_ENV
+ENV NODE_ENV="production"
+## App relevant Envs
+ENV PORT="3000"
+
+# Labels
+LABEL org.label-schema.build-date="${BUILD_DATE}"
+LABEL org.label-schema.name="ocelot.social:backend"
+LABEL org.label-schema.description="Maintenance page of the Social Network Software ocelot.social"
+LABEL org.label-schema.usage="https://github.com/Ocelot-Social-Community/Ocelot-Social/blob/master/README.md"
+LABEL org.label-schema.url="https://ocelot.social"
+LABEL org.label-schema.vcs-url="https://github.com/Ocelot-Social-Community/Ocelot-Social/tree/master/backend"
+LABEL org.label-schema.vcs-ref="${BUILD_COMMIT}"
+LABEL org.label-schema.vendor="ocelot.social Community"
+LABEL org.label-schema.version="${BUILD_VERSION}"
+LABEL org.label-schema.schema-version="1.0"
+LABEL maintainer="devops@ocelot.social"
+
+# Install Additional Software
+## install: git
+RUN apk --no-cache add git
+
+# Settings
+## Expose Container Port
+EXPOSE ${PORT}
+
+## Workdir
+RUN mkdir -p ${DOCKER_WORKDIR}
+WORKDIR ${DOCKER_WORKDIR}
 
-EXPOSE 3000
 CMD ["yarn", "run", "start"]
 
-# Expose the app port
-ARG BUILD_COMMIT
-ENV BUILD_COMMIT=$BUILD_COMMIT
-ARG WORKDIR=/develop-webapp
-RUN mkdir -p $WORKDIR
-WORKDIR $WORKDIR
-
-# See: https://github.com/nodejs/docker-node/pull/367#issuecomment-430807898
-RUN apk --no-cache add git
+##################################################################################
+# BUILD ### TODO # TODO # TODO # TODO # TODO # TODO # TODO # TODO # TODO # TODO ##
+##################################################################################
+FROM base as build
 
 COPY package.json yarn.lock ./
 RUN yarn install --production=false --frozen-lockfile --non-interactive
@@ -35,8 +73,11 @@ COPY maintenance/source ./
 
 RUN yarn run generate
 
+##################################################################################
+# PRODUCTION ### TODO # TODO # TODO # TODO # TODO # TODO # TODO # TODO # TODO ####
+##################################################################################
+FROM nginx:alpine as production
 
-FROM nginx:alpine
-COPY --from=build ./develop-webapp/dist/ /usr/share/nginx/html/
+COPY --from=build ./app/dist/ /usr/share/nginx/html/
 RUN rm /etc/nginx/conf.d/default.conf
 COPY maintenance/nginx/custom.conf /etc/nginx/conf.d/