diff --git a/boards/shields/nxp_m2_wifi_bt/doc/index.rst b/boards/shields/nxp_m2_wifi_bt/doc/index.rst
index 2cef6dc35db..3aab1028069 100644
--- a/boards/shields/nxp_m2_wifi_bt/doc/index.rst
+++ b/boards/shields/nxp_m2_wifi_bt/doc/index.rst
@@ -66,7 +66,7 @@ Below are the supported shields to be used with ``--shield <option>`` when you i
 For example:
 
 .. zephyr-app-commands::
-   :zephyr-app: samples/bluetooth/handsfree
+   :zephyr-app: samples/bluetooth/classic/handsfree
    :board: mimxrt1060_evk@C//qspi
    :shield: nxp_m2_1xk_wifi_bt
    :goals: build
diff --git a/doc/_scripts/redirects.py b/doc/_scripts/redirects.py
index 1c1e9e29942..67ecc7849db 100644
--- a/doc/_scripts/redirects.py
+++ b/doc/_scripts/redirects.py
@@ -230,6 +230,8 @@ REDIRECTS = [
     ('samples/bluetooth/broadcast_audio_sink/README', 'samples/bluetooth/bap_broadcast_sink/README'),
     ('samples/bluetooth/broadcast_audio_source/README', 'samples/bluetooth/bap_broadcast_source/README'),
     ('samples/bluetooth/central_iso/README', 'samples/bluetooth/iso_central/README'),
+    ('samples/bluetooth/handsfree/README', 'samples/bluetooth/classic/handsfree/README'),
+    ('samples/bluetooth/handsfree_ag/README', 'samples/bluetooth/classic/handsfree_ag/README'),
     ('samples/bluetooth/peripheral_iso/README', 'samples/bluetooth/iso_peripheral/README'),
     ('samples/bluetooth/public_broadcast_sink/README', 'samples/bluetooth/pbp_public_broadcast_sink/README'),
     ('samples/bluetooth/public_broadcast_source/README', 'samples/bluetooth/pbp_public_broadcast_source/README'),
diff --git a/samples/bluetooth/handsfree/CMakeLists.txt b/samples/bluetooth/classic/handsfree/CMakeLists.txt
similarity index 100%
rename from samples/bluetooth/handsfree/CMakeLists.txt
rename to samples/bluetooth/classic/handsfree/CMakeLists.txt
diff --git a/samples/bluetooth/handsfree/README.rst b/samples/bluetooth/classic/handsfree/README.rst
similarity index 84%
rename from samples/bluetooth/handsfree/README.rst
rename to samples/bluetooth/classic/handsfree/README.rst
index 2df63ba2ee1..3629b147693 100644
--- a/samples/bluetooth/handsfree/README.rst
+++ b/samples/bluetooth/classic/handsfree/README.rst
@@ -18,7 +18,7 @@ Requirements
 Building and Running
 ********************
 
-This sample can be found under :zephyr_file:`samples/bluetooth/handsfree` in
+This sample can be found under :zephyr_file:`samples/bluetooth/classic/handsfree` in
 the Zephyr tree.
 
 See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/handsfree/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf b/samples/bluetooth/classic/handsfree/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf
similarity index 100%
rename from samples/bluetooth/handsfree/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf
rename to samples/bluetooth/classic/handsfree/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf
diff --git a/samples/bluetooth/handsfree/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay b/samples/bluetooth/classic/handsfree/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay
similarity index 100%
rename from samples/bluetooth/handsfree/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay
rename to samples/bluetooth/classic/handsfree/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay
diff --git a/samples/bluetooth/handsfree/prj.conf b/samples/bluetooth/classic/handsfree/prj.conf
similarity index 100%
rename from samples/bluetooth/handsfree/prj.conf
rename to samples/bluetooth/classic/handsfree/prj.conf
diff --git a/samples/bluetooth/handsfree/sample.yaml b/samples/bluetooth/classic/handsfree/sample.yaml
similarity index 100%
rename from samples/bluetooth/handsfree/sample.yaml
rename to samples/bluetooth/classic/handsfree/sample.yaml
diff --git a/samples/bluetooth/handsfree/src/main.c b/samples/bluetooth/classic/handsfree/src/main.c
similarity index 100%
rename from samples/bluetooth/handsfree/src/main.c
rename to samples/bluetooth/classic/handsfree/src/main.c
diff --git a/samples/bluetooth/handsfree_ag/CMakeLists.txt b/samples/bluetooth/classic/handsfree_ag/CMakeLists.txt
similarity index 100%
rename from samples/bluetooth/handsfree_ag/CMakeLists.txt
rename to samples/bluetooth/classic/handsfree_ag/CMakeLists.txt
diff --git a/samples/bluetooth/handsfree_ag/Kconfig b/samples/bluetooth/classic/handsfree_ag/Kconfig
similarity index 100%
rename from samples/bluetooth/handsfree_ag/Kconfig
rename to samples/bluetooth/classic/handsfree_ag/Kconfig
diff --git a/samples/bluetooth/handsfree_ag/README.rst b/samples/bluetooth/classic/handsfree_ag/README.rst
similarity index 86%
rename from samples/bluetooth/handsfree_ag/README.rst
rename to samples/bluetooth/classic/handsfree_ag/README.rst
index e28d80433b0..64b870939f2 100644
--- a/samples/bluetooth/handsfree_ag/README.rst
+++ b/samples/bluetooth/classic/handsfree_ag/README.rst
@@ -18,7 +18,7 @@ Requirements
 Building and Running
 ********************
 
-This sample can be found under :zephyr_file:`samples/bluetooth/handsfree_ag` in
+This sample can be found under :zephyr_file:`samples/bluetooth/classic/handsfree_ag` in
 the Zephyr tree.
 
 See :zephyr:code-sample-category:`bluetooth` samples for details.
diff --git a/samples/bluetooth/handsfree_ag/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf b/samples/bluetooth/classic/handsfree_ag/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf
similarity index 100%
rename from samples/bluetooth/handsfree_ag/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf
rename to samples/bluetooth/classic/handsfree_ag/boards/mimxrt1170_evk_mimxrt1176_cm7_B.conf
diff --git a/samples/bluetooth/handsfree_ag/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay b/samples/bluetooth/classic/handsfree_ag/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay
similarity index 100%
rename from samples/bluetooth/handsfree_ag/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay
rename to samples/bluetooth/classic/handsfree_ag/boards/mimxrt1170_evk_mimxrt1176_cm7_B.overlay
diff --git a/samples/bluetooth/handsfree_ag/prj.conf b/samples/bluetooth/classic/handsfree_ag/prj.conf
similarity index 100%
rename from samples/bluetooth/handsfree_ag/prj.conf
rename to samples/bluetooth/classic/handsfree_ag/prj.conf
diff --git a/samples/bluetooth/handsfree_ag/sample.yaml b/samples/bluetooth/classic/handsfree_ag/sample.yaml
similarity index 100%
rename from samples/bluetooth/handsfree_ag/sample.yaml
rename to samples/bluetooth/classic/handsfree_ag/sample.yaml
diff --git a/samples/bluetooth/handsfree_ag/src/main.c b/samples/bluetooth/classic/handsfree_ag/src/main.c
similarity index 99%
rename from samples/bluetooth/handsfree_ag/src/main.c
rename to samples/bluetooth/classic/handsfree_ag/src/main.c
index a5f67af8512..8d2237b0a21 100644
--- a/samples/bluetooth/handsfree_ag/src/main.c
+++ b/samples/bluetooth/classic/handsfree_ag/src/main.c
@@ -257,6 +257,9 @@ static void discovery_timeout_cb(const struct bt_br_discovery_result *results, s
 				temp[eir[0] - 1] = '\0'; /* Set end flag */
 				printk(", name %s", temp);
 				break;
+			default:
+				/* Skip the EIR */
+				break;
 			}
 			len = len - eir[0] - 1;
 			eir = eir + eir[0] + 1;
diff --git a/samples/bluetooth/classic/index.rst b/samples/bluetooth/classic/index.rst
new file mode 100644
index 00000000000..5022bf6fd20
--- /dev/null
+++ b/samples/bluetooth/classic/index.rst
@@ -0,0 +1,6 @@
+.. zephyr:code-sample-category:: bluetooth_classic
+   :name: Bluetooth Classic
+   :show-listing:
+   :glob: **/*
+
+   These samples demonstrate the use of Bluetooth Classic in Zephyr.