diff --git a/applications/dsba-pdp/values.yaml b/applications/dsba-pdp/values.yaml
index 281a822..6edb0b4 100644
--- a/applications/dsba-pdp/values.yaml
+++ b/applications/dsba-pdp/values.yaml
@@ -18,7 +18,7 @@ dsba-pdp:
 
     # iSHARE config
     ishare:
-      existingSecret: walt-id-vcwaltid-tls-sec
+      existingSecret: vcwaltid-tls-sec
 
       clientId: did:web:my-did:did
       trustedFingerprints:
diff --git a/applications/keycloak/templates/didConfigMap.yaml b/applications/keycloak/templates/didConfigMap.yaml
index fc4bab5..2a5fe8f 100644
--- a/applications/keycloak/templates/didConfigMap.yaml
+++ b/applications/keycloak/templates/didConfigMap.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.didConfig.loadDidWebEnabled -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -16,3 +17,4 @@ data:
           \"path\": \"did\",
           \"x5u\": \"{{ .Values.didConfig.x5u }}\"
       }"
+{{- end }}
diff --git a/applications/keycloak/values.yaml b/applications/keycloak/values.yaml
index 435cd3a..826e0a9 100644
--- a/applications/keycloak/values.yaml
+++ b/applications/keycloak/values.yaml
@@ -46,7 +46,7 @@ keycloak:
   - name: VCISSUER_ISSUER_DID
     value: "did:web:my-did:did"
   - name: VCISSUER_WALTID_ADDRESS
-    value: "http://walt-id-vcwaltid"
+    value: "http://vcwaltid"
 
   # Volume mounts
   extraVolumeMounts:
@@ -72,7 +72,7 @@ keycloak:
         name: keycloak-did-config
     - name: did-secret
       secret: 
-        secretName: walt-id-vcwaltid-tls-sec
+        secretName: vcwaltid-tls-sec
 
   # Init containers for VC issuer and loading of DID
   initContainers:
@@ -90,7 +90,7 @@ keycloak:
         - /opt/did/script/import.sh
       env:
         - name: WALTID_CORE_ADDRESS
-          value: "walt-id-vcwaltid:7000"
+          value: "vcwaltid:7000"
       volumeMounts:
         - name: did-config
           mountPath: /opt/did/script
@@ -110,5 +110,12 @@ keycloak:
 
 # Config to create DID
 didConfig:
+  # Enable creation of ConfigMap for loading the DID into walt-id
+  # When disabling, also remove the load-did initContainer from the list above
+  loadDidWebEnabled: true
+
+  # Domain for DID web
   domain: "provider.com"
+
+  # x5u for DID web
   x5u: "https://provider.com/certs/tls.crt"
diff --git a/applications/keyrock/values.yaml b/applications/keyrock/values.yaml
index 03032a1..2b0e1df 100644
--- a/applications/keyrock/values.yaml
+++ b/applications/keyrock/values.yaml
@@ -74,10 +74,10 @@ keyrock:
     - name: IDM_PR_CLIENT_KEY
       valueFrom:
           secretKeyRef:
-            name: walt-id-vcwaltid-tls-sec
+            name: vcwaltid-tls-sec
             key: tls.key
     - name: IDM_PR_CLIENT_CRT
       valueFrom:
           secretKeyRef:
-            name: walt-id-vcwaltid-tls-sec
+            name: vcwaltid-tls-sec
             key: tls.crt
diff --git a/applications/pdp/values.yaml b/applications/pdp/values.yaml
index 281a822..6edb0b4 100644
--- a/applications/pdp/values.yaml
+++ b/applications/pdp/values.yaml
@@ -18,7 +18,7 @@ dsba-pdp:
 
     # iSHARE config
     ishare:
-      existingSecret: walt-id-vcwaltid-tls-sec
+      existingSecret: vcwaltid-tls-sec
 
       clientId: did:web:my-did:did
       trustedFingerprints:
diff --git a/applications/walt-id/Chart.yaml b/applications/vcwaltid/Chart.yaml
similarity index 93%
rename from applications/walt-id/Chart.yaml
rename to applications/vcwaltid/Chart.yaml
index fe1d374..f1e0084 100644
--- a/applications/walt-id/Chart.yaml
+++ b/applications/vcwaltid/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-name: walt-id
+name: vcwaltid
 description: Chart holder for argo-cd
 
 type: application
diff --git a/applications/walt-id/templates/_helpers.tpl b/applications/vcwaltid/templates/_helpers.tpl
similarity index 100%
rename from applications/walt-id/templates/_helpers.tpl
rename to applications/vcwaltid/templates/_helpers.tpl
diff --git a/applications/walt-id/templates/certificate.yaml b/applications/vcwaltid/templates/certificate.yaml
similarity index 100%
rename from applications/walt-id/templates/certificate.yaml
rename to applications/vcwaltid/templates/certificate.yaml
diff --git a/applications/walt-id/templates/deployment.yaml b/applications/vcwaltid/templates/deployment.yaml
similarity index 100%
rename from applications/walt-id/templates/deployment.yaml
rename to applications/vcwaltid/templates/deployment.yaml
diff --git a/applications/walt-id/templates/route-certs.yaml b/applications/vcwaltid/templates/route-certs.yaml
similarity index 100%
rename from applications/walt-id/templates/route-certs.yaml
rename to applications/vcwaltid/templates/route-certs.yaml
diff --git a/applications/walt-id/templates/route.yaml b/applications/vcwaltid/templates/route.yaml
similarity index 100%
rename from applications/walt-id/templates/route.yaml
rename to applications/vcwaltid/templates/route.yaml
diff --git a/applications/walt-id/templates/service.yaml b/applications/vcwaltid/templates/service.yaml
similarity index 100%
rename from applications/walt-id/templates/service.yaml
rename to applications/vcwaltid/templates/service.yaml
diff --git a/applications/walt-id/values.yaml b/applications/vcwaltid/values.yaml
similarity index 100%
rename from applications/walt-id/values.yaml
rename to applications/vcwaltid/values.yaml
diff --git a/applications/verifier/values.yaml b/applications/verifier/values.yaml
index c470d14..d199ea6 100644
--- a/applications/verifier/values.yaml
+++ b/applications/verifier/values.yaml
@@ -16,7 +16,7 @@ vcverifier:
 
     # Walt-id config
     ssikit:
-      auditorUrl: http://walt-id-vcwaltid:7003
+      auditorUrl: http://vcwaltid:7003
 
     # Verifier config
     verifier:
diff --git a/data-space-connector/values.yaml b/data-space-connector/values.yaml
index a6c0eac..1e16131 100644
--- a/data-space-connector/values.yaml
+++ b/data-space-connector/values.yaml
@@ -60,9 +60,9 @@ applications:
     helm_values:
     - values.yaml
 
-  - name: walt-id
+  - name: vcwaltid
     enabled: true
-    source_path: applications/walt-id
+    source_path: applications/vcwaltid
     source_ref: *branch
     destination: *destination
     helm_values: