2 files changed, 29 insertions, 1 deletions

diff --git a/recipes-core/packagegroups/packagegroup-container.bb b/recipes-core/packagegroups/packagegroup-container.bb
index 4b1ad009..f5e20344 100644
--- a/recipes-core/packagegroups/packagegroup-container.bb
+++ b/recipes-core/packagegroups/packagegroup-container.bb
@@ -11,6 +11,9 @@ PACKAGES = "\
     packagegroup-lxc \
     packagegroup-docker \
     packagegroup-oci \
+    packagegroup-cni \
+    packagegroup-netavark \
+    packagegroup-container-tools \
     ${@bb.utils.contains('DISTRO_FEATURES', 'seccomp ipv6', \
                          'packagegroup-podman', '', d)} \
     packagegroup-containerd \
@@ -36,8 +39,28 @@ RDEPENDS:packagegroup-podman = " \
     podman \
 "
 
+RDEPENDS:packagegroup-cni = " \
+    cni \
+    iptables \
+    iproute2 \
+    ipset \
+    bridge-utils \
+"
+
+RDEPENDS:packagegroup-netavark = " \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'seccomp', 'netavark aardvark-dns', '', d)} \
+"
+
+RDEPENDS:packagegroup-container-tools = " \
+    skopeo \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'seccomp', 'conmon', '', d)} \
+    umoci \
+    ${@bb.utils.contains('VIRTUAL-RUNTIME_container_engine','podman','podman-tui nerdctl podman-compose','',d)}  \
+    ${@bb.utils.contains_any('VIRTUAL-RUNTIME_container_engine','docker docker-moby','docker-compose','',d)}  \
+"
+
 RDEPENDS:packagegroup-oci = " \
-    virtual-runc \
+    ${VIRTUAL-RUNTIME_container_runtime} \
     oci-systemd-hook \
     oci-runtime-tools \
     oci-image-tools \
@@ -45,5 +68,9 @@ RDEPENDS:packagegroup-oci = " \
 
 RDEPENDS:packagegroup-containerd = " \
     virtual-containerd \
+    packagegroup-cni \
+    containerd-cni \
+    nerdctl \
+    tini \
 "
 
diff --git a/recipes-core/packagegroups/packagegroup-kubernetes.bb b/recipes-core/packagegroups/packagegroup-kubernetes.bb
index d518fc15..e06b1cb4 100644
--- a/recipes-core/packagegroups/packagegroup-kubernetes.bb
+++ b/recipes-core/packagegroups/packagegroup-kubernetes.bb
@@ -28,6 +28,7 @@ RDEPENDS:packagegroup-kubernetes-base = " \
 RDEPENDS:packagegroup-k8s-host = " \
     packagegroup-kubernetes-base \
     kubernetes \
+    cri-tools \
 "
 
 RDEPENDS:packagegroup-k8s-node = " \