diff --git a/.gitignore b/.gitignore
index 2586a9d07..31087d5e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -80,5 +80,5 @@ package-lock.json
 # --------------------------------------
 
 charts/**/charts/
-charts/**/manifests/
 my-values.yaml
+manifests/
\ No newline at end of file
diff --git a/charts/bpa/templates/acapy_deployment.yaml b/charts/bpa/templates/acapy_deployment.yaml
index 77dc172b8..37648f007 100644
--- a/charts/bpa/templates/acapy_deployment.yaml
+++ b/charts/bpa/templates/acapy_deployment.yaml
@@ -36,7 +36,7 @@ spec:
            --arg-file acapy-static-args.yml \   
            --inbound-transport http '0.0.0.0' {{ .Values.acapy.service.httpPort }} \ 
            --webhook-url http://{{ include "bpa.fullname" . }}:{{ .Values.bpa.service.port }}/log \
-           --genesis-url '{{ .Values.bpa.ledgerURL }}/genesis' \
+           --genesis-url '{{ .Values.bpa.config.ledger.browser }}/genesis' \
            --endpoint https://{{ (index .Values.acapy.ingress.hosts 0).host }} \
            --wallet-storage-type 'postgres_storage' \
            --wallet-name 'mywallet' \
diff --git a/charts/bpa/templates/bpa_configmap.yaml b/charts/bpa/templates/bpa_configmap.yaml
index 919f93529..99993f45c 100644
--- a/charts/bpa/templates/bpa_configmap.yaml
+++ b/charts/bpa/templates/bpa_configmap.yaml
@@ -5,6 +5,18 @@ metadata:
   labels:
     {{- include "bpa.labels" . | nindent 4 }}
 data:
-  application.yaml: |-
+  application.yaml: |-  
     bpa:           
 {{ toYaml .Values.bpa.config | indent 6 }}   
+      acapy:
+        url: http://{{ include "acapy.fullname" . }}:{{ .Values.acapy.service.adminPort }} 
+        apiKey: {{ .Values.acapy.adminURLApiKey }}
+        endpoint: https://{{ (index .Values.acapy.ingress.hosts 0).host }}  
+      pg:
+        url: jdbc:postgresql://{{ include "global.postgresql.fullname" . }}/{{ .Values.postgresql.postgresqlUsername }}
+        username: {{ .Values.postgresql.postgresqlUsername }}
+        password: $(POSTGRES_PASSWORD)
+      host: {{ (index .Values.bpa.ingress.hosts 0).host }}
+      micronaut:
+        security:
+          enabled: {{ .Values.bpa.config.security.enabled }}
\ No newline at end of file
diff --git a/charts/bpa/templates/bpa_deployment.yaml b/charts/bpa/templates/bpa_deployment.yaml
index 7368c8dff..b7cc26a0e 100644
--- a/charts/bpa/templates/bpa_deployment.yaml
+++ b/charts/bpa/templates/bpa_deployment.yaml
@@ -34,42 +34,12 @@ spec:
             - name: http
               containerPort: 8080
               protocol: TCP
-          env:
-            - name: BPA_BOOTSTRAP_PW
-              value: {{ .Values.bpa.password | quote }}
-            - name: BPA_BOOTSTRAP_UN
-              value: {{ .Values.bpa.userName | quote }}   
-            - name: BPA_DID_PREFIX
-              value: {{ .Values.bpa.didPrefix | quote }}
-            - name: BPA_LEDGER_BROWSER
-              value: {{ .Values.bpa.ledgerBrowser | quote }}
-            - name: BPA_RESOLVER_URL
-              value: {{ .Values.bpa.resolverURL | quote }}
-            - name: BPA_WEB_MODE
-              value: {{ .Values.bpa.webMode | quote }}
-            - name: AGENT_NAME
-              value: {{ .Values.bpa.agentName | quote }}
-            - name: ACAPY_ENDPOINT
-              value: https://{{ (index .Values.acapy.ingress.hosts 0).host }}
-            - name: BPA_IMPRINT_URL
-              value: {{ .Values.bpa.imprintURL | quote }}
-            - name: BPA_PRIVACY_POLICY_URL
-              value: {{ .Values.bpa.privacyPolicyURL | quote }}                            
+          env:                        
             - name: POSTGRES_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: {{ template "global.postgresql.fullname" . }}
                   key: postgresql-password                                             
-            - name: JAVA_OPTS
-              value: |
-                -Dbpa.acapy.url=http://{{ include "acapy.fullname" . }}:{{ .Values.acapy.service.adminPort }} 
-                -Dbpa.acapy.apiKey={{ .Values.acapy.adminURLApiKey }}
-                -Dmicronaut.security.enabled={{ .Values.bpa.securityEnabled }} 
-                -Dmicronaut.server.port=8080
-                -Dbpa.pg.url=jdbc:postgresql://{{ include "global.postgresql.fullname" . }}/{{ .Values.postgresql.postgresqlUsername }}
-                -Dbpa.pg.username={{ .Values.postgresql.postgresqlUsername }}
-                -Dbpa.pg.password=$(POSTGRES_PASSWORD)
-                -Dbpa.host={{ (index .Values.bpa.ingress.hosts 0).host }}
           resources:
             {{- toYaml .Values.bpa.resources | nindent 12 }}
       {{- with .Values.bpa.nodeSelector }}
@@ -83,4 +53,4 @@ spec:
       {{- with .Values.bpa.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
-      {{- end }}
+      {{- end }}
\ No newline at end of file
diff --git a/charts/bpa/values.yaml b/charts/bpa/values.yaml
index a4469a080..c0dc8bcd0 100644
--- a/charts/bpa/values.yaml
+++ b/charts/bpa/values.yaml
@@ -28,56 +28,40 @@ bpa:
     # If not set and create is true, a name is generated using the fullname template
     name: ""  
 
-  # -- enable security (username and password)
-  securityEnabled: true
-  
-  # -- Default username
-  userName: admin
-  
-  # -- Default password, overwrite default if running in production like environments
-  password: changeme
-
-  # --  Run in did:web mode with read only ledger. If set to true acapy.readOnlyMode has to be true too.
-  webMode: false
-
-  # --  Uni Resolver URL
-  resolverURL: https://resolver.stage.economyofthings.io
-  
-  # --  The ledger prefix that is configured with the Uni Resolver
-  didPrefix: "did:sov:iil:"
-
-  # --  The Ledger URL
-  ledgerURL: https://indy-test.bosch-digital.de
-  
-  # --  The Ledger Explorer  
-  ledgerBrowser: https://indy-test.bosch-digital.de
-
-  # -- The Agent Name as it should be displayed in the UI
-  agentName: "Business Partner Agent"
-
   # -- application config (remark: all new configuration values will sit here, the other ones can be migrated step by step)
   config: 
-    #test ledger schemas, can be overwritten / extended when e.g. working with other ledger
-    schemas:
-      bank-account:
-        id: "UmZ25DANwS6ngGWB4ye4tN:2:BankAccount:0.1"
-        label: "Bank Account"
-        defaultAttributeName: "iban"
-        # Note: this also works json style restrictions: [{id: 123, label: myLabel}]
-        restrictions:
-          - issuerDid: "did:sov:iil:UmZ25DANwS6ngGWB4ye4tN"
-            label: "Demo Bank"
-      commercial-register:
-        id: "R6WR6n7CQVDjvvmwofHK6S:2:commercialregister:0.1"
-        label: "Commercial Register"
-        defaultAttributeName: "companyName"
-        restrictions:
-          - issuerDid: "did:sov:iil:R6WR6n7CQVDjvvmwofHK6S"
-            label: "Commercial Register"
-            
-  imprintURL: 
-  
-  privacyPolicyURL:   
+    security:
+      enabled: true  
+    bootstrap:
+      username: admin
+      password: changeme      
+    resolver:
+      url: https://resolver.stage.economyofthings.io
+    ledger:
+      browser: https://indy-test.bosch-digital.de
+    name: Business Partner Agent
+    web:
+      only: false
+    #schemas:
+    #  bank-account:
+    #    id: "UmZ25DANwS6ngGWB4ye4tN:2:BankAccount:0.1"
+    #    label: "Bank Account"
+    #    defaultAttributeName: "iban"
+    #    restrictions:
+    #      - issuerDid: "did:sov:iil:UmZ25DANwS6ngGWB4ye4tN"
+    #        label: "Demo Bank"
+    #  commercial-register:
+    #    id: "R6WR6n7CQVDjvvmwofHK6S:2:commercialregister:0.1"
+    #    label: "Commercial Register"
+    #    defaultAttributeName: "companyName"
+    #    restrictions:
+    #      - issuerDid: "did:sov:iil:R6WR6n7CQVDjvvmwofHK6S"
+    #        label: "Commercial Register"
+    #imprint:
+    #  url: 
+    #privacy:
+    #  policy:
+    #    url:   
 
   imagePullSecrets: []
  
diff --git a/manifests/bpa/charts/postgresql/templates/secrets.yaml b/manifests/bpa/charts/postgresql/templates/secrets.yaml
deleted file mode 100644
index 0ad3ddad7..000000000
--- a/manifests/bpa/charts/postgresql/templates/secrets.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-# Source: bpa/charts/postgresql/templates/secrets.yaml
-apiVersion: v1
-kind: Secret
-metadata:
-  name: pupsi-postgresql
-  labels:
-    app.kubernetes.io/name: postgresql
-    helm.sh/chart: postgresql-9.7.2
-    app.kubernetes.io/instance: pupsi
-    app.kubernetes.io/managed-by: Helm
-type: Opaque
-data:
-  postgresql-password: "Y2hhbmdlLW1l"
diff --git a/manifests/bpa/charts/postgresql/templates/statefulset.yaml b/manifests/bpa/charts/postgresql/templates/statefulset.yaml
deleted file mode 100644
index c8d8f3289..000000000
--- a/manifests/bpa/charts/postgresql/templates/statefulset.yaml
+++ /dev/null
@@ -1,127 +0,0 @@
----
-# Source: bpa/charts/postgresql/templates/statefulset.yaml
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: pupsi-postgresql
-  labels:
-    app.kubernetes.io/name: postgresql
-    helm.sh/chart: postgresql-9.7.2
-    app.kubernetes.io/instance: pupsi
-    app.kubernetes.io/managed-by: Helm
-  annotations:
-spec:
-  serviceName: pupsi-postgresql-headless
-  replicas: 1
-  updateStrategy:
-    type: RollingUpdate
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: postgresql
-      app.kubernetes.io/instance: pupsi
-      role: master
-  template:
-    metadata:
-      name: pupsi-postgresql
-      labels:
-        app.kubernetes.io/name: postgresql
-        helm.sh/chart: postgresql-9.7.2
-        app.kubernetes.io/instance: pupsi
-        app.kubernetes.io/managed-by: Helm
-        role: master
-    spec:      
-      securityContext:
-        fsGroup: 1001
-      containers:
-        - name: pupsi-postgresql
-          image: docker.io/bitnami/postgresql:12
-          imagePullPolicy: "IfNotPresent"
-          resources:
-            requests:
-              cpu: 100m
-              memory: 256Mi
-          securityContext:
-            runAsUser: 1001
-          env:
-            - name: BITNAMI_DEBUG
-              value: "false"
-            - name: POSTGRESQL_PORT_NUMBER
-              value: "5432"
-            - name: POSTGRESQL_VOLUME_DIR
-              value: "/bitnami/postgresql"
-            - name: PGDATA
-              value: "/bitnami/postgresql/data"
-            - name: POSTGRES_USER
-              value: "bpa"
-            - name: POSTGRES_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: pupsi-postgresql
-                  key: postgresql-password
-            - name: POSTGRES_DB
-              value: "bpa"
-            - name: POSTGRESQL_ENABLE_LDAP
-              value: "no"
-            - name: POSTGRESQL_ENABLE_TLS
-              value: "no"
-            - name: POSTGRESQL_LOG_HOSTNAME
-              value: "false"
-            - name: POSTGRESQL_LOG_CONNECTIONS
-              value: "false"
-            - name: POSTGRESQL_LOG_DISCONNECTIONS
-              value: "false"
-            - name: POSTGRESQL_PGAUDIT_LOG_CATALOG
-              value: "off"
-            - name: POSTGRESQL_CLIENT_MIN_MESSAGES
-              value: "error"
-            - name: POSTGRESQL_SHARED_PRELOAD_LIBRARIES
-              value: "pgaudit"
-          ports:
-            - name: tcp-postgresql
-              containerPort: 5432
-          livenessProbe:
-            exec:
-              command:
-                - /bin/sh
-                - -c
-                - exec pg_isready -U "bpa" -d "dbname=bpa" -h 127.0.0.1 -p 5432
-            initialDelaySeconds: 30
-            periodSeconds: 10
-            timeoutSeconds: 5
-            successThreshold: 1
-            failureThreshold: 6
-          readinessProbe:
-            exec:
-              command:
-                - /bin/sh
-                - -c
-                - -e
-                - |
-                  exec pg_isready -U "bpa" -d "dbname=bpa" -h 127.0.0.1 -p 5432
-                  [ -f /opt/bitnami/postgresql/tmp/.initialized ] || [ -f /bitnami/postgresql/.initialized ]
-            initialDelaySeconds: 5
-            periodSeconds: 10
-            timeoutSeconds: 5
-            successThreshold: 1
-            failureThreshold: 6
-          volumeMounts:
-            - name: dshm
-              mountPath: /dev/shm
-            - name: data
-              mountPath: /bitnami/postgresql
-              subPath: 
-      volumes:
-        - name: dshm
-          emptyDir:
-            medium: Memory
-            sizeLimit: 1Gi
-  volumeClaimTemplates:
-    - metadata:
-        name: data
-      spec:
-        accessModes:
-          - "ReadWriteOnce"
-        resources:
-          requests:
-            storage: "1Gi"
-        storageClassName: default
diff --git a/manifests/bpa/charts/postgresql/templates/svc-headless.yaml b/manifests/bpa/charts/postgresql/templates/svc-headless.yaml
deleted file mode 100644
index dced74677..000000000
--- a/manifests/bpa/charts/postgresql/templates/svc-headless.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-# Source: bpa/charts/postgresql/templates/svc-headless.yaml
-apiVersion: v1
-kind: Service
-metadata:
-  name: pupsi-postgresql-headless
-  labels:
-    app.kubernetes.io/name: postgresql
-    helm.sh/chart: postgresql-9.7.2
-    app.kubernetes.io/instance: pupsi
-    app.kubernetes.io/managed-by: Helm
-spec:
-  type: ClusterIP
-  clusterIP: None
-  ports:
-    - name: tcp-postgresql
-      port: 5432
-      targetPort: tcp-postgresql
-  selector:
-    app.kubernetes.io/name: postgresql
-    app.kubernetes.io/instance: pupsi
diff --git a/manifests/bpa/charts/postgresql/templates/svc.yaml b/manifests/bpa/charts/postgresql/templates/svc.yaml
deleted file mode 100644
index 0ae20a990..000000000
--- a/manifests/bpa/charts/postgresql/templates/svc.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-# Source: bpa/charts/postgresql/templates/svc.yaml
-apiVersion: v1
-kind: Service
-metadata:
-  name: pupsi-postgresql
-  labels:
-    app.kubernetes.io/name: postgresql
-    helm.sh/chart: postgresql-9.7.2
-    app.kubernetes.io/instance: pupsi
-    app.kubernetes.io/managed-by: Helm
-  annotations:
-spec:
-  type: ClusterIP
-  ports:
-    - name: tcp-postgresql
-      port: 5432
-      targetPort: tcp-postgresql
-  selector:
-    app.kubernetes.io/name: postgresql
-    app.kubernetes.io/instance: pupsi
-    role: master
diff --git a/manifests/bpa/templates/acapy_configmap.yaml b/manifests/bpa/templates/acapy_configmap.yaml
deleted file mode 100644
index 1a76c00b0..000000000
--- a/manifests/bpa/templates/acapy_configmap.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-# Source: bpa/templates/acapy_configmap.yaml
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: pupsi-bpa-acapy
-  labels:
-    helm.sh/chart: bpa-0.1.0-alpha5.1
-    app.kubernetes.io/name: pupsi-bpa-acapy
-    app.kubernetes.io/instance: pupsi
-    app.kubernetes.io/version: "0.1.0-alpha5.1"
-    app.kubernetes.io/managed-by: Helm
-data:
-  acapy-static-args.yaml: |
-    auto-accept-invites: true
-    auto-accept-requests: true
-    auto-respond-messages: true
-    auto-respond-credential-proposal: true
-    auto-respond-credential-offer: true
-    auto-respond-credential-request: true
-    auto-respond-presentation-proposal: true
-    auto-respond-presentation-request: true
-    auto-store-credential: true
-    auto-verify-presentation: true
-    auto-ping-connection: true
-    monitor-ping: true
-    public-invites: true
-    plugin: 'aries_cloudagent.messaging.jsonld'
-    outbound-transport: http
-    wallet-type: 'indy'
-    log-level: debug
diff --git a/manifests/bpa/templates/acapy_deployment.yaml b/manifests/bpa/templates/acapy_deployment.yaml
deleted file mode 100644
index dd44e161a..000000000
--- a/manifests/bpa/templates/acapy_deployment.yaml
+++ /dev/null
@@ -1,82 +0,0 @@
----
-# Source: bpa/templates/acapy_deployment.yaml
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: pupsi-bpa-acapy
-  labels:
-    helm.sh/chart: bpa-0.1.0-alpha5.1
-    app.kubernetes.io/name: pupsi-bpa-acapy
-    app.kubernetes.io/instance: pupsi
-    app.kubernetes.io/version: "0.1.0-alpha5.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: pupsi-bpa-acapy
-      app.kubernetes.io/instance: pupsi
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: pupsi-bpa-acapy
-        app.kubernetes.io/instance: pupsi
-    spec:
-      securityContext:
-        {}
-      containers:
-        - name: acapy
-          securityContext:
-            runAsUser: 1001
-          image: "bcgovimages/aries-cloudagent:py36-1.15-0_0.5.6"
-          imagePullPolicy: IfNotPresent
-          args: [
-           "-c",
-           "sleep 15; \
-           aca-py start \  
-           --arg-file acapy-static-args.yml \   
-           --inbound-transport http '0.0.0.0' 8030 \ 
-           --webhook-url http://pupsi-bpa-bpacore:80/log \
-           --genesis-url 'https://explorer.idu.network/genesis' \
-           --endpoint https://pupsi-acapy.stage.economyofthings.io \
-           --wallet-storage-type 'postgres_storage' \
-           --wallet-name 'mywallet' \
-           --wallet-key '123' \
-           --wallet-storage-config '{\"url\":\"pupsi-postgresql:5432\",\"max_connections\":5}' \
-           --wallet-storage-creds '{\"account\":\"bpa\",\"password\":\"$(POSTGRES_PASSWORD)\",\"admin_account\":\"bpa\",\"admin_password\":\"$(POSTGRES_PASSWORD)\"}' \ 
-           --seed 'mdUdFwaVKoOQKEhddMxXU7OCY0YdmyQ2' \
-           --admin '0.0.0.0' 8031 \
-           --admin-insecure-mode \
-           --label ca-aca-py \
-           "
-          ]
-          command:
-          - /bin/bash
-          ports:
-            - name: http
-              containerPort: 8030
-              protocol: TCP
-            - name: admin
-              containerPort: 8031
-              protocol: TCP              
-          env:   
-            - name: POSTGRES_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: pupsi-postgresql
-                  key: postgresql-password  
-          volumeMounts:
-          - name: config
-            mountPath: "/home/indy/acapy-static-args.yml"
-            subPath: "acapy-static-args.yml"
-            readOnly: true        
-          resources:
-            requests:
-              cpu: 100m
-              memory: 256Mi
-      volumes:
-        - name: config
-          configMap:
-            name: pupsi-bpa-acapy
-            items:
-            - key: "acapy-static-args.yaml"
-              path: "acapy-static-args.yml"
diff --git a/manifests/bpa/templates/acapy_ingress.yaml b/manifests/bpa/templates/acapy_ingress.yaml
deleted file mode 100644
index a07fec1c2..000000000
--- a/manifests/bpa/templates/acapy_ingress.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-# Source: bpa/templates/acapy_ingress.yaml
-apiVersion: networking.k8s.io/v1beta1
-kind: Ingress
-metadata:
-  name: pupsi-bpa-acapy
-  labels:
-    helm.sh/chart: bpa-0.1.0-alpha5.1
-    app.kubernetes.io/name: pupsi-bpa-acapy
-    app.kubernetes.io/instance: pupsi
-    app.kubernetes.io/version: "0.1.0-alpha5.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  rules:
-    - host: "pupsi-acapy.stage.economyofthings.io"
-      http:
-        paths:
-          - path: /
-            backend:
-              serviceName: pupsi-bpa-acapy
-              servicePort: 8030
diff --git a/manifests/bpa/templates/acapy_service.yaml b/manifests/bpa/templates/acapy_service.yaml
deleted file mode 100644
index 9c30ea5e4..000000000
--- a/manifests/bpa/templates/acapy_service.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-# Source: bpa/templates/acapy_service.yaml
-apiVersion: v1
-kind: Service
-metadata:
-  name: pupsi-bpa-acapy
-  labels:
-    helm.sh/chart: bpa-0.1.0-alpha5.1
-    app.kubernetes.io/name: pupsi-bpa-acapy
-    app.kubernetes.io/instance: pupsi
-    app.kubernetes.io/version: "0.1.0-alpha5.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  type: ClusterIP
-  ports:
-    - port: 8030
-      targetPort: http
-      protocol: TCP
-      name: http
-    - port: 8031
-      targetPort: admin
-      protocol: TCP
-      name: admin      
-  selector:
-    app.kubernetes.io/name: pupsi-bpa-acapy
-    app.kubernetes.io/instance: pupsi
diff --git a/manifests/bpa/templates/bpa_auth.yaml b/manifests/bpa/templates/bpa_auth.yaml
deleted file mode 100644
index 7baca3fdb..000000000
--- a/manifests/bpa/templates/bpa_auth.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
----
-# Source: bpa/templates/bpa_auth.yaml
-kind: Role
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: pupsi-bpa-bpacore
-  labels:
-    helm.sh/chart: bpa-0.1.0-alpha5.1
-    app.kubernetes.io/name: pupsi-bpa-bpacore
-    app.kubernetes.io/instance: pupsi
-    app.kubernetes.io/version: "0.1.0-alpha5.1"
-    app.kubernetes.io/managed-by: Helm
-rules:
-  - apiGroups: [""]
-    resources: ["services", "endpoints", "configmaps", "secrets", "pods"]
-    verbs: ["get", "watch", "list"]
----
-# Source: bpa/templates/bpa_auth.yaml
-kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: pupsi-bpa-bpacore
-  labels:
-    helm.sh/chart: bpa-0.1.0-alpha5.1
-    app.kubernetes.io/name: pupsi-bpa-bpacore
-    app.kubernetes.io/instance: pupsi
-    app.kubernetes.io/version: "0.1.0-alpha5.1"
-    app.kubernetes.io/managed-by: Helm
-subjects:
-  - kind: ServiceAccount
-    name: pupsi-bpa-bpacore
-roleRef:
-  kind: Role
-  name: pupsi-bpa-bpacore
-  apiGroup: rbac.authorization.k8s.io
diff --git a/manifests/bpa/templates/bpa_configmap.yaml b/manifests/bpa/templates/bpa_configmap.yaml
deleted file mode 100644
index eb4ae9283..000000000
--- a/manifests/bpa/templates/bpa_configmap.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-# Source: bpa/templates/bpa_configmap.yaml
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: pupsi-bpa-bpacore
-  labels:
-    helm.sh/chart: bpa-0.1.0-alpha5.1
-    app.kubernetes.io/name: pupsi-bpa-bpacore
-    app.kubernetes.io/instance: pupsi
-    app.kubernetes.io/version: "0.1.0-alpha5.1"
-    app.kubernetes.io/managed-by: Helm
-data:
-  application.yaml: |-
-    bpa:           
-      schemas:
-        bank-account:
-          defaultAttributeName: iban
-          id: UmZ25DANwS6ngGWB4ye4tN:2:BankAccount:0.1
-          label: Bank Account
-          restrictions:
-          - issuerDid: did:sov:iil:UmZ25DANwS6ngGWB4ye4tN
-            label: Demo Bank
-        commercial-register:
-          defaultAttributeName: companyName
-          id: R6WR6n7CQVDjvvmwofHK6S:2:commercialregister:0.1
-          label: Commercial Register
-          restrictions:
-          - issuerDid: did:sov:iil:R6WR6n7CQVDjvvmwofHK6S
-            label: Commercial Register
\ No newline at end of file
diff --git a/manifests/bpa/templates/bpa_deployment.yaml b/manifests/bpa/templates/bpa_deployment.yaml
deleted file mode 100644
index 98a88d9d9..000000000
--- a/manifests/bpa/templates/bpa_deployment.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
----
-# Source: bpa/templates/bpa_deployment.yaml
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: pupsi-bpa-bpacore
-  labels:
-    helm.sh/chart: bpa-0.1.0-alpha5.1
-    app.kubernetes.io/name: pupsi-bpa-bpacore
-    app.kubernetes.io/instance: pupsi
-    app.kubernetes.io/version: "0.1.0-alpha5.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: pupsi-bpa-bpacore
-      app.kubernetes.io/instance: pupsi
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: pupsi-bpa-bpacore
-        app.kubernetes.io/instance: pupsi
-    spec:
-      serviceAccountName: pupsi-bpa-bpacore
-      securityContext:
-        {}
-      containers:
-        - name: bpacore
-          securityContext:
-            {}
-          image: "ghcr.io/hyperledger-labs/business-partner-agent:0.1.0-alpha5.1"
-          imagePullPolicy: IfNotPresent
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          env:
-            - name: BPA_BOOTSTRAP_PW
-              value: "bodai2020"
-            - name: BPA_BOOTSTRAP_UN
-              value: "masterdata"   
-            - name: BPA_DID_PREFIX
-              value: "did:sov:idu:"
-            - name: BPA_LEDGER_BROWSER
-              value: "https://explorer.idu.network"
-            - name: BPA_RESOLVER_URL
-              value: "https://resolver.stage.economyofthings.io"
-            - name: BPA_WEB_MODE
-              value: "false"
-            - name: AGENT_NAME
-              value: "Business Partner Agent"
-            - name: ACAPY_ENDPOINT
-              value: https://pupsi-acapy.stage.economyofthings.io
-            - name: BPA_IMPRINT_URL
-              value: "https://bpa.stage.economyofthings.io/"
-            - name: BPA_PRIVACY_POLICY_URL
-              value: "https://bpa.stage.economyofthings.io/privacyPolicy"                            
-            - name: POSTGRES_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: pupsi-postgresql
-                  key: postgresql-password                                             
-            - name: JAVA_OPTS
-              value: |
-                -Dbpa.acapy.url=http://pupsi-bpa-acapy:8031 
-                -Dbpa.acapy.apiKey=2f9729eef0be49608c1cffd49ee3cc4a
-                -Dmicronaut.security.enabled=true 
-                -Dmicronaut.server.port=8080
-                -Dbpa.pg.url=jdbc:postgresql://pupsi-postgresql/bpa
-                -Dbpa.pg.username=bpa
-                -Dbpa.pg.password=$(POSTGRES_PASSWORD)
-                -Dbpa.host=pupsi.stage.economyofthings.io
-          resources:
-            requests:
-              cpu: 100m
-              memory: 256Mi
diff --git a/manifests/bpa/templates/bpa_ingress.yaml b/manifests/bpa/templates/bpa_ingress.yaml
deleted file mode 100644
index 11bd0e899..000000000
--- a/manifests/bpa/templates/bpa_ingress.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-# Source: bpa/templates/bpa_ingress.yaml
-apiVersion: networking.k8s.io/v1beta1
-kind: Ingress
-metadata:
-  name: pupsi-bpa-bpacore
-  labels:
-    helm.sh/chart: bpa-0.1.0-alpha5.1
-    app.kubernetes.io/name: pupsi-bpa-bpacore
-    app.kubernetes.io/instance: pupsi
-    app.kubernetes.io/version: "0.1.0-alpha5.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  rules:
-    - host: "pupsi.stage.economyofthings.io"
-      http:
-        paths:
-          - path: /
-            backend:
-              serviceName: pupsi-bpa-bpacore
-              servicePort: 80
diff --git a/manifests/bpa/templates/bpa_service.yaml b/manifests/bpa/templates/bpa_service.yaml
deleted file mode 100644
index bcc5506db..000000000
--- a/manifests/bpa/templates/bpa_service.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-# Source: bpa/templates/bpa_service.yaml
-apiVersion: v1
-kind: Service
-metadata:
-  name: pupsi-bpa-bpacore
-  labels:
-    helm.sh/chart: bpa-0.1.0-alpha5.1
-    app.kubernetes.io/name: pupsi-bpa-bpacore
-    app.kubernetes.io/instance: pupsi
-    app.kubernetes.io/version: "0.1.0-alpha5.1"
-    app.kubernetes.io/managed-by: Helm
-spec:
-  type: ClusterIP
-  ports:
-    - port: 80
-      targetPort: http
-      protocol: TCP
-      name: http
-  selector:
-    app.kubernetes.io/name: pupsi-bpa-bpacore
-    app.kubernetes.io/instance: pupsi
diff --git a/manifests/bpa/templates/bpa_serviceaccount.yaml b/manifests/bpa/templates/bpa_serviceaccount.yaml
deleted file mode 100644
index a3e8bbc0e..000000000
--- a/manifests/bpa/templates/bpa_serviceaccount.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-# Source: bpa/templates/bpa_serviceaccount.yaml
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: pupsi-bpa-bpacore
-  labels:
-    helm.sh/chart: bpa-0.1.0-alpha5.1
-    app.kubernetes.io/name: pupsi-bpa-bpacore
-    app.kubernetes.io/instance: pupsi
-    app.kubernetes.io/version: "0.1.0-alpha5.1"
-    app.kubernetes.io/managed-by: Helm
diff --git a/manifests/bpa/templates/tests/test-connection.yaml b/manifests/bpa/templates/tests/test-connection.yaml
deleted file mode 100644
index 94bf80427..000000000
--- a/manifests/bpa/templates/tests/test-connection.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-# Source: bpa/templates/tests/test-connection.yaml
-apiVersion: v1
-kind: Pod
-metadata:
-  name: "pupsi-bpa-test-connection"
-  labels:
-    helm.sh/chart: bpa-0.1.0-alpha5.1
-    app.kubernetes.io/name: pupsi-bpa-bpacore
-    app.kubernetes.io/instance: pupsi
-    app.kubernetes.io/version: "0.1.0-alpha5.1"
-    app.kubernetes.io/managed-by: Helm
-  annotations:
-    "helm.sh/hook": test-success
-spec:
-  containers:
-    - name: wget
-      image: busybox
-      command: ['wget']
-      args: ['pupsi-bpa-bpacore:80']
-  restartPolicy: Never