diff --git a/infrastructure/charts/agent/templates/apisixroute.yaml b/infrastructure/charts/agent/templates/apisixroute.yaml
index 735a204ff7..c09ffdaee7 100644
--- a/infrastructure/charts/agent/templates/apisixroute.yaml
+++ b/infrastructure/charts/agent/templates/apisixroute.yaml
@@ -16,7 +16,7 @@ spec:
       {{- end }}
       paths:
       - /prism-agent/*
-      - /{{ include "cloud-agent.fullname" . }}/*
+      - /{{ include "cloud-agent.name" . }}/*
     backends:
        - serviceName: agent-server-tapir-service
          servicePort: 8085
@@ -27,7 +27,7 @@ spec:
     - name: proxy-rewrite
       enable: true
       config:
-        regex_uri: ["^/(prism-agent|{{ include "cloud-agent.fullname" . }})/(.*)","/$2"]
+        regex_uri: ["^/(prism-agent|{{ include "cloud-agent.name" . }})/(.*)","/$2"]
     - name: uri-blocker
       enable: true
       config:
@@ -57,7 +57,7 @@ spec:
       {{- end }}
       paths:
       - /prism-agent/didcomm*
-      - /{{ include "cloud-agent.fullname" . }}/didcomm*
+      - /{{ include "cloud-agent.name" . }}/didcomm*
     backends:
       - serviceName: agent-server-didcomm-service
         servicePort: 8090
@@ -65,7 +65,7 @@ spec:
     - name: proxy-rewrite
       enable: true
       config:
-        regex_uri: ["^/(prism-agent|{{ include "cloud-agent.fullname" . }})/didcomm(.*)", "/$2"]
+        regex_uri: ["^/(prism-agent|{{ include "cloud-agent.name" . }})/didcomm(.*)", "/$2"]
     {{- template "cors" . }}
     {{- template "headers.requestId" . }}
     {{- template "headers.security" . }}
@@ -89,7 +89,7 @@ spec:
       {{- end }}
       paths:
       - /prism-agent/schema-registry/schemas/*
-      - /{{ include "cloud-agent.fullname" . }}/schema-registry/schemas/*
+      - /{{ include "cloud-agent.name" . }}/schema-registry/schemas/*
       methods:
       - GET
     backends:
@@ -99,7 +99,7 @@ spec:
     - name: proxy-rewrite
       enable: true
       config:
-        regex_uri: ["^/(prism-agent|{{ include "cloud-agent.fullname" . }})/schema-registry/schemas/(.*)", "/schema-registry/schemas/$2"]
+        regex_uri: ["^/(prism-agent|{{ include "cloud-agent.name" . }})/schema-registry/schemas/(.*)", "/schema-registry/schemas/$2"]
     {{- template "cors" . }}
     {{- template "headers.requestId" . }}
     {{- template "headers.security" . }}
@@ -123,7 +123,7 @@ spec:
       {{- end }}
       paths:
         - /prism-agent/credential-definition-registry/definitions/*
-        - /{{ include "cloud-agent.fullname" . }}/credential-definition-registry/definitions/*
+        - /{{ include "cloud-agent.name" . }}/credential-definition-registry/definitions/*
       methods:
         - GET
     backends:
@@ -133,7 +133,7 @@ spec:
     - name: proxy-rewrite
       enable: true
       config:
-        regex_uri: ["^/(prism-agent|{{ include "cloud-agent.fullname" . }})/credential-definition-registry/definitions/(.*)", "/credential-definition-registry/definitions/$2"]
+        regex_uri: ["^/(prism-agent|{{ include "cloud-agent.name" . }})/credential-definition-registry/definitions/(.*)", "/credential-definition-registry/definitions/$2"]
     {{- template "cors" . }}
     {{- template "headers.requestId" . }}
     {{- template "headers.security" . }}
@@ -157,7 +157,7 @@ spec:
       {{- end }}
       paths:
       - /prism-agent/docs/*
-      - /{{ include "cloud-agent.fullname" . }}/docs/*
+      - /{{ include "cloud-agent.name" . }}/docs/*
     backends:
       - serviceName: agent-server-tapir-service
         servicePort: 8085
@@ -165,7 +165,7 @@ spec:
     - name: proxy-rewrite
       enable: true
       config:
-        regex_uri: ["^/(prism-agent|{{ include "cloud-agent.fullname" . }})/docs/(.*)","/docs/$2"]
+        regex_uri: ["^/(prism-agent|{{ include "cloud-agent.name" . }})/docs/(.*)","/docs/$2"]
     {{- template "cors" . }}
     {{- template "headers.requestId" . }}
     {{- template "headers.security" . }}
diff --git a/infrastructure/charts/agent/templates/apisixtls.yaml b/infrastructure/charts/agent/templates/apisixtls.yaml
index 3968dd8671..4b4c2954d2 100644
--- a/infrastructure/charts/agent/templates/apisixtls.yaml
+++ b/infrastructure/charts/agent/templates/apisixtls.yaml
@@ -2,7 +2,7 @@
 apiVersion: apisix.apache.org/v2
 kind: ApisixTls
 metadata:
-  name: "{{ include "cloud-agent.fullname" . }}-base-path-tls"
+  name: "{{ include "cloud-agent.name" . }}-base-path-tls"
   namespace: "{{ .Release.Namespace }}"
   labels:
     {{- include "labels.common" . | nindent 4}}
@@ -12,6 +12,6 @@ spec:
     - {{ . }}
   {{- end }}
   secret:
-    name: "{{ include "cloud-agent.fullname" . }}-base-path-secret"
+    name: "{{ include "cloud-agent.name" . }}-base-path-secret"
     namespace: "{{ .Release.Namespace }}"
 {{- end }}
diff --git a/infrastructure/charts/agent/templates/certificate.yaml b/infrastructure/charts/agent/templates/certificate.yaml
index eff83b0281..a7e19bda24 100644
--- a/infrastructure/charts/agent/templates/certificate.yaml
+++ b/infrastructure/charts/agent/templates/certificate.yaml
@@ -2,14 +2,14 @@
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
-  name: "{{ include "cloud-agent.fullname" . }}-base-path-cert"
+  name: "{{ include "cloud-agent.name" . }}-base-path-cert"
   namespace: "{{ .Release.Namespace }}"
   labels:
     {{- include "labels.common" . | nindent 4}}
   annotations:
     argocd.argoproj.io/sync-wave: "-1"
 spec:
-  secretName: "{{ include "cloud-agent.fullname" . }}-base-path-secret"
+  secretName: "{{ include "cloud-agent.name" . }}-base-path-secret"
   duration: 2160h0m0s # 90d
   renewBefore: 360h0m0s # 15d
   issuerRef:
diff --git a/infrastructure/charts/agent/templates/configmap.yaml b/infrastructure/charts/agent/templates/configmap.yaml
index 830b768fd8..2d83f2bd11 100644
--- a/infrastructure/charts/agent/templates/configmap.yaml
+++ b/infrastructure/charts/agent/templates/configmap.yaml
@@ -83,11 +83,11 @@ data:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "cloud-agent.fullname" . }}-realm-import
+  name: {{ include "cloud-agent.name" . }}-realm-import
   labels:
     {{- include "labels.common" . | nindent 4}}
 data:
-  {{ include "cloud-agent.fullname" . }}.json: |
+  {{ include "cloud-agent.name" . }}.json: |
     {
       "realm": {{ .Values.server.keycloak.realm | quote }},
       "enabled": true
diff --git a/infrastructure/charts/agent/templates/deployment.yaml b/infrastructure/charts/agent/templates/deployment.yaml
index b054a41e4f..69ba3babdf 100644
--- a/infrastructure/charts/agent/templates/deployment.yaml
+++ b/infrastructure/charts/agent/templates/deployment.yaml
@@ -1,19 +1,19 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "cloud-agent.fullname" . }}-server
+  name: {{ include "cloud-agent.name" . }}-server
   namespace: "{{ .Release.Namespace }}"
   labels:
     {{- include "labels.common" . | nindent 4 }}
 spec:
   selector:
     matchLabels:
-      app.kubernetes.io/name: {{ include "cloud-agent.fullname" . }}-server
+      app.kubernetes.io/name: {{ include "cloud-agent.name" . }}-server
   replicas: 1
   template:
     metadata:
       labels:
-        app.kubernetes.io/name: {{ include "cloud-agent.fullname" . }}-server
+        app.kubernetes.io/name: {{ include "cloud-agent.name" . }}-server
         {{- include "labels.common" . | nindent 8 }}
     spec:
       imagePullSecrets:
@@ -21,7 +21,7 @@ spec:
       initContainers:
       - name: wait-postgress-ready
         image: busybox
-        command: ['sh', '-c', "until nc -z {{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.fullname" . }}-postgres-cluster.{{ .Release.Namespace }} 5432; do echo waiting for postgress-operator; sleep 2; done;"]
+        command: ['sh', '-c', "until nc -z {{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.name" . }}-postgres-cluster.{{ .Release.Namespace }} 5432; do echo waiting for postgress-operator; sleep 2; done;"]
       {{- if .Values.server.keycloak.enabled }}
       - name: wait-keycloak-ready
         image: badouralix/curl-jq:ubuntu
@@ -52,7 +52,7 @@ spec:
       {{- end }}
       {{- end }}
       containers:
-      - name: {{ include "cloud-agent.fullname" . }}-server
+      - name: {{ include "cloud-agent.name" . }}-server
         image: "{{ .Values.server.image.repository }}/{{ .Values.server.image.tag }}:{{ .Values.server.image.version | default .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.server.image.pullPolicy }}
         livenessProbe:
@@ -78,7 +78,7 @@ spec:
                 key: salt
                 optional: false
           - name: POLLUX_DB_HOST
-            value: "{{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.fullname" . }}-postgres-cluster.{{ .Release.Namespace }}"
+            value: "{{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.name" . }}-postgres-cluster.{{ .Release.Namespace }}"
           - name: POLLUX_DB_PORT
             value: "5432"
           - name: POLLUX_DB_NAME
@@ -86,29 +86,29 @@ spec:
           - name: POLLUX_DB_USER
             valueFrom:
               secretKeyRef:
-                name: pollux-admin.{{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.fullname" . }}-postgres-cluster.credentials.postgresql.acid.zalan.do
+                name: pollux-admin.{{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.name" . }}-postgres-cluster.credentials.postgresql.acid.zalan.do
                 key: username
                 optional: false
           - name: POLLUX_DB_PASSWORD
             valueFrom:
               secretKeyRef:
-                name: pollux-admin.{{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.fullname" . }}-postgres-cluster.credentials.postgresql.acid.zalan.do
+                name: pollux-admin.{{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.name" . }}-postgres-cluster.credentials.postgresql.acid.zalan.do
                 key: password
                 optional: false
           - name: POLLUX_DB_APP_USER
             valueFrom:
               secretKeyRef:
-                name: pollux-application-user.{{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.fullname" . }}-postgres-cluster.credentials.postgresql.acid.zalan.do
+                name: pollux-application-user.{{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.name" . }}-postgres-cluster.credentials.postgresql.acid.zalan.do
                 key: username
                 optional: false
           - name: POLLUX_DB_APP_PASSWORD
             valueFrom:
               secretKeyRef:
-                name: pollux-application-user.{{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.fullname" . }}-postgres-cluster.credentials.postgresql.acid.zalan.do
+                name: pollux-application-user.{{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.name" . }}-postgres-cluster.credentials.postgresql.acid.zalan.do
                 key: password
                 optional: false
           - name: CONNECT_DB_HOST
-            value: "{{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.fullname" . }}-postgres-cluster.{{ .Release.Namespace }}"
+            value: "{{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.name" . }}-postgres-cluster.{{ .Release.Namespace }}"
           - name: CONNECT_DB_PORT
             value: "5432"
           - name: CONNECT_DB_NAME
@@ -116,29 +116,29 @@ spec:
           - name: CONNECT_DB_USER
             valueFrom:
               secretKeyRef:
-                name: connect-admin.{{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.fullname" . }}-postgres-cluster.credentials.postgresql.acid.zalan.do
+                name: connect-admin.{{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.name" . }}-postgres-cluster.credentials.postgresql.acid.zalan.do
                 key: username
                 optional: false
           - name: CONNECT_DB_PASSWORD
             valueFrom:
               secretKeyRef:
-                name: connect-admin.{{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.fullname" . }}-postgres-cluster.credentials.postgresql.acid.zalan.do
+                name: connect-admin.{{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.name" . }}-postgres-cluster.credentials.postgresql.acid.zalan.do
                 key: password
                 optional: false
           - name: CONNECT_DB_APP_USER
             valueFrom:
               secretKeyRef:
-                name: connect-application-user.{{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.fullname" . }}-postgres-cluster.credentials.postgresql.acid.zalan.do
+                name: connect-application-user.{{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.name" . }}-postgres-cluster.credentials.postgresql.acid.zalan.do
                 key: username
                 optional: false
           - name: CONNECT_DB_APP_PASSWORD
             valueFrom:
               secretKeyRef:
-                name: connect-application-user.{{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.fullname" . }}-postgres-cluster.credentials.postgresql.acid.zalan.do
+                name: connect-application-user.{{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.name" . }}-postgres-cluster.credentials.postgresql.acid.zalan.do
                 key: password
                 optional: false
           - name: AGENT_DB_HOST
-            value: "{{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.fullname" . }}-postgres-cluster.{{ .Release.Namespace }}"
+            value: "{{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.name" . }}-postgres-cluster.{{ .Release.Namespace }}"
           - name: AGENT_DB_PORT
             value: "5432"
           - name: AGENT_DB_NAME
@@ -146,31 +146,31 @@ spec:
           - name: AGENT_DB_USER
             valueFrom:
               secretKeyRef:
-                name: agent-admin.{{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.fullname" . }}-postgres-cluster.credentials.postgresql.acid.zalan.do
+                name: agent-admin.{{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.name" . }}-postgres-cluster.credentials.postgresql.acid.zalan.do
                 key: username
                 optional: false
           - name: AGENT_DB_PASSWORD
             valueFrom:
               secretKeyRef:
-                name: agent-admin.{{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.fullname" . }}-postgres-cluster.credentials.postgresql.acid.zalan.do
+                name: agent-admin.{{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.name" . }}-postgres-cluster.credentials.postgresql.acid.zalan.do
                 key: password
                 optional: false
           - name: AGENT_DB_APP_USER
             valueFrom:
               secretKeyRef:
-                name: agent-application-user.{{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.fullname" . }}-postgres-cluster.credentials.postgresql.acid.zalan.do
+                name: agent-application-user.{{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.name" . }}-postgres-cluster.credentials.postgresql.acid.zalan.do
                 key: username
                 optional: false
           - name: AGENT_DB_APP_PASSWORD
             valueFrom:
               secretKeyRef:
-                name: agent-application-user.{{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.fullname" . }}-postgres-cluster.credentials.postgresql.acid.zalan.do
+                name: agent-application-user.{{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.name" . }}-postgres-cluster.credentials.postgresql.acid.zalan.do
                 key: password
                 optional: false
           - name: DIDCOMM_SERVICE_URL
-            value: "https://{{ index .Values.ingress.applicationUrls 0 }}/{{ include "cloud-agent.fullname" . }}/didcomm"
+            value: "https://{{ index .Values.ingress.applicationUrls 0 }}/{{ include "cloud-agent.name" . }}/didcomm"
           - name: REST_SERVICE_URL
-            value: "https://{{ index .Values.ingress.applicationUrls 0 }}/{{ include "cloud-agent.fullname" . }}"
+            value: "https://{{ index .Values.ingress.applicationUrls 0 }}/{{ include "cloud-agent.name" . }}"
           - name: PRISM_NODE_HOST
             value: {{ .Values.vdrManager.host | quote }}
           - name: PRISM_NODE_PORT
diff --git a/infrastructure/charts/agent/templates/postgresql.yaml b/infrastructure/charts/agent/templates/postgresql.yaml
index 180c7e382a..1563ba10a6 100644
--- a/infrastructure/charts/agent/templates/postgresql.yaml
+++ b/infrastructure/charts/agent/templates/postgresql.yaml
@@ -1,7 +1,7 @@
 apiVersion: "acid.zalan.do/v1"
 kind: postgresql
 metadata:
-  name: "{{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.fullname" . }}-postgres-cluster"
+  name: "{{ .Values.database.postgres.managingTeam }}-{{ include "cloud-agent.name" . }}-postgres-cluster"
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "labels.common" . | nindent 4 }}
diff --git a/infrastructure/charts/agent/templates/service.yaml b/infrastructure/charts/agent/templates/service.yaml
index 449ac1a6f1..5ca6508249 100644
--- a/infrastructure/charts/agent/templates/service.yaml
+++ b/infrastructure/charts/agent/templates/service.yaml
@@ -4,14 +4,14 @@ metadata:
   name: agent-server-tapir-service
   namespace: "{{ .Release.Namespace }}"
   labels:
-    app.kubernetes.io/name: {{ include "cloud-agent.fullname" . }}-server
-    app.kubernetes.io/service: {{ include "cloud-agent.fullname" . }}-server-main
+    app.kubernetes.io/name: {{ include "cloud-agent.name" . }}-server
+    app.kubernetes.io/service: {{ include "cloud-agent.name" . }}-server-main
     {{- include "labels.common" . | nindent 4 }}
 spec:
   selector:
-    app.kubernetes.io/name: {{ include "cloud-agent.fullname" . }}-server
+    app.kubernetes.io/name: {{ include "cloud-agent.name" . }}-server
   ports:
-    - name: {{ include "cloud-agent.fullname" . }}-server-main
+    - name: {{ include "cloud-agent.name" . }}-server-main
       protocol: "TCP"
       port: 8085
       targetPort: 8085
@@ -25,14 +25,14 @@ metadata:
   name: agent-server-didcomm-service
   namespace: "{{ .Release.Namespace }}"
   labels:
-    app.kubernetes.io/name: {{ include "cloud-agent.fullname" . }}-server
-    app.kubernetes.io/service: {{ include "cloud-agent.fullname" . }}-server-didcomm
+    app.kubernetes.io/name: {{ include "cloud-agent.name" . }}-server
+    app.kubernetes.io/service: {{ include "cloud-agent.name" . }}-server-didcomm
     {{- include "labels.common" . | nindent 4 }}
 spec:
   selector:
-    app.kubernetes.io/name: {{ include "cloud-agent.fullname" . }}-server
+    app.kubernetes.io/name: {{ include "cloud-agent.name" . }}-server
   ports:
-    - name: {{ include "cloud-agent.fullname" . }}-server-didcomm
+    - name: {{ include "cloud-agent.name" . }}-server-didcomm
       protocol: "TCP"
       port: 8090
       targetPort: 8090
@@ -49,7 +49,7 @@ metadata:
   annotations:
     external-dns.alpha.kubernetes.io/hostname: "{{ join ", " .Values.ingress.applicationUrls }}"
   labels:
-    app.kubernetes.io/name: {{ include "cloud-agent.fullname" . }}-server
+    app.kubernetes.io/name: {{ include "cloud-agent.name" . }}-server
     app.kubernetes.io/service: agent-server-domain-name-fake
     {{- include "labels.common" . | nindent 4 }}
 spec: