diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass
index 789d6c74..d90b32a9 100644
--- a/meta/classes/dpkg-base.bbclass
+++ b/meta/classes/dpkg-base.bbclass
@@ -98,6 +98,12 @@ python() {
     if len(d.getVar('SRC_APT').strip()) > 0:
         bb.build.addtask('apt_unpack', 'do_patch', '', d)
         bb.build.addtask('cleanall_apt', 'do_cleanall', '', d)
+
+    # container docker fetcher
+    import container_fetcher
+    from bb.fetch2 import methods
+
+    methods.append(container_fetcher.Container())
 }
 
 do_apt_fetch() {
diff --git a/meta/lib/container_fetcher.py b/meta/lib/container_fetcher.py
new file mode 100644
index 00000000..0d659154
--- /dev/null
+++ b/meta/lib/container_fetcher.py
@@ -0,0 +1,86 @@
+# This software is a part of ISAR.
+# Copyright (c) Siemens AG, 2024
+#
+# SPDX-License-Identifier: MIT
+
+import oe.path
+import os
+import tempfile
+from   bb.fetch2 import FetchMethod
+from   bb.fetch2 import logger
+from   bb.fetch2 import MissingChecksumEvent
+from   bb.fetch2 import NoChecksumError
+from   bb.fetch2 import runfetchcmd
+
+class Container(FetchMethod):
+    def supports(self, ud, d):
+        return ud.type in ['docker']
+
+    def urldata_init(self, ud, d):
+        ud.tag = "latest"
+        if "tag" in ud.parm:
+            ud.tag = ud.parm["tag"]
+
+        ud.digest = None
+        if "digest" in ud.parm:
+            ud.digest = ud.parm["digest"]
+
+        ud.arch = d.getVar('PACKAGE_ARCH')
+        ud.variant = None
+        if ud.arch == "armhf":
+            ud.arch = "arm"
+            ud.variant = "v7"
+        elif ud.arch == "armel":
+            ud.arch = "arm"
+            ud.variant = "v6"
+
+        ud.container_name = ud.host + (ud.path if ud.path != "/" else "")
+        ud.container_src = ud.container_name + \
+            ("@" + ud.digest if ud.digest else ":" + ud.tag)
+        ud.localname = ud.container_name.replace('/', '.')
+        ud.localfile = "container-images/" + ud.arch + "/" + \
+            (ud.variant + "/" if ud.variant else "") + ud.localname + \
+            "_" + (ud.digest.replace(":", "-") if ud.digest else ud.tag) + \
+            ".zst"
+
+    def download(self, ud, d):
+        tarball = ud.localfile[:-len('.zst')]
+        with tempfile.TemporaryDirectory(dir=d.getVar('DL_DIR')) as tmpdir:
+            # Take a two steps for downloading into a docker archive because
+            # not all source may have the required Docker schema 2 manifest.
+            runfetchcmd("skopeo copy --preserve-digests " + \
+                f"--override-arch {ud.arch} " + \
+                (f"--override-variant {ud.variant} " if ud.variant else "") + \
+                f"docker://{ud.container_src} dir:{tmpdir}", d)
+            runfetchcmd(f"skopeo copy dir:{tmpdir} " + \
+                f"docker-archive:{tarball}:{ud.container_name}:{ud.tag}", d)
+        zstd_defaults = d.getVar('ZSTD_DEFAULTS')
+        runfetchcmd(f"zstd -f --rm {zstd_defaults} {tarball}", d)
+
+        if ud.digest:
+            return
+
+        checksum = bb.utils.sha256_file(ud.localpath + "/manifest.json")
+        checksum_line = f"SRC_URI = \"{ud.url};digest=sha256:{checksum}\""
+
+        strict = d.getVar("BB_STRICT_CHECKSUM") or "0"
+
+        # If strict checking enabled and neither sum defined, raise error
+        if strict == "1":
+            raise NoChecksumError(checksum_line)
+
+        checksum_event = {"sha256sum": checksum}
+        bb.event.fire(MissingChecksumEvent(ud.url, **checksum_event), d)
+
+        if strict == "ignore":
+            return
+
+        # Log missing digest so user can more easily add it
+        logger.warning(
+            f"Missing checksum for '{ud.localpath}', consider using this " \
+            f"SRC_URI in the recipe:\n{checksum_line}")
+
+    def unpack(self, ud, rootdir, d):
+        image_file = ud.localname + ":" + ud.tag + ".zst"
+        oe.path.remove(rootdir + "/" + image_file)
+        oe.path.copyhardlink(ud.localpath, rootdir + "/" + image_file)