diff --git a/src/freedombone-adduser b/src/freedombone-adduser
index 1af53292..3285c5cb 100755
--- a/src/freedombone-adduser
+++ b/src/freedombone-adduser
@@ -136,10 +136,8 @@ chmod 700 /home/$ADD_USERNAME/.gnupg
 chmod 600 /home/$ADD_USERNAME/.gnupg/*
 
 # Generate a GPG key
-echo 'Key-Type: 1' > /home/$ADD_USERNAME/gpg-genkey.conf
-echo 'Key-Length: 4096' >> /home/$ADD_USERNAME/gpg-genkey.conf
+echo 'Key-Type: 9' > /home/$ADD_USERNAME/gpg-genkey.conf
 echo 'Subkey-Type: 1' >> /home/$ADD_USERNAME/gpg-genkey.conf
-echo 'Subkey-Length: 4096' >> /home/$ADD_USERNAME/gpg-genkey.conf
 echo "Name-Real:  $ADD_USERNAME" >> /home/$ADD_USERNAME/gpg-genkey.conf
 echo "Name-Email: $ADD_USERNAME@$HOSTNAME" >> /home/$ADD_USERNAME/gpg-genkey.conf
 echo 'Expire-Date: 0' >> /home/$ADD_USERNAME/gpg-genkey.conf
diff --git a/src/freedombone-base-email b/src/freedombone-base-email
index 3dd52afb..470a21f1 100755
--- a/src/freedombone-base-email
+++ b/src/freedombone-base-email
@@ -1506,10 +1506,9 @@ function create_gpg_subkey {
 
     # Generate a GPG subkey
     # Here a 2048bit length is used to be compatible with yubikey
-    echo 'Key-Type: 1' > /home/$MY_USERNAME/gpg-genkey.conf
+    echo 'Key-Type: 9' > /home/$MY_USERNAME/gpg-genkey.conf
     echo "Key-Grip: $KEYGRIP" > /home/$MY_USERNAME/gpg-genkey.conf
     echo 'Subkey-Type: 1' >> /home/$MY_USERNAME/gpg-genkey.conf
-    echo 'Subkey-Length: 2048' >> /home/$MY_USERNAME/gpg-genkey.conf
     echo "subkey-Usage: $GPG_KEY_USAGE" > /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
@@ -1624,10 +1623,8 @@ function configure_gpg {
         fi
     else
         # Generate a GPG key
-        echo 'Key-Type: 1' > /home/$MY_USERNAME/gpg-genkey.conf
-        echo 'Key-Length: 4096' >> /home/$MY_USERNAME/gpg-genkey.conf
+        echo 'Key-Type: 9' > /home/$MY_USERNAME/gpg-genkey.conf
         echo 'Subkey-Type: 1' >> /home/$MY_USERNAME/gpg-genkey.conf
-        echo 'Subkey-Length: 4096' >> /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
diff --git a/src/freedombone-utils-backup b/src/freedombone-utils-backup
index 07c52dec..eaf4958f 100755
--- a/src/freedombone-utils-backup
+++ b/src/freedombone-utils-backup
@@ -65,10 +65,8 @@ function configure_backup_key {
     # Generate a GPG key for backups
     BACKUP_KEY_EXISTS=$(gpg_key_exists "$MY_USERNAME" "$MY_NAME (backup key)")
     if [[ $BACKUP_KEY_EXISTS == "no" ]]; then
-        echo 'Key-Type: 1' > /home/$MY_USERNAME/gpg-genkey.conf
-        echo 'Key-Length: 4096' >> /home/$MY_USERNAME/gpg-genkey.conf
+        echo 'Key-Type: 9' > /home/$MY_USERNAME/gpg-genkey.conf
         echo 'Subkey-Type: 1' >> /home/$MY_USERNAME/gpg-genkey.conf
-        echo 'Subkey-Length: 4096' >> /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