diff --git a/group_vars/default/pvc.yml b/group_vars/default/pvc.yml
index 87ab617..3e10964 100644
--- a/group_vars/default/pvc.yml
+++ b/group_vars/default/pvc.yml
@@ -82,10 +82,10 @@ pvc_routers:
 # > This option is *only* applied at cluster bootstrap and cannot be changed later
 #   here, only by editing the `files/ceph/<cluster>/ceph.conf` file directly.
 #pvc_osd_memory_limit: 939524096
-# Zookeeper heap memory limit, sets Xms and Xmx values to the Java process; default is 256M.
-# WARNING: Do not set lower than 128MB when using pvc_log_to_zookeeper, or lower than 32MB otherwise!
-#pvc_zookeeper_heap_limit: 128M
-# Zookeeper stack memory limit, sets Xss value to the Java process; default is 512M.
+# Zookeeper heap memory limit, sets Xms and Xmx values to the Java process; default is 512M.
+# WARNING: Do not set lower than 256MB when using pvc_log_to_zookeeper, or lower than 64MB otherwise!
+#pvc_zookeeper_heap_limit: 256M
+# Zookeeper stack memory limit, sets Xss value to the Java process; default is 1024M.
 # WARNING: Do not set lower than 128MB when using pvc_log_to_zookeeper, or lower than 32MB otherwise!
 #pvc_zookeeper_stack_limit: 128M
 
diff --git a/roles/pvc/defaults/main.yml b/roles/pvc/defaults/main.yml
index b29cded..b7854ae 100644
--- a/roles/pvc/defaults/main.yml
+++ b/roles/pvc/defaults/main.yml
@@ -22,8 +22,8 @@ pvc_fence_migrate_target_selector: mem  # The selector to use for migrating VMs
 
 # Memory tuning
 pvc_osd_memory_limit: 4294967296
-pvc_zookeeper_heap_limit: 256M
-pvc_zookeeper_stack_limit: 512M
+pvc_zookeeper_heap_limit: 512M
+pvc_zookeeper_stack_limit: 1024M
 
 # Ceph storage
 ceph_storage_secret_key: ""
diff --git a/roles/pvc/templates/zookeeper/environment.j2 b/roles/pvc/templates/zookeeper/environment.j2
index e571fd2..2367ed8 100644
--- a/roles/pvc/templates/zookeeper/environment.j2
+++ b/roles/pvc/templates/zookeeper/environment.j2
@@ -11,8 +11,6 @@ JMXLOCALONLY=false
 #   Increase the maximum buffer size from 1048575 (1MB) to 67108864 (64MB); required to allow a single `create`
 #   transaction, in the /api/v1/restore specifically, of >1MB of data; 64MB seems a reasonable limit given my
 #   cluster is only ~5.2MB of raw JSON data and beyond 12x that seems like a cluster too large for PVC.
-# Xms/Xmx=128M
-#   Reduce the Java memory size to minimize RAM consumption by Zookeeper.
 JAVA_OPTS="-Djava.net.preferIPv4Stack=True -Djute.maxbuffer=67108864 -Xms{{ pvc_zookeeper_heap_limit }} -Xmx{{ pvc_zookeeper_heap_limit }} -Xss{{ pvc_zookeeper_stack_limit }}"
 JAVA=/usr/bin/java
 CLASSPATH="/etc/zookeeper/conf:/usr/share/java/jline.jar:/usr/share/java/log4j-1.2.jar:/usr/share/java/xercesImpl.jar:/usr/share/java/xmlParserAPIs.jar:/usr/share/java/netty.jar:/usr/share/java/slf4j-api.jar:/usr/share/java/slf4j-log4j12.jar:/usr/share/java/zookeeper.jar"