diff --git a/Patches/LineageOS-15.1/android_build/0001-OTA_Keys.patch b/Patches/LineageOS-15.1/android_build/0001-OTA_Keys.patch
index 04959c4f..61842c2b 100644
--- a/Patches/LineageOS-15.1/android_build/0001-OTA_Keys.patch
+++ b/Patches/LineageOS-15.1/android_build/0001-OTA_Keys.patch
@@ -5,21 +5,20 @@ Subject: [PATCH] Allow setting OTA public keys from environment variable
 
 Change-Id: Ib2a00de63b0c7a8790640462d13a84daf2076fa7
 ---
- core/Makefile          | 5 +++++
+ core/Makefile          | 4 ++++
  core/product_config.mk | 5 +++++
- 2 files changed, 10 insertions(+)
+ 2 files changed, 9 insertions(+)
 
 diff --git a/core/Makefile b/core/Makefile
-index f2a524d58c..bdd18d7dec 100644
+index f2a524d58c..92c7928d35 100644
 --- a/core/Makefile
 +++ b/core/Makefile
-@@ -1217,6 +1217,11 @@ endif
+@@ -1217,6 +1217,10 @@ endif
  # substitute other keys for this one.
  OTA_PUBLIC_KEYS := $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem
  
 +ifneq ($(OTA_KEY_OVERRIDE_DIR),)
 +    OTA_PUBLIC_KEYS := $(OTA_KEY_OVERRIDE_DIR)/releasekey.x509.pem
-+    PRODUCT_EXTRA_RECOVERY_KEYS := $(OTA_KEY_OVERRIDE_DIR)/extra
 +endif
 +
  # Generate a file containing the keys that will be read by the
diff --git a/Patches/LineageOS-16.0/android_build/0001-OTA_Keys.patch b/Patches/LineageOS-16.0/android_build/0001-OTA_Keys.patch
index 056c774b..981a2828 100644
--- a/Patches/LineageOS-16.0/android_build/0001-OTA_Keys.patch
+++ b/Patches/LineageOS-16.0/android_build/0001-OTA_Keys.patch
@@ -5,21 +5,20 @@ Subject: [PATCH] Allow setting OTA public keys from environment variable
 
 Change-Id: Ib2a00de63b0c7a8790640462d13a84daf2076fa7
 ---
- core/Makefile          | 5 +++++
+ core/Makefile          | 4 ++++
  core/product_config.mk | 5 +++++
- 2 files changed, 10 insertions(+)
+ 2 files changed, 9 insertions(+)
 
 diff --git a/core/Makefile b/core/Makefile
-index 404bb54133..88b50d3e1d 100644
+index 404bb54133..bd23c8be3d 100644
 --- a/core/Makefile
 +++ b/core/Makefile
-@@ -1413,6 +1413,11 @@ endif
+@@ -1413,6 +1413,10 @@ endif
  # substitute other keys for this one.
  OTA_PUBLIC_KEYS := $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem
  
 +ifneq ($(OTA_KEY_OVERRIDE_DIR),)
 +    OTA_PUBLIC_KEYS := $(OTA_KEY_OVERRIDE_DIR)/releasekey.x509.pem
-+    PRODUCT_EXTRA_RECOVERY_KEYS := $(OTA_KEY_OVERRIDE_DIR)/extra
 +endif
 +
  # Generate a file containing the keys that will be read by the
diff --git a/Patches/LineageOS-17.1/android_build/0002-OTA_Keys.patch b/Patches/LineageOS-17.1/android_build/0002-OTA_Keys.patch
index d1febc43..452a9d39 100644
--- a/Patches/LineageOS-17.1/android_build/0002-OTA_Keys.patch
+++ b/Patches/LineageOS-17.1/android_build/0002-OTA_Keys.patch
@@ -5,21 +5,20 @@ Subject: [PATCH] Allow setting OTA public keys from environment variable
 
 Change-Id: Ib2a00de63b0c7a8790640462d13a84daf2076fa7
 ---
- core/Makefile          | 5 +++++
+ core/Makefile          | 4 ++++
  core/product_config.mk | 5 +++++
- 2 files changed, 10 insertions(+)
+ 2 files changed, 9 insertions(+)
 
 diff --git a/core/Makefile b/core/Makefile
-index f6c2463439..69f2826e97 100644
+index f6c2463439..7f4823a1ac 100644
 --- a/core/Makefile
 +++ b/core/Makefile
-@@ -1895,6 +1895,11 @@ endif
+@@ -1895,6 +1895,10 @@ endif
  # substitute other keys for this one.
  OTA_PUBLIC_KEYS := $(DEFAULT_SYSTEM_DEV_CERTIFICATE).x509.pem
  
 +ifneq ($(OTA_KEY_OVERRIDE_DIR),)
 +    OTA_PUBLIC_KEYS := $(OTA_KEY_OVERRIDE_DIR)/releasekey.x509.pem
-+    PRODUCT_EXTRA_RECOVERY_KEYS := $(OTA_KEY_OVERRIDE_DIR)/extra
 +endif
 +
  # Generate a file containing the keys that will be read by the