diff --git a/apps/jaeger.yaml b/apps/jaeger-operator.yaml
similarity index 100%
rename from apps/jaeger.yaml
rename to apps/jaeger-operator.yaml
diff --git a/apps/keycloak.yaml b/apps/keycloak.yaml
deleted file mode 100644
index 965ba119..00000000
--- a/apps/keycloak.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: keycloak
-  namespace: argocd
-spec:
-  project: aux
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: idp
-  sources:
-  - repoURL: https://charts.bitnami.com/bitnami
-    targetRevision: 24.0.2
-    chart: keycloak
-    helm:
-      valueFiles:
-        - $values/values/keycloak/values.yaml
-  - repoURL: https://gitlab.com/oceanbox/manifests.git
-    targetRevision: main
-    ref: values
-
diff --git a/apps/dex.yaml b/apps/prod-dex.yaml
similarity index 100%
rename from apps/dex.yaml
rename to apps/prod-dex.yaml
diff --git a/apps/geoserver.yaml b/apps/prod-geoserver.yaml
similarity index 100%
rename from apps/geoserver.yaml
rename to apps/prod-geoserver.yaml
diff --git a/values/atlantis/values-staging.yaml b/values/atlantis/values-staging.yaml
index 3e1a28a3..c3f39b51 100644
--- a/values/atlantis/values-staging.yaml
+++ b/values/atlantis/values-staging.yaml
@@ -96,8 +96,8 @@ cluster:
   bootstrap:
     enabled: true
     source:
-      db: prod-archmeister
-      namespace: atlantis
+      db: prod-atlantis-db
+      namespace: prod-atlantis
 
 resources:
   limits: