diff --git a/k8s/helmfile/env/production/api.values.yaml.gotmpl b/k8s/helmfile/env/production/api.values.yaml.gotmpl
index 6b491a979..fa4a4efa5 100644
--- a/k8s/helmfile/env/production/api.values.yaml.gotmpl
+++ b/k8s/helmfile/env/production/api.values.yaml.gotmpl
@@ -76,7 +76,7 @@ app:
   jwtSecretSecretName: api-app-secrets
   jwtSecretSecretKey: api-app-jwt-secret
   queryServiceHost: queryservice.default.svc.cluster.local:9999
-  elasticSearchHost: elasticsearch-master.default.svc.cluster.local:9200,elasticsearch-1.default.svc.cluster.local:9200
+  elasticSearchHost: elasticsearch-1.default.svc.cluster.local:9200
   redis:
     prefix: wikibase_production_api
     # TODO is it possible to take advantage of replicas here?
diff --git a/k8s/helmfile/env/production/mediawiki-139.values.yaml.gotmpl b/k8s/helmfile/env/production/mediawiki-139.values.yaml.gotmpl
index 48a6b1df7..830cf7c53 100644
--- a/k8s/helmfile/env/production/mediawiki-139.values.yaml.gotmpl
+++ b/k8s/helmfile/env/production/mediawiki-139.values.yaml.gotmpl
@@ -16,10 +16,6 @@ mw:
     password:
     passwordSecretName: redis-password
     passwordSecretKey: password
-  writeOnlyElasticsearch:
-    host: elasticsearch-master.default.svc.cluster.local
-    port: 9200
-    es6: true
   elasticsearch:
     host: elasticsearch-1.default.svc.cluster.local
     port: 9200
diff --git a/k8s/helmfile/env/staging/mediawiki-139.values.yaml.gotmpl b/k8s/helmfile/env/staging/mediawiki-139.values.yaml.gotmpl
index c2b3aaf1b..3b6a67e15 100644
--- a/k8s/helmfile/env/staging/mediawiki-139.values.yaml.gotmpl
+++ b/k8s/helmfile/env/staging/mediawiki-139.values.yaml.gotmpl
@@ -10,7 +10,6 @@ mw:
     host: elasticsearch-1.default.svc.cluster.local
     port: 9200
     es6: false
-  writeOnlyElasticsearch: false
 
 resources:
   web:
diff --git a/k8s/helmfile/helmfile.yaml b/k8s/helmfile/helmfile.yaml
index ba023921f..21575db9b 100644
--- a/k8s/helmfile/helmfile.yaml
+++ b/k8s/helmfile/helmfile.yaml
@@ -117,7 +117,7 @@ releases:
     namespace: default
     chart: wbstack/elasticsearch-legacy
     version: 6.8.22-wmde2
-    installed: {{ eq .Environment.Name "production" | toYaml }}
+    installed: false
     <<: *default_release
 
   - name: elasticsearch-1