diff --git a/applications/archmeister.yaml b/applications/archmeister.yaml
index f171d9c6..42f6f562 100644
--- a/applications/archmeister.yaml
+++ b/applications/archmeister.yaml
@@ -26,8 +26,8 @@ spec:
       destination:
         namespace: atlantis
         server: "{{ .cluster }}"
-      source:
-        repoURL: https://gitlab.com/oceanbox/manifests.git
+      sources:
+      - repoURL: https://gitlab.com/oceanbox/manifests.git
         targetRevision: dev
         path: charts/archmeister
         plugin:
@@ -37,6 +37,9 @@ spec:
             string: "{{ .env }}"
           - name: hostname
             string: "{{ .hostname }}"
+      - repoURL: https://gitlab.com/oceanbox/manifests.git
+        targetRevision: dev
+        path: charts/archmeister/manifests
   templatePatch: |
     {{- if .autoSync }}
     spec:
diff --git a/applications/hipster.yaml b/applications/hipster.yaml
index 5d410439..390e8804 100644
--- a/applications/hipster.yaml
+++ b/applications/hipster.yaml
@@ -4,23 +4,28 @@ 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:443
         env: staging
         hostname: hipster.beta.oceanbox.io
+        autoSync: true
+        prune: true
   template:
     metadata:
-      name: '{{ env }}-hipster'
+      name: '{{ .env }}-hipster'
     spec:
       project: atlantis
       destination:
         namespace: atlantis
-        server: '{{ cluster }}'
+        server: '{{ .cluster }}'
       sources:
       - repoURL: https://gitlab.com/oceanbox/manifests.git
         targetRevision: dev
@@ -29,9 +34,16 @@ spec:
           name: kustomize-helm-with-rewrite
           parameters:
           - name: env
-            string: '{{ env }}'
+            string: '{{ .env }}'
           - name: hostname
-            string: '{{ hostname }}'
+            string: '{{ .hostname }}'
       - repoURL: https://gitlab.com/oceanbox/manifests.git
         targetRevision: dev
         path: charts/hipster/manifests
+  templatePatch: |
+    {{- if .autoSync }}
+    spec:
+      syncPolicy:
+        automated:
+          prune: {{ .prune }}
+    {{- end }}
diff --git a/charts/archmeister/resources/archmeister-env-secret.yaml b/charts/archmeister/manifests/archmeister-env-secret.yaml
similarity index 81%
rename from charts/archmeister/resources/archmeister-env-secret.yaml
rename to charts/archmeister/manifests/archmeister-env-secret.yaml
index 220f770e..19b080ff 100644
--- a/charts/archmeister/resources/archmeister-env-secret.yaml
+++ b/charts/archmeister/manifests/archmeister-env-secret.yaml
@@ -3,8 +3,6 @@ kind: Secret
 metadata:
   name: archmeister-env
   namespace: atlantis
-  labels:
-    oceanbox.io/atlantis-env: sync
 stringData:
   OICD_CLIENT_SECRET: ieK3yak9zoh3yeewee8quahY6seiv7Ro
   SEQ_APIKEY: bFdYPKLDvnau3fQa1vRV
diff --git a/charts/hipster/manifests/hipster-env-secret.yaml b/charts/hipster/manifests/hipster-env-secret.yaml
index e025ab84..f7283920 100644
--- a/charts/hipster/manifests/hipster-env-secret.yaml
+++ b/charts/hipster/manifests/hipster-env-secret.yaml
@@ -3,8 +3,6 @@ kind: Secret
 metadata:
   name: hipster-env
   namespace: atlantis
-  labels:
-    oceanbox.io/atlantis-env: sync
 stringData:
   SEQ_APIKEY: bFdYPKLDvnau3fQa1vRV
 type: Opaque