diff --git a/values/env.yaml b/values/env.yaml
index b39f89f2..887b70ac 100644
--- a/values/env.yaml
+++ b/values/env.yaml
@@ -1,9 +1,5 @@
 clusterConfig:
   manifests: https://gitlab.com/oceanbox/manifests.git
-  argo:
-    enabled: true
-  cilium:
-    enabled: true
   env: "" #[dev, test, staging, prod]
   initca: ""
   domain: ".local"
@@ -18,10 +14,6 @@ clusterConfig:
   acme_email: ""
   nodenames: []
   nodes: []
-  s3:
-    hosts: []
-    patterns: []
-    cidr: []
   ingress_clusterissuer: "letsencrypt-production"
   ingress_whitelist_ips:
     - 10.0.0.0/8
@@ -41,3 +33,11 @@ clusterConfig:
     #    name: github-oidc
     #  allowed_organizations: <org>
     #  allowed_teams: <team-id>
+  s3:
+    hosts: []
+    patterns: []
+    cidr: []
+  argo:
+    enabled: true
+  cilium:
+    enabled: true
diff --git a/values/prometheus/values/prometheus.yaml.gotmpl b/values/prometheus/values/prometheus.yaml.gotmpl
index 5cf1a411..f98ef685 100644
--- a/values/prometheus/values/prometheus.yaml.gotmpl
+++ b/values/prometheus/values/prometheus.yaml.gotmpl
@@ -476,9 +476,7 @@ prometheus:
     pathType: ImplementationSpecific
 
   prometheusSpec:
-    #{{- if .Values.install.otel.enabled }}
     enableRemoteWriteReceiver: true
-    #{{- end }}
 
     tolerations: []
       # - key: unschedulable