diff --git a/.mikaela/gpg.conf b/.mikaela/gpg.conf
index 30738004..0771f767 100644
--- a/.mikaela/gpg.conf
+++ b/.mikaela/gpg.conf
@@ -22,9 +22,11 @@
 
 #keyserver-options auto-key-retrieve no-include-revoked
 #import-clean
+# Ignore preferred keyserver, clean up imports (as import/export options)
+keyserver-options no-honor-keyserver-url import-clean
 
-# Try to automatically find keys from keyserver if key for email address isn't found, but we are encrypting to email address.
-auto-key-locate keyserver
+# Try to automatically find keys from local/wkd if key for email address isn't found, but we are encrypting to email address.
+auto-key-locate local,wkd
 
 # Use my key by default
 default-key 0x99392F62BAE30723
diff --git a/gpg/gpg.conf b/gpg/gpg.conf
index 7841657f..60102dc6 100644
--- a/gpg/gpg.conf
+++ b/gpg/gpg.conf
@@ -22,9 +22,11 @@
 
 #keyserver-options auto-key-retrieve no-include-revoked
 #import-clean
+# Ignore preferred keyserver, clean up imports (as import/export options)
+keyserver-options no-honor-keyserver-url import-clean
 
-# Try to automatically find keys from keyserver if key for email address isn't found, but we are encrypting to email address.
-auto-key-locate keyserver
+# Try to automatically find keys from local/wkd if key for email address isn't found, but we are encrypting to email address.
+auto-key-locate local,wkd
 
 # Use my key by default
 #default-key 0x99392F62BAE30723 # MIKAELA_GREP # MIKAELA_GREP_GPG