diff --git a/src/main/resources/jitsi/deployment.yaml b/src/main/resources/jitsi/deployment.yaml
index 5e39452..d725566 100644
--- a/src/main/resources/jitsi/deployment.yaml
+++ b/src/main/resources/jitsi/deployment.yaml
@@ -20,16 +20,6 @@ spec:
           image: jitsi/jicofo:stable-8922-1
           imagePullPolicy: IfNotPresent
           env:
-            - name: XMPP_SERVER
-              value: localhost
-            - name: XMPP_DOMAIN
-              value: meet.meissa-gmbh
-            - name: XMPP_AUTH_DOMAIN
-              value: auth.meet.meissa-gmbh
-            - name: XMPP_MUC_DOMAIN
-              value: muc.meet.meissa-gmbh
-            - name: XMPP_INTERNAL_MUC_DOMAIN
-              value: internal-muc.meet.meissa-gmbh
             - name: JICOFO_COMPONENT_SECRET
               valueFrom:
                 secretKeyRef:
@@ -44,22 +34,12 @@ spec:
                   key: JICOFO_AUTH_PASSWORD
             - name: TZ
               value: Europe/Berlin
-            - name: JVB_BREWERY_MUC
-              value: jvbbrewery
         - name: prosody
           image: jitsi/prosody:stable-8922-1
           imagePullPolicy: IfNotPresent
           env:
             - name: PUBLIC_URL
               value: REPLACE_JITSI_FQDN
-            - name: XMPP_DOMAIN
-              value: meet.meissa-gmbh
-            - name: XMPP_AUTH_DOMAIN
-              value: auth.meet.meissa-gmbh
-            - name: XMPP_MUC_DOMAIN
-              value: muc.meet.meissa-gmbh
-            - name: XMPP_INTERNAL_MUC_DOMAIN
-              value: internal-muc.meet.meissa-gmbh
             - name: JICOFO_COMPONENT_SECRET
               valueFrom:
                 secretKeyRef:
@@ -89,20 +69,6 @@ spec:
           env:
             - name: PUBLIC_URL
               value: REPLACE_JITSI_FQDN
-            - name: XMPP_SERVER
-              value: localhost
-            - name: JICOFO_AUTH_USER
-              value: focus
-            - name: XMPP_DOMAIN
-              value: meet.meissa-gmbh
-            - name: XMPP_AUTH_DOMAIN
-              value: auth.meet.meissa-gmbh
-            - name: XMPP_INTERNAL_MUC_DOMAIN
-              value: internal-muc.meet.meissa-gmbh
-            - name: XMPP_BOSH_URL_BASE
-              value: http://127.0.0.1:5280
-            - name: XMPP_MUC_DOMAIN
-              value: muc.meet.meissa-gmbh
             - name: TZ
               value: Europe/Berlin
             - name: JVB_TCP_HARVESTER_DISABLED
@@ -127,16 +93,6 @@ spec:
           env:
             - name: PUBLIC_URL
               value: REPLACE_JITSI_FQDN
-            - name: XMPP_SERVER
-              value: localhost
-            - name: DOCKER_HOST_ADDRESS
-              value: REPLACE_JITSI_FQDN
-            - name: XMPP_DOMAIN
-              value: meet.meissa-gmbh
-            - name: XMPP_AUTH_DOMAIN
-              value: auth.meet.meissa-gmbh
-            - name: XMPP_INTERNAL_MUC_DOMAIN
-              value: internal-muc.meet.meissa-gmbh
             - name: JICOFO_AUTH_USER
               value: focus
             - name: JVB_TCP_HARVESTER_DISABLED
@@ -145,6 +101,7 @@ spec:
               value: jvb
             - name: JVB_PORT
               value: "30300"
+              #TODO: Why is this port different from the default?
             - name: JVB_AUTH_PASSWORD
               valueFrom:
                 secretKeyRef:
@@ -162,12 +119,6 @@ spec:
         - name: etherpad
           image: etherpad/etherpad:1.9.2
           env:
-          - name: XMPP_SERVER
-            value: localhost   
-          - name: XMPP_DOMAIN
-            value: meet.meissa-gmbh
-          - name: XMPP_AUTH_DOMAIN
-            value: auth.meet.meissa-gmbh
           - name: JICOFO_COMPONENT_SECRET
             valueFrom:
               secretKeyRef:
@@ -177,8 +128,6 @@ spec:
             value: focus
           - name: JVB_BREWERY_MUC
             value: jvbbrewery
-          - name: XMPP_INTERNAL_MUC_DOMAIN
-            value: internal-muc.meet.meissa-gmbh
           - name: JICOFO_AUTH_PASSWORD
             valueFrom:
               secretKeyRef: