diff --git a/onos.sh b/onos.sh
index d0f7c3d..574c223 100755
--- a/onos.sh
+++ b/onos.sh
@@ -139,6 +139,15 @@
 
 JVM_OPTS="$JVM_OPTS -Dhazelcast.logging.type=slf4j -Dhazelcast.jmx=true -Dhazelcast.jmx.detailed=true"
 
+# TODO revisit HZ related magic numbers
+# HZ Default:1000000
+JVM_OPTS="$JVM_OPTS -Dhazelcast.event.queue.capacity=4000000"
+# HZ Default:32 (KB)
+JVM_OPTS="$JVM_OPTS -Dhazelcast.socket.receive.buffer.size=4096"
+# HZ Default:32 (KB)
+JVM_OPTS="$JVM_OPTS -Dhazelcast.socket.send.buffer.size=4096"
+
+
 # Uncomment to dump final JVM flags to stdout
 #JVM_OPTS="$JVM_OPTS -XX:+PrintFlagsFinal"
 
diff --git a/src/main/java/net/onrc/onos/core/datagrid/HazelcastDatagrid.java b/src/main/java/net/onrc/onos/core/datagrid/HazelcastDatagrid.java
index 7096bd9..855d6a4 100644
--- a/src/main/java/net/onrc/onos/core/datagrid/HazelcastDatagrid.java
+++ b/src/main/java/net/onrc/onos/core/datagrid/HazelcastDatagrid.java
@@ -20,7 +20,6 @@
 import com.hazelcast.config.FileSystemXmlConfig;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.instance.GroupProperties;
 
 /**
  * A datagrid service that uses Hazelcast as a datagrid.
@@ -86,10 +85,6 @@
         hazelcastConfig.setProperty(GroupProperties.PROP_OPERATION_THREAD_COUNT, "1");
         hazelcastConfig.setProperty(GroupProperties.PROP_EVENT_THREAD_COUNT, "1");
         */
-        //
-        hazelcastConfig.setProperty(GroupProperties.PROP_EVENT_QUEUE_CAPACITY, "4000000");
-        hazelcastConfig.setProperty(GroupProperties.PROP_SOCKET_RECEIVE_BUFFER_SIZE, "4096");
-        hazelcastConfig.setProperty(GroupProperties.PROP_SOCKET_SEND_BUFFER_SIZE, "4096");
     }
 
     /**