diff --git a/helm/charts/opa/config/opa.yaml b/helm/charts/opa/config/opa.yaml
index 02facd83..fa658c29 100644
--- a/helm/charts/opa/config/opa.yaml
+++ b/helm/charts/opa/config/opa.yaml
@@ -11,11 +11,9 @@ bundles:
     service: s3
     resource: {{ .Values.s3.filePath }}
 
-{{ if .Values.status.enabled }}
 status:
   console: {{ .Values.status.console }}
-  prometheus: {{ .Values.status.metrics }}
-{{ end }}
+  prometheus: true
 
 decision_logs:
   console: {{ .Values.decisionLogs.console }}
@@ -31,8 +29,8 @@ distributed_tracing:
 
 storage:
   disk:
-    auto_create: {{ .Values.storage.autoCreate }}
-    directory: {{ .Values.storage.directory }}
+    auto_create: true
+    directory: /tmp/opa
 
 labels:
   {{- range $key, $value := .Values.labels }}
diff --git a/helm/charts/opa/values.yaml b/helm/charts/opa/values.yaml
index 8eaa3236..e28a78e8 100644
--- a/helm/charts/opa/values.yaml
+++ b/helm/charts/opa/values.yaml
@@ -42,13 +42,10 @@ additionalPodAnnotations: {}
 s3:
   endpoint: http://localhost:9000/opa
   secretName: s3-secret
-  awsRegion: ' '
   filePath: '/dev.tar.gz'
 
 status:
-  enabled: true
-  console: true
-  metrics: true
+  console: false
 
 decisionLogs:
   console: true
@@ -60,10 +57,6 @@ tracing:
   endpoint: localhost:4317
   # samplePercentage: 1 # Default is 100%
 
-storage:
-  autoCreate: true
-  directory: /tmp/opa
-
 resources:
   enabled: true
   value: