diff --git a/helm/template/Chart.yaml b/helm/template/Chart.yaml
index 5f6353a..0ca281a 100644
--- a/helm/template/Chart.yaml
+++ b/helm/template/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: template
 description: A Helm library chart containing common templates, keeping application templates short
 type: library
-version: 0.2.2
+version: 0.2.3
 maintainers:
   - name: Jim Martens
     url: https://2martens.de
@@ -11,7 +11,9 @@ sources:
 annotations:
   artifacthub.io/changes: |
     - kind: fixed
-      description: Fixed path to secret when using vault
+      description: Reverted path to secret for vault
+    - kind: fixed
+      description: Changed namespace for vault secrets app to release namespace
   artifacthub.io/signKey: |
     fingerprint: F0F153B65BAD467201D7544E47393ABD1F96B7C8
     url: https://mafiasi.de/pks/key/47393ABD1F96B7C8.asc
diff --git a/helm/template/templates/_deployment.yaml b/helm/template/templates/_deployment.yaml
index 8c577cd..b2a6de7 100644
--- a/helm/template/templates/_deployment.yaml
+++ b/helm/template/templates/_deployment.yaml
@@ -41,16 +41,11 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default "latest" }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
-          {{- if and .Values.secrets (not .Values.vault.enabled) }}
+          {{- if or .Values.secrets .Values.vault.enabled }}
           envFrom:
             - secretRef:
                 name: {{ include "template.fullname" . }}
           {{- end }}
-          {{- if .Values.vault.enabled }}
-          envFrom:
-            - secretRef:
-                name: {{ .Values.vault.operatorNamespace | default "vault-secrets-operator-system" }}/{{ include "template.fullname" . }}
-          {{- end }}
           env:
           {{- if .Values.application.isSpring }}
             - name: SPRING_PROFILES_ACTIVE
diff --git a/helm/template/templates/_vault-secrets-app.yaml b/helm/template/templates/_vault-secrets-app.yaml
index 16eb65d..fefdc71 100644
--- a/helm/template/templates/_vault-secrets-app.yaml
+++ b/helm/template/templates/_vault-secrets-app.yaml
@@ -4,7 +4,7 @@ apiVersion: secrets.hashicorp.com/v1beta1
 kind: HCPVaultSecretsApp
 metadata:
   name: {{ include "template.fullname" . }}
-  namespace: {{ .Values.vault.operatorNamespace | default "vault-secrets-operator-system" }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "template.labels" . | nindent 4 }}
 spec: