diff --git a/debian/changelog b/debian/changelog
index 72dbc00..6974e12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+osinfo-db (0.20220214-1ubuntu2.1) jammy; urgency=medium
+
+  * Cherry-pick upstream tests fix: osinfo: skip supported='false' devices
+  * Disable virtio-gpu only for Ubuntu 22.04, i.e. enable it for
+    Ubuntu 18.04 to 21.10 and >= 22.10 again (LP: #1985148)
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Thu, 11 Aug 2022 18:42:48 +0200
+
 osinfo-db (0.20220214-1ubuntu2) jammy; urgency=medium
 
   * Add patch to disable experimental 3D Acceleration feature for Ubuntu guests
diff --git a/debian/patches/Revert-ubuntu-Enable-3D-Acceleration-option-with-virtio1..patch b/debian/patches/Revert-ubuntu-Enable-3D-Acceleration-option-with-virtio1..patch
deleted file mode 100644
index f057e48..0000000
--- a/debian/patches/Revert-ubuntu-Enable-3D-Acceleration-option-with-virtio1..patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Jeremy Bicha <jeremy.bicha@canonical.com>
-Date: Tue, 19 Apr 2022 17:43:14 -0400
-Subject: Revert "ubuntu: Enable 3D Acceleration option with virtio1.0-gpu"
-
-This appears to have broken the non-3D Accleration
-Ubuntu on Wayland session for 22.04 LTS.
-Let's just disable this feature for now.
-https://launchpad.net/bugs/1969524
-
-This reverts commit f7f475dd0bdc7b73fbab8fecba0a5ec10731b94f.
-
-Signed-off-by: Jeremy Bicha <jeremy.bicha@canonical.com>
----
- data/os/ubuntu.com/ubuntu-18.04.xml.in | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/data/os/ubuntu.com/ubuntu-18.04.xml.in b/data/os/ubuntu.com/ubuntu-18.04.xml.in
-index 71f4c6c..e0f4200 100644
---- a/data/os/ubuntu.com/ubuntu-18.04.xml.in
-+++ b/data/os/ubuntu.com/ubuntu-18.04.xml.in
-@@ -31,10 +31,6 @@
-       </recommended>
-     </resources>
- 
--    <devices>
--      <device id="http://pcisig.com/pci/1af4/1050"/> <!-- virtio1.0-gpu -->
--    </devices>
--
-     <media arch="x86_64" live="true">
-       <url>https://releases.ubuntu.com/releases/bionic/ubuntu-18.04.6-desktop-amd64.iso</url>
-       <iso>
diff --git a/debian/patches/series b/debian/patches/series
index 07f0257..9be94d2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -26,4 +26,5 @@ fix-Use-C.UTF-8-locale.patch
 ubuntu-list-desktop-before-server.patch
 ubuntu18.04-use-latest-available-ISOs.patch
 ubuntu22.04-drop-prerelease-tag.patch
-Revert-ubuntu-Enable-3D-Acceleration-option-with-virtio1..patch
+tests-osinfo-skip-supported-false-devices.patch
+ubuntu2204-Temporarily-disable-virtio1.0-gpu.patch
diff --git a/debian/patches/tests-osinfo-skip-supported-false-devices.patch b/debian/patches/tests-osinfo-skip-supported-false-devices.patch
new file mode 100644
index 0000000..ac506c0
--- /dev/null
+++ b/debian/patches/tests-osinfo-skip-supported-false-devices.patch
@@ -0,0 +1,27 @@
+From: Victor Toso <victortoso@redhat.com>
+Date: Thu, 12 May 2022 20:18:13 +0200
+Subject: tests: osinfo: skip supported='false' devices
+
+This patch is based on Cole Robinson's work.
+Related: https://gitlab.com/libosinfo/osinfo-db/-/merge_requests/441
+
+Signed-off-by: Victor Toso <victortoso@redhat.com>
+Origin: upstream, commit fb42032e06832b34ab21f3d18a346487c08f010a
+---
+ tests/osinfo.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/osinfo.py b/tests/osinfo.py
+index 2268ffa..e74dbbc 100644
+--- a/tests/osinfo.py
++++ b/tests/osinfo.py
+@@ -74,7 +74,8 @@ class Os(_XMLBase):
+         devicelist = self._root.find('devices')
+         if devicelist is not None:
+             for device in devicelist.findall('device'):
+-                devices.append(device.get('id'))
++                if device.get("supported") != "false":
++                    devices.append(device.get('id'))
+         return devices
+ 
+     @_cache_property
diff --git a/debian/patches/ubuntu2204-Temporarily-disable-virtio1.0-gpu.patch b/debian/patches/ubuntu2204-Temporarily-disable-virtio1.0-gpu.patch
new file mode 100644
index 0000000..66ce2e4
--- /dev/null
+++ b/debian/patches/ubuntu2204-Temporarily-disable-virtio1.0-gpu.patch
@@ -0,0 +1,33 @@
+From: Jeremy Bicha <jeremy.bicha@canonical.com>
+Date: Thu, 21 Apr 2022 14:11:57 -0400
+Subject: ubuntu2204: Temporarily disable virtio1.0-gpu
+
+GNOME on Wayland is currently unusable (black screen) with
+this device unless the experimental 3D Accleration option is used
+
+This will be fixed with a future gnome-remote-desktop update
+
+https://launchpad.net/bugs/1971195
+
+Signed-off-by: Jeremy Bicha <jeremy.bicha@canonical.com>
+Origin: upstream, https://gitlab.com/libosinfo/osinfo-db/-/merge_requests/441
+LP: #1985148
+---
+ data/os/ubuntu.com/ubuntu-22.04.xml.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/data/os/ubuntu.com/ubuntu-22.04.xml.in b/data/os/ubuntu.com/ubuntu-22.04.xml.in
+index 832b679..d3cada7 100644
+--- a/data/os/ubuntu.com/ubuntu-22.04.xml.in
++++ b/data/os/ubuntu.com/ubuntu-22.04.xml.in
+@@ -32,6 +32,10 @@
+       </recommended>
+     </resources>
+ 
++    <devices>
++      <device id="http://pcisig.com/pci/1af4/1050" supported="false"/> <!-- virtio1.0-gpu -->
++    </devices>
++
+     <!-- installer-script limitations
+             Server-Live media run with the new subiquity installer.
+             The new style for automated install provided isn't supported