diff --git a/helmfile.d/docs.yaml.gotmpl b/helmfile.d/docs.yaml.gotmpl
index ae2258f7..cee2bc9e 100644
--- a/helmfile.d/docs.yaml.gotmpl
+++ b/helmfile.d/docs.yaml.gotmpl
@@ -17,7 +17,7 @@ releases:
   - ../values/docs/kustomize/{{ .Environment.Name }}
   missingFileHandler: Info
 - name: manifests
-  namespace: {{ .Environment.Name }}-docs
+  namespace: docs
   chart: manifests
   condition: docs.enabled
   missingFileHandler: Info
diff --git a/helmfile.d/makai.yaml.gotmpl b/helmfile.d/makai.yaml.gotmpl
index 7e66c806..948070d6 100644
--- a/helmfile.d/makai.yaml.gotmpl
+++ b/helmfile.d/makai.yaml.gotmpl
@@ -6,7 +6,7 @@ commonLabels:
 
 releases:
 - name: makai
-  namespace: {{ .Environment.Name }}-makai
+  namespace: makai
   chart: ../charts/makai
   condition: makai.enabled
   values:
@@ -17,7 +17,7 @@ releases:
   - ../values/makai/kustomize/{{ .Environment.Name }}
   missingFileHandler: Info
 - name: manifests
-  namespace: {{ .Environment.Name }}-makai
+  namespace: makai
   chart: manifests
   condition: makai.enabled
   missingFileHandler: Info
diff --git a/values/makai/env-hel1.yaml.gotmpl b/values/makai/env-hel1.yaml.gotmpl
new file mode 100644
index 00000000..0d24cef9
--- /dev/null
+++ b/values/makai/env-hel1.yaml.gotmpl
@@ -0,0 +1,2 @@
+makai:
+  enabled: true
diff --git a/values/makai/env-oceanbox.yaml.gotmpl b/values/makai/env-oceanbox.yaml.gotmpl
index 0d24cef9..5771a2b4 100644
--- a/values/makai/env-oceanbox.yaml.gotmpl
+++ b/values/makai/env-oceanbox.yaml.gotmpl
@@ -1,2 +1,2 @@
 makai:
-  enabled: true
+  enabled: false
diff --git a/values/makai/manifests/makai.yaml b/values/makai/manifests/makai.yaml
index dd4b3117..3285c7ad 100644
--- a/values/makai/manifests/makai.yaml
+++ b/values/makai/manifests/makai.yaml
@@ -2,7 +2,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: {{ .Values.makai.env }}-makai
+  name: makai
   namespace: argocd
   annotations:
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
@@ -11,7 +11,7 @@ metadata:
   - resources-finalizer.argocd.argoproj.io
 spec:
   destination:
-    namespace: {{ .Values.makai.env }}-makai
+    namespace: makai
     server: https://kubernetes.default.svc
   project: default
   sources:
@@ -24,7 +24,7 @@ spec:
       - name: CLUSTER_NAME
         value: {{ .Values.clusterConfig.cluster }}
       - name: HELMFILE_ENVIRONMENT
-        value: {{ .Values.makai.env }}
+        value: default
       - name: HELMFILE_FILE_PATH
         value: makai.yaml.gotmpl
   syncPolicy:
diff --git a/values/makai/values/values-staging.yaml b/values/makai/values/values-staging.yaml
deleted file mode 100644
index ee513a99..00000000
--- a/values/makai/values/values-staging.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-replicaCount: 1
-image:
-  tag: "436608af-debug"
-env:
-  - name: APP_VERSION
-    value: "0.0.0-staging"
-  - name: LOG_LEVEL
-    value: "1"
-ingress:
-  enabled: true
-  className: "nginx"
-  annotations:
-    cert-manager.io/cluster-issuer: letsencrypt-production
-    nginx.ingress.kubernetes.io/backend-protocol: HTTP
-    nginx.ingress.kubernetes.io/enable-cors: "true"
-    nginx.ingress.kubernetes.io/proxy-buffer-size: 128k
-    nginx.ingress.kubernetes.io/ssl-redirect: "true"
-    oceanbox.io/expose: internal
-  hosts:
-    - host: makai.dev.oceanbox.io
-      paths:
-        - path: /
-          pathType: ImplementationSpecific
-  tls:
-    - hosts:
-        - makai.dev.oceanbox.io
-      secretName: staging-makai-tls
diff --git a/values/makai/values/values-prod.yaml b/values/makai/values/values.yaml
similarity index 82%
rename from values/makai/values/values-prod.yaml
rename to values/makai/values/values.yaml
index 0bb6ace7..fc1e56d0 100644
--- a/values/makai/values/values-prod.yaml
+++ b/values/makai/values/values.yaml
@@ -1,9 +1,11 @@
 replicaCount: 1
+image:
+  tag: "436608af-debug"
 env:
   - name: APP_VERSION
-    value: "1.5.0"
+    value: "0.0.0"
   - name: LOG_LEVEL
-    value: "2"
+    value: "1"
 ingress:
   enabled: true
   className: "nginx"
@@ -15,11 +17,11 @@ ingress:
     nginx.ingress.kubernetes.io/ssl-redirect: "true"
     oceanbox.io/expose: internal
   hosts:
-    - host: makai.srv.oceanbox.io
+    - host: makai.oceanbox.io
       paths:
         - path: /
           pathType: ImplementationSpecific
   tls:
     - hosts:
-        - makai.srv.oceanbox.io
+        - makai.oceanbox.io
       secretName: makai-tls