diff --git a/CMakeLists.txt b/CMakeLists.txt
index fa9212546db44..bc08c5ee55c98 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1089,6 +1089,7 @@ if (SAI_IMPL OR BUILD_SAI_FAKE)
   add_dependencies(fboss_forwarding_stack
     diag_shell_client
     fboss2
+    fboss2-dev
     fsdb
     qsfp_service
     wedge_qsfp_util
diff --git a/fboss-image/distro_cli/README.md b/fboss-image/distro_cli/README.md
index a50932042f47f..64dc7419ba4a1 100644
--- a/fboss-image/distro_cli/README.md
+++ b/fboss-image/distro_cli/README.md
@@ -7,4 +7,3 @@ cmake --build . --target distro_cli_tests
 # Run via CTest
 ctest -R distro_cli -V
 ```
-
diff --git a/fboss-image/distro_cli/tests/download_test.py b/fboss-image/distro_cli/tests/download_test.py
index 69df3f51e805a..d869c19286498 100644
--- a/fboss-image/distro_cli/tests/download_test.py
+++ b/fboss-image/distro_cli/tests/download_test.py
@@ -18,7 +18,7 @@
 import unittest
 from pathlib import Path
 
-from distro_cli.lib.download import download_artifact, HTTP_METADATA_FILENAME
+from distro_cli.lib.download import HTTP_METADATA_FILENAME, download_artifact
 from distro_cli.tests.test_helpers import enter_tempdir, override_artifact_store_dir
 
 
diff --git a/fboss-image/image_builder/templates/centos-09.0/root_files/usr/local/bin/diag_shell_client b/fboss-image/image_builder/templates/centos-09.0/root_files/usr/local/bin/diag_shell_client
new file mode 100755
index 0000000000000..ed86625cb976d
--- /dev/null
+++ b/fboss-image/image_builder/templates/centos-09.0/root_files/usr/local/bin/diag_shell_client
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec /usr/local/lib/fboss_cmd_find.sh diag_shell_client "$@"
diff --git a/fboss-image/image_builder/templates/centos-09.0/root_files/usr/local/bin/fboss2 b/fboss-image/image_builder/templates/centos-09.0/root_files/usr/local/bin/fboss2
new file mode 100755
index 0000000000000..e221ce56d7279
--- /dev/null
+++ b/fboss-image/image_builder/templates/centos-09.0/root_files/usr/local/bin/fboss2
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec /usr/local/lib/fboss_cmd_find.sh fboss2 "$@"
diff --git a/fboss-image/image_builder/templates/centos-09.0/root_files/usr/local/bin/fboss2-dev b/fboss-image/image_builder/templates/centos-09.0/root_files/usr/local/bin/fboss2-dev
new file mode 100755
index 0000000000000..ecc58323b784c
--- /dev/null
+++ b/fboss-image/image_builder/templates/centos-09.0/root_files/usr/local/bin/fboss2-dev
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec /usr/local/lib/fboss_cmd_find.sh fboss2-dev "$@"
diff --git a/fboss-image/image_builder/templates/centos-09.0/root_files/usr/local/bin/fw_util b/fboss-image/image_builder/templates/centos-09.0/root_files/usr/local/bin/fw_util
new file mode 100755
index 0000000000000..191119cc2fd60
--- /dev/null
+++ b/fboss-image/image_builder/templates/centos-09.0/root_files/usr/local/bin/fw_util
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec /usr/local/lib/fboss_cmd_find.sh fw_util "$@"
diff --git a/fboss-image/image_builder/templates/centos-09.0/root_files/usr/local/bin/sensor_service_client b/fboss-image/image_builder/templates/centos-09.0/root_files/usr/local/bin/sensor_service_client
new file mode 100755
index 0000000000000..b6f952492a101
--- /dev/null
+++ b/fboss-image/image_builder/templates/centos-09.0/root_files/usr/local/bin/sensor_service_client
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec /usr/local/lib/fboss_cmd_find.sh sensor_service_client "$@"
diff --git a/fboss-image/image_builder/templates/centos-09.0/root_files/usr/local/bin/showtech b/fboss-image/image_builder/templates/centos-09.0/root_files/usr/local/bin/showtech
new file mode 100755
index 0000000000000..b5fe3a6075c4a
--- /dev/null
+++ b/fboss-image/image_builder/templates/centos-09.0/root_files/usr/local/bin/showtech
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec /usr/local/lib/fboss_cmd_find.sh showtech "$@"
diff --git a/fboss-image/image_builder/templates/centos-09.0/root_files/usr/local/bin/weutil b/fboss-image/image_builder/templates/centos-09.0/root_files/usr/local/bin/weutil
new file mode 100755
index 0000000000000..f4a22a1a9f06b
--- /dev/null
+++ b/fboss-image/image_builder/templates/centos-09.0/root_files/usr/local/bin/weutil
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec /usr/local/lib/fboss_cmd_find.sh weutil "$@"
diff --git a/fboss-image/image_builder/templates/centos-09.0/root_files/usr/local/lib/fboss_cmd_find.sh b/fboss-image/image_builder/templates/centos-09.0/root_files/usr/local/lib/fboss_cmd_find.sh
new file mode 100755
index 0000000000000..71f7862f27a4e
--- /dev/null
+++ b/fboss-image/image_builder/templates/centos-09.0/root_files/usr/local/lib/fboss_cmd_find.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+# Find and run the given FBOSS command.
+# Usage: fboss_cmd_find.sh <binary_name> [args...]
+set -e
+
+# Install locations during image build
+default_forwarding_stack_path="/opt/fboss/bin"
+default_platform_stack_path="/opt/fboss/bin"
+
+if [ -z "$1" ]; then
+  echo "No command specified" >&2
+  exit 1
+fi
+
+cmd="$1"
+shift
+
+case "$cmd" in
+fboss2 | fboss2-dev | diag_shell_client)
+  # Forwarding stack commands
+  stack_path=${default_forwarding_stack_path}
+  ;;
+
+fw_util | sensor_service_client | showtech | weutil)
+  # Platform stack commands
+  stack_path=${default_platform_stack_path}
+  ;;
+
+*)
+  echo "Unknown FBOSS command: $cmd" >&2
+  exit 1
+  ;;
+esac
+
+exec "${stack_path}/${cmd}" "$@"
diff --git a/fboss/oss/scripts/package.py b/fboss/oss/scripts/package.py
index d1dcfc18897a4..730c4b676f2bb 100755
--- a/fboss/oss/scripts/package.py
+++ b/fboss/oss/scripts/package.py
@@ -23,6 +23,7 @@
 FORWARDING_BINARIES = [
     "diag_shell_client",
     "fboss2",
+    "fboss2-dev",
     "fboss_hw_agent-sai_impl",
     "fboss_sw_agent",
     "fsdb",