diff --git a/deployment/helm/templates/deployment.yaml b/deployment/helm/templates/deployment.yaml
index d3220ef9da5c9a9f05fb19f70754168839965e0b..f7f5608d55e2c570eb455ac072fbc783059ef521 100644
--- a/deployment/helm/templates/deployment.yaml
+++ b/deployment/helm/templates/deployment.yaml
@@ -26,8 +26,6 @@ spec:
     spec:
       securityContext:
         {{- include "app.securitycontext" . | nindent 8 }}
-      imagePullSecrets:
-        - name: {{ .Values.image.pullSecrets }}
       containers:
       - name: {{ .Chart.Name }}
         image: "{{ .Values.image.repository }}/{{ .Values.image.name }}:{{ default .Chart.AppVersion .Values.image.tag }}"
@@ -77,11 +75,11 @@ spec:
           - name: "STORAGESERVICE_CRYPTO_SIGNKEY"
             value:  {{ .Values.config.crypto.signKey }}
           - name:  "STORAGESERVICE_MESSAGING_ENABLED"
-            value: {{.Values.config.messaging.enabled}}
+            value: "{{.Values.config.messaging.enabled}}"
           - name:  "STORAGESERVICE_MESSAGING_STORAGETOPIC"
             value: {{.Values.config.messaging.storageTopic}}
           - name:  "CLOUDEVENTPROVIDER_MESSAGING_PROTOCOL"
-            value: "nats"
+            value: {{.Values.config.messaging.host}}
           - name:  "CLOUDEVENTPROVIDER_MESSAGING_NATS_URL"
             value: {{.Values.config.messaging.protocol}}
           {{- if .Values.config.vault }}
diff --git a/deployment/helm/values.yaml b/deployment/helm/values.yaml
index 6fc9df4e14487b60deed48541c52d81f2599fddb..8642c9ddcc091a7624d48c79b74801bd5b6da613 100644
--- a/deployment/helm/values.yaml
+++ b/deployment/helm/values.yaml
@@ -2,10 +2,10 @@ replicaCount: 1
 name: storage-service
 
 image:
-  repository: node-654e3bca7fbeeed18f81d7c7.ps-xaas.io/ocm/storage-service
+  repository: node-654e3bca7fbeeed18f81d7c7.ps-xaas.io/ocm-wstack
   imagePullPolicy: Always
   name: storage-service
-  tag: latest
+  tag: main
 
 podAnnotations: {}
 
@@ -43,7 +43,7 @@ ingress:
         - path: /storage(/|$)(.*)
           port: 8080
   tls:
-    - secretName: letsencrypt-service-tls
+    - secretName: xfsc-wildcard
       hosts:
         - ocm.xfsc.dev
 security:
@@ -53,10 +53,10 @@ security:
 config:
   port: 8080
   cassandra:
-    hosts: cassandra-dev.development.svc.cluster.local:9042
+    hosts: cassandra.cassandra.svc.cluster.local:9042
     keyspace: user_space
     user: cassandra
-    passwordSecret: cassandra-dev
+    passwordSecret: cassandra
     passwordKey: cassandra-password
   crypto:
     signKey: test
@@ -66,11 +66,12 @@ config:
     basedomain: http://localhost:8080
     country: DE
     region: EU
-    mode: REMOTE
+    mode: DIRECT
   messaging:
     enabled: true
     storageTopic: storage
     host: http://localhost:4222
+    protocol: nats
   vault:
     address: http://vault.vault.svc.cluster.local:8200
     tokenName: vault
diff --git a/internal/connection/db.go b/internal/connection/db.go
index cea2359601f66d1d64ae2a7eabffdcc52aa50b45..8a7dfc0b1d89c3b94ce7d0b7e08cf8148da8732b 100644
--- a/internal/connection/db.go
+++ b/internal/connection/db.go
@@ -78,7 +78,7 @@ func Connection() (SessionInterface, error) {
 	if cassandraConfig.User != "" && cassandraConfig.Password != "" {
 		cluster.Authenticator = gocql.PasswordAuthenticator{
 			Username: cassandraConfig.User,
-			Password: cassandraConfig.User,
+			Password: cassandraConfig.Password,
 		}
 	}