diff --git a/vm-ubuntu-24.04/install-p4dev-v8.sh b/vm-ubuntu-24.04/install-p4dev-v8.sh
index 3165a970..1d80fd5d 100755
--- a/vm-ubuntu-24.04/install-p4dev-v8.sh
+++ b/vm-ubuntu-24.04/install-p4dev-v8.sh
@@ -849,7 +849,7 @@ else
     git log -n 1
     TIME_BEHAVIORAL_MODEL_INSTALL_START=$(date +%s)
     PATCH_DIR="${THIS_SCRIPT_DIR_ABSOLUTE}/patches"
-    patch -p1 < "${PATCH_DIR}/behavioral-model-support-fedora.patch"
+    patch -p1 < "${PATCH_DIR}/behavioral-model-adjust-ubuntu-packges.patch"
     patch -p1 < "${PATCH_DIR}/behavioral-model-support-venv-2026-apr.patch"
     # This command installs Thrift, which I want to include in my build of
     # simple_switch_grpc
diff --git a/vm-ubuntu-24.04/install.sh b/vm-ubuntu-24.04/install.sh
index bb3f9127..0cfd243e 100755
--- a/vm-ubuntu-24.04/install.sh
+++ b/vm-ubuntu-24.04/install.sh
@@ -45,11 +45,11 @@ else
 fi
 
 case ${VERSION} in
-    2026-May-01)
-	export INSTALL_BEHAVIORAL_MODEL_SOURCE_VERSION="08bba268ecf3c92e53778b9605696c1e2c46d9e8"
-	export INSTALL_PI_SOURCE_VERSION="51805c0108cb49e85e4812dd05bb6693b1f48f85"
-	export INSTALL_P4C_SOURCE_VERSION="fe95abfa3318512732776a1ad0aa83b4f2192216"
-	export INSTALL_PTF_SOURCE_VERSION="c67ca73692fb1ec23e0b11c7f5b03f1633da09a2"
+    2026-Jun-01)
+	export INSTALL_BEHAVIORAL_MODEL_SOURCE_VERSION="282fce33f94046150781e0cb2e1576a01a2522b9"
+	export INSTALL_PI_SOURCE_VERSION="c99ed2ad5d2614be33e788d9c5f32f4f22e9c384"
+	export INSTALL_P4C_SOURCE_VERSION="78157dc6c13157df802309313d1005b77cfbe7b1"
+	export INSTALL_PTF_SOURCE_VERSION="c15b9e8273976559e6c08e6ca8dc5ff1e2a0a623"
 	;;
     latest)
 	echo "Using the latest version of all p4lang repository source code."
diff --git a/vm-ubuntu-24.04/patches/behavioral-model-adjust-ubuntu-packges.patch b/vm-ubuntu-24.04/patches/behavioral-model-adjust-ubuntu-packges.patch
new file mode 100644
index 00000000..f057619d
--- /dev/null
+++ b/vm-ubuntu-24.04/patches/behavioral-model-adjust-ubuntu-packges.patch
@@ -0,0 +1,37 @@
+diff --git a/install_deps.sh b/install_deps.sh
+index 02dd6d2..7673969 100755
+--- a/install_deps.sh
++++ b/install_deps.sh
+@@ -18,31 +18,20 @@ sudo apt-get install -y \
+     g++ \
+     libboost-dev \
+     libboost-program-options-dev \
++    libboost-test-dev \
+     libboost-thread-dev \
+     libevent-dev \
+     libffi-dev \
+     libgmp-dev \
+-    libgrpc++-dev \
+-    libgrpc-dev \
+     libjsoncpp-dev \
+-    libnanomsg-dev \
+     libpcap-dev \
+-    libprotobuf-dev \
+-    libprotoc-dev \
+-    libreadline-dev \
+     libssl-dev \
+-    libthrift-dev \
+     libtool \
+     libtool-bin \
+     libxxhash-dev \
+     pkg-config \
+-    protobuf-compiler \
+-    protobuf-compiler-grpc \
+     python3-dev \
+     python3-pip \
+-    python3-six \
+-    python3-thrift \
+-    thrift-compiler \
+     wget
+ 
+ tmpdir=`mktemp -d -p .`
diff --git a/vm-ubuntu-24.04/patches/behavioral-model-adjust-ubuntu-packges.patch.license b/vm-ubuntu-24.04/patches/behavioral-model-adjust-ubuntu-packges.patch.license
new file mode 100644
index 00000000..5157373f
--- /dev/null
+++ b/vm-ubuntu-24.04/patches/behavioral-model-adjust-ubuntu-packges.patch.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2026 Andy Fingerhut
+
+SPDX-License-Identifier: Apache-2.0
diff --git a/vm-ubuntu-24.04/patches/behavioral-model-support-fedora.patch b/vm-ubuntu-24.04/patches/behavioral-model-support-fedora.patch
deleted file mode 100644
index 71f8e83c..00000000
--- a/vm-ubuntu-24.04/patches/behavioral-model-support-fedora.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff --git a/install_deps.sh b/install_deps.sh
-index 37a49c9..cb06756 100755
---- a/install_deps.sh
-+++ b/install_deps.sh
-@@ -1,45 +1,58 @@
- #!/bin/bash
- set -e
- 
--sudo apt-get install -y \
--    autoconf \
--    automake \
--    bison \
--    build-essential \
--    ccache \
--    cmake \
--    flex \
--    git \
--    g++ \
--    libboost-dev \
--    libboost-filesystem-dev \
--    libboost-program-options-dev \
--    libboost-system-dev \
--    libboost-test-dev \
--    libboost-thread-dev \
--    libevent-dev \
--    libffi-dev \
--    libgmp-dev \
--    libgrpc++-dev \
--    libgrpc-dev \
--    libnanomsg-dev \
--    libpcap-dev \
--    libprotobuf-dev \
--    libprotoc-dev \
--    libreadline-dev \
--    libssl-dev \
--    libthrift-dev \
--    libtool \
--    libtool-bin \
--    pkg-config \
--    protobuf-compiler \
--    protobuf-compiler-grpc \
--    python3-dev \
--    python3-pip \
--    python3-six \
--    python3-thrift \
--    thrift-compiler \
--    wget
-+if [ ! -r /etc/os-release ]
-+then
-+    1>&2 echo "No file /etc/os-release.  Cannot determine what OS this is."
-+    exit 1
-+fi
-+source /etc/os-release
-+
-+if [ "${ID}" = "ubuntu" ]
-+then
-+    sudo apt-get install -y \
-+         automake \
-+         cmake \
-+         libgmp-dev \
-+         libpcap-dev \
-+         libboost-dev \
-+         libboost-test-dev \
-+         libboost-program-options-dev \
-+         libboost-system-dev \
-+         libboost-filesystem-dev \
-+         libboost-thread-dev \
-+         libevent-dev \
-+         libtool \
-+         flex \
-+         bison \
-+         pkg-config \
-+         g++ \
-+         libssl-dev \
-+         libffi-dev \
-+         python3-dev \
-+         python3-pip \
-+         wget
-+elif [ "${ID}" = "fedora" ]
-+then
-+    sudo dnf install -y \
-+         automake \
-+         cmake \
-+         gmp-devel \
-+         libpcap-devel \
-+         boost-devel \
-+         boost-system \
-+         boost-thread \
-+         boost-filesystem \
-+         boost-test \
-+         boost-static \
-+         libevent-devel \
-+         libtool \
-+         flex \
-+         bison \
-+         pkg-config \
-+         g++ \
-+         openssl-devel
-+fi
- 
- tmpdir=`mktemp -d -p .`
- cd $tmpdir
diff --git a/vm-ubuntu-24.04/patches/behavioral-model-support-fedora.patch.license b/vm-ubuntu-24.04/patches/behavioral-model-support-fedora.patch.license
deleted file mode 100644
index ce6f24cf..00000000
--- a/vm-ubuntu-24.04/patches/behavioral-model-support-fedora.patch.license
+++ /dev/null
@@ -1,3 +0,0 @@
-SPDX-FileCopyrightText: 2024 Andy Fingerhut
-
-SPDX-License-Identifier: Apache-2.0