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/docker-compose.override.yml b/docker-compose.override.yml
index 15cf00e7a..ff2a398bb 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -38,7 +38,7 @@ services:
   # NEO4J ################################################
   ########################################################
   neo4j:
-    image: ocelotsocialnetwork/neo4j:development
+    image: ocelotsocialnetwork/neo4j-community:development
     ports:
       # Also expose the neo4j query browser
       - 7474:7474
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 973cf87cf..d11ecde54 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -27,7 +27,7 @@ services:
   # NEO4J ################################################
   ########################################################
   neo4j:
-    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 d20bb6aec..863fb2c25 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -71,7 +71,7 @@ services:
   # NEO4J ################################################
   ########################################################
   neo4j:
-    image: ocelotsocialnetwork/neo4j:latest
+    image: ocelotsocialnetwork/neo4j-community:latest
     build:
       context: ./neo4j
       # community edition 👆🏼, because we have no enterprise licence 👇🏼 at the moment