diff --git a/rocketchat/templates/chat-deployment.yaml b/rocketchat/templates/chat-deployment.yaml
index 9a2f38c..53278ef 100644
--- a/rocketchat/templates/chat-deployment.yaml
+++ b/rocketchat/templates/chat-deployment.yaml
@@ -102,12 +102,16 @@ spec:
               name: {{ template "rocketchat.fullname" . }}
               key: reg-token
         {{- end }}
-        {{- if and .Values.license .Release.IsInstall }}
-        - name: ROCKETCHAT_LICENSE
+        {{- if .Values.license }}
+        - name: OVERWRITE_SETTING_Enterprise_License
           valueFrom:
             secretKeyRef:
               name: {{ template "rocketchat.fullname" . }}
               key: license
+        - name: OVERWRITE_SETTING_Show_Setup_Wizard
+          value: "completed"
+        - name: LICENSE_DEBUG
+          value: "true"
         {{- end }}
         {{- if .Values.prometheusScraping.enabled }}
         - name: OVERWRITE_SETTING_Prometheus_Enabled
diff --git a/rocketchat/values.yaml b/rocketchat/values.yaml
index c2b07ed..a02d75d 100644
--- a/rocketchat/values.yaml
+++ b/rocketchat/values.yaml
@@ -87,7 +87,11 @@ extraInitContainers: []
 ## Specifies a Registration Token (obtainable at https://cloud.rocket.chat)
 #registrationToken: ""
 
-## Specifies an Enterprise License
+## Specifies an Enterprise License key
+## When set, automatically configures:
+##   OVERWRITE_SETTING_Enterprise_License - injects the license key
+##   OVERWRITE_SETTING_Show_Setup_Wizard  - marks setup as completed
+##   LICENSE_DEBUG                        - enables license debug logging
 # license: ""
 
 ## Pod anti-affinity can prevent the scheduler from placing RocketChat replicas on the same node.