diff --git a/launcher/src/main/java/io/snappydata/tools/QuickLauncher.java b/launcher/src/main/java/io/snappydata/tools/QuickLauncher.java
index <HASH>..<HASH> 100644
--- a/launcher/src/main/java/io/snappydata/tools/QuickLauncher.java
+++ b/launcher/src/main/java/io/snappydata/tools/QuickLauncher.java
@@ -124,6 +124,15 @@ class QuickLauncher extends LauncherBase {
     // add java path to command-line first
     commandLine.add(System.getProperty("java.home") + "/bin/java");
     commandLine.add("-server");
+    // https://github.com/airlift/jvmkill is added to libgemfirexd.so
+    // adding agentpath helps kill jvm in case of OOM. kill -9 is not
+    // used as it fails in certain cases
+    String arch = System.getProperty("os.arch");
+    if(arch.contains("64") || arch.contains("s390x")){
+      commandLine.add("-agentpath:" + snappyHome + "/jars/libgemfirexd64.so");
+    }else{
+      commandLine.add("-agentpath:" + snappyHome + "/jars/libgemfirexd.so");
+    }
     // get the startup options and command-line arguments (JVM arguments etc)
     HashMap<String, Object> options = getStartOptions(args, snappyHome, commandLine, env);
adding commandline arg to kill on OOM (#<I>)

* adding commandline arg to kill on OOM



* checking if system is <I> bit to apply right libgemfirexd<<I>/<I>>.so