diff --git a/src/freedombone-base-email b/src/freedombone-base-email
index 99fc367b..6b04b686 100755
--- a/src/freedombone-base-email
+++ b/src/freedombone-base-email
@@ -1626,9 +1626,11 @@ function configure_gpg {
         echo 'Key-Type: eddsa' > /home/$MY_USERNAME/gpg-genkey.conf
         echo 'Key-Curve: Ed25519' >> /home/$MY_USERNAME/gpg-genkey.conf
         echo 'Subkey-Type: eddsa' >> /home/$MY_USERNAME/gpg-genkey.conf
+        echo 'Subkey-Curve: Ed25519' >> /home/$MY_USERNAME/gpg-genkey.conf
         echo "Name-Real:  $MY_NAME" >> /home/$MY_USERNAME/gpg-genkey.conf
         echo "Name-Email: $MY_EMAIL_ADDRESS" >> /home/$MY_USERNAME/gpg-genkey.conf
         echo 'Expire-Date: 0' >> /home/$MY_USERNAME/gpg-genkey.conf
+        cat /home/$MY_USERNAME/gpg-genkey.conf
         if [ -f $IMAGE_PASSWORD_FILE ]; then
             echo "Passphrase: $(printf `cat $IMAGE_PASSWORD_FILE`)" >> /home/$MY_USERNAME/gpg-genkey.conf
         else
diff --git a/src/freedombone-utils-backup b/src/freedombone-utils-backup
index 24aff1c0..61949dce 100755
--- a/src/freedombone-utils-backup
+++ b/src/freedombone-utils-backup
@@ -68,10 +68,12 @@ function configure_backup_key {
         echo 'Key-Type: eddsa' > /home/$MY_USERNAME/gpg-genkey.conf
         echo 'Key-Curve: Ed25519' >> /home/$MY_USERNAME/gpg-genkey.conf
         echo 'Subkey-Type: eddsa' >> /home/$MY_USERNAME/gpg-genkey.conf
+        echo 'Subkey-Curve: Ed25519' >> /home/$MY_USERNAME/gpg-genkey.conf
         echo "Name-Real:  $MY_NAME" >> /home/$MY_USERNAME/gpg-genkey.conf
         echo "Name-Email: $MY_EMAIL_ADDRESS" >> /home/$MY_USERNAME/gpg-genkey.conf
         echo "Name-Comment: backup key" >> /home/$MY_USERNAME/gpg-genkey.conf
         echo 'Expire-Date: 0' >> /home/$MY_USERNAME/gpg-genkey.conf
+        cat /home/$MY_USERNAME/gpg-genkey.conf
         echo "Passphrase: $BACKUP_DUMMY_PASSWORD" >> /home/$MY_USERNAME/gpg-genkey.conf
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/gpg-genkey.conf
         echo $'Backup key does not exist. Creating it.'