diff --git a/deployment/ocelot-social/deployment-backend.yaml b/deployment/ocelot-social/deployment-backend.yaml
index eb6dd7d46..0bb266323 100644
--- a/deployment/ocelot-social/deployment-backend.yaml
+++ b/deployment/ocelot-social/deployment-backend.yaml
@@ -4,7 +4,7 @@ metadata:
   creationTimestamp: null
   labels:
     ocelot.social/commit: COMMIT
-    ocelot.social/selector: deployment-human-connection-backend
+    ocelot.social/selector: deployment-ocelot-social-backend
   name: backend
   namespace: ocelot-social
 spec:
@@ -14,7 +14,7 @@ spec:
   revisionHistoryLimit: 2147483647
   selector:
     matchLabels:
-      ocelot.social/selector: deployment-human-connection-backend
+      ocelot.social/selector: deployment-ocelot-social-backend
   strategy:
     rollingUpdate:
       maxSurge: 0
@@ -27,7 +27,7 @@ spec:
       creationTimestamp: null
       labels:
         ocelot.social/commit: COMMIT
-        ocelot.social/selector: deployment-human-connection-backend
+        ocelot.social/selector: deployment-ocelot-social-backend
       name: backend
     spec:
       containers:
diff --git a/deployment/ocelot-social/deployment-neo4j.yaml b/deployment/ocelot-social/deployment-neo4j.yaml
index 578602ced..548cedd7e 100644
--- a/deployment/ocelot-social/deployment-neo4j.yaml
+++ b/deployment/ocelot-social/deployment-neo4j.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   creationTimestamp: null
   labels:
-    ocelot.social/selector: deployment-human-connection-neo4j
+    ocelot.social/selector: deployment-ocelot-social-neo4j
   name: neo4j
   namespace: ocelot-social
 spec:
@@ -12,7 +12,7 @@ spec:
   revisionHistoryLimit: 2147483647
   selector:
     matchLabels:
-      ocelot.social/selector: deployment-human-connection-neo4j
+      ocelot.social/selector: deployment-ocelot-social-neo4j
   strategy:
     rollingUpdate:
       maxSurge: 0
@@ -24,7 +24,7 @@ spec:
         backup.velero.io/backup-volumes: neo4j-data
       creationTimestamp: null
       labels:
-        ocelot.social/selector: deployment-human-connection-neo4j
+        ocelot.social/selector: deployment-ocelot-social-neo4j
       name: neo4j
     spec:
       containers:
diff --git a/deployment/ocelot-social/deployment-web.yaml b/deployment/ocelot-social/deployment-webapp.yaml
similarity index 86%
rename from deployment/ocelot-social/deployment-web.yaml
rename to deployment/ocelot-social/deployment-webapp.yaml
index 01ea0e18b..4b0fec2a1 100644
--- a/deployment/ocelot-social/deployment-web.yaml
+++ b/deployment/ocelot-social/deployment-webapp.yaml
@@ -4,7 +4,7 @@ metadata:
   creationTimestamp: null
   labels:
     ocelot.social/commit: COMMIT
-    ocelot.social/selector: deployment-human-connection-web
+    ocelot.social/selector: deployment-ocelot-social-webapp
   name: web
   namespace: ocelot-social
 spec:
@@ -14,7 +14,7 @@ spec:
   revisionHistoryLimit: 2147483647
   selector:
     matchLabels:
-      ocelot.social/selector: deployment-human-connection-web
+      ocelot.social/selector: deployment-ocelot-social-webapp
   strategy:
     rollingUpdate:
       maxSurge: 1
@@ -25,7 +25,7 @@ spec:
       creationTimestamp: null
       labels:
         ocelot.social/commit: COMMIT
-        ocelot.social/selector: deployment-human-connection-web
+        ocelot.social/selector: deployment-ocelot-social-webapp
       name: web
     spec:
       containers:
diff --git a/deployment/ocelot-social/mailserver/deployment-mailserver.yaml b/deployment/ocelot-social/mailserver/deployment-mailserver.yaml
index 54a6a3332..dc5c49347 100644
--- a/deployment/ocelot-social/mailserver/deployment-mailserver.yaml
+++ b/deployment/ocelot-social/mailserver/deployment-mailserver.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   creationTimestamp: null
   labels:
-    ocelot.social/selector: deployment-human-connection-mailserver
+    ocelot.social/selector: deployment-ocelot-social-mailserver
   name: mailserver
   namespace: ocelot-social
 spec:
@@ -13,7 +13,7 @@ spec:
   revisionHistoryLimit: 2147483647
   selector:
     matchLabels:
-      ocelot.social/selector: deployment-human-connection-mailserver
+      ocelot.social/selector: deployment-ocelot-social-mailserver
   strategy:
     rollingUpdate:
       maxSurge: 1
@@ -23,7 +23,7 @@ spec:
     metadata:
       creationTimestamp: null
       labels:
-        ocelot.social/selector: deployment-human-connection-mailserver
+        ocelot.social/selector: deployment-ocelot-social-mailserver
       name: mailserver
     spec:
       containers:
diff --git a/deployment/ocelot-social/mailserver/service-mailserver.yaml b/deployment/ocelot-social/mailserver/service-mailserver.yaml
index 691e2a7bb..8c38a94b4 100644
--- a/deployment/ocelot-social/mailserver/service-mailserver.yaml
+++ b/deployment/ocelot-social/mailserver/service-mailserver.yaml
@@ -4,7 +4,7 @@ metadata:
   name: mailserver
   namespace: ocelot-social
   labels:
-    ocelot.social/selector: deployment-human-connection-mailserver
+    ocelot.social/selector: deployment-ocelot-social-mailserver
 spec:
   ports:
   - name: web
@@ -14,4 +14,4 @@ spec:
     port: 25
     targetPort: 25
   selector:
-    ocelot.social/selector: deployment-human-connection-mailserver
+    ocelot.social/selector: deployment-ocelot-social-mailserver
diff --git a/deployment/ocelot-social/maintenance/deployment-maintenance.yaml b/deployment/ocelot-social/maintenance/deployment-maintenance.yaml
index e30337a22..6dda94e17 100644
--- a/deployment/ocelot-social/maintenance/deployment-maintenance.yaml
+++ b/deployment/ocelot-social/maintenance/deployment-maintenance.yaml
@@ -6,12 +6,12 @@ metadata:
 spec:
   selector:
     matchLabels:
-      ocelot.social/selector: deployment-human-connection-maintenance
+      ocelot.social/selector: deployment-ocelot-social-maintenance
   template:
     metadata:
       labels:
         ocelot.social/commit: COMMIT
-        ocelot.social/selector: deployment-human-connection-maintenance
+        ocelot.social/selector: deployment-ocelot-social-maintenance
       name: maintenance
     spec:
       containers:
diff --git a/deployment/ocelot-social/maintenance/service-maintenance.yaml b/deployment/ocelot-social/maintenance/service-maintenance.yaml
index b35b3c39b..7c636e253 100644
--- a/deployment/ocelot-social/maintenance/service-maintenance.yaml
+++ b/deployment/ocelot-social/maintenance/service-maintenance.yaml
@@ -4,11 +4,11 @@ metadata:
   name: maintenance
   namespace: ocelot-social
   labels:
-    ocelot.social/selector: deployment-human-connection-maintenance
+    ocelot.social/selector: deployment-ocelot-social-maintenance
 spec:
   ports:
     - name: web
       port: 80
       targetPort: 80
   selector:
-    ocelot.social/selector: deployment-human-connection-maintenance
+    ocelot.social/selector: deployment-ocelot-social-maintenance
diff --git a/deployment/ocelot-social/service-backend.yaml b/deployment/ocelot-social/service-backend.yaml
index bb1e5488e..16d5859f8 100644
--- a/deployment/ocelot-social/service-backend.yaml
+++ b/deployment/ocelot-social/service-backend.yaml
@@ -4,11 +4,11 @@ metadata:
   name: backend
   namespace: ocelot-social
   labels:
-    ocelot.social/selector: deployment-human-connection-backend
+    ocelot.social/selector: deployment-ocelot-social-backend
 spec:
   ports:
     - name: web
       port: 4000
       targetPort: 4000
   selector:
-    ocelot.social/selector: deployment-human-connection-backend
+    ocelot.social/selector: deployment-ocelot-social-backend
diff --git a/deployment/ocelot-social/service-neo4j.yaml b/deployment/ocelot-social/service-neo4j.yaml
index 33ab84588..2a0e404ea 100644
--- a/deployment/ocelot-social/service-neo4j.yaml
+++ b/deployment/ocelot-social/service-neo4j.yaml
@@ -4,7 +4,7 @@ metadata:
   name: neo4j
   namespace: ocelot-social
   labels:
-    ocelot.social/selector: deployment-human-connection-neo4j
+    ocelot.social/selector: deployment-ocelot-social-neo4j
 spec:
   ports:
   - name: bolt
@@ -14,4 +14,4 @@ spec:
     port: 7474
     targetPort: 7474
   selector:
-    ocelot.social/selector: deployment-human-connection-neo4j
+    ocelot.social/selector: deployment-ocelot-social-neo4j
diff --git a/deployment/ocelot-social/service-web.yaml b/deployment/ocelot-social/service-webapp.yaml
similarity index 58%
rename from deployment/ocelot-social/service-web.yaml
rename to deployment/ocelot-social/service-webapp.yaml
index b78cca570..a3acacb11 100644
--- a/deployment/ocelot-social/service-web.yaml
+++ b/deployment/ocelot-social/service-webapp.yaml
@@ -4,11 +4,11 @@ metadata:
   name: web
   namespace: ocelot-social
   labels:
-    ocelot.social/selector: deployment-human-connection-web
+    ocelot.social/selector: deployment-ocelot-social-webapp
 spec:
   ports:
     - name: web
       port: 3000
       targetPort: 3000
   selector:
-    ocelot.social/selector: deployment-human-connection-web
+    ocelot.social/selector: deployment-ocelot-social-webapp