diff --git a/config-drive/master_config.yaml b/config-drive/master_config.yaml
index 3e68c74..c3db534 100644
--- a/config-drive/master_config.yaml
+++ b/config-drive/master_config.yaml
@@ -227,6 +227,11 @@
 
     echo "Configuring salt"
     envsubst < /root/minion.conf > /etc/salt/minion.d/minion.conf
+    if [ -f /mnt/gpg/salt_master_pillar.asc ]; then
+      mkdir /etc/salt/gpgkeys
+      chmod 700 /etc/salt/gpgkeys
+      GNUPGHOME=/etc/salt/gpgkeys gpg --import /mnt/gpg/salt_master_pillar.asc
+    fi
     enable_services
 
     # Wait for salt-master and salt-minion to wake up after restart