diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml
index b4d78dac..127bf0d0 100644
--- a/elasticsearch/values.yaml
+++ b/elasticsearch/values.yaml
@@ -29,7 +29,8 @@ conf:
       host: 0.0.0.0
     path:
       data: /var/lib/elasticsearch/data
-      logs: /data/log
+      # TODO(srwilkers): Update this log path with meaningful config overrides
+      logs: /var/lib/elasticsearch/data
     zen:
       min_masters: 2
   logging:
@@ -57,9 +58,9 @@ replicas:
   client: 2
 
 images:
-  memory_init: docker.io/kolla/ubuntu-source-elasticsearch:3.0.3
-  elasticsearch: docker.io/kolla/ubuntu-source-elasticsearch:3.0.3
-  helm_tests: docker.io/kolla/ubuntu-source-elasticsearch:3.0.3
+  memory_init: docker.io/kolla/ubuntu-source-elasticsearch:4.0.0
+  elasticsearch: docker.io/kolla/ubuntu-source-elasticsearch:4.0.0
+  helm_tests: docker.io/kolla/ubuntu-source-elasticsearch:4.0.0
   pull_policy: "IfNotPresent"
 
 network:
diff --git a/tools/gate/basic_launch.sh b/tools/gate/basic_launch.sh
index 8dde99c3..76c2a086 100755
--- a/tools/gate/basic_launch.sh
+++ b/tools/gate/basic_launch.sh
@@ -27,7 +27,9 @@ kube_wait_for_pods openstack 1200
 # todo(srwilkers): implement helm tests for postgresql
 #helm_test_deployment postgresql openstack
 
-helm install --name=elasticsearch local/elasticsearch --namespace=kube-system
+helm install --name=elasticsearch local/elasticsearch --namespace=kube-system \
+  --set conf.elasticsearch.bootstrap.memory_lock=false
+
 kube_wait_for_pods kube-system 600
 
 helm_test_deployment elasticsearch kube-system