diff --git a/debian/patches/amdgpu/nonlinux.patch b/debian/patches/amdgpu/nonlinux.patch
index 2c0098ed..0f66f517 100644
--- a/debian/patches/amdgpu/nonlinux.patch
+++ b/debian/patches/amdgpu/nonlinux.patch
@@ -5,13 +5,13 @@ https://reviews.llvm.org/D143017
 Previously, on non-Linux, amdgpu would get enabled whatever the CPU
 architecture.
 
-Index: llvm-toolchain-15-15.0.7/openmp/libomptarget/plugins/amdgpu/CMakeLists.txt
+Index: llvm-toolchain-16_16.0.0~+rc4/openmp/libomptarget/plugins/amdgpu/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-15-15.0.7.orig/openmp/libomptarget/plugins/amdgpu/CMakeLists.txt
-+++ llvm-toolchain-15-15.0.7/openmp/libomptarget/plugins/amdgpu/CMakeLists.txt
-@@ -27,7 +27,7 @@ if(NOT LIBOMPTARGET_DEP_LIBELF_FOUND)
-   return()
- endif()
+--- llvm-toolchain-16_16.0.0~+rc4.orig/openmp/libomptarget/plugins/amdgpu/CMakeLists.txt
++++ llvm-toolchain-16_16.0.0~+rc4/openmp/libomptarget/plugins/amdgpu/CMakeLists.txt
+@@ -22,7 +22,7 @@ endif()
+ # as of rocm-3.7, hsa is installed with cmake packages and kmt is found via hsa
+ find_package(hsa-runtime64 QUIET 1.2.0 HINTS ${CMAKE_INSTALL_PREFIX} PATHS /opt/rocm)
  
 -if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(ppc64le)|(aarch64)$" AND CMAKE_SYSTEM_NAME MATCHES "Linux")
 +if(NOT (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(ppc64le)|(aarch64)$" AND CMAKE_SYSTEM_NAME MATCHES "Linux"))
diff --git a/debian/patches/force-sse2-compiler-rt.diff b/debian/patches/force-sse2-compiler-rt.diff
index 7a5a49c2..391540c8 100644
--- a/debian/patches/force-sse2-compiler-rt.diff
+++ b/debian/patches/force-sse2-compiler-rt.diff
@@ -1,10 +1,10 @@
-Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/compiler-rt/lib/builtins/CMakeLists.txt
+Index: llvm-toolchain-16_16.0.0~+rc4/compiler-rt/lib/builtins/CMakeLists.txt
 ===================================================================
---- llvm-toolchain-snapshot_16~++20230123091551+c3737a652230.orig/compiler-rt/lib/builtins/CMakeLists.txt
-+++ llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/compiler-rt/lib/builtins/CMakeLists.txt
-@@ -754,6 +754,12 @@ else ()
- 
-   append_list_if(COMPILER_RT_HAS_FLOAT16 -DCOMPILER_RT_HAS_FLOAT16 BUILTIN_CFLAGS)
+--- llvm-toolchain-16_16.0.0~+rc4.orig/compiler-rt/lib/builtins/CMakeLists.txt
++++ llvm-toolchain-16_16.0.0~+rc4/compiler-rt/lib/builtins/CMakeLists.txt
+@@ -750,6 +750,12 @@ else ()
+     append_list_if(COMPILER_RT_ENABLE_CET -fcf-protection=full BUILTIN_CFLAGS)
+   endif()
  
 +  if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64")
 +    append_list_if(COMPILER_RT_HAS_FLOAT16 -msse2 -DCOMPILER_RT_HAS_FLOAT16 BUILTIN_CFLAGS)
diff --git a/debian/patches/series b/debian/patches/series
index f32f47c4..17041de8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -150,5 +150,4 @@ bolt-disable-emit-relocs.patch
 link-grpc.diff
 
 amdgpu/nonlinux.patch
-amdgpu/usr-search-paths.patch
 amdgpu/bitcode-multiarch.patch