diff --git a/.github/workflows/create_containers.yml b/.github/workflows/create_containers.yml
index 41f78e7602dd..5da34101400c 100644
--- a/.github/workflows/create_containers.yml
+++ b/.github/workflows/create_containers.yml
@@ -2,6 +2,8 @@ name: Create containers
 on:
   schedule:
     - cron:  '0 0 * * *'
+  push:
+    branches: [ dasharo-ci ]
 
 jobs:
   push_to_registry:
@@ -9,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [fedora, debian-x86_64, arch, debian-i386, void]
+        os: [ubuntu-20.04]
 
     steps:
       - name: Check out the repo
@@ -32,5 +34,5 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
           registry: docker.pkg.github.com
-          repository: fwupd/fwupd/fwupd-${{matrix.os}}
+          repository: Dasharo/fwupd/fwupd-${{matrix.os}}
           tags: latest
diff --git a/contrib/ci/Dockerfile-ubuntu-20.04.in b/contrib/ci/Dockerfile-ubuntu-20.04.in
new file mode 100644
index 000000000000..bd6db6b4d730
--- /dev/null
+++ b/contrib/ci/Dockerfile-ubuntu-20.04.in
@@ -0,0 +1,9 @@
+FROM ubuntu:20.04
+%%%OS%%%
+ENV CI_NETWORK true
+ENV CC clang
+RUN echo fubar > /etc/machine-id
+%%%ARCH_SPECIFIC_COMMAND%%%
+%%%INSTALL_DEPENDENCIES_COMMAND%%%
+WORKDIR /github/workspace
+CMD ["./contrib/ci/debian.sh"]
diff --git a/contrib/ci/dependencies.xml b/contrib/ci/dependencies.xml
index a302261ef1ab..5933641cc0d1 100644
--- a/contrib/ci/dependencies.xml
+++ b/contrib/ci/dependencies.xml
@@ -8,6 +8,7 @@
   <dependency type="build" id="abigail-tools">
     <distro id="ubuntu">
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="bash">
@@ -26,6 +27,7 @@
     </distro>
     <distro id="ubuntu">
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="bubblewrap">
@@ -39,6 +41,7 @@
     </distro>
     <distro id="ubuntu">
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="base-devel">
@@ -69,16 +72,19 @@
     </distro>
     <distro id="ubuntu">
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="clang">
     <distro id="ubuntu">
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="clang-tools">
     <distro id="ubuntu">
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="clang-format">
@@ -90,6 +96,7 @@
     </distro>
     <distro id="ubuntu">
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="gcc">
@@ -121,6 +128,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="libcairo-gobject2">
@@ -139,6 +147,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="libjson-glib-dev">
@@ -185,6 +194,7 @@
     </distro>
     <distro id="ubuntu">
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="libpci-dev">
@@ -205,6 +215,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="fonts-noto">
@@ -228,6 +239,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="devscripts">
@@ -237,6 +249,7 @@
     </distro>
     <distro id="ubuntu">
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="debhelper">
@@ -267,6 +280,7 @@
     </distro>
     <distro id="ubuntu">
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="dconf">
@@ -286,6 +300,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="intltool">
@@ -300,6 +315,7 @@
     </distro>
     <distro id="ubuntu">
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="libfreetype6-dev">
@@ -318,6 +334,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="fontconfig">
@@ -335,6 +352,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="libflashrom-dev">
@@ -374,6 +392,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="gettext">
@@ -463,6 +482,7 @@
     </distro>
     <distro id="ubuntu">
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="libglib2.0-doc">
@@ -472,6 +492,7 @@
     </distro>
     <distro id="ubuntu">
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="libglib2.0-dev">
@@ -525,6 +546,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="gnome-desktop-testing">
@@ -537,6 +559,7 @@
     </distro>
     <distro id="ubuntu">
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="gnutls-dev">
@@ -558,6 +581,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="gnutls-bin">
@@ -579,6 +603,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <!-- TODO: Drop build dependency after switching to gidoc-gen -->
@@ -600,6 +625,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="jq">
@@ -653,6 +679,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
     <distro id="void">
       <package>libjcat-devel</package>
@@ -671,6 +698,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="libarchive-dev">
@@ -689,6 +717,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
     <distro id="void">
       <package>libarchive-devel</package>
@@ -767,6 +796,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
     <distro id="void">
       <package>gcab-devel</package>
@@ -782,6 +812,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="libgudev-1.0-dev">
@@ -800,6 +831,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="libgusb-dev">
@@ -875,6 +907,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
     <distro id="void">
       <package>libsoup-devel</package>
@@ -902,6 +935,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="libtool-bin">
@@ -913,6 +947,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="libstemmer-0">
@@ -927,6 +962,7 @@
     </distro>
     <distro id="ubuntu">
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="libxml2-dev:s390x">
@@ -941,6 +977,7 @@
     </distro>
     <distro id="ubuntu">
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="locales">
@@ -953,6 +990,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="meson">
@@ -974,6 +1012,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
     <distro id="void">
       <package />
@@ -1021,6 +1060,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="pkg-config">
@@ -1032,6 +1072,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
     <distro id="void">
       <package />
@@ -1084,6 +1125,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="libqmi-glib-dev">
@@ -1105,6 +1147,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="libmbim-glib-dev">
@@ -1126,6 +1169,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="libpolkit-gobject-1-dev">
@@ -1147,6 +1191,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="python34-pip">
@@ -1181,6 +1226,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="gi-docgen">
@@ -1193,6 +1239,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="python3-typogrify">
@@ -1203,6 +1250,7 @@
     </distro>
     <distro id="ubuntu">
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
     <distro id="fedora">
       <package />
@@ -1219,6 +1267,7 @@
     </distro>
     <distro id="ubuntu">
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="python3-markdown">
@@ -1227,6 +1276,7 @@
     </distro>
     <distro id="ubuntu">
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="python3-jinja2">
@@ -1240,6 +1290,7 @@
     </distro>
     <distro id="ubuntu">
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="python3-gobject">
@@ -1265,6 +1316,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="python3-requests">
@@ -1304,6 +1356,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
     <distro id="void">
       <package>sqlite-devel</package>
@@ -1352,6 +1405,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="shared-mime-info">
@@ -1373,6 +1427,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="texlive-fonts-recommended">
@@ -1382,6 +1437,7 @@
     </distro>
     <distro id="ubuntu">
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="udev">
@@ -1394,6 +1450,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="umockdev">
@@ -1414,6 +1471,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="valac">
@@ -1438,6 +1496,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="valgrind">
@@ -1542,6 +1601,7 @@
   <dependency type="build" id="shellcheck">
     <distro id="ubuntu">
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
     <distro id="fedora">
       <package>ShellCheck</package>
@@ -1559,6 +1619,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
     <distro id="fedora">
       <package>protobuf-c-devel</package>
@@ -1576,6 +1637,7 @@
     <distro id="ubuntu">
       <control />
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
     <distro id="fedora">
       <package />
@@ -1587,6 +1649,7 @@
   <dependency type="build" id="sudo">
     <distro id="ubuntu">
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
   <dependency type="build" id="python3-venv">
@@ -1596,6 +1659,7 @@
     </distro>
     <distro id="ubuntu">
       <package variant="x86_64" />
+      <package variant="20.04" />
     </distro>
   </dependency>
 </dependencies>