diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 1396868..c3e04aa 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -17,22 +17,22 @@ jobs:
       - name: Build neo4j base image
         uses: docker/build-push-action@v1.1.0
         with:
-          repository: humanconnection/neo4j
-          tags: latest
+          repository: schoolsinmotion/neo4j
+          tags: bare
           path: Human-Connection/neo4j/
           push: false
       - name: Build backend base image
         uses: docker/build-push-action@v1.1.0
         with:
-          repository: humanconnection/nitro-backend
-          tags: latest
+          repository: schoolsinmotion/nitro-backend
+          tags: bare
           path: Human-Connection/backend/
           push: false
       - name: Build webapp base image
         uses: docker/build-push-action@v1.1.0
         with:
-          repository: humanconnection/nitro-web
-          tags: latest
+          repository: schoolsinmotion/nitro-web
+          tags: bare
           path: Human-Connection/webapp/
           push: false
 
@@ -44,8 +44,7 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
           tags: latest
           path: neo4j/
-          cache_from: humanconnection/neo4j:latest
-          push: false
+          push: true
       - name: Build backend customized image
         uses: docker/build-push-action@v1.1.0
         with:
@@ -54,8 +53,7 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
           tags: latest
           path: backend/
-          cache_from: humanconnection/backend:build-and-test
-          push: false
+          push: true
       - name: Build webapp customized image
         uses: docker/build-push-action@v1.1.0
         with:
@@ -64,5 +62,4 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
           tags: latest
           path: webapp/
-          cache_from: humanconnection/webapp:build-and-test
-          push: false
+          push: true
diff --git a/backend/Dockerfile b/backend/Dockerfile
index e2bd079..860cb52 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1 +1 @@
-FROM humanconnection/backend:build-and-test
+FROM schoolsinmotion/backend:bare
diff --git a/docker-compose.yml b/docker-compose.yml
index 7aaffeb..b69da64 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,6 @@ services:
     image: schoolsinmotion/webapp:latest
     ports:
       - 3000:3000
-      - 3002:3002
     networks:
       - hc-network
     depends_on:
@@ -31,7 +30,6 @@ services:
       - JWT_SECRET=b/&&7b78BF&fv/Vd
       - MAPBOX_TOKEN=pk.eyJ1IjoiaHVtYW4tY29ubmVjdGlvbiIsImEiOiJjajl0cnBubGoweTVlM3VwZ2lzNTNud3ZtIn0.KZ8KK9l70omjXbEkkbHGsQ
       - PRIVATE_KEY_PASSPHRASE=a7dsf78sadg87ad87sfagsadg78
-      - "DEBUG=${DEBUG}"
       - EMAIL_SUPPORT=support@human-connection.org
       - EMAIL_DEFAULT_SENDER=info@human-connection.org
       - PUBLIC_REGISTRATION=true
@@ -46,6 +44,5 @@ services:
       - NEO4J_ACCEPT_LICENSE_AGREEMENT=yes
     ports:
       - 7687:7687
-      - 7474:7474
 networks:
   hc-network:
diff --git a/neo4j/Dockerfile b/neo4j/Dockerfile
index 9e455d3..bb20ebc 100644
--- a/neo4j/Dockerfile
+++ b/neo4j/Dockerfile
@@ -1 +1 @@
-FROM humanconnection/neo4j:latest
+FROM schoolsinmotion/neo4j:bare
diff --git a/webapp/Dockerfile b/webapp/Dockerfile
index f638beb..d3cd591 100644
--- a/webapp/Dockerfile
+++ b/webapp/Dockerfile
@@ -1,2 +1,3 @@
-FROM humanconnection/webapp:build-and-test
+FROM schoolsinmotion/webapp:bare
 COPY static/ static/
+COPY constants/ constants/
diff --git a/webapp/constants/emails.js b/webapp/constants/emails.js
new file mode 100644
index 0000000..5a69681
--- /dev/null
+++ b/webapp/constants/emails.js
@@ -0,0 +1,4 @@
+export default {
+  SUPPORT: 'support-schools-in-motion@roschaefer.de',
+  MODERATION: 'moderation-schools-in-motion@roschaefer.de',
+}
diff --git a/webapp/constants/links.js b/webapp/constants/links.js
new file mode 100644
index 0000000..36ee423
--- /dev/null
+++ b/webapp/constants/links.js
@@ -0,0 +1,7 @@
+export default {
+  ORGANIZATION: 'https://www.youth-and-arts.nrw/',
+  DONATE: 'https://www.youth-and-arts.nrw/de/kontakt',
+  IMPRINT: 'https://www.youth-and-arts.nrw/de/impressum',
+  DATA_PRIVACY: 'https://www.youth-and-arts.nrw/de/datenschutzerklaerung',
+  FAQ: 'https://www.youth-and-arts.nrw/de/kontakt',
+}
diff --git a/webapp/constants/manifest.js b/webapp/constants/manifest.js
new file mode 100644
index 0000000..95a9dea
--- /dev/null
+++ b/webapp/constants/manifest.js
@@ -0,0 +1,7 @@
+export default {
+  name: 'fyphe_O',
+  short_name: 'fO',
+  description: 'The schools in motion network',
+  theme_color: '#17b53f',
+  lang: 'en',
+}