diff --git a/templates/jibri/xmpp-secret.yaml b/templates/jibri/xmpp-secret.yaml
index 441908f..3b0f4ea 100644
--- a/templates/jibri/xmpp-secret.yaml
+++ b/templates/jibri/xmpp-secret.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.jibri.enabled }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -7,6 +6,7 @@ metadata:
     {{- include "jitsi-meet.jibri.labels" . | nindent 4 }}
 type: Opaque
 data:
+{{- if .Values.jibri.enabled }}
   JIBRI_XMPP_USER: '{{ .Values.jibri.xmpp.user | b64enc }}'
   JIBRI_XMPP_PASSWORD: '{{ default (randAlphaNum 10) .Values.jibri.xmpp.password | b64enc }}'
   JIBRI_RECORDER_USER: '{{ .Values.jibri.recorder.user | b64enc }}'
diff --git a/values.yaml b/values.yaml
index 7f49f1a..bf33295 100644
--- a/values.yaml
+++ b/values.yaml
@@ -410,16 +410,15 @@ prosody:
   server:
   extraEnvFrom:
   - secretRef:
-      name: '{{ include "prosody.fullname" . }}-jigasi'
+      name: '{{ include "prosody.fullname" . }}-jibri'
   - secretRef:
       name: '{{ include "prosody.fullname" . }}-jicofo'
+  - secretRef:
+      name: '{{ include "prosody.fullname" . }}-jigasi'
   - secretRef:
       name: '{{ include "prosody.fullname" . }}-jvb'
   - configMapRef:
       name: '{{ include "prosody.fullname" . }}-common'
-  ## Uncomment this if you want to use jibri:
-  # - secretRef:
-  #     name: '{{ include "prosody.fullname" . }}-jibri'
   image:
     repository: jitsi/prosody
     tag: 'stable-9111'