diff --git a/apps/archmeister.yaml b/apps/archmeister.yaml
deleted file mode 100644
index 7555b1c8..00000000
--- a/apps/archmeister.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: ApplicationSet
-metadata:
-  name: archmeister
-  namespace: argocd
-spec:
-  goTemplate: true
-  generators:
-  - list:
-      elements:
-      - cluster: https://kubernetes.default.svc
-        env: prod
-        hostname: archmeister.srv.oceanbox.io
-        autoSync: false
-        prune: true
-      # - cluster: https://staging-vcluster.staging-vcluster
-      #   env: staging
-      #   hostname: archmeister.beta.oceanbox.io
-      #   autoSync: true
-      #   prune: true
-  template:
-    metadata:
-      name: "{{ .env }}-archmeister"
-    spec:
-      project: atlantis
-      destination:
-        namespace: atlantis
-        server: "{{ .cluster }}"
-      sources:
-      - repoURL: https://gitlab.com/oceanbox/manifests.git
-        targetRevision: main
-        path: values/archmeister
-        plugin:
-          name: kustomize-helm-with-rewrite
-          parameters:
-          - name: env
-            string: "{{ .env }}"
-          - name: hostname
-            string: "{{ .hostname }}"
-  templatePatch: |
-    {{- if .autoSync }}
-    spec:
-      syncPolicy:
-        automated:
-          prune: {{ .prune }}
-          selfHeal: false
-    {{- end }}
diff --git a/apps/atlantis-host-resources.yaml b/apps/atlantis-host-resources.yaml
deleted file mode 100644
index 2b046e83..00000000
--- a/apps/atlantis-host-resources.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: atlantis-cluster-resources
-  namespace: argocd
-  # annotations: # close, but no cigar
-  #   argocd.argoproj.io/compare-options: ServerSideDiff=true,IncludeMutationWebhook=true
-spec:
-  project: atlantis
-  destination:
-    server: https://kubernetes.default.svc
-  syncPolicy:
-    automated:
-      prune: false
-      selfHeal: false
-  # ignoreDifferences:
-  #   - kind: Secret
-  #     name: prod-rabbitmq
-  #     jqPathExpressions:
-  #       - '.data'
-  #       - '.metadata.annotations.clone'
-  #       - '.metadata.labels'
-  sources:
-  - repoURL: https://gitlab.com/oceanbox/manifests.git
-    targetRevision: main
-    path: resources/atlantis
-
diff --git a/apps/atlantis-resources.yaml b/apps/atlantis-resources.yaml
deleted file mode 100644
index 5b43af7d..00000000
--- a/apps/atlantis-resources.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-# Currently not in use. Configured via the create-vcluster script.
-apiVersion: argoproj.io/v1alpha1
-kind: ApplicationSet
-metadata:
-  name: atlantis-resources
-  namespace: argocd
-spec:
-  goTemplate: true
-  generators:
-  - list:
-      elements:
-      - cluster: https://kubernetes.default.svc
-        env: prod
-        autoSync: false
-        prune: false
-      # - cluster: https://staging-vcluster.staging-vcluster
-      #   env: staging
-      #   autoSync: false
-      #   prune: false
-  template:
-    metadata:
-      name: "{{ .env }}-atlantis-resources"
-    spec:
-      project: aux
-      syncPolicy:
-        automated: {}
-      destination:
-        server: "{{ .cluster }}"
-        namespace: atlantis
-      sources: {}
-      # - repoURL: https://gitlab.com/oceanbox/manifests.git
-      #   targetRevision: main
-      #   path: 'resources/atlantis/manifests/{{ env }}'
-  templatePatch: |
-    {{- if .autoSync }}
-    spec:
-      syncPolicy:
-        automated:
-          prune: {{ .prune }}
-          selfHeal: false
-    {{- end }}
diff --git a/apps/atlantis.yaml b/apps/atlantis.yaml
deleted file mode 100644
index e76ea605..00000000
--- a/apps/atlantis.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: ApplicationSet
-metadata:
-  name: atlantis
-  namespace: argocd
-spec:
-  goTemplate: true
-  generators:
-  - list:
-      elements:
-      - cluster: https://kubernetes.default.svc
-        env: prod
-        hostname: atlantis.srv.oceanbox.io
-        autoSync: false
-        prune: true
-      # - cluster: https://staging-vcluster.staging-vcluster
-      #   env: staging
-      #   hostname: atlantis.beta.oceanbox.io
-      #   autoSync: true
-      #   prune: true
-  template:
-    metadata:
-      name: '{{ .env }}-atlantis'
-    spec:
-      project: atlantis
-      destination:
-        namespace: atlantis
-        server: '{{ .cluster }}'
-      sources:
-      - repoURL: https://gitlab.com/oceanbox/manifests.git
-        targetRevision: main
-        path: values/atlantis
-        plugin:
-          name: kustomize-helm-with-rewrite
-          parameters:
-          - name: env
-            string: '{{ .env }}'
-          - name: hostname
-            string: '{{ .hostname }}'
-  templatePatch: |
-    {{- if .autoSync }}
-    spec:
-      syncPolicy:
-        automated:
-          prune: {{ .prune }}
-          selfHeal: false
-    {{- end }}
diff --git a/apps/busynix.yaml b/apps/busynix.yaml
index 51ddd807..5e9fbaae 100644
--- a/apps/busynix.yaml
+++ b/apps/busynix.yaml
@@ -1,34 +1,21 @@
 apiVersion: argoproj.io/v1alpha1
-kind: ApplicationSet
+kind: Application
 metadata:
   name: busynix
   namespace: argocd
 spec:
-  generators:
-  - list:
-      elements:
-      # - cluster: https://kubernetes.default.svc
-      #   env: prod
-      #   hostname: busynix.srv.oceanbox.io
-      - cluster: https://staging-vcluster.staging-vcluster
-        env: staging
-        hostname: busynix.beta.oceanbox.io
-  template:
-    metadata:
-      name: '{{ env }}-busynix'
-    spec:
-      project: aux
-      destination:
-        namespace: default
-        server: '{{ cluster }}'
-      source:
-        repoURL: https://gitlab.com/oceanbox/manifests.git
-        targetRevision: main
-        path: values/busynix
-        plugin:
-          name: kustomize-helm-with-rewrite
-          parameters:
-          - name: env
-            string: '{{ env }}'
-          - name: hostname
-            string: '{{ hostname }}'
+  project: aux
+  destination:
+    namespace: default
+    server: https://kubernetes.default.svc
+  source:
+    repoURL: https://gitlab.com/oceanbox/manifests.git
+    targetRevision: main
+    path: values/busynix
+    plugin:
+      name: kustomize-helm-with-rewrite
+      parameters:
+      - name: env
+        string: staging
+      - name: hostname
+        string: busynix.beta.oceanbox.io
diff --git a/apps/dex.yaml b/apps/dex.yaml
index d2444255..8150435c 100644
--- a/apps/dex.yaml
+++ b/apps/dex.yaml
@@ -1,15 +1,28 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: dex
+  name: prod-dex
   namespace: argocd
 spec:
   project: aux
   destination:
     server: https://kubernetes.default.svc
-    namespace: idp
-  source:
-    repoURL: https://gitlab.com/oceanbox/manifests.git
+    namespace: dex
+  sources:
+  - repoURL: https://gitlab.com/oceanbox/manifests.git
     targetRevision: nixidy
-    path: values/dex/manifests
+    path: 'values/dex/prod'
+  - repoURL: https://gitlab.com/oceanbox/manifests.git
+    targetRevision: nixidy
+    path: values/dex/resources
+  - repoURL: https://charts.dexidp.io
+    targetRevision: 0.19.1
+    chart: dex
+    helm:
+      valueFiles:
+        - $values/values/dex/values.yaml
+        - $values/values/dex/values-prod.yaml
+  - repoURL: https://gitlab.com/oceanbox/manifests.git
+    targetRevision: nixidy
+    ref: values
 
diff --git a/apps/geoserver.yaml b/apps/geoserver.yaml
index 1dac7343..05d13a8b 100644
--- a/apps/geoserver.yaml
+++ b/apps/geoserver.yaml
@@ -1,38 +1,25 @@
 apiVersion: argoproj.io/v1alpha1
-kind: ApplicationSet
+kind: Application
 metadata:
-  name: geoserver
+  name: prod-geoserver
   namespace: argocd
 spec:
-  generators:
-  - list:
-      elements:
-      - cluster: https://kubernetes.default.svc
-        env: prod
-        hostname: geoserver.srv.oceanbox.io
-      # - cluster: https://kubernetes.default.svc
-      #   env: staging
-      #   hostname: geoserver.beta.oceanbox.io
-  template:
-    metadata:
-      name: '{{ env }}-geoserver'
-    spec:
-      project: aux
-      destination:
-        server: https://kubernetes.default.svc
-        namespace: geoserver
-      sources:
-      - repoURL: https://gitlab.com/oceanbox/manifests.git
-        targetRevision: main
-        path: values/geoserver
-        plugin:
-          name: kustomize-helm-with-rewrite
-          parameters:
-          - name: env
-            string: '{{ env }}'
-          - name: hostname
-            string: geoserver.srv.oceanbox.io
-          - name: flags
-            string: "--skip-tests"
-          - name: chart
-            string: ncsa/geoserver
+  project: aux
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: geoserver
+  sources:
+  - repoURL: https://gitlab.com/oceanbox/manifests.git
+    targetRevision: main
+    path: values/geoserver
+    plugin:
+      name: kustomize-helm-with-rewrite
+      parameters:
+      - name: env
+        string: prod
+      - name: hostname
+        string: geoserver.srv.oceanbox.io
+      - name: flags
+        string: "--skip-tests"
+      - name: chart
+        string: ncsa/geoserver
diff --git a/apps/hipster.yaml b/apps/hipster.yaml
deleted file mode 100644
index 05b799d4..00000000
--- a/apps/hipster.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: ApplicationSet
-metadata:
-  name: hipster
-  namespace: argocd
-spec:
-  goTemplate: true
-  generators:
-  - list:
-      elements:
-      - cluster: https://kubernetes.default.svc
-        env: prod
-        hostname: hipster.srv.oceanbox.io
-        autoSync: false
-        prune: true
-      # - cluster: https://staging-vcluster.staging-vcluster
-      #   env: staging
-      #   hostname: hipster.beta.oceanbox.io
-      #   autoSync: true
-      #   prune: true
-  template:
-    metadata:
-      name: '{{ .env }}-hipster'
-    spec:
-      project: atlantis
-      destination:
-        namespace: atlantis
-        server: '{{ .cluster }}'
-      sources:
-      - repoURL: https://gitlab.com/oceanbox/manifests.git
-        targetRevision: main
-        path: values/hipster
-        plugin:
-          name: kustomize-helm-with-rewrite
-          parameters:
-          - name: env
-            string: '{{ .env }}'
-          - name: hostname
-            string: '{{ .hostname }}'
-  templatePatch: |
-    {{- if .autoSync }}
-    spec:
-      syncPolicy:
-        automated:
-          prune: {{ .prune }}
-          selfHeal: false
-    {{- end }}
diff --git a/apps/petimeter.yaml b/apps/petimeter.yaml
deleted file mode 100644
index ad389599..00000000
--- a/apps/petimeter.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: ApplicationSet
-metadata:
-  name: petimeter
-  namespace: argocd
-spec:
-  goTemplate: true
-  generators:
-  - list:
-      elements:
-      - cluster: https://kubernetes.default.svc
-        env: prod
-        hostname: petimeter.srv.oceanbox.io
-        autoSync: false
-        prune: true
-      # - cluster: https://staging-vcluster.staging-vcluster
-      #   env: staging
-      #   hostname: petimeter.beta.oceanbox.io
-      #   autoSync: true
-      #   prune: true
-  template:
-    metadata:
-      name: '{{ .env }}-petimeter'
-    spec:
-      project: atlantis
-      destination:
-        namespace: atlantis
-        server: '{{ .cluster }}'
-      sources:
-      - repoURL: https://gitlab.com/oceanbox/manifests.git
-        targetRevision: main
-        path: values/petimeter
-        plugin:
-          name: kustomize-helm-with-rewrite
-          parameters:
-          - name: env
-            string: '{{ .env }}'
-          - name: hostname
-            string: '{{ .hostname }}'
-      - repoURL: https://gitlab.com/oceanbox/manifests.git
-        targetRevision: main
-        path: values/petimeter/manifests
-  templatePatch: |
-    {{- if .autoSync }}
-    spec:
-      syncPolicy:
-        automated:
-          prune: {{ .prune }}
-          selfHeal: false
-    {{- end }}
diff --git a/apps/redis.yaml b/apps/redis.yaml
index 18fe9327..588d6739 100644
--- a/apps/redis.yaml
+++ b/apps/redis.yaml
@@ -1,39 +1,28 @@
 apiVersion: argoproj.io/v1alpha1
-kind: ApplicationSet
+kind: Application
 metadata:
-  name: redis
+  name: prod-redis
   namespace: argocd
 spec:
-  generators:
-  - list:
-      elements:
-      - cluster: https://kubernetes.default.svc
-        env: prod
-      - cluster: https://kubernetes.default.svc
-        env: staging
-  template:
-    metadata:
-      name: '{{ env }}-redis'
-    spec:
-      project: aux
-      destination:
-        server: https://kubernetes.default.svc
-        namespace: redis
-      sources:
-        - repoURL: https://charts.bitnami.com/bitnami
-          targetRevision: 19.5.2
-          chart: redis
-          helm:
-            valueFiles:
-              - $values/values/redis/values-{{ env }}.yaml
-        - repoURL: https://gitlab.com/oceanbox/manifests.git
-          targetRevision: HEAD
-          ref: values
-        - repoURL: https://gitlab.com/oceanbox/manifests.git
-          targetRevision: main
-          path: values/redis/{{ env }}
-      ignoreDifferences:
-        - group: apps
-          kind: StatefulSet
-          jqPathExpressions:
-            - '.spec.template.spec.containers[].resources.limits.cpu'
+  project: aux
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: redis
+  sources:
+    - repoURL: https://charts.bitnami.com/bitnami
+      targetRevision: 19.5.2
+      chart: redis
+      helm:
+        valueFiles:
+          - $values/values/redis/values-prod.yaml
+    - repoURL: https://gitlab.com/oceanbox/manifests.git
+      targetRevision: HEAD
+      ref: values
+    - repoURL: https://gitlab.com/oceanbox/manifests.git
+      targetRevision: main
+      path: values/redis/prod
+  ignoreDifferences:
+    - group: apps
+      kind: StatefulSet
+      jqPathExpressions:
+        - '.spec.template.spec.containers[].resources.limits.cpu'
diff --git a/apps/sorcerer.yaml b/apps/sorcerer.yaml
deleted file mode 100644
index b781d0c6..00000000
--- a/apps/sorcerer.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: ApplicationSet
-metadata:
-  name: sorcerer
-  namespace: argocd
-spec:
-  goTemplate: true
-  generators:
-  - list:
-      elements:
-      - cluster: https://10.255.241.99:4443
-        env: prod
-        hostname: sorcerer.data.oceanbox.io
-        autoSync: false
-        prune: true
-      # - cluster: https://10.255.241.99:4443
-      #   env: staging
-      #   hostname: sorcerer.ekman.oceanbox.io
-      #   autoSync: true
-      #   prune: true
-  template:
-    metadata:
-      name: '{{ .env }}-sorcerer'
-    spec:
-      project: atlantis
-      destination:
-        namespace: sorcerer
-        server: '{{ .cluster }}'
-      sources:
-      - repoURL: https://gitlab.com/oceanbox/manifests.git
-        targetRevision: main
-        path: values/sorcerer
-        plugin:
-          name: kustomize-helm-with-rewrite
-          parameters:
-          - name: env
-            string: '{{ .env }}'
-          - name: hostname
-            string: '{{ .hostname }}'
-  templatePatch: |
-    {{- if .autoSync }}
-    spec:
-      syncPolicy:
-        automated:
-          prune: {{ .prune }}
-          selfHeal: false
-    {{- end }}
diff --git a/apps/wordpress.yaml b/apps/wordpress.yaml
index 6a58ab56..379f5bc8 100644
--- a/apps/wordpress.yaml
+++ b/apps/wordpress.yaml
@@ -14,7 +14,7 @@ spec:
     chart: wordpress
     helm:
       valueFiles:
-        - $values/wordpress/values.yaml
+        - $values/values/wordpress/values.yaml
   - repoURL: https://gitlab.com/oceanbox/manifests.git
     targetRevision: HEAD
     ref: values
diff --git a/kustomizations/dex/templates b/kustomizations/dex/templates
deleted file mode 160000
index 1fd8cd00..00000000
--- a/kustomizations/dex/templates
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1fd8cd005f740e1dd7974ead1f3b82963cc3777a
diff --git a/values/dex/base/cluster.yaml b/values/dex/base/cluster.yaml
deleted file mode 100644
index 39f8a6c0..00000000
--- a/values/dex/base/cluster.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: postgresql.cnpg.io/v1
-kind: Cluster
-metadata:
-  name: dexdb
-spec:
-  enableSuperuserAccess: true
-  instances: 2
-  logLevel: info
-  storage:
-    pvcTemplate:
-      accessModes:
-      - ReadWriteOnce
-      resources:
-        requests:
-          storage: 1Gi
-      storageClassName: managed-nfs-storage
-      volumeMode: Filesystem
-    resizeInUseVolumes: true
-    size: 1Gi
diff --git a/values/dex/base/config.yaml b/values/dex/base/config.yaml
deleted file mode 100644
index bcb94223..00000000
--- a/values/dex/base/config.yaml
+++ /dev/null
@@ -1,165 +0,0 @@
-issuer: https://idp.oceanbox.io/dex
-storage:
-  type: postgres
-  config:
-    host: staging-dexdb-rw
-    port: 5432
-    database: app
-    user: app
-    password: epq4dGyf5sheJ7fp9f0NgYtPwlhS2Gvtb5FXl6tddcNGyIhwN9DchExTUD7nxFMH
-    ssl:
-      mode: disable
-web:
-  http: 127.0.0.1:5556
-telemetry:
-  http: 127.0.0.1:5558
-grpc:
-  addr: 127.0.0.1:5557
-frontend:
-  dir: /srv/dex/web
-  issuer: oceanbox
-  extra:
-    client_logo_url: "../theme/client-logo.png"
-# enablePasswordDB: true
-# staticPasswords:
-#   - email: "admin@oceanbox.io"
-#     hash: "$2y$12$2AUaWnDEpHxsfFyRzTwx8e8WtJtnhGJOujPjP3BXVVCJe3c.k2PjC"
-#     username: "admin"
-#     userID: "9a15441c-4d66-4b26-a0f6-4e619535ee8f"
-oauth2:
-  responseTypes: [ "code" ]
-  skipApprovalScreen: true
-  alwaysShowLoginScreen: false
-connectors:
-- type: microsoft
-  id: oceanbox
-  name: oceanbox.io
-  config:
-    clientID: 43667ac0-37e1-422f-99fc-50a699bb255c
-    clientSecret: 5kA8Q~N1Gq~YBgJyKg8xNONZbvf4bM0Qwp_AUbM8
-    redirectURI: https://idp.oceanbox.io/dex/callback
-    tenant: organizations
-- type: microsoft
-  id: itp
-  name: itpartner.no
-  config:
-    clientID: 43667ac0-37e1-422f-99fc-50a699bb255c
-    clientSecret: 5kA8Q~N1Gq~YBgJyKg8xNONZbvf4bM0Qwp_AUbM8
-    redirectURI: https://idp.oceanbox.io/dex/callback
-    tenant: organizations
-# - type: microsoft
-#   id: oceanbox
-#   name: oceanbox.io
-#   config:
-#     clientID: 43667ac0-37e1-422f-99fc-50a699bb255c
-#     clientSecret: 5kA8Q~N1Gq~YBgJyKg8xNONZbvf4bM0Qwp_AUbM8
-#     tenant: 3f737008-e9a0-4485-9d27-40329d288089
-#     redirectURI: https://idp.oceanbox.io/dex/callback
-#     onlySecurityGroups: true
-#     groups:
-#       - atlantis
-- type: microsoft
-  id: salmar
-  name: salmar.no
-  config:
-    clientID: 3f6f1153-e5da-40eb-a2dd-ede6c7bf6058
-    clientSecret: jR48Q~b6CyZrPclp0B8OCdET1B5TuiSfz1ygDc3C
-    tenant: de10159d-2c09-4762-966c-e841d3391feb
-    redirectURI: https://idp.oceanbox.io/dex/callback
-    onlySecurityGroups: true
-    groups:
-      - Azure-Grp-App-Cloud-Oceanbox
-- type: microsoft
-  id: aqua-kompetanse
-  name: aqua-kompetanse.no
-  config:
-    clientID: 9fd83910-1a21-4869-8a30-19fc32722ee2
-    clientSecret: WnG8Q~DBcmUuTWsb-N0PVFXaBjeqI1XfiW.cYbZY
-    tenant: 6cd538cc-6cba-463f-9d22-1e0eda9695e3
-    redirectURI: https://idp.oceanbox.io/dex/callback
-    onlySecurityGroups: true
-    groups:
-      - Oceanbox
-- type: oidc
-  id: keycloak
-  name: default
-  config:
-    issuer: https://auth.oceanbox.io/realms/oceanbox
-    clientID: dex
-    clientSecret: 4T7oMYLeShuIvrF3wvg4A24gcZWzdcrC
-    redirectURI: https://idp.oceanbox.io/dex/callback
-    promptType: login
-staticClients:
-  - id: atlantis
-    redirectURIs:
-      - 'https://maps.oceanbox.io/signin-oidc'
-      - 'https://maps.srv.oceanbox.io/signin-oidc'
-      - 'https://atlantis.srv.oceanbox.io/signin-oidc'
-      - 'https://maps.relic.oceanbox.io/signin-oidc'
-    name: 'Atlantis'
-    secret: KOJ6bDHzE5vdyfSrzgwLjtM5PzA809Zm
-  - id: atlantis_dev
-    redirectURIs:
-      - 'https://atlantis.beta.oceanbox.io/signin-oidc'
-      - 'https://beta.oceanbox.io/signin-oidc'
-      - 'https://atlas.oceanbox.io/signin-oidc'
-      - 'https://jonas-atlantis.dev.oceanbox.io/signin-oidc'
-      - 'https://stig-atlantis.dev.oceanbox.io/signin-oidc'
-      - 'https://simkir-atlantis.dev.oceanbox.io/signin-oidc'
-      - 'https://atlantis.local.oceanbox.io:8080/signin-oidc'
-      - 'https://atlantis.local.oceanbox.io:8085/signin-oidc'
-    name: 'Atlantis dev'
-    secret: 3QjfSPmAemjn34XVA2o1fvoS7I4gKvOR
-  - id: petimeter
-    redirectURIs:
-      - 'https://petimeter.srv.oceanbox.io/signin-oidc'
-    name: 'Petimeter dev'
-    secret: kkrKo3mmmseMnorf9qw3eklefkoOKFNs
-  - id: petimeter_dev
-    redirectURIs:
-      - 'https://petimeter.beta.oceanbox.io/signin-oidc'
-      - 'https://jonas-petimeter.dev.oceanbox.io/signin-oidc'
-      - 'https://stig-petimeter.dev.oceanbox.io/signin-oidc'
-      - 'https://simkir-petimeter.dev.oceanbox.io/signin-oidc'
-      - 'https://local.oceanbox.io:8080/signin-oidc'
-    name: 'Petimeter dev'
-    secret: kfngKJF9EKVBnnvgkdmPfs0qw3rmjslk
-  - id: sorcerer
-    redirectURIs:
-      - 'https://sorcerer.data.oceanbox.io/signin-oidc'
-      - 'https://sorcerer.ekman.oceanbox.io/signin-oidc'
-    name: 'Sorcerer'
-    secret: sIUXxSQLaTJiLCQ9AqBhmEbAL9lubHGB
-  - id: sorcerer_dev
-    redirectURIs:
-      - 'https://sorcerer.ekman.oceanbox.io/signin-oidc'
-      - 'https://jonas-sorcerer.ekman.oceanbox.io/signin-oidc'
-      - 'https://stig-sorcerer.ekman.oceanbox.io/signin-oidc'
-      - 'https://simkir-sorcerer.ekman.oceanbox.io/signin-oidc'
-      - 'https://sorcerer.local.oceanbox.io:8080/signin-oidc'
-      - 'https://sorcerer.local.oceanbox.io:8085/signin-oidc'
-    name: 'Sorcerer dev'
-    secret: cyrgDr1UzhQrJn8nRVqEt9BJ9mLk3OBy
-  - id: archmeister
-    redirectURIs:
-      - 'https://archmeister.srv.oceanbox.io/signin-oidc'
-    name: 'Archmeister'
-    secret: ieK3yak9zoh3yeewee8quahY6seiv7Ro
-  - id: archmeister_dev
-    redirectURIs:
-      - 'https://archmeister.beta.oceanbox.io/signin-oidc'
-      - 'https://jonas-archmeister.dev.oceanbox.io/signin-oidc'
-      - 'https://stig-archmeister.dev.oceanbox.io/signin-oidc'
-      - 'https://simkir-archmeister.dev.oceanbox.io/signin-oidc'
-      - 'https://local.oceanbox.io:9080/signin-oidc'
-    name: 'Archmeister dev'
-    secret: Dae1eekeedeuKaoCiesh1Jei6aishe8I
-  - id: test
-    redirectURIs:
-      - 'http://localhost:8080/signin-oidc'
-      - 'https://localhost:8080/signin-oidc'
-      - 'http://localhost:8085/signin-oidc'
-      - 'https://localhost:8085/signin-oidc'
-    name: 'Local development'
-    secret: jkdjrKKkfkrkieurbd743jdrrrJdnRqR
-
diff --git a/values/dex/base/kustomization.yaml b/values/dex/base/kustomization.yaml
deleted file mode 100644
index 1b52498b..00000000
--- a/values/dex/base/kustomization.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-generatorOptions:
-  disableNameSuffixHash: true
-secretGenerator:
-  - name: dex-config
-    files:
-      - config.yaml
-resources:
-  - cluster.yaml
diff --git a/values/dex/manifests/dex.yaml b/values/dex/manifests/dex.yaml
deleted file mode 100644
index e3477f00..00000000
--- a/values/dex/manifests/dex.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: ApplicationSet
-metadata:
-  name: dex
-  namespace: argocd
-spec:
-  generators:
-  - list:
-      elements:
-      - cluster: https://kubernetes.default.svc
-        env: prod
-        hostanme: idp.srv.oceanbox.io
-      - cluster: https://kubernetes.default.svc
-        env: staging
-        hostanme: idp.beta.oceanbox.io
-  template:
-    metadata:
-      name: '{{ env }}-dex'
-    spec:
-      project: atlantis
-      destination:
-        server: https://kubernetes.default.svc
-        namespace: idp
-      sources:
-      - repoURL: https://gitlab.com/oceanbox/manifests.git
-        targetRevision: nixidy
-        path: 'values/dex/{{ env }}'
-      - repoURL: https://charts.dexidp.io
-        targetRevision: 0.19.1
-        chart: dex
-        helm:
-          valueFiles:
-            - $values/values/dex/values.yaml
-            - $values/values/dex/values-{{ env }}.yaml
-      - repoURL: https://gitlab.com/oceanbox/manifests.git
-        targetRevision: nixidy
-        ref: values
diff --git a/values/dex/manifests/resources.yaml b/values/dex/manifests/resources.yaml
deleted file mode 100644
index ab3457ff..00000000
--- a/values/dex/manifests/resources.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: dex-resources
-  namespace: argocd
-spec:
-  project: atlantis
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: idp
-  source:
-    repoURL: https://gitlab.com/oceanbox/manifests.git
-    targetRevision: nixidy
-    path: values/dex/resources
-
diff --git a/values/dex/prod/kustomization.yaml b/values/dex/prod/kustomization.yaml
deleted file mode 100644
index de96953d..00000000
--- a/values/dex/prod/kustomization.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-namePrefix: prod-
-resources:
-  - ../base
diff --git a/values/dex/staging/cluster_patch.yaml b/values/dex/staging/cluster_patch.yaml
deleted file mode 100644
index 965bd964..00000000
--- a/values/dex/staging/cluster_patch.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-- op: replace
-  path: /spec/instances
-  value: 1
diff --git a/values/dex/staging/kustomization.yaml b/values/dex/staging/kustomization.yaml
deleted file mode 100644
index 423514ef..00000000
--- a/values/dex/staging/kustomization.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-namePrefix: staging-
-patches:
-  - target:
-      group: postgresql.cnpg.io
-      version: v1
-      kind: Cluster
-    path: cluster_patch.yaml
-resources:
-  - ../base