diff --git a/packer/jambonz-feature-server/template.json b/packer/jambonz-feature-server/template.json
index a78477d..d52086b 100644
--- a/packer/jambonz-feature-server/template.json
+++ b/packer/jambonz-feature-server/template.json
@@ -15,10 +15,10 @@
     "source_ami_filter": {
       "filters": {
         "virtualization-type": "hvm",
-        "name": "debian-stretch-hvm-x86_64-gp2-*",
+        "name": "debian-10-amd64-*",
         "root-device-type": "ebs"
       },
-      "owners": ["379101102735"],
+      "owners": ["136693071363"],
       "most_recent": true
     },
     "instance_type": "{{user `instance_type`}}",
@@ -27,7 +27,7 @@
     "ami_description": "{{user `ami_description`}}",
     "launch_block_device_mappings": [
       {
-        "device_name": "xvda",
+        "device_name": "/dev/xvda",
         "volume_size": 40,
         "volume_type": "gp2",
         "delete_on_termination": true
@@ -51,7 +51,7 @@
       "inline": [
         "while [ ! -f /var/lib/cloud/instance/boot-finished ]; do echo 'Waiting for cloud-init...'; sleep 1; done",
         "sudo apt-get update",
-        "sudo apt-get -y install python lsof gcc g++ make cmake build-essential git autoconf automake mysql-client redis-tools \\",
+        "sudo apt-get -y install python lsof gcc g++ make cmake build-essential git autoconf automake default-mysql-client redis-tools \\",
         "curl telnet libtool libtool-bin libssl-dev libcurl4-openssl-dev libz-dev systemd-coredump liblz4-tool \\",
         "iptables-dev libavformat-dev liblua5.1-0-dev libavfilter-dev libavcodec-dev libswresample-dev \\",
         "libevent-dev libpcap-dev libxmlrpc-core-c3-dev markdown libjson-glib-dev lsb-release \\",
diff --git a/packer/jambonz-monitoring/scripts/install_postgresql.sh b/packer/jambonz-monitoring/scripts/install_postgresql.sh
index 11275fa..8b96d3f 100644
--- a/packer/jambonz-monitoring/scripts/install_postgresql.sh
+++ b/packer/jambonz-monitoring/scripts/install_postgresql.sh
@@ -6,7 +6,7 @@ DB_USER=$2
 DB_PASS=$3
 
 wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O- | sudo apt-key add -
-sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main" > /etc/apt/sources.list.d/postgresql.list'
+sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/postgresql.list'
 sudo apt-get update
 sudo apt-get install -y postgresql-12
 sudo systemctl daemon-reload
diff --git a/packer/jambonz-monitoring/template.json b/packer/jambonz-monitoring/template.json
index 92a6fee..5708dbf 100644
--- a/packer/jambonz-monitoring/template.json
+++ b/packer/jambonz-monitoring/template.json
@@ -18,10 +18,10 @@
     "source_ami_filter": {
       "filters": {
         "virtualization-type": "hvm",
-        "name": "debian-stretch-hvm-x86_64-gp2-*",
+        "name": "debian-10-amd64-*",
         "root-device-type": "ebs"
       },
-      "owners": ["379101102735"],
+      "owners": ["136693071363"],
       "most_recent": true
     },
     "instance_type": "{{user `instance_type`}}",
@@ -30,7 +30,7 @@
     "ami_description": "{{user `ami_description`}}",
     "launch_block_device_mappings": [
       {
-        "device_name": "xvda",
+        "device_name": "/dev/xvda",
         "volume_size": 40,
         "volume_type": "gp2",
         "delete_on_termination": true
diff --git a/packer/jambonz-sbc-rtp/template.json b/packer/jambonz-sbc-rtp/template.json
index 98a85e4..f0cadb8 100644
--- a/packer/jambonz-sbc-rtp/template.json
+++ b/packer/jambonz-sbc-rtp/template.json
@@ -16,10 +16,10 @@
     "source_ami_filter": {
       "filters": {
         "virtualization-type": "hvm",
-        "name": "debian-stretch-hvm-x86_64-gp2-*",
+        "name": "debian-10-amd64-*",
         "root-device-type": "ebs"
       },
-      "owners": ["379101102735"],
+      "owners": ["136693071363"],
       "most_recent": true
     },
     "instance_type": "{{user `instance_type`}}",
@@ -28,7 +28,7 @@
     "ami_description": "{{user `ami_description`}}",
     "launch_block_device_mappings": [
       {
-        "device_name": "xvda",
+        "device_name": "/dev/xvda",
         "volume_size": 40,
         "volume_type": "gp2",
         "delete_on_termination": true
@@ -52,7 +52,7 @@
       "inline": [
         "while [ ! -f /var/lib/cloud/instance/boot-finished ]; do echo 'Waiting for cloud-init...'; sleep 1; done",
         "sudo apt-get update",
-        "sudo apt-get -y install python lsof gcc g++ make cmake build-essential git autoconf automake mysql-client redis-tools \\",
+        "sudo apt-get -y install python lsof gcc g++ make cmake build-essential git autoconf automake default-mysql-client redis-tools \\",
         "curl telnet libtool libtool-bin libssl-dev libcurl4-openssl-dev libz-dev systemd-coredump liblz4-tool \\",
         "iptables-dev libavformat-dev liblua5.1-0-dev libavfilter-dev libavcodec-dev libswresample-dev \\",
         "libevent-dev libpcap-dev libxmlrpc-core-c3-dev markdown libjson-glib-dev lsb-release \\",
diff --git a/packer/jambonz-sbc-sip-rtp/template.json b/packer/jambonz-sbc-sip-rtp/template.json
index b76a78c..54bc6b7 100644
--- a/packer/jambonz-sbc-sip-rtp/template.json
+++ b/packer/jambonz-sbc-sip-rtp/template.json
@@ -19,10 +19,10 @@
     "source_ami_filter": {
       "filters": {
         "virtualization-type": "hvm",
-        "name": "debian-stretch-hvm-x86_64-gp2-*",
+        "name": "debian-10-amd64-*",
         "root-device-type": "ebs"
       },
-      "owners": ["379101102735"],
+      "owners": ["136693071363"],
       "most_recent": true
     },
     "instance_type": "{{user `instance_type`}}",
@@ -31,7 +31,7 @@
     "ami_description": "{{user `ami_description`}}",
     "launch_block_device_mappings": [
       {
-        "device_name": "xvda",
+        "device_name": "/dev/xvda",
         "volume_size": 40,
         "volume_type": "gp2",
         "delete_on_termination": true
@@ -55,7 +55,7 @@
       "inline": [
         "while [ ! -f /var/lib/cloud/instance/boot-finished ]; do echo 'Waiting for cloud-init...'; sleep 1; done",
         "sudo apt-get update",
-        "sudo apt-get -y install lsof python lsof gcc g++ make cmake build-essential git autoconf automake mysql-client redis-tools \\",
+        "sudo apt-get -y install lsof python lsof gcc g++ make cmake build-essential git autoconf automake default-mysql-client redis-tools \\",
         "curl telnet libtool libtool-bin libssl-dev libcurl4-openssl-dev libz-dev systemd-coredump liblz4-tool \\",
         "iptables-dev libavformat-dev liblua5.1-0-dev libavfilter-dev libavcodec-dev libswresample-dev \\",
         "libevent-dev libpcap-dev libxmlrpc-core-c3-dev markdown libjson-glib-dev lsb-release \\",
diff --git a/packer/jambonz-sbc-sip/template.json b/packer/jambonz-sbc-sip/template.json
index a087e6b..52d6712 100644
--- a/packer/jambonz-sbc-sip/template.json
+++ b/packer/jambonz-sbc-sip/template.json
@@ -15,10 +15,10 @@
     "source_ami_filter": {
       "filters": {
         "virtualization-type": "hvm",
-        "name": "debian-stretch-hvm-x86_64-gp2-*",
+        "name": "debian-10-amd64-*",
         "root-device-type": "ebs"
       },
-      "owners": ["379101102735"],
+      "owners": ["136693071363"],
       "most_recent": true
     },
     "instance_type": "{{user `instance_type`}}",
@@ -27,7 +27,7 @@
     "ami_description": "{{user `ami_description`}}",
     "launch_block_device_mappings": [
       {
-        "device_name": "xvda",
+        "device_name": "/dev/xvda",
         "volume_size": 40,
         "volume_type": "gp2",
         "delete_on_termination": true
@@ -51,7 +51,7 @@
       "inline": [
         "while [ ! -f /var/lib/cloud/instance/boot-finished ]; do echo 'Waiting for cloud-init...'; sleep 1; done",
         "sudo apt-get update",
-        "sudo apt-get -y install python gcc g++ make cmake build-essential git autoconf automake mysql-client redis-tools \\",
+        "sudo apt-get -y install python gcc g++ make cmake build-essential git autoconf automake default-mysql-client redis-tools \\",
         "curl telnet libtool libtool-bin libssl-dev libcurl4-openssl-dev libz-dev systemd-coredump liblz4-tool \\",
         "iptables-dev libavformat-dev liblua5.1-0-dev libavfilter-dev libavcodec-dev libswresample-dev \\",
         "libevent-dev libpcap-dev libxmlrpc-core-c3-dev markdown libjson-glib-dev lsb-release \\",