diff --git a/mysql/tasks/main.yml b/mysql/tasks/main.yml
index cf65cb718f42b9613f1cdfd7f2c65cd85f1fd767..c5a4a9f4b26fa0d1bbc71fd57c34a203ad2f2548 100644
--- a/mysql/tasks/main.yml
+++ b/mysql/tasks/main.yml
@@ -5,12 +5,19 @@
   apt:
     name:
       - mariadb-server
-      - python-mysqldb
+      - python3-mysqldb
     state: present
   tags:
     - packages
     - mysql
 
+- name: ensure legacy mysql packages are installed
+  apt:
+    name:
+      - python-mysqldb
+    state: present
+  when: ansible_distribution_major_version|int(default=99) < 11
+
 - name: ensure mysql is started
   service:
     name: mysql
diff --git a/postgres/files/pgbackup-bullseye.sh b/postgres/files/pgbackup-bullseye.sh
new file mode 100755
index 0000000000000000000000000000000000000000..06c8e980afe64e1d28497187c5e6e395f166721d
--- /dev/null
+++ b/postgres/files/pgbackup-bullseye.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+for DB in $(sudo -u postgres psql -t -q -A -c "select datname from pg_catalog.pg_database where not datname like 'template%';")
+do
+	sudo -u postgres pg_dump $DB | gzip -c -- > ${DB}.sql.gz
+done
+
+sudo -u postgres pg_dumpall -g -U postgres | gzip -c -- > pg_dumpall.sql.gz
+
diff --git a/postgres/tasks/main.yml b/postgres/tasks/main.yml
index eb4549f6e99a7a3df383b1dc0e502848e4a8204c..1867e9cf5be8eab78ee4afe5c6113f8e50a87b4b 100644
--- a/postgres/tasks/main.yml
+++ b/postgres/tasks/main.yml
@@ -19,11 +19,17 @@
     name:
       # yamllint disable-line rule:line-length
       - postgresql{{ "-{}".format(postgres_version) if postgres_version is defined }}
-      - python-psycopg2
       - python3-psycopg2
       - libpq-dev
     state: present
 
+- name: ensure legacy postgres packages are installed
+  apt:
+    name:
+      - python-psycopg2
+    state: present
+  when: ansible_distribution_major_version|int(default=99) < 11
+
 - name: ensure postgres is started
   service:
     name: postgresql
@@ -32,8 +38,8 @@
 
 - name: ensure we have our postgres backup script
   copy:
-    src: pgbackup.sh
-    dest: /usr/local/bin/
+    src: "pgbackup{{ '-bullseye' if ansible_distribution_major_version|int(default=99) > 10 else '' }}.sh"
+    dest: /usr/local/bin/pgbackup.sh
     owner: root
     group: root
     mode: '0755'