diff --git a/helmfile/apps/nubus/values-nubus.yaml.gotmpl b/helmfile/apps/nubus/values-nubus.yaml.gotmpl
index c3e1cdd5..c2a08449 100644
--- a/helmfile/apps/nubus/values-nubus.yaml.gotmpl
+++ b/helmfile/apps/nubus/values-nubus.yaml.gotmpl
@@ -1012,6 +1012,7 @@ nubusUdmListener:
     auth:
       password: {{ .Values.secrets.nubus.provisioning.udmListenerNatsPassword | quote}}
 
+# TODO: Can be completely removed.
 nubusSelfServiceListener:
   enabled: false
   resources:
@@ -1049,6 +1050,8 @@ nubusSelfServiceConsumer:
       password: {{ .Values.secrets.nubus.selfserviceConsumer.provisioningApiPassword | quote}}
   resources:
     {{ .Values.resources.umsSelfserviceConsumer | toYaml | nindent 4 }}
+  resourcesWaitForDependency:
+    {{ .Values.resources.umsSelfserviceConsumer | toYaml | nindent 4 }}
   replicaCount: {{ .Values.replicas.umsSelfserviceConsumer }}
   waitForDependency:
     image:
@@ -1084,10 +1087,12 @@ nubusStackDataUms:
     imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
   initResources:
     {{ .Values.resources.umsStackDataUms | toYaml | nindent 4 }}
+  # TODO: I'm 95% sure that this section is not doing anything and can be deleted.
   nubusPortalConsumer:
     objectStorage:
       bucketName: {{ .Values.objectstores.nubus.bucket | quote }}
       endpoint: {{ printf "https://%s" (.Values.objectstores.nubus.endpoint | default (printf "%s.%s" .Values.global.hosts.minioApi .Values.global.domain)) | quote }}
+  # TODO: I'm 95% sure that this section is not doing anything and can be deleted.
   nubusPortalServer:
     objectStorage:
       bucketName: {{ .Values.objectstores.nubus.bucket | quote }}