diff --git a/meta-lmp-base/conf/layer.conf b/meta-lmp-base/conf/layer.conf
index c01cf90aca..b3d6831031 100644
--- a/meta-lmp-base/conf/layer.conf
+++ b/meta-lmp-base/conf/layer.conf
@@ -60,3 +60,6 @@ BBMASK:append = " \
     /meta-virtualization/dynamic-layers/raspberrypi/recipes-kernel/linux/linux-yocto_6.6.bbappend \
     /meta-virtualization/dynamic-layers/xilinx/recipes-bsp/u-boot/u-boot-xlnx-scr.bbappend \
 "
+
+# To use the meta-virt scarthgap branch we need to replace the docker-ce by docker-moby
+BBMASK:append = "/meta-tegra/external/virtualization-layer/recipes-containers/docker/docker-ce_%.bbappend"
diff --git a/meta-lmp-bsp/dynamic-layers/tegra/recipes-containers/docker/docker-moby_%.bbappend b/meta-lmp-bsp/dynamic-layers/tegra/recipes-containers/docker/docker-moby_%.bbappend
new file mode 100644
index 0000000000..fb697a1cad
--- /dev/null
+++ b/meta-lmp-bsp/dynamic-layers/tegra/recipes-containers/docker/docker-moby_%.bbappend
@@ -0,0 +1,25 @@
+do_install:append:tegra() {
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)};    then
+        install -d ${D}${sysconfdir}/init.d
+        install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init
+    fi
+}
+
+RRECOMMENDS:${PN}:append:tegra = " \
+    kernel-module-br-netfilter \
+    kernel-module-esp4 \
+    kernel-module-ip-vs \
+    kernel-module-ip-vs-rr \
+    kernel-module-macvlan \
+    kernel-module-nf-conntrack-netlink \
+    kernel-module-nf-nat-ftp \
+    kernel-module-nf-nat-redirect \
+    kernel-module-nf-nat-tftp \
+    kernel-module-overlay \
+    kernel-module-veth \
+    kernel-module-xt-addrtype \
+    kernel-module-xt-conntrack \
+    kernel-module-xt-redirect \
+"
+
+PACKAGE_ARCH:tegra = "${TEGRA_PKGARCH}"