diff -Nru openjdk-21-21+35/debian/changelog openjdk-21-21+35/debian/changelog
--- openjdk-21-21+35/debian/changelog	2023-09-21 16:39:23.000000000 +1200
+++ openjdk-21-21+35/debian/changelog	2023-09-25 15:25:51.000000000 +1300
@@ -1,3 +1,11 @@
+openjdk-21 (21+35-1~20.04) focal; urgency=medium
+
+  * Upload to Ubuntu 20.04 (LP: #2036873).
+  * d/rules: disable jtreg tests for focal and jammy. No jtreg7 backport
+    yet.
+
+ -- Vladimir Petko <vladimir.petko@canonical.com>  Mon, 25 Sep 2023 15:25:51 +1300
+
 openjdk-21 (21+35-1) unstable; urgency=medium

   * OpenJDK 21 release build, (no changes).
diff -Nru openjdk-21-21+35/debian/control openjdk-21-21+35/debian/control
--- openjdk-21-21+35/debian/control	2023-09-21 16:39:23.000000000 +1200
+++ openjdk-21-21+35/debian/control	2023-09-25 15:25:51.000000000 +1300
@@ -6,10 +6,10 @@
 Build-Depends: debhelper (>= 11),
   m4, lsb-release, zip, unzip,
   sharutils, gawk, cpio, pkg-config, procps, wdiff, fastjar (>= 2:0.96-0ubuntu2),
-  time, strip-nondeterminism, debugedit (>= 4.16),
-  jtreg7  <!nocheck>, libtestng7-java <!nocheck>, xvfb <!nocheck>, xauth <!nocheck>, xfonts-base <!nocheck>, libgl1-mesa-dri [!x32] <!nocheck>, xfwm4 <!nocheck>, x11-xkb-utils <!nocheck>, dbus-x11 <!nocheck>, libasmtools-java <!nocheck>, googletest <!nocheck>, google-mock <!nocheck>, xvfb  <!nocheck>,
+  time, strip-nondeterminism,
+  file,
   autoconf, automake, autotools-dev, ant, ant-optional,
-  g++-13 <!cross>,
+  g++-9 <!cross>,
   openjdk-20-jdk-headless:native | openjdk-21-jdk-headless:native,
   libxtst-dev, libxi-dev, libxt-dev, libxaw7-dev, libxrender-dev, libcups2-dev, libasound2-dev, liblcms2-dev, libxinerama-dev, libkrb5-dev, xsltproc, libpcsclite-dev, libxrandr-dev, libelf-dev, libfontconfig1-dev, libgtk2.0-0 | libgtk-3-0, libfreetype-dev, libharfbuzz-dev,
   libffi-dev, libffi-dev:native,
diff -Nru openjdk-21-21+35/debian/rules openjdk-21-21+35/debian/rules
--- openjdk-21-21+35/debian/rules	2023-09-21 16:39:23.000000000 +1200
+++ openjdk-21-21+35/debian/rules	2023-09-25 15:25:50.000000000 +1300
@@ -169,7 +169,7 @@
   with_check = disabled running check on $(DEB_HOST_ARCH)
 endif
 # no jtreg backport yet
-ifneq (,$(filter $(distrel), precise trusty xenial bionic bookworm bullseye))
+ifneq (,$(filter $(distrel), precise trusty xenial bionic focal jammy bookworm bullseye))
   with_check = disabled for $(distrel), no $(jtreg_pkg)
 endif
 #with_check = disabled, more recent jtreg needed