diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 1c7927665..56df65ea0 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -56,9 +56,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}" --build-arg BBUILD_DATE=$BUILD_DATE --build-arg BBUILD_VERSION=$BUILD_VERSION --build-arg BBUILD_COMMIT=$BUILD_COMMIT neo4j/
+        run: docker build --target community -t "ocelotsocialnetwork/neo4j-community:latest" -t "ocelotsocialnetwork/neo4j-community:${VERSION}" -t "ocelotsocialnetwork/neo4j-community:${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
+        run: docker save "ocelotsocialnetwork/neo4j-community" > /tmp/neo4j.tar
       - name: Upload Artifact
         uses: actions/upload-artifact@v2
         with:
@@ -238,7 +238,7 @@ jobs:
       - name: login to dockerhub
         run: echo "${DOCKERHUB_TOKEN}" | docker login -u "${DOCKERHUB_USERNAME}" --password-stdin
       - name: Push neo4j
-        run: docker push --all-tags ocelotsocialnetwork/neo4j
+        run: docker push --all-tags ocelotsocialnetwork/neo4j-community
       - name: Push backend
         run: docker push --all-tags ocelotsocialnetwork/backend
       - name: Push webapp
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5dd385ad8..9564aa2f7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -43,8 +43,8 @@ jobs:
       ##########################################################################
       - name: Neo4J | Build `community` image
         run: |
-          docker build --target community -t "ocelotsocialnetwork/neo4j:community" neo4j/
-          docker save "ocelotsocialnetwork/neo4j:community" > /tmp/neo4j.tar
+          docker build --target community -t "ocelotsocialnetwork/neo4j-community:test" neo4j/
+          docker save "ocelotsocialnetwork/neo4j-community:test" > /tmp/neo4j.tar
       - name: Upload Artifact
         uses: actions/upload-artifact@v2
         with:
diff --git a/backend/Dockerfile b/backend/Dockerfile
index 0ebdfb1eb..6c2f72bd3 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -91,6 +91,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
 # TODO - externalize the uploads so we can copy the whole folder
 COPY --from=build ${DOCKER_WORKDIR}/public/img/ ./public/img/
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index baf4bf89f..e740af1fe 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -44,7 +44,7 @@ services:
   ########################################################
   neo4j:
     # name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there
-    image: ocelotsocialnetwork/neo4j:local-development
+    image: ocelotsocialnetwork/neo4j-community:local-development
     ports:
       # Also expose the neo4j query browser
       - 7474:7474
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 843dd5ff8..3485274db 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -33,7 +33,7 @@ services:
   ########################################################
   neo4j:
     # name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there
-    image: ocelotsocialnetwork/neo4j:community
+    image: ocelotsocialnetwork/neo4j-community:test
     #environment:
     #  - NEO4J_dbms_connector_bolt_enabled=true
     #  - NEO4J_dbms_connector_bolt_tls__level=OPTIONAL
diff --git a/docker-compose.yml b/docker-compose.yml
index 796489439..98024362a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -77,7 +77,7 @@ services:
   ########################################################
   neo4j:
     # name the image so that it cannot be found in a DockerHub repository, otherwise it will not be built locally from the 'dockerfile' but pulled from there
-    image: ocelotsocialnetwork/neo4j:local-production
+    image: ocelotsocialnetwork/neo4j-community:local-production
     build:
       context: ./neo4j
       # community edition 👆🏼, because we have no enterprise licence 👇🏼 at the moment
diff --git a/webapp/Dockerfile b/webapp/Dockerfile
index 8d830a9d5..a086a4b2a 100644
--- a/webapp/Dockerfile
+++ b/webapp/Dockerfile
@@ -94,6 +94,13 @@ FROM base as production
 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 package.json for script definitions (lock file should not be needed)
 COPY --from=build ${DOCKER_WORKDIR}/package.json ./package.json