diff --git a/common-nix.vars.pkr.hcl b/common-nix.vars.pkr.hcl
index eafb1e602..adcb6c8f3 100644
--- a/common-nix.vars.pkr.hcl
+++ b/common-nix.vars.pkr.hcl
@@ -1 +1 @@
-postgres-version = "15.6.1.135"
+postgres-version = "15.6.1.136"
diff --git a/ebssurrogate/scripts/surrogate-bootstrap-nix.sh b/ebssurrogate/scripts/surrogate-bootstrap-nix.sh
index 45cbc8ac6..3b0bb93c8 100755
--- a/ebssurrogate/scripts/surrogate-bootstrap-nix.sh
+++ b/ebssurrogate/scripts/surrogate-bootstrap-nix.sh
@@ -110,6 +110,11 @@ function format_and_mount_rootfs {
 	fi
 	
 	mkfs.ext4 /dev/xvdh
+
+	# Explicitly reserving 100MiB worth of blocks for the data volume
+	RESERVED_DATA_VOLUME_BLOCK_COUNT=$((100 * 1024 * 1024 / 4096))
+	tune2fs -r $RESERVED_DATA_VOLUME_BLOCK_COUNT /dev/xvdh
+
 	mkdir -p /mnt/data
 	mount -o defaults,discard /dev/xvdh /mnt/data
 }
diff --git a/scripts/90-cleanup.sh b/scripts/90-cleanup.sh
index ebbf49080..f2e19686d 100644
--- a/scripts/90-cleanup.sh
+++ b/scripts/90-cleanup.sh
@@ -36,7 +36,10 @@ elif [ -n "$(command -v apt-get)" ]; then
 	libicu-dev \
 	libcgal-dev \
 	libgcc-9-dev \
-	libgcc-8-dev
+	libgcc-8-dev \
+ 	ansible
+
+  add-apt-repository --yes --remove ppa:ansible/ansible
 
   source /etc/os-release
   apt-get -y remove --purge linux-headers-5.11.0-1021-aws
diff --git a/scripts/nix-provision.sh b/scripts/nix-provision.sh
index 223e84926..1c7acbd58 100644
--- a/scripts/nix-provision.sh
+++ b/scripts/nix-provision.sh
@@ -38,8 +38,12 @@ EOF
         $ARGS
 }
 
+function cleanup_packages {
+    apt-get -y remove --purge ansible
+    add-apt-repository --yes --remove ppa:ansible/ansible
+}
 
 install_packages
 install_nix
 execute_stage2_playbook
-
+cleanup_packages