diff --git a/drivers/elasticsearch/src/main/java/io/sbk/driver/Elasticsearch/Elasticsearch.java b/drivers/elasticsearch/src/main/java/io/sbk/driver/Elasticsearch/Elasticsearch.java
index c76b295d..17b074cd 100644
--- a/drivers/elasticsearch/src/main/java/io/sbk/driver/Elasticsearch/Elasticsearch.java
+++ b/drivers/elasticsearch/src/main/java/io/sbk/driver/Elasticsearch/Elasticsearch.java
@@ -143,26 +143,15 @@ private  void createIndex(ElasticsearchClient client, String indexName) {
         }
     }
 
-    private void shutDownElasticsearch() {
-        //shut down for linux system (optional)
+    @Override
+    public void closeStorage(final ParameterOptions params) throws IOException {
         try {
-            String[] command = {"sh", "-c", "sudo systemctl stop elasticsearch"};
-            Process process = Runtime.getRuntime().exec(command);
-            int exitCode = process.waitFor();
-
-            if (exitCode == 0) {
-                Printer.log.info("Elasticsearch shut down successfully.");
-            } else {
-                Printer.log.info("Failed to shut down Elasticsearch.");
-            }
-        } catch (IOException | InterruptedException e) {
+            elasticsearchClient._transport().close();
+        } catch (ElasticsearchException e) {
             e.printStackTrace();
+            Printer.log.error("Failed to close the connection");
         }
-    }
 
-    @Override
-    public void closeStorage(final ParameterOptions params) throws IOException {
-        shutDownElasticsearch();
     }
 
     @Override
diff --git a/drivers/elasticsearch/src/main/java/io/sbk/driver/Elasticsearch/ElasticsearchReader.java b/drivers/elasticsearch/src/main/java/io/sbk/driver/Elasticsearch/ElasticsearchReader.java
index 47ec33dd..a1aad68f 100644
--- a/drivers/elasticsearch/src/main/java/io/sbk/driver/Elasticsearch/ElasticsearchReader.java
+++ b/drivers/elasticsearch/src/main/java/io/sbk/driver/Elasticsearch/ElasticsearchReader.java
@@ -51,23 +51,5 @@ public String read() throws IOException {
 
     @Override
     public void close() throws IOException {
-        shutDownElasticsearch();
     }
-
-    private void shutDownElasticsearch() {
-        try {
-            String[] command = {"sh", "-c", "sudo systemctl stop elasticsearch"};
-            Process process = Runtime.getRuntime().exec(command);
-            int exitCode = process.waitFor();
-
-            if (exitCode == 0) {
-                Printer.log.info("Elasticsearch shut down successfully.");
-            } else {
-                Printer.log.info("Failed to shut down Elasticsearch.");
-            }
-        } catch (IOException | InterruptedException e) {
-            e.printStackTrace();
-        }
-    }
-
 }
\ No newline at end of file
diff --git a/drivers/elasticsearch/src/main/java/io/sbk/driver/Elasticsearch/ElasticsearchWriter.java b/drivers/elasticsearch/src/main/java/io/sbk/driver/Elasticsearch/ElasticsearchWriter.java
index a58484ef..425af5e2 100644
--- a/drivers/elasticsearch/src/main/java/io/sbk/driver/Elasticsearch/ElasticsearchWriter.java
+++ b/drivers/elasticsearch/src/main/java/io/sbk/driver/Elasticsearch/ElasticsearchWriter.java
@@ -53,7 +53,6 @@ public void sync() throws IOException {
 
     @Override
     public void close() throws IOException {
-        shutDownElasticsearch();
     }
 
 
@@ -72,21 +71,4 @@ private void writeData(String data) {
             throw new RuntimeException(ex);
         }
     }
-
-    private void shutDownElasticsearch() {
-        try {
-            String[] command = {"sh", "-c", "sudo systemctl stop elasticsearch"};
-            Process process = Runtime.getRuntime().exec(command);
-            int exitCode = process.waitFor();
-
-            if (exitCode == 0) {
-                System.out.println("Elasticsearch shut down successfully.");
-            } else {
-                System.out.println("Failed to shut down Elasticsearch.");
-            }
-        } catch (IOException | InterruptedException e) {
-            e.printStackTrace();
-        }
-    }
-
 }
\ No newline at end of file