diff --git a/etc/elasticsearch/elasticsearch.yml b/etc/elasticsearch/elasticsearch.yml
index 8fa7776..e235573 100644
--- a/etc/elasticsearch/elasticsearch.yml
+++ b/etc/elasticsearch/elasticsearch.yml
@@ -7,6 +7,3 @@ network.host: 0.0.0.0
 discovery.zen.minimum_master_nodes: 1
 # This is a test -- if this is here, then the volume is mounted correctly.
 path.logs: /var/log/elasticsearch
-
-cluster.routing.allocation.disk.watermark.low: "85%"
-cluster.routing.allocation.disk.watermark.high: "90%"
diff --git a/usr/sbin/so-elastic-configure-stack b/usr/sbin/so-elastic-configure-stack
index 6f4085a..6626069 100755
--- a/usr/sbin/so-elastic-configure-stack
+++ b/usr/sbin/so-elastic-configure-stack
@@ -51,18 +51,15 @@ else
 	cp -av $ES_YAML $ES_YAML_BAK
 	cp -av $SRC/$ES_YAML $ES_YAML
 	
-	# Preserve custom settings, if present
-	# Transport settings
+	# If old config file had custom settings, migrate them to new config file
+
+	# transport settings
 	# https://www.elastic.co/guide/en/elasticsearch/reference/current/modules-transport.html
-	grep transport $ES_YAML_BAK >> $ES_YAML
+	grep "transport" $ES_YAML_BAK >> $ES_YAML
        
-	# Low/High watermark settings
+	# cluster.routing.allocation.disk settings
 	# https://www.elastic.co/guide/en/elasticsearch/reference/current/disk-allocator.html#disk-allocator
-        grep watermark $ES_YAML_BAK >> $ES_YAML
-        if [ $? != 0 ]; then
-		echo 'cluster.routing.allocation.disk.watermark.low: "85%"' >> $ES_YAML
-		echo 'cluster.routing.allocation.disk.watermark.high: "90%"' >> $ES_YAML
-	fi
+        grep "cluster.routing.allocation.disk" $ES_YAML_BAK >> $ES_YAML
 fi
 
 # Set cluster name
diff --git a/usr/sbin/so-elsa-export b/usr/sbin/so-elsa-export
old mode 100755
new mode 100644