diff -Nru lxc-3.0.3/debian/changelog lxc-3.0.3/debian/changelog
--- lxc-3.0.3/debian/changelog	2018-11-23 04:49:34.000000000 +0000
+++ lxc-3.0.3/debian/changelog	2023-05-05 13:06:12.000000000 +0100
@@ -1,3 +1,18 @@
+lxc (3.0.3-0ubuntu1~18.04.3) bionic; urgency=medium
+
+  * Fix tests issue by avoiding falling back to inexistent trusty LXC images
+    and using the bionic ones (LP: #1939537)
+
+ -- Andrei Gherzan <andrei.gherzan@canonical.com>  Fri, 05 May 2023 14:06:12 +0200
+
+lxc (3.0.3-0ubuntu1~18.04.2) bionic; urgency=medium
+
+  * Cherry-pick upstream bugfixes (LP: #1848587 LP: #1886790):
+    - tests: use /dev/loop-control instead of /dev/network_latency
+    - This unbreaks adt-matrix / adt testing of Bionic hwe kernels
+
+ -- Dimitri John Ledkov <dimitri.ledkov@canonical.com>  Fri, 24 Feb 2023 13:50:04 +0000
+
 lxc (3.0.3-0ubuntu1~18.04.1) bionic; urgency=medium
 
   * New upstream bugfix release (LP: #1804755):
diff -Nru lxc-3.0.3/debian/patches/0002-Fix-tests-lxc-default-image-trusty.patch lxc-3.0.3/debian/patches/0002-Fix-tests-lxc-default-image-trusty.patch
--- lxc-3.0.3/debian/patches/0002-Fix-tests-lxc-default-image-trusty.patch	1970-01-01 01:00:00.000000000 +0100
+++ lxc-3.0.3/debian/patches/0002-Fix-tests-lxc-default-image-trusty.patch	2023-05-05 13:06:12.000000000 +0100
@@ -0,0 +1,48 @@
+Description: Fix tests that fall back to trusy LXC images
+Bug: https://bugs.launchpad.net/bugs/1939537
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/tests/lxc-test-apparmor-mount
++++ b/src/tests/lxc-test-apparmor-mount
+@@ -159,7 +159,7 @@
+     chown -R $TUSER: $HDIR/.cache/lxc
+ 
+ # default release is trusty, or the systems release if recognized
+-release=trusty
++release=bionic
+ if [ -f /etc/lsb-release ]; then
+     . /etc/lsb-release
+     rels=$(ubuntu-distro-info --supported 2>/dev/null) ||
+--- a/src/tests/lxc-test-autostart
++++ b/src/tests/lxc-test-autostart
+@@ -45,7 +45,7 @@
+ CONTAINER_NAME=lxc-test-auto
+ 
+ # default release is trusty, or the systems release if recognized
+-release=trusty
++release=bionic
+ if [ -f /etc/lsb-release ]; then
+     . /etc/lsb-release
+     rels=$(ubuntu-distro-info --supported 2>/dev/null) ||
+--- a/src/tests/lxc-test-unpriv
++++ b/src/tests/lxc-test-unpriv
+@@ -157,7 +157,7 @@
+ fi
+ 
+ # default release is trusty, or the systems release if recognized
+-release=trusty
++release=bionic
+ if [ -f /etc/lsb-release ]; then
+     . /etc/lsb-release
+     rels=$(ubuntu-distro-info --supported 2>/dev/null) ||
+--- a/src/tests/lxc-test-usernic.in
++++ b/src/tests/lxc-test-usernic.in
+@@ -135,7 +135,7 @@
+ fi
+ 
+ # default release is trusty, or the systems release if recognized
+-release=trusty
++release=bionic
+ if [ -f /etc/lsb-release ]; then
+     . /etc/lsb-release
+     rels=$(ubuntu-distro-info --supported 2>/dev/null) ||
diff -Nru lxc-3.0.3/debian/patches/0027-tests-use-dev-loop-control-instead-of-dev-network_la.patch lxc-3.0.3/debian/patches/0027-tests-use-dev-loop-control-instead-of-dev-network_la.patch
--- lxc-3.0.3/debian/patches/0027-tests-use-dev-loop-control-instead-of-dev-network_la.patch	1970-01-01 01:00:00.000000000 +0100
+++ lxc-3.0.3/debian/patches/0027-tests-use-dev-loop-control-instead-of-dev-network_la.patch	2023-05-05 13:06:12.000000000 +0100
@@ -0,0 +1,27 @@
+From 1df746548ddbd277088e2911b8fd227f12f96c5f Mon Sep 17 00:00:00 2001
+From: Christian Brauner <christian.brauner@ubuntu.com>
+Date: Mon, 18 Nov 2019 15:08:22 +0100
+Subject: tests: use /dev/loop-control instead of /dev/network_latency
+
+BugLink: https://bugs.launchpad.net/bugs/1848587
+
+The latter device has been removed apparently.
+
+Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
+---
+ src/tests/device_add_remove.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tests/device_add_remove.c b/src/tests/device_add_remove.c
+index 4a2e95138..50ccb2d51 100644
+--- a/src/tests/device_add_remove.c
++++ b/src/tests/device_add_remove.c
+@@ -21,7 +21,7 @@
+ #include <lxc/lxccontainer.h>
+ 
+ #define NAME "device_add_remove_test"
+-#define DEVICE "/dev/network_latency"
++#define DEVICE "/dev/loop-control"
+ 
+ int main(int argc, char *argv[])
+ {
diff -Nru lxc-3.0.3/debian/patches/series lxc-3.0.3/debian/patches/series
--- lxc-3.0.3/debian/patches/series	2018-11-23 04:49:34.000000000 +0000
+++ lxc-3.0.3/debian/patches/series	2023-05-05 13:06:12.000000000 +0100
@@ -1 +1,3 @@
 0001-Allocate-new-lxcbr0-subnet-at-startup-time.patch
+0002-Fix-tests-lxc-default-image-trusty.patch
+0027-tests-use-dev-loop-control-instead-of-dev-network_la.patch