diff --git a/values/atlantis/values/values-beta.yaml.gotmpl b/values/atlantis/values/values-beta.yaml.gotmpl
new file mode 100644
index 00000000..b2d5a1af
--- /dev/null
+++ b/values/atlantis/values/values-beta.yaml.gotmpl
@@ -0,0 +1,81 @@
+replicaCount: 1
+
+podAnnotations:
+  dapr.io/app-id: "beta-atlantis"
+
+env:
+  - name: APP_NAMESPACE
+    value: beta-atlantis
+  - name: APP_VERSION
+    value: "2.97.4"
+  - name: LOG_LEVEL
+    value: "2"
+  - name: ANALYTICS_WEB_ID
+    value: "16e7d807-4db5-45fd-92a9-27393445a153"
+  - name: REDIS_USER
+    value: default
+  - name: REDIS_PASSWORD
+    valueFrom:
+      secretKeyRef:
+        name: beta-atlantis-redis
+        key: redis-password
+  - name: DB_HOST
+    value: beta-atlantis-db-rw
+  - name: DB_PORT
+    value: "5432"
+  - name: DB_USER
+    valueFrom:
+      secretKeyRef:
+        name: beta-atlantis-db-superuser
+        key: username
+  - name: DB_PASSWORD
+    valueFrom:
+      secretKeyRef:
+        name: beta-atlantis-db-superuser
+        key: password
+  - name: DAPR_API_TOKEN
+    valueFrom:
+      secretKeyRef:
+        name: dapr-api-token
+        key: token
+
+ingress:
+  enabled: true
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-production
+    nginx.ingress.kubernetes.io/proxy-buffer-size: 128k
+  hosts:
+    - host: maps.beta.oceanbox.io
+      paths:
+        - path: /
+          pathType: ImplementationSpecific
+      internal:
+        - path: /internal
+          pathType: ImplementationSpecific
+        - path: /dapr
+          pathType: ImplementationSpecific
+        - path: /actors
+          pathType: ImplementationSpecific
+        - path: /job
+          pathType: ImplementationSpecific
+        - path: /events
+          pathType: ImplementationSpecific
+        - path: /metrics
+          pathType: ImplementationSpecific
+  tls:
+    - hosts:
+       - maps.beta.oceanbox.io
+      secretName: beta-atlantis-tls
+
+cluster:
+  instances: 2
+  bootstrap:
+    enabled: false
+
+resources:
+  limits:
+    cpu: 1
+    memory: 1Gi
+  requests:
+    cpu: 500m
+    memory: 1Gi
diff --git a/values/atlantis/values/values.yaml.gotmpl b/values/atlantis/values/values.yaml.gotmpl
index d13d6170..598c1ef0 100644
--- a/values/atlantis/values/values.yaml.gotmpl
+++ b/values/atlantis/values/values.yaml.gotmpl
@@ -1,4 +1,3 @@
-
 podAnnotations:
   dapr.io/enabled: "true"
   dapr.io/app-port: "8085"
diff --git a/values/sorcerer/kustomize/beta/appsettings.json b/values/sorcerer/kustomize/beta/appsettings.json
deleted file mode 100644
index 2beddb28..00000000
--- a/values/sorcerer/kustomize/beta/appsettings.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-    "oidc": {
-        "issuer": "https://auth.oceanbox.io/realms/oceanbox",
-        "authorization_endpoint": "https://auth.oceanbox.io/realms/oceanbox/protocol/openid-connect/auth",
-        "token_endpoint": "https://auth.oceanbox.io/realms/oceanbox/protocol/openid-connect/token",
-        "jwks_uri": "https://auth.oceanbox.io/realms/oceanbox/protocol/openid-connect/certs",
-        "userinfo_endpoint": "https://auth.oceanbox.io/realms/oceanbox/protocol/openid-connect/userinfo",
-        "end_session_endpoint": "https://auth.oceanbox.io/realms/oceanbox/protocol/openid-connect/logout",
-        "device_authorization_endpoint": "https://auth.oceanbox.io/realms/oceanbox/protocol/openid-connect/auth/device",
-        "clientId": "sorcerer",
-        "clientSecret": "",
-        "scopes": [
-            "openid",
-            "email",
-            "offline_access",
-            "profile"
-        ],
-        "audiences": [
-            "atlantis",
-            "atlantis_dev",
-            "sorcerer",
-            "sorcerer_dev"
-        ]
-    },
-    "sso": {
-        "cookieDomain": ".oceanbox.io",
-        "cookieName": ".obx.beta",
-        "ttl": 12.0,
-        "signedOutRedirectUri": "https://maps.beta.oceanbox.io",
-        "realm": "atlantis",
-        "environment": "beta",
-        "keyStore": {
-            "kind": "azure",
-            "uri": "https://atlantis.blob.core.windows.net",
-            "key": "dataprotection-keys"
-        },
-        "keyVault": {
-            "kind": "azure",
-            "uri": "https://atlantisvault.vault.azure.net",
-            "key": "dataencryption-keys"
-        }
-    },
-    "plainAuthUsers": [],
-    "fga": {
-      "apiUrl": "https://openfga.srv.oceanbox.io",
-      "apiKey": "",
-      "storeId": "01JKTZXMP7ANN4GG2P5W8Y56M6",
-      "modelId": "01JKTZYMCZZBVSBG66W27XMW0A"
-    },
-    "sentryUrl": "https://5e6e3584098dc006de18038cf85d2cbe@o4509530141622272.ingest.de.sentry.io/4509547350065232",
-    "redis": "beta-sorcerer-redis:6379,user=default,password=secret",
-    "allowedOrigins": [
-        "http://localhost:8085",
-        "http://localhost:8080",
-        "https://localhost:8080",
-        "https://sorcerer.data.oceanbox.io",
-        "https://sorcerer.ekman.oceanbox.io",
-        "https://sorcerer.local.oceanbox.io:8080",
-        "https://atlantis.local.oceanbox.io:8080",
-        "https://maps.oceanbox.io",
-        "https://maps.beta.oceanbox.io",
-        "https://atlantis.beta.oceanbox.io",
-        "https://jonas-atlantis.dev.oceanbox.io",
-        "https://stig-atlantis.dev.oceanbox.io",
-        "https://prod-sorcerer.ekman.oceanbox.io",
-        "http://prod-sorcerer.ekman.oceanbox.io"
-    ],
-    "appName": "sorcerer",
-    "appEnv": "beta",
-    "appNamespace": "beta-sorcerer",
-    "appVersion": "0.0.0",
-    "otelCollector": "http://10.255.241.12:4317",
-    "archiveSvc": "https://maps.beta.oceanbox.io",
-    "dataDir": "/data/archives",
-    "cacheDir": "/data/archives/cache"
-}
diff --git a/values/sorcerer/kustomize/beta/archives-backup-volume.yaml b/values/sorcerer/kustomize/beta/archives-backup-volume.yaml
deleted file mode 100644
index 84e20b2c..00000000
--- a/values/sorcerer/kustomize/beta/archives-backup-volume.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: pv-beta-backup-archives
-spec:
-  accessModes:
-  - ReadWriteMany
-  capacity:
-    storage: 400T
-  local:
-    path: /backup/archives
-  persistentVolumeReclaimPolicy: Retain
-  volumeMode: Filesystem
-  nodeAffinity:
-    required:
-      nodeSelectorTerms:
-      - matchExpressions:
-        - key: kubernetes.io/hostname
-          operator: In
-          values:
-          - ekman
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: beta-oceanbox-backup-archives
-spec:
-  accessModes:
-  - ReadWriteMany
-  resources:
-    requests:
-      storage: 400T
-  storageClassName: ""
-  volumeMode: Filesystem
-  volumeName: pv-beta-backup-archives
diff --git a/values/sorcerer/kustomize/beta/configurations.yaml b/values/sorcerer/kustomize/beta/configurations.yaml
deleted file mode 100644
index 3131d2c8..00000000
--- a/values/sorcerer/kustomize/beta/configurations.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-apiVersion: dapr.io/v1alpha1
-kind: Component
-metadata:
-  name: configstore
-spec:
-  type: configuration.redis
-  version: v1
-  metadata:
-  - name: redisHost
-    value: beta-sorcerer-redis:6379
-  - name: redisUsername
-    value: default
-  - name: redisPassword
-    secretKeyRef:
-      name: beta-sorcerer-redis
-      key:  redis-password
-  - name: redisDB
-    value: "1"
-scopes:
-  - beta-sorcerer
diff --git a/values/sorcerer/kustomize/beta/default.env b/values/sorcerer/kustomize/beta/default.env
deleted file mode 100644
index 2dfb0bd0..00000000
--- a/values/sorcerer/kustomize/beta/default.env
+++ /dev/null
@@ -1 +0,0 @@
-SEQ_APIKEY=7iIXHJukYjSLQDix6CnZ
diff --git a/values/sorcerer/kustomize/beta/deployment_patch.yaml b/values/sorcerer/kustomize/beta/deployment_patch.yaml
deleted file mode 100644
index b5d99932..00000000
--- a/values/sorcerer/kustomize/beta/deployment_patch.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-- op: replace
-  path: /spec/template/spec/containers/0/volumeMounts/0/mountPath
-  value: /data
-- op: add
-  path: /spec/template/spec/containers/0/envFrom/-
-  value:
-    secretRef:
-      name: azure-keyvault
-- op: add
-  path: /spec/template/spec/containers/0/envFrom/-
-  value:
-    secretRef:
-      name: beta-sorcerer-env
diff --git a/values/sorcerer/kustomize/beta/keyvault.yaml b/values/sorcerer/kustomize/beta/keyvault.yaml
deleted file mode 100644
index a8b2ce2a..00000000
--- a/values/sorcerer/kustomize/beta/keyvault.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-apiVersion: dapr.io/v1alpha1
-kind: Component
-metadata:
-  name: azure-keyvault
-spec:
-  type: secretstores.azure.keyvault
-  version: v1
-  metadata:
-  - name: vaultName
-    value: atlantisvault
-  - name: azureTenantId
-    secretKeyRef:
-      name: azure-keyvault
-      key: AZURE_TENANT_ID
-  - name: azureClientId
-    secretKeyRef:
-      name: azure-keyvault
-      key: AZURE_CLIENT_ID
-  - name: azureClientSecret
-    secretKeyRef:
-      name: azure-keyvault
-      key: AZURE_CLIENT_SECRET
\ No newline at end of file
diff --git a/values/sorcerer/kustomize/beta/kustomization.yaml b/values/sorcerer/kustomize/beta/kustomization.yaml
deleted file mode 100644
index 1bb40a9a..00000000
--- a/values/sorcerer/kustomize/beta/kustomization.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-generatorOptions:
-  disableNameSuffixHash: true
-configMapGenerator:
-- name: prod-sorcerer-appsettings
-  files:
-    - appsettings.json
-patches:
-- target:
-    group: apps
-    version: v1
-    kind: Deployment
-  path: deployment_patch.yaml
-resources:
-- ../base
-- pv.yaml
-- pvc.yaml
-- secrets.yaml
-- configurations.yaml
-- keyvault.yaml
-- rbac.yaml
-- secretstore.yaml
-- statestore.yaml
-- tracing.yaml
\ No newline at end of file
diff --git a/values/sorcerer/kustomize/beta/pv.yaml b/values/sorcerer/kustomize/beta/pv.yaml
deleted file mode 100644
index 8ea2acf6..00000000
--- a/values/sorcerer/kustomize/beta/pv.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: pv-beta-sorcerer-ceph-archives
-spec:
-  accessModes:
-  - ReadWriteMany
-  capacity:
-    storage: 1Gi
-  csi:
-    driver: rook-ceph.cephfs.csi.ceph.com
-    nodeStageSecretRef:
-      name: rook-csi-cephfs-node
-      namespace: rook-ceph
-    volumeAttributes:
-      clusterID: rook-ceph
-      fsName: data
-      rootPath: /
-      staticVolume: "true"
-    volumeHandle: pv-beta-sorcerer-ceph-archives
-  persistentVolumeReclaimPolicy: Retain
-  volumeMode: Filesystem
diff --git a/values/sorcerer/kustomize/beta/pvc.yaml b/values/sorcerer/kustomize/beta/pvc.yaml
deleted file mode 100644
index b949575b..00000000
--- a/values/sorcerer/kustomize/beta/pvc.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: beta-sorcerer-ceph-archives
-spec:
-  accessModes:
-  - ReadWriteMany
-  resources:
-    requests:
-      storage: 1Gi
-  storageClassName: ""
-  volumeMode: Filesystem
-  volumeName: pv-beta-sorcerer-ceph-archives
-status:
-  accessModes:
-  - ReadWriteMany
-  capacity:
-    storage: 1Gi
diff --git a/values/sorcerer/kustomize/beta/rbac.yaml b/values/sorcerer/kustomize/beta/rbac.yaml
deleted file mode 100644
index 188ce09a..00000000
--- a/values/sorcerer/kustomize/beta/rbac.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: beta-sorcerer
-  namespace: beta-sorcerer
-rules:
-- apiGroups:
-  - ""
-  resourceNames:
-  - beta-sorcerer-appsettings
-  resources:
-  - configmaps
-  verbs:
-  - get
-  - watch
-- apiGroups:
-  - ""
-  resourceNames:
-  - azure-keyvault
-  - beta-sorcerer-redis
-  resources:
-  - secrets
-  verbs:
-  - get
-  - watch
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: beta-sorcerer
-  namespace: beta-sorcerer
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: beta-sorcerer
-subjects:
-- kind: ServiceAccount
-  name: beta-sorcerer
-  namespace: beta-sorcerer
diff --git a/values/sorcerer/kustomize/beta/secrets.yaml b/values/sorcerer/kustomize/beta/secrets.yaml
deleted file mode 100644
index 7f187fd9..00000000
--- a/values/sorcerer/kustomize/beta/secrets.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  name: beta-sorcerer-env
-type: Opaque
-data:
----
-apiVersion: v1
-kind: Secret
-metadata:
-  annotations:
-    kyverno/clone: "true"
-  name: azure-keyvault
-type: Opaque
-data:
diff --git a/values/sorcerer/kustomize/beta/secretstore.yaml b/values/sorcerer/kustomize/beta/secretstore.yaml
deleted file mode 100644
index c23086e1..00000000
--- a/values/sorcerer/kustomize/beta/secretstore.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: dapr.io/v1alpha1
-kind: Component
-metadata:
-  name: secretstore
-spec:
-  type: secretstores.kubernetes
-  version: v1
-  metadata:
-   - name: defaultNamespace
-     value: beta-sorcerer
diff --git a/values/sorcerer/kustomize/beta/statestore.yaml b/values/sorcerer/kustomize/beta/statestore.yaml
deleted file mode 100644
index 1a6f2853..00000000
--- a/values/sorcerer/kustomize/beta/statestore.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-apiVersion: dapr.io/v1alpha1
-kind: Component
-metadata:
-  name: statestore
-spec:
-  type: state.redis
-  version: v1
-  metadata:
-  - name: redisHost
-    value: beta-sorcerer-redis:6379
-  - name: redisUsername
-    value: default
-  - name: redisPassword
-    secretKeyRef:
-      name: beta-sorcerer-redis
-      key:  redis-password
-  - name: actorStateStore
-    value: "true"
-  - name: redisDB
-    value: "0"
-scopes:
-  - beta-sorcerer
diff --git a/values/sorcerer/kustomize/beta/tracing.yaml b/values/sorcerer/kustomize/beta/tracing.yaml
deleted file mode 100644
index 4c4c318c..00000000
--- a/values/sorcerer/kustomize/beta/tracing.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: dapr.io/v1alpha1
-kind: Configuration
-metadata:
-  name: tracing
-spec:
-  tracing:
-    samplingRate: "1"
-    otel:
-      endpointAddress: "10.255.241.12:4317"
-      protocol: grpc
-      isSecure: false
diff --git a/values/sorcerer/values/values-beta.yaml b/values/sorcerer/values/values-beta.yaml
deleted file mode 100644
index c6d1c9c1..00000000
--- a/values/sorcerer/values/values-beta.yaml
+++ /dev/null
@@ -1,115 +0,0 @@
-replicaCount: 2
-
-podAnnotations:
-  dapr.io/enabled: "true"
-  dapr.io/app-id: "beta-sorcerer"
-  dapr.io/app-port: "8085"
-  dapr.io/api-token-secret: "dapr-api-token"
-  dapr.io/config: "tracing"
-  dapr.io/app-protocol: "http"
-  dapr.io/log-as-json: "true"
-  dapr.io/sidecar-cpu-request: "10m"
-  dapr.io/sidecar-memory-request: "50Mi"
-  # dapr.io/sidecar-cpu-limit: "300m"
-  # dapr.io/sidecar-memory-limit: "1000Mi"
-
-env:
-  - name: APP_VERSION
-    value: "4.16.3"
-  - name: LOG_LEVEL
-    value: "2"
-  - name: REDIS_USER
-    value: default
-  - name: REDIS_PASSWORD
-    valueFrom:
-      secretKeyRef:
-        name: beta-sorcerer-redis
-        key: redis-password
-  - name: DAPR_API_TOKEN
-    valueFrom:
-      secretKeyRef:
-        name: dapr-api-token
-        key: token
-
-ingress:
-  enabled: true
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt-betauction
-    nginx.ingress.kubernetes.io/affinity: "cookie"
-    nginx.ingress.kubernetes.io/session-cookie-name: "http-affinity"
-    nginx.ingress.kubernetes.io/session-cookie-expires: "86400"
-    nginx.ingress.kubernetes.io/session-cookie-max-age: "86400"
-  hosts:
-    - host: sorcerer.beta.oceanbox.io
-      paths:
-      paths:
-        - path: /
-          pathType: ImplementationSpecific
-      internal:
-        - path: /internal
-          pathType: ImplementationSpecific
-        - path: /dapr
-          pathType: ImplementationSpecific
-        - path: /actors
-          pathType: ImplementationSpecific
-        - path: /job
-          pathType: ImplementationSpecific
-        - path: /events
-          pathType: ImplementationSpecific
-        - path: /metrics
-          pathType: ImplementationSpecific
-  tls:
-    - hosts:
-       - sorcerer.beta.oceanbox.io
-      secretName: beta-sorcerer-tls
-
-persistence:
-  enabled: true
-  existingClaim: beta-sorcerer-ceph-archives
-  # existingClaim: beta-oceanbox-backup-archives
-
-# nodeSelector:
-#   node-role.kubernetes.io/srv: ""
-#   kubernetes.io/hostname: fs-backup
-#   node-role.kubernetes.io/worker: c1-1
-
-# tolerations:
-#   - key: workload
-#     operator: Equal
-#     value: compute
-#     effect: NoSchedule
-redis:
-  enabled: true
-  replicas: 3
-  size: 2Gi
-  backup:
-    enabled: true
-  secret:
-    name: "beta-sorcerer-redis"
-    key: "redis-password"
-  resources:
-    cpu: 150m
-    memory: 256Mi
-
-affinity:
-  nodeAffinity:
-    requiredDuringSchedulingIgnoredDuringExecution:
-      nodeSelectorTerms:
-      - matchExpressions:
-        - key: "topology.kubernetes.io/group"
-          operator: In
-          values:
-          - srv
-  podAntiAffinity:
-    requiredDuringSchedulingIgnoredDuringExecution:
-    - labelSelector:
-        matchExpressions:
-        - key: "app.kubernetes.io/name"
-          operator: In
-          values:
-          - sorcerer
-        - key: "app.kubernetes.io/instance"
-          operator: In
-          values:
-          - beta-sorcerer
-      topologyKey: "kubernetes.io/hostname"