diff --git a/src/main/cljc/dda/c4k_jitsi/jitsi.cljc b/src/main/cljc/dda/c4k_jitsi/jitsi.cljc
index a0c23f8..f7b72ce 100644
--- a/src/main/cljc/dda/c4k_jitsi/jitsi.cljc
+++ b/src/main/cljc/dda/c4k_jitsi/jitsi.cljc
@@ -143,5 +143,12 @@
   (let [{:keys [fqdn namespace]} config]
     [(->
       (yaml/load-as-edn "jitsi/prosody-sa.yaml")
+      (cm/replace-all-matching "NAMESPACE" namespace))
+     (->
+      (yaml/load-as-edn "jitsi/prosody-common-cm.yaml")
+      (cm/replace-all-matching "JITSI_FQDN" fqdn)
+      (cm/replace-all-matching "NAMESPACE" namespace))
+     (->
+      (yaml/load-as-edn "jitsi/prosody-default-cm.yaml")
       (cm/replace-all-matching "NAMESPACE" namespace))]))
 
diff --git a/src/main/resources/jitsi/prosody-common-cm.yaml b/src/main/resources/jitsi/prosody-common-cm.yaml
new file mode 100644
index 0000000..5619166
--- /dev/null
+++ b/src/main/resources/jitsi/prosody-common-cm.yaml
@@ -0,0 +1,22 @@
+# Source: jitsi-meet/templates/common-configmap.yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: prosody-common
+  namespace: NAMESPACE
+  labels:
+    app.kubernetes.io/name: jitsi-meet
+data:
+  ENABLE_AUTH: "0"
+  ENABLE_GUESTS: "1"
+  PUBLIC_URL: JITSI_FQDN
+  XMPP_DOMAIN: meet.jitsi
+  XMPP_MUC_DOMAIN: muc.meet.jitsi
+  XMPP_AUTH_DOMAIN: auth.meet.jitsi
+  XMPP_GUEST_DOMAIN: guest.meet.jitsi
+  XMPP_RECORDER_DOMAIN: recorder.meet.jitsi
+  XMPP_INTERNAL_MUC_DOMAIN: internal-muc.meet.jitsi
+  ENABLE_COLIBRI_WEBSOCKET: 'true'
+  ENABLE_COLIBRI_WEBSOCKET_UNSAFE_REGEX: '1'
+  ENABLE_XMPP_WEBSOCKET: 'true'
+  TZ: 'Europe/Amsterdam'
\ No newline at end of file
diff --git a/src/main/resources/jitsi/prosody-default-cm.yaml b/src/main/resources/jitsi/prosody-default-cm.yaml
new file mode 100644
index 0000000..04d1cd4
--- /dev/null
+++ b/src/main/resources/jitsi/prosody-default-cm.yaml
@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: prosody-defaults
+  namespace: NAMESPACE
+  labels:
+    app.kubernetes.io/name: prosody
+data:
+  prosody.cfg.lua: |
+    # Using prosody /default/prosody.cfg.lua from container image
+    
+  saslauthd.conf: |
+    # Using prosody /default/saslauthd.conf from container image
+    
+  jitsi-meet.cfg.lua: |
+    # Using prosody /default/conf.d/jitsi-meet.cfg.lua from container image
\ No newline at end of file
diff --git a/src/main/resources/jitsi/prosody-sa.yaml b/src/main/resources/jitsi/prosody-sa.yaml
index d9d3922..765094f 100644
--- a/src/main/resources/jitsi/prosody-sa.yaml
+++ b/src/main/resources/jitsi/prosody-sa.yaml
@@ -4,6 +4,4 @@ metadata:
   name: prosody
   namespace: NAMESPACE
   labels:
-    helm.sh/chart: prosody-1.4.1
-    app.kubernetes.io/name: prosody
-    app.kubernetes.io/version: "stable-9646"
\ No newline at end of file
+    app.kubernetes.io/name: prosody
\ No newline at end of file