diff --git a/infra/octopusdeploy/templates/secrets.yaml b/infra/octopusdeploy/templates/secrets.yaml
index c8a3b1f..517f019 100644
--- a/infra/octopusdeploy/templates/secrets.yaml
+++ b/infra/octopusdeploy/templates/secrets.yaml
@@ -62,15 +62,33 @@ spec:
 apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
-  name: octopusdeploy-connectionstring
+  name: octopusdeploy-masterkey
 spec:
   secretStoreRef:
     name: vault
     kind: ClusterSecretStore
   target:
-    name: octopusdeploy-connectionstring
+    name: octopusdeploy-masterkey
   data:
     - secretKey: secret
       remoteRef:
         key: kv/octopusdeploy
-        property: connectionstring
+        property: masterkey
+
+---
+
+apiVersion: external-secrets.io/v1beta1
+kind: ExternalSecret
+metadata:
+  name: octopusdeploy-sapassword
+spec:
+  secretStoreRef:
+    name: vault
+    kind: ClusterSecretStore
+  target:
+    name: octopusdeploy-sapassword
+  data:
+    - secretKey: secret
+      remoteRef:
+        key: kv/octopusdeploy
+        property: sapassword
diff --git a/infra/octopusdeploy/values.yaml b/infra/octopusdeploy/values.yaml
index 67882f2..caf8560 100644
--- a/infra/octopusdeploy/values.yaml
+++ b/infra/octopusdeploy/values.yaml
@@ -1,7 +1,6 @@
 octopusdeploy-helm:
   octopus:
+    createSecrets: false
     acceptEula: Y
-    username: admin
-    password: temp
   mssql:
     enabled: true
\ No newline at end of file