diff --git a/api/composer.lock b/api/composer.lock
index 8045658..4967a74 100644
--- a/api/composer.lock
+++ b/api/composer.lock
@@ -720,12 +720,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/ConductionNL/CommonGroundBundle.git",
-                "reference": "267522eb37ac76025bff1ab5aa10bdd05bff91bf"
+                "reference": "c3b146fcb885a55e6c58787779a539ce38d31e39"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ConductionNL/CommonGroundBundle/zipball/267522eb37ac76025bff1ab5aa10bdd05bff91bf",
-                "reference": "267522eb37ac76025bff1ab5aa10bdd05bff91bf",
+                "url": "https://api.github.com/repos/ConductionNL/CommonGroundBundle/zipball/c3b146fcb885a55e6c58787779a539ce38d31e39",
+                "reference": "c3b146fcb885a55e6c58787779a539ce38d31e39",
                 "shasum": ""
             },
             "require": {
@@ -808,7 +808,7 @@
                 "issues": "https://github.com/ConductionNL/ConductionCommonGroundBundle/issues",
                 "source": "https://github.com/ConductionNL/ConductionCommonGroundBundle"
             },
-            "time": "2021-03-18T09:26:44+00:00"
+            "time": "2021-06-07T09:41:30+00:00"
         },
         {
             "name": "dasprid/enum",
diff --git a/api/helm/charts/redis-12.7.7.tgz b/api/helm/charts/redis-12.7.7.tgz
deleted file mode 100644
index 77e34cd..0000000
Binary files a/api/helm/charts/redis-12.7.7.tgz and /dev/null differ
diff --git a/api/helm/index.yaml b/api/helm/index.yaml
index 0fe531e..9324f72 100644
--- a/api/helm/index.yaml
+++ b/api/helm/index.yaml
@@ -5,7 +5,7 @@ entries:
       category: Database
     apiVersion: v2
     appVersion: 11.10.0
-    created: "2021-04-12T13:29:06.9550107Z"
+    created: "2021-06-07T09:47:58.2668684Z"
     dependencies:
     - name: common
       repository: https://charts.bitnami.com/bitnami
@@ -34,47 +34,13 @@ entries:
     urls:
     - charts/postgresql-10.1.1.tgz
     version: 10.1.1
-  redis:
-  - annotations:
-      category: Database
-    apiVersion: v2
-    appVersion: 6.0.11
-    created: "2021-04-12T13:29:06.9826521Z"
-    dependencies:
-    - name: common
-      repository: https://charts.bitnami.com/bitnami
-      tags:
-      - bitnami-common
-      version: 1.x.x
-    description: Open source, advanced key-value store. It is often referred to as
-      a data structure server since keys can contain strings, hashes, lists, sets
-      and sorted sets.
-    digest: 2d70861d16fc410ed6d6c818b97f7b0d519031147e5c7b42c5691d4c38742c44
-    home: https://github.com/bitnami/charts/tree/master/bitnami/redis
-    icon: https://bitnami.com/assets/stacks/redis/img/redis-stack-220x234.png
-    keywords:
-    - redis
-    - keyvalue
-    - database
-    maintainers:
-    - email: containers@bitnami.com
-      name: Bitnami
-    - email: cedric@desaintmartin.fr
-      name: desaintmartin
-    name: redis
-    sources:
-    - https://github.com/bitnami/bitnami-docker-redis
-    - http://redis.io/
-    urls:
-    - charts/redis-12.7.7.tgz
-    version: 12.7.7
   waardepapieren-balie:
   - apiVersion: v1
     appVersion: V1.0
-    created: "2021-04-12T13:29:06.8506671Z"
+    created: "2021-06-07T09:47:58.2465021Z"
     description: Naast deze JSON rest API is er ook een [graphql](/graphql) interface
       beschikbaar.
-    digest: ab1b7e1ed691c41e25ed54a6f93e1a14fc95acf0223c4b2c8e08691308562728
+    digest: 74382e7dee2ba6f4c050d78d407aea4f4fbdad4c52e759abcad08298494fc6ac
     home: https://www.conduction.nl
     icon: https://conductionnl.github.io/images/conduction_avatar_blue_on_transparant.svg
     keywords:
@@ -94,30 +60,4 @@ entries:
     urls:
     - waardepapieren-balie-0.1.0.tgz
     version: 0.1.0
-  waardepapieren-ballie:
-  - apiVersion: v1
-    appVersion: V1.0
-    created: "2021-04-12T13:29:06.926262Z"
-    description: Naast deze JSON rest API is er ook een [graphql](/graphql) interface
-      beschikbaar.
-    digest: 73299431a2774e84ddc4fcf927fb11c1f27bf25755194659e5236ba06a14e06b
-    home: https://www.conduction.nl
-    icon: https://conductionnl.github.io/images/conduction_avatar_blue_on_transparant.svg
-    keywords:
-    - commonground
-    - haven
-    - nlx
-    - component
-    maintainers:
-    - email: ruben@conduction.nl
-      name: Ruben van der Linde
-    - email: info@conduction.nl
-      name: Conduction
-    name: waardepapieren-ballie
-    sources:
-    - https://commonground.conduction.nl/
-    - https://www.commonground.nl/
-    urls:
-    - waardepapieren-ballie-0.1.0.tgz
-    version: 0.1.0
-generated: "2021-04-12T13:29:06.8249981Z"
+generated: "2021-06-07T09:47:58.2352539Z"
diff --git a/api/helm/templates/configmap.yaml b/api/helm/templates/configmap.yaml
index 46fc7fc..1abfe9c 100644
--- a/api/helm/templates/configmap.yaml
+++ b/api/helm/templates/configmap.yaml
@@ -29,17 +29,18 @@ data:
   app-auth: {{ .Values.settings.authorisationEnabled | quote }}
   app-audittrail: {{ .Values.settings.audittrailEnabled | quote }}
   app-notification: {{ .Values.settings.notificationEnabled | quote }}
-  
+
+  {{ if (eq $.Values.settings.type "application" ) }}
+  redis-host: {{ printf "%s-redis-headless" $redisServiceName | quote }}
+  redis-port: {{ .Values.redis.redisPort | toString | quote }}
+  digispoof-location: {{ .Values.commonground.digispoof.location }}
+  eherkenning-location: {{ .Values.commonground.eherkenning.location }}
+  {{ end }}
+
   cache: {{ .Values.settings.cache | quote }}
   env: {{ .Values.settings.env | quote }}
   debug: {{ .Values.settings.debug | quote }}
   trusted-proxies: {{ join "," .Values.settings.trustedProxies }}
   trusted-hosts: {{ .Values.settings.trustedHosts | quote }}
-  php-service: {{ .Values.settings.name }}-{{ .Values.settings.env }}-php  
+  php-service: {{ .Values.settings.name }}-{{ .Values.settings.env }}-php
 
-  {{- if (eq $.Values.settings.type "application" ) }}
-  redis-host: {{ printf "%s-redis" $redisServiceName | quote }}
-  redis-port: {{ .Values.redis.redisPort | toString | quote }}
-  digispoof-location: { { .Values.commonground.digispoof.location } }
-  eherkenning-location: { { .Values.commonground.eherkenning.location } }
-  {{-end }}
diff --git a/api/helm/templates/php-deployment.yaml b/api/helm/templates/php-deployment.yaml
index 7c69d89..4f927b0 100644
--- a/api/helm/templates/php-deployment.yaml
+++ b/api/helm/templates/php-deployment.yaml
@@ -150,21 +150,7 @@ spec:
                 secretKeyRef:
                   name: {{ template "fullname" . }}
                   key: app_application_key
-            - name: APP_URL
-              {{- if and (eq $.Values.settings.env "prod") (eq $.Values.settings.type "component") }}
-              value: https://{{ $.Values.settings.domain }}/api/{{ $.Values.settings.majorVersion }}/{{ $.Values.settings.subpath }}
-              {{- else if and (eq $.Values.settings.env "prod") $.Values.settings.subpath }}
-              value: https://{{ $.Values.settings.domain }}/{{ $.Values.settings.subpath }}
-              {{- else if eq $.Values.settings.env "prod" }}
-              value: https://{{ $.Values.settings.domain }}
-              {{- else if eq $.Values.settings.type "component" }}
-              value: https://{{ $.Values.settings.env }}.{{ $.Values.settings.domain }}/api/{{ $.Values.settings.majorVersion }}/{{ $.Values.settings.subpath }}
-              {{- else if $.Values.settings.subpath }}
-              value: https://{{ $.Values.settings.env }}.{{ $.Values.settings.domain }}/{{ $.Values.settings.subpath }}
-              {{- else }}
-              value: https://{{ $.Values.settings.env }}.{{ $.Values.settings.domain }}
-              {{- end }}
-           {{- if (eq $.Values.settings.type "application" ) }}
+            {{- if (eq $.Values.settings.type "application" ) }}
             - name: REDIS_HOST
               valueFrom:
                 configMapKeyRef:
@@ -177,15 +163,29 @@ spec:
                   key: redis-port
             - name: APP_DIGISPOOF_LOCATION
               valueFrom:
-                  configMapKeyRef:
-                      name: {{ template "fullname" . }}
-                      key: digispoof-location
+                configMapKeyRef:
+                  name: {{ template "fullname" . }}
+                  key: digispoof-location
             - name: APP_EHERKENNING_LOCATION
               valueFrom:
-                  configMapKeyRef:
-                      name: {{ template "fullname" . }}
-                      key: eherkenning-location
-          {{-end }}
+                configMapKeyRef:
+                  name: {{ template "fullname" . }}
+                  key: eherkenning-location
+            {{- end }}
+            - name: APP_URL
+              {{- if and (eq $.Values.settings.env "prod") (eq $.Values.settings.type "component") }}
+              value: https://{{ $.Values.settings.domain }}/api/{{ $.Values.settings.majorVersion }}/{{ $.Values.settings.subpath }}
+              {{- else if and (eq $.Values.settings.env "prod") $.Values.settings.subpath }}
+              value: https://{{ $.Values.settings.domain }}/{{ $.Values.settings.subpath }}
+              {{- else if eq $.Values.settings.env "prod" }}
+              value: https://{{ $.Values.settings.domain }}
+              {{- else if eq $.Values.settings.type "component" }}
+              value: https://{{ $.Values.settings.env }}.{{ $.Values.settings.domain }}/api/{{ $.Values.settings.majorVersion }}/{{ $.Values.settings.subpath }}
+              {{- else if $.Values.settings.subpath }}
+              value: https://{{ $.Values.settings.env }}.{{ $.Values.settings.domain }}/{{ $.Values.settings.subpath }}
+              {{- else }}
+              value: https://{{ $.Values.settings.env }}.{{ $.Values.settings.domain }}
+              {{- end }}
           resources:
 {{ toYaml .Values.resources | indent 12 }}
     {{- if .Values.nodeSelector }}
diff --git a/api/helm/values.yaml b/api/helm/values.yaml
index 0967451..3808f82 100644
--- a/api/helm/values.yaml
+++ b/api/helm/values.yaml
@@ -21,6 +21,7 @@ settings:
   cache: false
   type: application
   id: 
+  internal: false
   replicaCount: 1
   corsAllowOrigin: ['*']
   trustedHosts: '^.+$'
@@ -89,7 +90,7 @@ postgresql:
   # Persistent Volume Storage configuration.
   # ref: https://kubernetes.io/docs/user-guide/persistent-volumes
   persistence:
-    enabled: false
+    enabled: true
   pullPolicy: IfNotPresent
 #  image:
 #    repository: postgres
diff --git a/api/helm/waardepapieren-balie-0.1.0.tgz b/api/helm/waardepapieren-balie-0.1.0.tgz
index ba1275c..5ad2df7 100644
Binary files a/api/helm/waardepapieren-balie-0.1.0.tgz and b/api/helm/waardepapieren-balie-0.1.0.tgz differ
diff --git a/api/helm/waardepapieren-ballie-0.1.0.tgz b/api/helm/waardepapieren-ballie-0.1.0.tgz
deleted file mode 100644
index 3040cfe..0000000
Binary files a/api/helm/waardepapieren-ballie-0.1.0.tgz and /dev/null differ
diff --git a/api/public/schema/openapi.yaml b/api/public/schema/openapi.yaml
index e0822cc..65494d9 100644
--- a/api/public/schema/openapi.yaml
+++ b/api/public/schema/openapi.yaml
@@ -2439,12 +2439,12 @@ definitions:
         description: 'The moment this request was created'
         type: string
         format: date-time
-        example: '2021-04-12 13:31:28'
+        example: '2021-06-07 09:47:30'
       dateModified:
         description: 'The moment this request last Modified'
         type: string
         format: date-time
-        example: '2021-04-12 13:31:28'
+        example: '2021-06-07 09:47:30'
     required: []
   AuditTrail-write:
     properties:
@@ -2492,12 +2492,12 @@ definitions:
         description: 'The moment this request was created'
         type: string
         format: date-time
-        example: '2021-04-12 13:31:28'
+        example: '2021-06-07 09:47:30'
       dateModified:
         description: 'The moment this request last Modified'
         type: string
         format: date-time
-        example: '2021-04-12 13:31:28'
+        example: '2021-06-07 09:47:30'
     required: []
   ChangeLog-write:
     properties: