diff --git a/Patches/LineageOS-18.1/android_frameworks_ex/0001-constify_JNINativeMethod.patch b/Patches/LineageOS-18.1/android_frameworks_ex/0001-constify_JNINativeMethod.patch
index 8dc18001..8f76effe 100644
--- a/Patches/LineageOS-18.1/android_frameworks_ex/0001-constify_JNINativeMethod.patch
+++ b/Patches/LineageOS-18.1/android_frameworks_ex/0001-constify_JNINativeMethod.patch
@@ -8,7 +8,7 @@ Subject: [PATCH] constify JNINativeMethod table
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/framesequence/jni/FrameSequenceJNI.cpp b/framesequence/jni/FrameSequenceJNI.cpp
-index c701f03..4041733 100644
+index c701f033..4041733d 100644
 --- a/framesequence/jni/FrameSequenceJNI.cpp
 +++ b/framesequence/jni/FrameSequenceJNI.cpp
 @@ -141,7 +141,7 @@ static jlong JNICALL nativeGetFrame(
diff --git a/Patches/LineageOS-18.1/android_frameworks_opt_net_wifi/0001-Random_MAC.patch b/Patches/LineageOS-18.1/android_frameworks_opt_net_wifi/0001-Random_MAC.patch
index 8bd693f8..d1554379 100644
--- a/Patches/LineageOS-18.1/android_frameworks_opt_net_wifi/0001-Random_MAC.patch
+++ b/Patches/LineageOS-18.1/android_frameworks_opt_net_wifi/0001-Random_MAC.patch
@@ -156,7 +156,7 @@ index f40d65624..7276bfb44 100644
      }
  
 diff --git a/service/java/com/android/server/wifi/WifiConfigurationUtil.java b/service/java/com/android/server/wifi/WifiConfigurationUtil.java
-index 7273da333..2ffe547b1 100644
+index ffa9facf5..cfd5ce98f 100644
 --- a/service/java/com/android/server/wifi/WifiConfigurationUtil.java
 +++ b/service/java/com/android/server/wifi/WifiConfigurationUtil.java
 @@ -203,7 +203,7 @@ public class WifiConfigurationUtil {
diff --git a/Patches/LineageOS-19.1/android_frameworks_base/0026-Crash_Details.patch b/Patches/LineageOS-19.1/android_frameworks_base/0026-Crash_Details.patch
index bf1800aa..f2663ff5 100644
--- a/Patches/LineageOS-19.1/android_frameworks_base/0026-Crash_Details.patch
+++ b/Patches/LineageOS-19.1/android_frameworks_base/0026-Crash_Details.patch
@@ -156,10 +156,10 @@ index 3210af7bdebc..a89494c3ae25 100644
      </application>
  </manifest>
 diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
-index 4a7d7089d712..f0441de18929 100644
+index 48ff6d535874..90ac8317a40e 100644
 --- a/packages/SystemUI/res/values/strings.xml
 +++ b/packages/SystemUI/res/values/strings.xml
-@@ -2353,4 +2353,9 @@
+@@ -2355,4 +2355,9 @@
  
      <!-- Title for User Switch dialog. [CHAR LIMIT=20] -->
      <string name="qs_user_switch_dialog_title">Select user</string>
diff --git a/Patches/LineageOS-19.1/android_packages_modules_Wifi/0001-Random_MAC.patch b/Patches/LineageOS-19.1/android_packages_modules_Wifi/0001-Random_MAC.patch
index d878f80c..c11b7175 100644
--- a/Patches/LineageOS-19.1/android_packages_modules_Wifi/0001-Random_MAC.patch
+++ b/Patches/LineageOS-19.1/android_packages_modules_Wifi/0001-Random_MAC.patch
@@ -89,7 +89,7 @@ index b0212133a..5f40104ce 100644
              return config.getRandomizedMacAddress();
          }
 diff --git a/service/java/com/android/server/wifi/WifiConfigurationUtil.java b/service/java/com/android/server/wifi/WifiConfigurationUtil.java
-index 4892dbf52..36b3f0ae3 100644
+index 3ab3ca3d0..883441cda 100644
 --- a/service/java/com/android/server/wifi/WifiConfigurationUtil.java
 +++ b/service/java/com/android/server/wifi/WifiConfigurationUtil.java
 @@ -225,7 +225,7 @@ public class WifiConfigurationUtil {
diff --git a/Scripts/LineageOS-18.1/Patch.sh b/Scripts/LineageOS-18.1/Patch.sh
index 365d05cd..a61a5fc8 100644
--- a/Scripts/LineageOS-18.1/Patch.sh
+++ b/Scripts/LineageOS-18.1/Patch.sh
@@ -123,10 +123,6 @@ applyPatch "$DOS_PATCHES/android_external_hardened_malloc/0001-Broken_Cameras.pa
 fi;
 fi;
 
-if enterAndClear "external/libvpx"; then
-applyPatch "$DOS_PATCHES_COMMON/android_external_libvpx/CVE-2023-5217.patch"; #VP8: disallow thread count changes
-fi;
-
 if enterAndClear "external/libxml2"; then
 git fetch https://github.com/LineageOS/android_external_libxml2 refs/changes/53/368053/1 && git cherry-pick FETCH_HEAD; #R_asb_2023-10
 fi;
diff --git a/Scripts/LineageOS-19.1/Patch.sh b/Scripts/LineageOS-19.1/Patch.sh
index af25d912..2015d5cf 100644
--- a/Scripts/LineageOS-19.1/Patch.sh
+++ b/Scripts/LineageOS-19.1/Patch.sh
@@ -121,10 +121,6 @@ applyPatch "$DOS_PATCHES/android_external_hardened_malloc/0001-Broken_Cameras-2.
 fi;
 fi;
 
-if enterAndClear "external/libvpx"; then
-applyPatch "$DOS_PATCHES_COMMON/android_external_libvpx/CVE-2023-5217.patch"; #VP8: disallow thread count changes
-fi;
-
 if enterAndClear "external/libxml2"; then
 git fetch https://github.com/LineageOS/android_external_libxml2 refs/changes/28/368028/1 && git cherry-pick FETCH_HEAD; #S_asb_2023-10
 fi;
diff --git a/Scripts/LineageOS-20.0/Patch.sh b/Scripts/LineageOS-20.0/Patch.sh
index babbb9b6..ef412010 100644
--- a/Scripts/LineageOS-20.0/Patch.sh
+++ b/Scripts/LineageOS-20.0/Patch.sh
@@ -123,10 +123,6 @@ sed -i 's/34359738368/2147483648/' Android.bp; #revert 48-bit address space requ
 fi;
 fi;
 
-if enterAndClear "external/libvpx"; then
-applyPatch "$DOS_PATCHES_COMMON/android_external_libvpx/CVE-2023-5217.patch"; #VP8: disallow thread count changes
-fi;
-
 if enterAndClear "external/libxml2"; then
 git am $DOS_PATCHES/ASB-2023-10/libxml-*.patch;
 fi;