diff --git a/samples/xtensa-dc233c-linux-uclibcfdpic/crosstool.config b/samples/xtensa-dc233c-linux-uclibcfdpic/crosstool.config
index d858d682f..40bf091c4 100644
--- a/samples/xtensa-dc233c-linux-uclibcfdpic/crosstool.config
+++ b/samples/xtensa-dc233c-linux-uclibcfdpic/crosstool.config
@@ -12,17 +12,17 @@ CT_LINUX_DEVEL_BRANCH="v6.6"
 CT_ARCH_BINFMT_FDPIC=y
 CT_BINUTILS_SRC_DEVEL=y
 CT_BINUTILS_DEVEL_URL="https://github.com/jcmvbkbc/binutils-gdb-xtensa.git"
-CT_BINUTILS_DEVEL_BRANCH="xtensa-2.42-fdpic"
+CT_BINUTILS_DEVEL_BRANCH="xtensa-2.42-fdpic-musl"
 CT_BINUTILS_PLUGINS=y
 # CT_BINUTILS_RELRO is not set
 CT_LIBC_UCLIBC_NG=y
 CT_UCLIBC_NG_SRC_DEVEL=y
 CT_UCLIBC_NG_DEVEL_URL="https://github.com/jcmvbkbc/uclibc-ng-xtensa.git"
-CT_UCLIBC_NG_DEVEL_BRANCH="xtensa-1.0.46-fdpic"
+CT_UCLIBC_NG_DEVEL_BRANCH="xtensa-1.0.48-fdpic"
 CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/xtensa-dc233c-linux-uclibcfdpic/uclibc.config"
 CT_LIBC_UCLIBC_IPV6=y
 CT_LIBC_UCLIBC_WCHAR=y
 CT_GCC_SRC_DEVEL=y
 CT_GCC_DEVEL_URL="https://github.com/jcmvbkbc/gcc-xtensa.git"
-CT_GCC_DEVEL_BRANCH="xtensa-14-9480-fdpic"
+CT_GCC_DEVEL_BRANCH="xtensa-14-9655-fdpic"
 # CT_CC_GCC_SJLJ_EXCEPTIONS is not set
diff --git a/samples/xtensa-esp32-linux-uclibcfdpic/crosstool.config b/samples/xtensa-esp32-linux-uclibcfdpic/crosstool.config
index 66d244049..b678444a2 100644
--- a/samples/xtensa-esp32-linux-uclibcfdpic/crosstool.config
+++ b/samples/xtensa-esp32-linux-uclibcfdpic/crosstool.config
@@ -12,17 +12,17 @@ CT_LINUX_DEVEL_BRANCH="v6.6"
 CT_ARCH_BINFMT_FDPIC=y
 CT_BINUTILS_SRC_DEVEL=y
 CT_BINUTILS_DEVEL_URL="https://github.com/jcmvbkbc/binutils-gdb-xtensa.git"
-CT_BINUTILS_DEVEL_BRANCH="xtensa-2.42-fdpic"
+CT_BINUTILS_DEVEL_BRANCH="xtensa-2.42-fdpic-musl"
 CT_BINUTILS_PLUGINS=y
 # CT_BINUTILS_RELRO is not set
 CT_LIBC_UCLIBC_NG=y
 CT_UCLIBC_NG_SRC_DEVEL=y
 CT_UCLIBC_NG_DEVEL_URL="https://github.com/jcmvbkbc/uclibc-ng-xtensa.git"
-CT_UCLIBC_NG_DEVEL_BRANCH="xtensa-1.0.46-fdpic"
+CT_UCLIBC_NG_DEVEL_BRANCH="xtensa-1.0.48-fdpic"
 CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/xtensa-esp32-linux-uclibcfdpic/uclibc.config"
 CT_LIBC_UCLIBC_IPV6=y
 CT_LIBC_UCLIBC_WCHAR=y
 CT_GCC_SRC_DEVEL=y
 CT_GCC_DEVEL_URL="https://github.com/jcmvbkbc/gcc-xtensa.git"
-CT_GCC_DEVEL_BRANCH="xtensa-14-9480-fdpic"
+CT_GCC_DEVEL_BRANCH="xtensa-14-9655-fdpic"
 # CT_CC_GCC_SJLJ_EXCEPTIONS is not set
diff --git a/samples/xtensa-esp32s3-linux-uclibcfdpic/crosstool.config b/samples/xtensa-esp32s3-linux-uclibcfdpic/crosstool.config
index 64a74a81b..1f4846c7d 100644
--- a/samples/xtensa-esp32s3-linux-uclibcfdpic/crosstool.config
+++ b/samples/xtensa-esp32s3-linux-uclibcfdpic/crosstool.config
@@ -12,17 +12,17 @@ CT_LINUX_DEVEL_BRANCH="v6.6"
 CT_ARCH_BINFMT_FDPIC=y
 CT_BINUTILS_SRC_DEVEL=y
 CT_BINUTILS_DEVEL_URL="https://github.com/jcmvbkbc/binutils-gdb-xtensa.git"
-CT_BINUTILS_DEVEL_BRANCH="xtensa-2.42-fdpic"
+CT_BINUTILS_DEVEL_BRANCH="xtensa-2.42-fdpic-musl"
 CT_BINUTILS_PLUGINS=y
 # CT_BINUTILS_RELRO is not set
 CT_LIBC_UCLIBC_NG=y
 CT_UCLIBC_NG_SRC_DEVEL=y
 CT_UCLIBC_NG_DEVEL_URL="https://github.com/jcmvbkbc/uclibc-ng-xtensa.git"
-CT_UCLIBC_NG_DEVEL_BRANCH="xtensa-1.0.46-fdpic"
+CT_UCLIBC_NG_DEVEL_BRANCH="xtensa-1.0.48-fdpic"
 CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/xtensa-esp32s3-linux-uclibcfdpic/uclibc.config"
 CT_LIBC_UCLIBC_IPV6=y
 CT_LIBC_UCLIBC_WCHAR=y
 CT_GCC_SRC_DEVEL=y
 CT_GCC_DEVEL_URL="https://github.com/jcmvbkbc/gcc-xtensa.git"
-CT_GCC_DEVEL_BRANCH="xtensa-14-9480-fdpic"
+CT_GCC_DEVEL_BRANCH="xtensa-14-9655-fdpic"
 # CT_CC_GCC_SJLJ_EXCEPTIONS is not set