diff --git a/debian/postinst b/debian/postinst
index 9b276316..da1ff453 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -70,6 +70,8 @@ configure)
 		# postgres UID. Note that we put this code here instead of the
 		# delphix-platform service as we need it to be executed before
 		# the postgres package gets installed.
+		sed -i 's/^UID_MAX.*/UID_MAX 65437/g' /etc/login.defs
+		sed -i 's/^GID_MAX.*/GID_MAX 65437/g' /etc/login.defs
 		addgroup postgres --gid 65437
 		adduser --home /var/lib/postgresql --no-create-home \
 			--shell /bin/bash --ingroup postgres \
diff --git a/debian/rules b/debian/rules
index 865bac7b..66aa5cce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,6 +85,7 @@ DEPENDS += ansible, \
 	   rsyslog, \
 	   sudo, \
 	   systemd-container, \
+	   systemd-resolved, \
 	   tzdata, \
 	   udev,
 
@@ -110,14 +111,6 @@ DEPENDS += $(DEPENDS.$(TARGET_PLATFORM))
 #
 DEPENDS += delphix-build-info,
 
-#
-# The usrmerge package modifies the layout of directories under root (/) upon
-# installation, to ensure that a Delphix Engine upgraded to Ubuntu 20.04 has
-# the same directory layout as a Delphix Engine that initially came on
-# Ubuntu 20.04 (or later).
-#
-DEPENDS += usrmerge,
-
 #
 # These packages help strengthen the security of the appliance by identifying
 # and preventing undesired behaviors.
@@ -131,18 +124,16 @@ DEPENDS += aide, \
 # or replaced without regard for backward compatibility.
 #
 DEPENDS += aptitude, \
-	   awscli, \
-	   bcc-tools, \
+	   bcc, \
 	   bpftrace, \
 	   crash-python, \
 	   delphix-rust, \
 	   dnsutils, \
-	   drgn, \
+	   python3-drgn, \
 	   dstat, \
 	   emacs-nox, \
 	   ethtool, \
 	   gdb, \
-	   gdb-python, \
 	   htop, \
 	   iftop, \
 	   inotify-tools, \
@@ -150,7 +141,7 @@ DEPENDS += aptitude, \
 	   jq, \
 	   kdump-tools, \
 	   ldap-utils, \
-	   libkdumpfile, \
+	   libkdumpfile10, \
 	   linux-tools-common, \
 	   lsof, \
 	   man-db, \
@@ -229,4 +220,3 @@ override_dh_auto_test:
 	# testing via another mechanism, so running it during package
 	# builds is unnecessary.
 	#
-
diff --git a/files/common/var/lib/delphix-platform/ansible/10-delphix-platform/roles/delphix-platform/tasks/main.yml b/files/common/var/lib/delphix-platform/ansible/10-delphix-platform/roles/delphix-platform/tasks/main.yml
index 36f1956a..0126e60b 100644
--- a/files/common/var/lib/delphix-platform/ansible/10-delphix-platform/roles/delphix-platform/tasks/main.yml
+++ b/files/common/var/lib/delphix-platform/ansible/10-delphix-platform/roles/delphix-platform/tasks/main.yml
@@ -349,7 +349,7 @@
     regexp: '^{{ item.key }}='
     line: '{{ item.key }}="{{ item.value }}"'
   with_items:
-    - { key: 'JAVA_HOME', value: '/usr/lib/jvm/adoptopenjdk-java8-jdk-amd64' }
+    - { key: 'JAVA_HOME', value: '/usr/lib/jvm/java-8-openjdk-amd64' }
 
 #
 # Configure the Azure agent. Only run this on Azure, since that is the