diff --git a/templates/console/console-deployment.yaml b/templates/console/console-deployment.yaml
index 6bb33a9..c80958e 100644
--- a/templates/console/console-deployment.yaml
+++ b/templates/console/console-deployment.yaml
@@ -35,7 +35,9 @@ spec:
           {{- include "georchestra.common-envs" . | nindent 10 }}
           {{- include "georchestra.ldap-envs" . | nindent 10 }}
           {{- include "georchestra.database-georchestra-envs" . | nindent 10 }}
+          {{- if $rabbitmq.enabled -}}
           {{- include "georchestra.rabbitmq-georchestra-envs" . | nindent 10 }}
+          {{- end }}
           {{- if $webapp.extra_environment }}
           {{- $webapp.extra_environment | toYaml | nindent 10 }}
           {{- end }}
diff --git a/templates/gateway/gateway-deployment.yaml b/templates/gateway/gateway-deployment.yaml
index 60c1f28..6fc6f32 100644
--- a/templates/gateway/gateway-deployment.yaml
+++ b/templates/gateway/gateway-deployment.yaml
@@ -38,7 +38,9 @@ spec:
           {{- include "georchestra.common-envs" . | nindent 10 }}
           {{- include "georchestra.ldap-envs" . | nindent 10 }}
           {{- include "georchestra.database-georchestra-envs" . | nindent 10 }}
+          {{- if $rabbitmq.enabled -}}
           {{- include "georchestra.rabbitmq-georchestra-envs" . | nindent 10 }}
+          {{- end }}
           {{- if $webapp.extra_environment }}
           {{- $webapp.extra_environment | toYaml | nindent 10 }}
           {{- end }}