diff --git a/configs/aarch64-zephyr-elf.config b/configs/aarch64-zephyr-elf.config
index 3e071836..c459c2b4 100644
--- a/configs/aarch64-zephyr-elf.config
+++ b/configs/aarch64-zephyr-elf.config
@@ -5,4 +5,4 @@ CT_ARCH_64=y
 CT_TARGET_VENDOR="zephyr"
 CT_TARGET_CFLAGS="-moverride=tune=no_ldp_stp_qregs -ftls-model=local-exec"
 CT_MULTILIB=y
-CT_GDB_CROSS_EXTRA_CONFIG_ARRAY="--enable-targets=arm-zephyr-eabi --enable-threads=c11 --enable-libstdcxx-time=c11 --enable-libstdcxx-threads"
+CT_GDB_CROSS_EXTRA_CONFIG_ARRAY="--enable-targets=arm-zephyr-eabi"
diff --git a/configs/common.config b/configs/common.config
index 17df7510..9c317655 100644
--- a/configs/common.config
+++ b/configs/common.config
@@ -15,11 +15,8 @@ CT_GDB_CUSTOM_LOCATION="${GITHUB_WORKSPACE}/gdb"
 # GCC
 CT_GCC_SRC_CUSTOM=y
 CT_GCC_CUSTOM_LOCATION="${GITHUB_WORKSPACE}/gcc"
-# NOTE: --enable-threads=c11 is still necessary here to override the value inherited by
-# build/cc/gcc.sh with baremetal "mode"
-CT_CC_GCC_EXTRA_CONFIG_ARRAY="--with-gnu-ld --with-gnu-as --enable-initfini-array --enable-threads=c11 --enable-libstdcxx-time=c11 --enable-libstdcxx-threads"
+CT_CC_GCC_EXTRA_CONFIG_ARRAY="--with-gnu-ld --with-gnu-as --enable-initfini-array"
 CT_CC_LANG_CXX=y
-CT_THREADS_C11=y
 
 # Newlib
 CT_NEWLIB_SRC_CUSTOM=y
diff --git a/configs/x86_64-zephyr-elf.config b/configs/x86_64-zephyr-elf.config
index be431dba..f3a90cf8 100644
--- a/configs/x86_64-zephyr-elf.config
+++ b/configs/x86_64-zephyr-elf.config
@@ -6,4 +6,4 @@ CT_TARGET_VENDOR="zephyr"
 CT_TARGET_CFLAGS="-ftls-model=local-exec"
 CT_MULTILIB=y
 CT_BINUTILS_EXTRA_CONFIG_ARRAY="--enable-targets=x86_64-pep"
-CT_CC_GCC_EXTRA_CONFIG_ARRAY="--with-gnu-ld --with-gnu-as --enable-initfini-array --with-cpu-32=i586 --with-arch-32=i586 --with-cpu-64=generic --with-arch-64=x86-64  --enable-threads=c11 --enable-libstdcxx-time=c11 --enable-libstdcxx-threads"
+CT_CC_GCC_EXTRA_CONFIG_ARRAY="--with-gnu-ld --with-gnu-as --enable-initfini-array --with-cpu-32=i586 --with-arch-32=i586 --with-cpu-64=generic --with-arch-64=x86-64"
diff --git a/gcc b/gcc
index b016c34c..504d8c3a 160000
--- a/gcc
+++ b/gcc
@@ -1 +1 @@
-Subproject commit b016c34c39aa42a550fef3bf59876b942ca4a11a
+Subproject commit 504d8c3a8dc4b8222c272818b407fd772768e8cf