diff --git a/src/freedombone-base-email b/src/freedombone-base-email
index d155252cce6ef74cfd5dab6cbbece576a0e352dc..a9d33ab2d32213902998eac310897e56556a2208 100755
--- a/src/freedombone-base-email
+++ b/src/freedombone-base-email
@@ -1550,6 +1550,12 @@ function configure_gpg {
     fi
 
     sed -i "s|keyserver hkp://keys.gnupg.net|keyserver $GPG_KEYSERVER|g" "$gpg_dir/gpg.conf"
+    if ! grep -q 'keyserver.ubuntu.com' "$gpg_dir/gpg.conf"; then
+        echo 'keyserver hkp://keyserver.ubuntu.com' >> "$gpg_dir/gpg.conf"
+    fi
+    if ! grep -q 'keys.riseup.net' "$gpg_dir/gpg.conf"; then
+        echo 'keyserver hkp://keys.riseup.net' >> "$gpg_dir/gpg.conf"
+    fi
 
     gpg_agent_setup root
     gpg_agent_setup "$MY_USERNAME"
@@ -1677,6 +1683,31 @@ function prevent_mail_process_overrun {
     cron_add_mins 5 '/usr/bin/exim_check'
 }
 
+function populate_keyservers {
+    for d in /home/*/ ; do
+        refresh_keys=
+        USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
+        if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
+            if [ -f "/home/$USERNAME/.gnupg/gpg.conf" ]; then
+                # keyserver.ubuntu.com
+                if ! grep -q "keyserver hkp://keyserver.ubuntu.com" "/home/$USERNAME/.gnupg/gpg.conf"; then
+                    echo "keyserver hkp://keyserver.ubuntu.com" >> "/home/$USERNAME/.gnupg/gpg.conf"
+                    refresh_keys=1
+                fi
+
+                # keys.riseup.net
+                if ! grep -q "keyserver hkp://keys.riseup.net" "/home/$USERNAME/.gnupg/gpg.conf"; then
+                    echo "keyserver hkp://keys.riseup.net" >> "/home/$USERNAME/.gnupg/gpg.conf"
+                    refresh_keys=1
+                fi
+            fi
+            if [ $refresh_keys ]; then
+                su -c 'gpg --refresh-keys' "$USERNAME"
+            fi
+        fi
+    done
+}
+
 function install_email {
     if [[ $SYSTEM_TYPE == "mesh"* ]]; then
         return
diff --git a/src/freedombone-upgrade b/src/freedombone-upgrade
index 4534f96b5e560df226d530fd51d6ca920ca9b7ac..f8f61eb15d83215698d6218f02d99a07c9d46a34 100755
--- a/src/freedombone-upgrade
+++ b/src/freedombone-upgrade
@@ -120,6 +120,7 @@ if [ -d "$PROJECT_DIR" ]; then
         email_update_onion_domain
         prevent_mail_process_overrun
         android_update_apps yes
+        populate_keyservers
         #defrag_filesystem
 
         # reinstall tor from backports