diff --git a/smardigo/templates/connect/deployment.yml b/smardigo/templates/connect/deployment.yml
index bbf2ef5..fd16aed 100644
--- a/smardigo/templates/connect/deployment.yml
+++ b/smardigo/templates/connect/deployment.yml
@@ -1,16 +1,16 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: "{{ .Release.Name }}-connect"
+  name: "connect"
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: "{{ .Release.Name }}-connect"
+      app: "connect"
   template:
     metadata:
       labels:
-        app: "{{ .Release.Name }}-connect"
+        app: "connect"
     spec:
       hostAliases:
       - ip: "{{ .Values.sharedService.keycloak.host.ip }}"
@@ -21,7 +21,7 @@ spec:
         secret:
           secretName: elastic-client-cert
       containers:
-      - name: "{{ .Release.Name }}-connect"
+      - name: "connect"
         image: "{{ .Values.harbor.host.name }}/{{ .Values.connect.image.name }}:{{ .Values.connect.image.version }}"
         imagePullPolicy: Always
         volumeMounts:
@@ -40,7 +40,7 @@ spec:
         - name: SMA_JWT_SECRET
           valueFrom:
             secretKeyRef:
-              name: "{{ .Release.Name }}-connect-secrets"
+              name: "connect-secrets"
               key: JWT_SECRET
 
         - name: SPRING_PROFILES_INCLUDE
@@ -80,7 +80,7 @@ spec:
         - name: IAM_CLIENT_ENABLED
           value: "true"
         - name: EXTERNAL_IAM_SERVER_URL
-          value: "http://{{ .Release.Name }}-iam:8080"
+          value: "http://iam:8080"
 
         - name: MAIL_PROTOCOL
           value: "smtp"
@@ -123,7 +123,7 @@ spec:
       initContainers:
       - name: init-iam
         image: busybox:1.28
-        command: ['sh', '-c', "until nslookup {{ .Release.Name }}-iam; do echo waiting for iam; sleep 2; done"]
+        command: ['sh', '-c', "until nslookup iam; do echo waiting for iam; sleep 2; done"]
       - name: init-postgres
         image: busybox:1.28
         command: ['sh', '-c', "until nslookup {{ .Values.connect.datasource.host }}; do echo waiting for postgres; sleep 2; done"]
diff --git a/smardigo/templates/connect/ingress.yml b/smardigo/templates/connect/ingress.yml
index 35e6098..0ef16ac 100644
--- a/smardigo/templates/connect/ingress.yml
+++ b/smardigo/templates/connect/ingress.yml
@@ -15,7 +15,7 @@ spec:
       paths:
       - backend:
           service:
-            name: "{{ .Release.Name }}-connect"
+            name: "connect"
             port:
               number: 8080
         path: /
diff --git a/smardigo/templates/connect/secret.yml b/smardigo/templates/connect/secret.yml
index b812bd9..811a5ec 100644
--- a/smardigo/templates/connect/secret.yml
+++ b/smardigo/templates/connect/secret.yml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ .Release.Name }}-connect-secrets
+  name: connect-secrets
 data:
   JWT_SECRET: ZDI3NTJjNjU3NTU4NDg5Yzg3MjEyZTJhMjkyYTcyNjk=
   AUTH_TOKEN: ZXlKbGJtTWlPaUpCTVRJNFEwSkRMVWhUTWpVMklpd2lZV3huSWpvaVpHbHlJbjAuLm5PV2xhZXRhM0swaHpwZ2dXaWNBeXcuaVc5ZF9tUmhKVm1FRzZGT3plT1BQY2VvNTRIMTBzdkZJWDlya1ZqcnZhUS5kSDNfQVlOOUZ1MV9hamk0MkpMY0h3
diff --git a/smardigo/templates/connect/service.yml b/smardigo/templates/connect/service.yml
index 5fe9d96..4fb6e90 100644
--- a/smardigo/templates/connect/service.yml
+++ b/smardigo/templates/connect/service.yml
@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: "{{ .Release.Name }}-connect"
+  name: "connect"
 spec:
   selector:
-    app: "{{ .Release.Name }}-connect"
+    app: "connect"
   type: NodePort
   ports:
     - port: 8080
diff --git a/smardigo/templates/iam/deployment.yml b/smardigo/templates/iam/deployment.yml
index ce47010..449e3f4 100644
--- a/smardigo/templates/iam/deployment.yml
+++ b/smardigo/templates/iam/deployment.yml
@@ -1,23 +1,23 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: "{{ .Release.Name }}-iam"
+  name: "iam"
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: "{{ .Release.Name }}-iam"
+      app: "iam"
   template:
     metadata:
       labels:
-        app: "{{ .Release.Name }}-iam"
+        app: "iam"
     spec:
       hostAliases:
       - ip: "{{ .Values.sharedService.keycloak.host.ip }}"
         hostnames:
         - "{{ .Values.sharedService.keycloak.host.name }}"
       containers:
-      - name: "{{ .Release.Name }}-iam"
+      - name: "iam"
         image: "{{ .Values.harbor.host.name }}/{{ .Values.iam.image.name }}:{{ .Values.iam.image.version }}"
         imagePullPolicy: Always
         env:
diff --git a/smardigo/templates/iam/service.yml b/smardigo/templates/iam/service.yml
index dccbefd..ea3ab09 100644
--- a/smardigo/templates/iam/service.yml
+++ b/smardigo/templates/iam/service.yml
@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: "{{ .Release.Name }}-iam"
+  name: "iam"
 spec:
   selector:
-    app: "{{ .Release.Name }}-iam"
+    app: "iam"
   type: NodePort
   ports:
     - port: 8080
diff --git a/smardigo/values.yaml b/smardigo/values.yaml
index 43e0b5a..bf0a8f5 100644
--- a/smardigo/values.yaml
+++ b/smardigo/values.yaml
@@ -61,8 +61,8 @@ connect:
     password: 
     properties:
       simulation: true
-      base_url: "https://dev-teanant-cluster-connect.smardigo.digital"
-      base_url_extern: "https://dev-teanant-cluster.smardigo.digital"
+      base_url: "https://dev-mobene-nsodev-connect.smardigo.digital"
+      base_url_extern: "https://dev-mobene-nsodev-connect.smardigo.digital"
       sender: "noreply-connect@netgo.de"
       sender_alias: "noreply-connect"