diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 831900f..f6cd443 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -8,63 +8,63 @@ version: 2
 # List of directories to scan for updates
 updates:
   - package-ecosystem: "docker"
-    directory: "applications/activation-service"
+    directory: "argocd/applications/activation-service"
     schedule:
       interval: "daily"
   - package-ecosystem: "docker"
-    directory: "applications/contract-management"
+    directory: "argocd/applications/contract-management"
     schedule:
       interval: "daily"
   - package-ecosystem: "docker"
-    directory: "applications/credentials-config-service"
+    directory: "argocd/applications/credentials-config-service"
     schedule:
       interval: "daily"
   - package-ecosystem: "docker"
-    directory: "applications/dsba-pdp"
+    directory: "argocd/applications/dsba-pdp"
     schedule:
       interval: "daily"
   #- package-ecosystem: "docker"
-  #  directory: "applications/keycloak"
+  #  directory: "argocd/applications/keycloak"
   #  schedule:
   #    interval: "daily"
   #- package-ecosystem: "docker"
-  #  directory: "applications/keyrock"
+  #  directory: "argocd/applications/keyrock"
   #  schedule:
   #    interval: "daily"
   - package-ecosystem: "docker"
-    directory: "applications/kong"
+    directory: "argocd/applications/kong"
     schedule:
       interval: "daily"
   #- package-ecosystem: "docker"
-  #  directory: "applications/mongodb"
+  #  directory: "argocd/applications/mongodb"
   #  schedule:
   #    interval: "daily"
   #- package-ecosystem: "docker"
-  #  directory: "applications/mysql"
+  #  directory: "argocd/applications/mysql"
   #  schedule:
   #    interval: "daily"
   - package-ecosystem: "docker"
-    directory: "applications/orion-ld"
+    directory: "argocd/applications/orion-ld"
     schedule:
       interval: "daily"
   #- package-ecosystem: "docker"
-  #  directory: "applications/postgres"
+  #  directory: "argocd/applications/postgres"
   #  schedule:
   #    interval: "daily"
   - package-ecosystem: "docker"
-    directory: "applications/tm-forum-api"
+    directory: "argocd/applications/tm-forum-api"
     schedule:
       interval: "daily"
   - package-ecosystem: "docker"
-    directory: "applications/trusted-issuers-list"
+    directory: "argocd/applications/trusted-issuers-list"
     schedule:
       interval: "daily"
   - package-ecosystem: "docker"
-    directory: "applications/vcwaltid"
+    directory: "argocd/applications/vcwaltid"
     schedule:
       interval: "daily"
   - package-ecosystem: "docker"
-    directory: "applications/verifier"
+    directory: "argocd/applications/verifier"
     schedule:
       interval: "daily"
   
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index c1eb4b9..516c905 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -71,11 +71,11 @@ jobs:
 
       - name: Download values for participant
         run: |
-          cd data-space-connector/
+          cd argocd/data-space-connector/
           wget -O values-participant.yaml ${{ env.GITOPS_REPO }}/${{ env.NAMESPACE }}/${{ matrix.participant }}/${{ env.VALUES_DIR }}/values.yaml
           cat values-participant.yaml
 
       - name: Deploy applications
         run: |
-          cd data-space-connector/
+          cd argocd/data-space-connector/
           helm template ${{ secrets.OVERWRITE_VALUES }} -f values-participant.yaml . | oc -n argocd apply -f -
diff --git a/README.md b/README.md
index de9236f..70537f9 100644
--- a/README.md
+++ b/README.md
@@ -48,14 +48,14 @@ The chart is available at the repository ```https://fiware-ops.github.io/data-sp
 structure and type of the required VCs, internal hostnames of the different connector components and providing the configuration of the DID and keys/certs.  
 Also have a look at the [examples](#examples).
 
-The chart also contains the [argo-cd applications support](./data-space-connector/templates/), thus it can be used to generate argo-deployments, too. In plain Helm deployments, this should be disabled in the values.yaml:
+The chart also contains the [argo-cd applications support](./argocd/data-space-connector/templates/), thus it can be used to generate argo-deployments, too. In plain Helm deployments, this should be disabled in the values.yaml:
 ```yaml
 argoApplications: false
 ```
 
-Configurations for all sub-charts(and sub-dependencies) can be managed through the top-level values.yaml of the chart. It contains the default values of each [application](./applications/). The configuration of the applications can be changed under the key ```<APPLICATION_NAME>```, please see the individual applications and there sub-charts for the available options. 
+Configurations for all sub-charts(and sub-dependencies) can be managed through the top-level values.yaml of the chart. It contains the default values of each [application](./argocd/applications/). The configuration of the applications can be changed under the key ```<APPLICATION_NAME>```, please see the individual applications and there sub-charts for the available options. 
 Example:
-In order to change the image-tag of [Keycloak](./applications/keycloak/) and the issuer did used by it, the values.yaml looks as following:
+In order to change the image-tag of [Keycloak](./argocd/applications/keycloak/) and the issuer did used by it, the values.yaml looks as following:
 ```yaml
 keycloak:
     # configuration directly in the application chart, extending the original keycloak chart
diff --git a/applications/activation-service/Chart.yaml b/argocd/applications/activation-service/Chart.yaml
similarity index 100%
rename from applications/activation-service/Chart.yaml
rename to argocd/applications/activation-service/Chart.yaml
diff --git a/applications/activation-service/values.yaml b/argocd/applications/activation-service/values.yaml
similarity index 100%
rename from applications/activation-service/values.yaml
rename to argocd/applications/activation-service/values.yaml
diff --git a/applications/contract-management/Chart.yaml b/argocd/applications/contract-management/Chart.yaml
similarity index 100%
rename from applications/contract-management/Chart.yaml
rename to argocd/applications/contract-management/Chart.yaml
diff --git a/applications/contract-management/values.yaml b/argocd/applications/contract-management/values.yaml
similarity index 100%
rename from applications/contract-management/values.yaml
rename to argocd/applications/contract-management/values.yaml
diff --git a/applications/credentials-config-service/Chart.yaml b/argocd/applications/credentials-config-service/Chart.yaml
similarity index 100%
rename from applications/credentials-config-service/Chart.yaml
rename to argocd/applications/credentials-config-service/Chart.yaml
diff --git a/applications/credentials-config-service/values.yaml b/argocd/applications/credentials-config-service/values.yaml
similarity index 100%
rename from applications/credentials-config-service/values.yaml
rename to argocd/applications/credentials-config-service/values.yaml
diff --git a/applications/dsba-pdp/Chart.yaml b/argocd/applications/dsba-pdp/Chart.yaml
similarity index 100%
rename from applications/dsba-pdp/Chart.yaml
rename to argocd/applications/dsba-pdp/Chart.yaml
diff --git a/applications/dsba-pdp/values.yaml b/argocd/applications/dsba-pdp/values.yaml
similarity index 100%
rename from applications/dsba-pdp/values.yaml
rename to argocd/applications/dsba-pdp/values.yaml
diff --git a/applications/keycloak/Chart.yaml b/argocd/applications/keycloak/Chart.yaml
similarity index 100%
rename from applications/keycloak/Chart.yaml
rename to argocd/applications/keycloak/Chart.yaml
diff --git a/applications/keycloak/templates/_helpers.tpl b/argocd/applications/keycloak/templates/_helpers.tpl
similarity index 100%
rename from applications/keycloak/templates/_helpers.tpl
rename to argocd/applications/keycloak/templates/_helpers.tpl
diff --git a/applications/keycloak/templates/certificate.yaml b/argocd/applications/keycloak/templates/certificate.yaml
similarity index 100%
rename from applications/keycloak/templates/certificate.yaml
rename to argocd/applications/keycloak/templates/certificate.yaml
diff --git a/applications/keycloak/templates/didConfigMap.yaml b/argocd/applications/keycloak/templates/didConfigMap.yaml
similarity index 100%
rename from applications/keycloak/templates/didConfigMap.yaml
rename to argocd/applications/keycloak/templates/didConfigMap.yaml
diff --git a/applications/keycloak/templates/profilesConfigMap.yaml b/argocd/applications/keycloak/templates/profilesConfigMap.yaml
similarity index 100%
rename from applications/keycloak/templates/profilesConfigMap.yaml
rename to argocd/applications/keycloak/templates/profilesConfigMap.yaml
diff --git a/applications/keycloak/templates/route.yaml b/argocd/applications/keycloak/templates/route.yaml
similarity index 100%
rename from applications/keycloak/templates/route.yaml
rename to argocd/applications/keycloak/templates/route.yaml
diff --git a/applications/keycloak/values.yaml b/argocd/applications/keycloak/values.yaml
similarity index 100%
rename from applications/keycloak/values.yaml
rename to argocd/applications/keycloak/values.yaml
diff --git a/applications/keyrock/Chart.yaml b/argocd/applications/keyrock/Chart.yaml
similarity index 100%
rename from applications/keyrock/Chart.yaml
rename to argocd/applications/keyrock/Chart.yaml
diff --git a/applications/keyrock/values.yaml b/argocd/applications/keyrock/values.yaml
similarity index 100%
rename from applications/keyrock/values.yaml
rename to argocd/applications/keyrock/values.yaml
diff --git a/applications/kong/Chart.yaml b/argocd/applications/kong/Chart.yaml
similarity index 100%
rename from applications/kong/Chart.yaml
rename to argocd/applications/kong/Chart.yaml
diff --git a/applications/kong/templates/_helpers.tpl b/argocd/applications/kong/templates/_helpers.tpl
similarity index 100%
rename from applications/kong/templates/_helpers.tpl
rename to argocd/applications/kong/templates/_helpers.tpl
diff --git a/applications/kong/templates/proxy-certificate.yaml b/argocd/applications/kong/templates/proxy-certificate.yaml
similarity index 100%
rename from applications/kong/templates/proxy-certificate.yaml
rename to argocd/applications/kong/templates/proxy-certificate.yaml
diff --git a/applications/kong/templates/proxy-route.yaml b/argocd/applications/kong/templates/proxy-route.yaml
similarity index 100%
rename from applications/kong/templates/proxy-route.yaml
rename to argocd/applications/kong/templates/proxy-route.yaml
diff --git a/applications/kong/values.yaml b/argocd/applications/kong/values.yaml
similarity index 100%
rename from applications/kong/values.yaml
rename to argocd/applications/kong/values.yaml
diff --git a/applications/mongodb/Chart.yaml b/argocd/applications/mongodb/Chart.yaml
similarity index 100%
rename from applications/mongodb/Chart.yaml
rename to argocd/applications/mongodb/Chart.yaml
diff --git a/applications/mongodb/values.yaml b/argocd/applications/mongodb/values.yaml
similarity index 100%
rename from applications/mongodb/values.yaml
rename to argocd/applications/mongodb/values.yaml
diff --git a/applications/mysql/Chart.yaml b/argocd/applications/mysql/Chart.yaml
similarity index 100%
rename from applications/mysql/Chart.yaml
rename to argocd/applications/mysql/Chart.yaml
diff --git a/applications/mysql/values.yaml b/argocd/applications/mysql/values.yaml
similarity index 100%
rename from applications/mysql/values.yaml
rename to argocd/applications/mysql/values.yaml
diff --git a/applications/orion-ld/Chart.yaml b/argocd/applications/orion-ld/Chart.yaml
similarity index 100%
rename from applications/orion-ld/Chart.yaml
rename to argocd/applications/orion-ld/Chart.yaml
diff --git a/applications/orion-ld/values.yaml b/argocd/applications/orion-ld/values.yaml
similarity index 100%
rename from applications/orion-ld/values.yaml
rename to argocd/applications/orion-ld/values.yaml
diff --git a/applications/postgres/Chart.yaml b/argocd/applications/postgres/Chart.yaml
similarity index 100%
rename from applications/postgres/Chart.yaml
rename to argocd/applications/postgres/Chart.yaml
diff --git a/applications/postgres/values.yaml b/argocd/applications/postgres/values.yaml
similarity index 100%
rename from applications/postgres/values.yaml
rename to argocd/applications/postgres/values.yaml
diff --git a/applications/tm-forum-api/Chart.yaml b/argocd/applications/tm-forum-api/Chart.yaml
similarity index 100%
rename from applications/tm-forum-api/Chart.yaml
rename to argocd/applications/tm-forum-api/Chart.yaml
diff --git a/applications/tm-forum-api/values.yaml b/argocd/applications/tm-forum-api/values.yaml
similarity index 100%
rename from applications/tm-forum-api/values.yaml
rename to argocd/applications/tm-forum-api/values.yaml
diff --git a/applications/trusted-issuers-list/Chart.yaml b/argocd/applications/trusted-issuers-list/Chart.yaml
similarity index 100%
rename from applications/trusted-issuers-list/Chart.yaml
rename to argocd/applications/trusted-issuers-list/Chart.yaml
diff --git a/applications/trusted-issuers-list/values.yaml b/argocd/applications/trusted-issuers-list/values.yaml
similarity index 100%
rename from applications/trusted-issuers-list/values.yaml
rename to argocd/applications/trusted-issuers-list/values.yaml
diff --git a/applications/vcwaltid/Chart.yaml b/argocd/applications/vcwaltid/Chart.yaml
similarity index 100%
rename from applications/vcwaltid/Chart.yaml
rename to argocd/applications/vcwaltid/Chart.yaml
diff --git a/applications/vcwaltid/templates/_helpers.tpl b/argocd/applications/vcwaltid/templates/_helpers.tpl
similarity index 100%
rename from applications/vcwaltid/templates/_helpers.tpl
rename to argocd/applications/vcwaltid/templates/_helpers.tpl
diff --git a/applications/vcwaltid/templates/certificate.yaml b/argocd/applications/vcwaltid/templates/certificate.yaml
similarity index 100%
rename from applications/vcwaltid/templates/certificate.yaml
rename to argocd/applications/vcwaltid/templates/certificate.yaml
diff --git a/applications/vcwaltid/templates/deployment.yaml b/argocd/applications/vcwaltid/templates/deployment.yaml
similarity index 100%
rename from applications/vcwaltid/templates/deployment.yaml
rename to argocd/applications/vcwaltid/templates/deployment.yaml
diff --git a/applications/vcwaltid/templates/ingress-certs.yaml b/argocd/applications/vcwaltid/templates/ingress-certs.yaml
similarity index 100%
rename from applications/vcwaltid/templates/ingress-certs.yaml
rename to argocd/applications/vcwaltid/templates/ingress-certs.yaml
diff --git a/applications/vcwaltid/templates/ingress.yaml b/argocd/applications/vcwaltid/templates/ingress.yaml
similarity index 100%
rename from applications/vcwaltid/templates/ingress.yaml
rename to argocd/applications/vcwaltid/templates/ingress.yaml
diff --git a/applications/vcwaltid/templates/route-certs.yaml b/argocd/applications/vcwaltid/templates/route-certs.yaml
similarity index 100%
rename from applications/vcwaltid/templates/route-certs.yaml
rename to argocd/applications/vcwaltid/templates/route-certs.yaml
diff --git a/applications/vcwaltid/templates/route.yaml b/argocd/applications/vcwaltid/templates/route.yaml
similarity index 100%
rename from applications/vcwaltid/templates/route.yaml
rename to argocd/applications/vcwaltid/templates/route.yaml
diff --git a/applications/vcwaltid/templates/service.yaml b/argocd/applications/vcwaltid/templates/service.yaml
similarity index 100%
rename from applications/vcwaltid/templates/service.yaml
rename to argocd/applications/vcwaltid/templates/service.yaml
diff --git a/applications/vcwaltid/values.yaml b/argocd/applications/vcwaltid/values.yaml
similarity index 100%
rename from applications/vcwaltid/values.yaml
rename to argocd/applications/vcwaltid/values.yaml
diff --git a/applications/verifier/Chart.yaml b/argocd/applications/verifier/Chart.yaml
similarity index 100%
rename from applications/verifier/Chart.yaml
rename to argocd/applications/verifier/Chart.yaml
diff --git a/applications/verifier/values.yaml b/argocd/applications/verifier/values.yaml
similarity index 100%
rename from applications/verifier/values.yaml
rename to argocd/applications/verifier/values.yaml
diff --git a/data-space-connector/Chart.yaml b/argocd/data-space-connector/Chart.yaml
similarity index 100%
rename from data-space-connector/Chart.yaml
rename to argocd/data-space-connector/Chart.yaml
diff --git a/data-space-connector/templates/_helpers.tpl b/argocd/data-space-connector/templates/_helpers.tpl
similarity index 100%
rename from data-space-connector/templates/_helpers.tpl
rename to argocd/data-space-connector/templates/_helpers.tpl
diff --git a/data-space-connector/templates/argo-application.yaml b/argocd/data-space-connector/templates/argo-application.yaml
similarity index 100%
rename from data-space-connector/templates/argo-application.yaml
rename to argocd/data-space-connector/templates/argo-application.yaml
diff --git a/data-space-connector/values.yaml b/argocd/data-space-connector/values.yaml
similarity index 75%
rename from data-space-connector/values.yaml
rename to argocd/data-space-connector/values.yaml
index dbe3c6b..764cc3c 100644
--- a/data-space-connector/values.yaml
+++ b/argocd/data-space-connector/values.yaml
@@ -14,7 +14,7 @@ applications:
 
   - name: mysql
     enabled: true
-    source_path: applications/mysql
+    source_path: argocd/applications/mysql
     source_ref: *branch
     destination: *destination
     helm_values:
@@ -22,7 +22,7 @@ applications:
 
   - name: mongodb
     enabled: true
-    source_path: applications/mongodb
+    source_path: argocd/applications/mongodb
     source_ref: *branch
     destination: *destination
     helm_values:
@@ -30,7 +30,7 @@ applications:
 
   - name: postgres
     enabled: true
-    source_path: applications/postgres
+    source_path: argocd/applications/postgres
     source_ref: *branch
     destination: *destination
     helm_values:
@@ -38,7 +38,7 @@ applications:
 
   - name: orion
     enabled: true
-    source_path: applications/orion-ld
+    source_path: argocd/applications/orion-ld
     source_ref: *branch
     destination: *destination
     helm_values:
@@ -46,7 +46,7 @@ applications:
 
   - name: credentials-config-service
     enabled: true
-    source_path: applications/credentials-config-service
+    source_path: argocd/applications/credentials-config-service
     source_ref: *branch
     destination: *destination
     helm_values:
@@ -54,7 +54,7 @@ applications:
 
   - name: trusted-issuers-list
     enabled: true
-    source_path: applications/trusted-issuers-list
+    source_path: argocd/applications/trusted-issuers-list
     source_ref: *branch
     destination: *destination
     helm_values:
@@ -62,7 +62,7 @@ applications:
 
   - name: vcwaltid
     enabled: true
-    source_path: applications/vcwaltid
+    source_path: argocd/applications/vcwaltid
     source_ref: *branch
     destination: *destination
     helm_values:
@@ -70,7 +70,7 @@ applications:
 
   - name: verifier
     enabled: true
-    source_path: applications/verifier
+    source_path: argocd/applications/verifier
     source_ref: *branch
     destination: *destination
     helm_values:
@@ -78,7 +78,7 @@ applications:
 
   - name: keycloak
     enabled: true
-    source_path: applications/keycloak
+    source_path: argocd/applications/keycloak
     source_ref: *branch
     destination: *destination
     helm_values:
@@ -86,7 +86,7 @@ applications:
 
   - name: keyrock
     enabled: true
-    source_path: applications/keyrock
+    source_path: argocd/applications/keyrock
     source_ref: *branch
     destination: *destination
     helm_values:
@@ -94,7 +94,7 @@ applications:
 
   - name: dsba-pdp
     enabled: true
-    source_path: applications/dsba-pdp
+    source_path: argocd/applications/dsba-pdp
     source_ref: *branch
     destination: *destination
     helm_values:
@@ -102,7 +102,7 @@ applications:
 
   - name: kong
     enabled: true
-    source_path: applications/kong
+    source_path: argocd/applications/kong
     source_ref: *branch
     destination: *destination
     helm_values:
@@ -110,7 +110,7 @@ applications:
 
   - name: activation-service
     enabled: true
-    source_path: applications/activation-service
+    source_path: argocd/applications/activation-service
     source_ref: *branch
     destination: *destination
     helm_values:
@@ -118,7 +118,7 @@ applications:
 
   - name: tm-forum-api
     enabled: true
-    source_path: applications/tm-forum-api
+    source_path: argocd/applications/tm-forum-api
     source_ref: *branch
     destination: *destination
     helm_values:
@@ -126,7 +126,7 @@ applications:
 
   - name: contract-management
     enabled: true
-    source_path: applications/contract-management
+    source_path: argocd/applications/contract-management
     source_ref: *branch
     destination: *destination
     helm_values: