diff --git a/generators/server/templates/src/main/docker/elasticsearch.yml.ejs b/generators/server/templates/src/main/docker/elasticsearch.yml.ejs
index c0a0c575a853..1bc64de19bca 100644
--- a/generators/server/templates/src/main/docker/elasticsearch.yml.ejs
+++ b/generators/server/templates/src/main/docker/elasticsearch.yml.ejs
@@ -16,7 +16,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -%>
-version: '2'
+version: '2.2'
 services:
     <%= baseName.toLowerCase() %>-elasticsearch:
         image: <%= DOCKER_ELASTICSEARCH %>
@@ -27,4 +27,4 @@ services:
             - 9300:9300
         environment:
             - "ES_JAVA_OPTS=-Xms1024m -Xmx1024m"
-            - discovery.type=single-node
+            - "discovery.type=single-node"
diff --git a/test-integration/scripts/20-no-memory-limit-elasticsearch.sh b/test-integration/scripts/20-no-memory-limit-elasticsearch.sh
index 592831da1859..e7956d0e76c0 100755
--- a/test-integration/scripts/20-no-memory-limit-elasticsearch.sh
+++ b/test-integration/scripts/20-no-memory-limit-elasticsearch.sh
@@ -5,7 +5,6 @@ source $(dirname $0)/00-init-env.sh
 
 cd "$JHI_FOLDER_APP"
 if [ -a src/main/docker/elasticsearch.yml ]; then
-    sed -i -e 's/        environment:/        # environment:/1;' src/main/docker/elasticsearch.yml
     sed -i -e 's/            - \"ES_JAVA_OPTS=-Xms1024m -Xmx1024m\"/        #     - \"ES_JAVA_OPTS=-Xms1024m -Xmx1024m\"/1;' src/main/docker/elasticsearch.yml
     cat src/main/docker/elasticsearch.yml
 fi