diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 5d03b1b..c8e76b6 100644
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -68,7 +68,8 @@ OPENSSL_CN='Common Name'
 OPENSSL_EMAILADDRESS='info@localhost'
 
 # GPG configuration
-GPG_REAL_NAME='WARNING: MISP AutoGenerated VM consider this Key VOID!'
+GPG_REAL_NAME='Autogenerated Key'
+GPG_COMMENT='WARNING: MISP AutoGenerated VM consider this Key VOID!'
 GPG_EMAIL_ADDRESS='admin@admin.test'
 GPG_KEY_LENGTH='2048'
 GPG_PASSPHRASE=''
@@ -425,13 +426,13 @@ echo "--- Generating a GPG encryption key… ---"
 sudo apt-get install -y rng-tools haveged
 sudo -u www-data mkdir $PATH_TO_MISP/.gnupg
 sudo chmod 700 $PATH_TO_MISP/.gnupg
-cat >gen-key-script <<EOF
+cat >/tmp/gen-key-script <<EOF
     %echo Generating a default key
     Key-Type: default
     Key-Length: $GPG_KEY_LENGTH
     Subkey-Type: default
     Name-Real: $GPG_REAL_NAME
-    Name-Comment: no comment
+    Name-Comment: $GPG_COMMENT
     Name-Email: $GPG_EMAIL_ADDRESS
     Expire-Date: 0
     Passphrase: '$GPG_PASSPHRASE'
@@ -439,11 +440,10 @@ cat >gen-key-script <<EOF
     %commit
     %echo done
 EOF
-sudo -u www-data gpg --homedir $PATH_TO_MISP/.gnupg --batch --gen-key gen-key-script
-rm gen-key-script
+sudo -u www-data gpg --homedir $PATH_TO_MISP/.gnupg --batch --gen-key /tmp/gen-key-script
+rm /tmp/gen-key-script
 # And export the public key to the webroot
-sudo -u www-data gpg --homedir $PATH_TO_MISP/.gnupg --batch --gen-key gen-key-scriptgpg --homedir $PATH_TO_MISP/.gnupg --export --armor $EMAIL_ADDRESS > $PATH_TO_MISP/app/webroot/gpg.asc
-
+sudo -u www-data sh -c "gpg --homedir $PATH_TO_MISP/.gnupg --export --armor $GPG_EMAIL_ADDRESS > $PATH_TO_MISP/app/webroot/gpg.asc"
 
 echo "--- Making the background workers start on boot… ---"
 sudo chmod 755 $PATH_TO_MISP/app/Console/worker/start.sh