diff --git a/docker.sysext/create.sh b/docker.sysext/create.sh
index 2685f11..955a5c4 100644
--- a/docker.sysext/create.sh
+++ b/docker.sysext/create.sh
@@ -17,19 +17,11 @@ function list_available_versions() {
 }
 # --
 
-function populate_sysext_root_options() {
-  echo "  --without <docker|containerd>  : Build the sysext without docker or"
-  echo "                                     containerd/runc, respectively."
-}
-# --
-
 function populate_sysext_root() {
   local sysextroot="$1"
   local arch="$2"
   local version="$3"
 
-  local without="$(get_optional_param "without" "" "$@")"
-
   # The github release uses different arch identifiers
   local rel_arch="$(arch_transform 'x86-64' 'x86_64' "$arch")"
   rel_arch="$(arch_transform 'arm64' 'aarch64' "$rel_arch")"
@@ -41,33 +33,11 @@ function populate_sysext_root() {
   mkdir -p "${sysextroot}"/usr/bin
   cp -R docker/* "${sysextroot}"/usr/bin/
 
-  if [[ "${without}" == docker ]] ; then
-    announce "Removing docker from sysext as requested (shipping containerd/runc only)"
-
-    rm "${sysextroot}/usr/bin/docker" \
-       "${sysextroot}/usr/bin/dockerd" \
-       "${sysextroot}/usr/bin/docker-init" \
-       "${sysextroot}/usr/bin/docker-proxy" \
-       "${sysextroot}/usr/lib/systemd/system/docker.socket" \
-       "${sysextroot}/usr/lib/systemd/system/sockets.target.d/10-docker-socket.conf" \
-       "${sysextroot}/usr/lib/systemd/system/docker.service"
-
-     rmdir "${sysextroot}/usr/lib/systemd/system/sockets.target.d"
-
-  elif [[ "${without}" == containerd ]] ; then
-    announce "Removing containerd / runc from sysext as requested (shipping docker only)"
-
-    rm "${sysextroot}/usr/bin/containerd" \
-       "${sysextroot}/usr/bin/containerd-shim-runc-v2" \
-       "${sysextroot}/usr/bin/ctr" \
-       "${sysextroot}/usr/bin/runc" \
-       "${sysextroot}/usr/lib/systemd/system/containerd.service" \
-       "${sysextroot}/usr/lib/systemd/system/multi-user.target.d/10-containerd-service.conf" \
-       "${sysextroot}/usr/share/containerd/config.toml" \
-       "${sysextroot}/usr/share/containerd/config-cgroups.toml"
+  announce "Removing containerd / runc from sysext as it has its own sysext"
 
-     rmdir "${sysextroot}/usr/share/containerd" \
-           "${sysextroot}/usr/lib/systemd/system/multi-user.target.d/"
-  fi
+  rm "${sysextroot}/usr/bin/containerd" \
+      "${sysextroot}/usr/bin/containerd-shim-runc-v2" \
+      "${sysextroot}/usr/bin/ctr" \
+      "${sysextroot}/usr/bin/runc"
 }
 # --
diff --git a/docker.sysext/files/usr/lib/systemd/system/containerd.service b/docker.sysext/files/usr/lib/systemd/system/containerd.service
deleted file mode 100644
index 2410230..0000000
--- a/docker.sysext/files/usr/lib/systemd/system/containerd.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=containerd container runtime
-After=network.target
-[Service]
-Delegate=yes
-Environment=CONTAINERD_CONFIG=/usr/share/containerd/config.toml
-ExecStartPre=mkdir -p /run/docker/libcontainerd
-ExecStartPre=ln -fs /run/containerd/containerd.sock /run/docker/libcontainerd/docker-containerd.sock
-ExecStart=/usr/bin/containerd --config ${CONTAINERD_CONFIG}
-KillMode=process
-Restart=always
-# (lack of) limits from the upstream docker service unit
-LimitNOFILE=1048576
-LimitNPROC=infinity
-LimitCORE=infinity
-TasksMax=infinity
-[Install]
-WantedBy=multi-user.target
diff --git a/docker.sysext/files/usr/lib/systemd/system/multi-user.target.d/10-containerd-service.conf b/docker.sysext/files/usr/lib/systemd/system/multi-user.target.d/10-containerd-service.conf
deleted file mode 100644
index 82d843d..0000000
--- a/docker.sysext/files/usr/lib/systemd/system/multi-user.target.d/10-containerd-service.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Unit]
-Upholds=containerd.service
diff --git a/docker.sysext/files/usr/share/containerd/config-cgroupfs.toml b/docker.sysext/files/usr/share/containerd/config-cgroupfs.toml
deleted file mode 100644
index fc6ab91..0000000
--- a/docker.sysext/files/usr/share/containerd/config-cgroupfs.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-version = 2
-# set containerd's OOM score
-oom_score = -999
-[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
-# setting runc.options unsets parent settings
-runtime_type = "io.containerd.runc.v2"
-[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
-SystemdCgroup = false
diff --git a/docker.sysext/files/usr/share/containerd/config.toml b/docker.sysext/files/usr/share/containerd/config.toml
deleted file mode 100644
index 083d435..0000000
--- a/docker.sysext/files/usr/share/containerd/config.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-version = 2
-# set containerd's OOM score
-oom_score = -999
-[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
-# setting runc.options unsets parent settings
-runtime_type = "io.containerd.runc.v2"
-[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
-SystemdCgroup = true