diff --git a/argocd/_ekman.yaml b/argocd/_ekman.yaml
deleted file mode 100644
index 5bcdb9bc..00000000
--- a/argocd/_ekman.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: v1
-stringData:
-  config: '{"bearerToken":"eyJhbGciOiJSUzI1NiIsImtpZCI6IjFja0VGbHBYYjMxVEZiWFBNYVNERldhZTlHUXFWdDM2cGpGZUhTVFB3QU0ifQ.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJrdWJlLXN5c3RlbSIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VjcmV0Lm5hbWUiOiJjbHVzdGVyLWFkbWluLXRva2VuIiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9zZXJ2aWNlLWFjY291bnQubmFtZSI6ImNsdXN0ZXItYWRtaW4iLCJrdWJlcm5ldGVzLmlvL3NlcnZpY2VhY2NvdW50L3NlcnZpY2UtYWNjb3VudC51aWQiOiI0YjE2ZmQzYi1mNjJiLTQ2MzctOGIwNC0yMGNiNTBlNzhiMmYiLCJzdWIiOiJzeXN0ZW06c2VydmljZWFjY291bnQ6a3ViZS1zeXN0ZW06Y2x1c3Rlci1hZG1pbiJ9.sd3AP4HmHgjLXSmQMZC6lEeVX2y1_RdzCK34-TKtu2k_6NhGtGopc10ZdNXy68uigwVLVNFW1fREpj5z3mgpWyQPUzZrXN0ANp0C3oM8rt77cKRrmn_ZQuiMjH_0_t4tmjwIWla5rQ52Y7QC-zoCMfAkalofh1Jo0yu8QeWIXd3Q0hnfGiIKCwVrfWrZXopLbiuntKColFMQPkenz-pPo5DjcMAarmlXGy-TztGvN1X5NkVWy8DXrSUPLL_JZ5Ok5DZoGejilrssj45sXBeUyTM5pIYZi7gE5ngB2y1nod9UakkPKXeF_ZyFtvLMtvXOCi1YNgfYM9crtuECz8DoRA","tlsClientConfig":{"insecure":true}}'
-  name: ekman
-  server: https://10.255.241.99:4443
-kind: Secret
-metadata:
-  labels:
-    argocd.argoproj.io/secret-type: cluster
-  name: cluster-ekman
-  namespace: argocd
-type: Opaque
-
-
diff --git a/argocd/reset-ekman-cluster.sh b/argocd/reset-ekman-cluster.sh
old mode 100644
new mode 100755
diff --git a/bin/generate.sh b/bin/generate.sh
new file mode 100755
index 00000000..f5849f8f
--- /dev/null
+++ b/bin/generate.sh
@@ -0,0 +1,86 @@
+#!/usr/bin/env bash
+
+helmfile () {
+
+tier=$2
+name=$1
+
+cat << EOF
+bases:
+ - ../envs/environments.yaml.gotmpl
+
+commonLabels:
+  tier: $tier
+
+releases:
+- name: $name
+  namespace: {{ .Environment.Name }}-$name
+  chart: ../charts/$name
+  condition: $name.enabled
+  values:
+  - ../values/$name/values/$name.yaml.gotmpl
+  - ../values/$name/values/$name-{{ .Environment.Name }}.yaml.gotmpl
+  postRenderer: ../bin/kustomizer
+  postRendererArgs:
+  - ../values/$name/kustomize/{{ .Environment.Name }}
+  missingFileHandler: Info
+- name: $name-manifests
+  namespace: {{ .Environment.Name }}-$name
+  chart: _$name-manifests
+  condition: $name.enabled
+  missingFileHandler: Info
+  values:
+  - ../values/values-{{ requiredEnv "CLUSTER_NAME" }}.yaml
+  - ../values/$name/values.yaml.gotmpl
+  - ../values/$name/values-{{ requiredEnv "CLUSTER_NAME" }}.yaml.gotmpl
+  hooks:
+  - events: [ prepare, cleanup ]
+    showlogs: true
+    command: ../bin/helmify
+    args:
+    - '{{`{{ if eq .Event.Name "prepare" }}build{{ else }}clean{{ end }}`}}'
+    - '{{`{{ .Release.Chart }}`}}'
+    - '{{`{{ .Environment.Name }}`}}'
+    - ../values/$name/manifests
+    - _$name-manifests
+- name: $name-app
+  namespace: argocd
+  chart: _$name-app
+  condition: $name.enabled
+  missingFileHandler: Info
+  values:
+  - ../values/values-{{ requiredEnv "CLUSTER_NAME" }}.yaml
+  - ../values/$name/values.yaml.gotmpl
+  - ../values/$name/values-{{ requiredEnv "CLUSTER_NAME" }}.yaml.gotmpl
+  hooks:
+  - events: [ prepare, cleanup ]
+    showlogs: true
+    command: ../bin/helmify
+    args:
+    - '{{`{{ if eq .Event.Name "prepare" }}build{{ else }}clean{{ end }}`}}'
+    - '{{`{{ .Release.Chart }}`}}'
+    - '{{`{{ .Environment.Name }}`}}'
+    - ../values/$name/app.yaml
+    - _$name-app
+EOF
+}
+
+while true; do
+    case $* in
+        --with-env)
+            ns=true
+            shift ;;
+        --*|-*) shift;;
+        *) break ;;
+    esac
+done
+
+name=$1
+tier=$2
+if [ -n "$ns" ]; then
+    namespace="namespace: {{ .Environment.Name }}-$name"
+else
+    namespace="namespace: $name"
+fi
+
+helmfile $1 $2