diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml
index c08a9179..a119ae74 100644
--- a/.zuul.d/jobs.yaml
+++ b/.zuul.d/jobs.yaml
@@ -66,19 +66,6 @@
         - gentoo/build-succeeds
         - debian-minimal/stable-vm
 
-- job:
-    name: dib-functests-containers
-    description: |
-      These are tests for elements focused on containers or other
-      small deployments
-    abstract: true
-    voting: false
-    parent: dib-functests-base
-    vars:
-      dib_functests:
-        - ubuntu-systemd-container/bionic-build-succeeds
-        - ubuntu-systemd-container/xenial-build-succeeds
-
 - job:
     name: dib-functests-arm64
     description: |
@@ -116,13 +103,6 @@
     nodeset: ubuntu-bionic
     voting: false
 
-- job:
-    name: dib-functests-bionic-python3-containers
-    description: |
-      The containers tests on a Bionic build host with Python 3
-    parent: dib-functests-containers
-    nodeset: ubuntu-bionic
-    voting: false
 
 # ARM64 tests
 - job:
diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml
index 15e917dd..cc648250 100644
--- a/.zuul.d/project.yaml
+++ b/.zuul.d/project.yaml
@@ -29,7 +29,6 @@
         - dib-functests-bionic-python3
         - dib-functests-bionic-python3-image
         - dib-functests-bionic-python3-extras
-        - dib-functests-bionic-python3-containers
         - ironic-python-agent-check-image-dib-centos8
         - dib-nodepool-functional-openstack-debian-bullseye-src:
             voting: false
diff --git a/diskimage_builder/elements/ubuntu-systemd-container/README.rst b/diskimage_builder/elements/ubuntu-systemd-container/README.rst
index 22e75134..21480942 100644
--- a/diskimage_builder/elements/ubuntu-systemd-container/README.rst
+++ b/diskimage_builder/elements/ubuntu-systemd-container/README.rst
@@ -2,6 +2,10 @@
 ubuntu-systemd-container
 ========================
 
+.. note::
+
+   As of October 2021 this element is deprecated and unmaintained.
+
 The ``ubuntu-systemd-container`` element uses debootstrap for generating
 a minimal image for use by machine containers. In contrast the ``ubuntu``
 element uses the cloud-image as the initial base and the ``ubuntu-minimal``