3 files changed, 26 insertions, 11 deletions
diff --git a/docker/scripts/lib_apt.sh b/docker/scripts/lib_apt.sh
index 356e8818b..beeb4829d 100644
--- a/docker/scripts/lib_apt.sh
+++ b/docker/scripts/lib_apt.sh
@@ -20,8 +20,26 @@ if [ -n "$(alias lib_apt_imported 2> /dev/null)" ] ; then
 fi
 alias lib_apt_imported=true
 
-DIND_FROM_IMAGE="cruizba/ubuntu-dind:jammy-26.1.3-r2"
-HST_FROM_IMAGE="ubuntu:22.04"
+select_dind_image() {
+    local input_image="$1"
+    local dind_image=""
+
+    case "$input_image" in
+      "ubuntu:22.04")
+        dind_image="cruizba/ubuntu-dind:jammy-26.1.3-r2"
+        is_dind_image="true"
+        ;;
+      "ubuntu:24.04")
+        dind_image="cruizba/ubuntu-dind:noble-26.1.3-r2"
+        is_dind_image="true"
+        ;;
+      *)
+        dind_image="$input_image"
+        ;;
+    esac
+
+    echo "$dind_image"
+}
 
 export CIMAN_DOCKER_SCRIPTS=${CIMAN_DOCKER_SCRIPTS:-"$(dirname $BASH_SOURCE)"}
 . "$CIMAN_DOCKER_SCRIPTS/lib_common.sh"
@@ -374,10 +392,7 @@ generate_apt_dockerfile() {
     local is_dind_image="false"
 
     # TODO: Enable HST on AARCH64 when supported in vpp/extras/hs-test
-    if [ "$from_image" = "$HST_FROM_IMAGE" ] ; then
-        from_image="$DIND_FROM_IMAGE"
-        is_dind_image="true"
-    fi
+    from_image=$(select_dind_image "$from_image")
 
     cat <<EOF  >"$DOCKERIGNOREFILE"
 **/__pycache__
diff --git a/docker/scripts/lib_csit.sh b/docker/scripts/lib_csit.sh
index 06cfb471b..72b32bbd9 100644
--- a/docker/scripts/lib_csit.sh
+++ b/docker/scripts/lib_csit.sh
@@ -34,8 +34,8 @@ export CIMAN_DOCKER_SCRIPTS="${CIMAN_DOCKER_SCRIPTS:-$(dirname ${BASH_SOURCE[0]}
 #       to create an enumerated set of jobs jobs that match the
 #       definitions here.
 declare -A CSIT_VPP_BRANCHES
-CSIT_VPP_BRANCHES["ubuntu-22.04"]="stable/2406 master"
-CSIT_VPP_BRANCHES["ubuntu-24.04"]="master"
+CSIT_VPP_BRANCHES["ubuntu-22.04"]="stable/2410 stable/2502 master"
+CSIT_VPP_BRANCHES["ubuntu-24.04"]="stable/2410 stable/2502 master"
 export CSIT_VPP_BRANCHES
 
 CSIT_SUPPORTED_EXECUTOR_CLASSES="builder csit_dut"
diff --git a/docker/scripts/lib_vpp.sh b/docker/scripts/lib_vpp.sh
index 3d827a15c..83dd2c9d0 100644
--- a/docker/scripts/lib_vpp.sh
+++ b/docker/scripts/lib_vpp.sh
@@ -122,7 +122,7 @@ docker_build_setup_vpp() {
 #       to create an enumerated set of jobs jobs that match the
 #       definitions here.
 declare -A VPP_BRANCHES
-VPP_BRANCHES["debian-12"]="stable/2410 master"
-VPP_BRANCHES["ubuntu-22.04"]="stable/2406 stable/2410 master"
-VPP_BRANCHES["ubuntu-24.04"]="stable/2410 master"
+VPP_BRANCHES["debian-12"]="stable/2410 stable/2502 master"
+VPP_BRANCHES["ubuntu-22.04"]="stable/2410 stable/2502 master"
+VPP_BRANCHES["ubuntu-24.04"]="stable/2410 stable/2502 master"
 export VPP_BRANCHES