diff --git a/charts/collab/templates/NOTES.txt b/charts/collab/templates/NOTES.txt
index 8978eda..7944fec 100644
--- a/charts/collab/templates/NOTES.txt
+++ b/charts/collab/templates/NOTES.txt
@@ -3,3 +3,21 @@ Application URL:
   {{- $host := (urlParse .Values.codetogether.url).host }}
   http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host }}{{ .path }}
 {{- end }}
+
+{{- if or .Values.av.enabled .Values.av.serverIP .Values.av.stunServers.enabled .Values.av.jitsiUrl }}
+
+###############################################################################
+# WARNING: A/V OPTIONS DEPRECATED
+###############################################################################
+Audio/Video options were detected in your Helm values:
+
+  av.enabled              = {{ .Values.av.enabled | default "false" }}
+  av.serverIP             = {{ .Values.av.serverIP | default "" }}
+  av.stunServers.enabled  = {{ .Values.av.stunServers.enabled | default "false" }}
+  av.jitsiUrl             = {{ .Values.av.jitsiUrl | default "" }}
+
+A/V is no longer supported and these settings will be ignored by the server.
+Please remove these values from your codetogether-values.yaml.
+###############################################################################
+
+{{- end }}
\ No newline at end of file
diff --git a/charts/collab/templates/deployment.yaml b/charts/collab/templates/deployment.yaml
index 02712fd..89e46fe 100644
--- a/charts/collab/templates/deployment.yaml
+++ b/charts/collab/templates/deployment.yaml
@@ -111,14 +111,6 @@ spec:
           - name: CT_AV_ENABLED
             value: {{ .Values.av.enabled | quote }}
 
-          # ------------------------------
-          # A/V DEPRECATION NOTICE
-          # ------------------------------
-          {{- if or .Values.av.enabled .Values.av.serverIP .Values.av.stunServers.enabled .Values.av.jitsiUrl }}
-          - name: CT_AV_DEPRECATED_WARNING
-            value: "Audio/Video options detected in Helm values, but A/V is no longer supported and will be ignored."
-          {{- end }}
-
           {{- if .Values.av.enabled }} 
           - name: CT_AV_LAN_IP
             value: {{ .Values.av.serverIP | quote }}