diff --git a/k8s/apps/amnezia/external-secrets.yaml b/k8s/apps/amnezia/external-secrets.yaml
index 2a20341..f498f8b 100644
--- a/k8s/apps/amnezia/external-secrets.yaml
+++ b/k8s/apps/amnezia/external-secrets.yaml
@@ -58,10 +58,11 @@ spec:
     name: amnezia-fellow
     deletionPolicy: Delete
     template:
+      engineVersion: v2
       type: Opaque
       data:
         database-url: |-
-          postgresql://amnezia_fellow:{{ .amnezia_fellow }}@psql.psql.svc:5432/amnezia_fellow
+          postgresql://amnezia_fellow:{{ .amnezia_fellow | urlquery }}@psql.psql.svc:5432/amnezia_fellow
         postgres-password: |-
           {{ .amnezia_fellow }}
   data:
diff --git a/k8s/apps/amnezia/fellow-deployment.yaml b/k8s/apps/amnezia/fellow-deployment.yaml
index b892a0a..e8860c5 100644
--- a/k8s/apps/amnezia/fellow-deployment.yaml
+++ b/k8s/apps/amnezia/fellow-deployment.yaml
@@ -32,11 +32,11 @@ spec:
               containerPort: 8000
               protocol: TCP
           env:
-            #- name: AMNEZIA_FELLOW_DATABASE_URL
-            #  valueFrom:
-            #    secretKeyRef:
-            #      name: amnezia-fellow
-            #      key: database-url
+            - name: AMNEZIA_FELLOW_DATABASE_URL
+              valueFrom:
+                secretKeyRef:
+                  name: amnezia-fellow
+                  key: database-url
             - name: AMNEZIA_FELLOW_K8S_NAMESPACE
               value: "amnezia"
             - name: AMNEZIA_FELLOW_K8S_CLIENTS_SECRET
@@ -70,10 +70,3 @@ spec:
             limits:
               cpu: "500m"
               memory: "512Mi"
-          volumeMounts:
-            - name: data
-              mountPath: /data
-      volumes:
-        - name: data
-          persistentVolumeClaim:
-            claimName: amnezia-fellow-data