diff --git a/CHANGELOG.md b/CHANGELOG.md
index eec8ca0..f38168a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ Please refer to the SaltStack [Release Notes](https://docs.saltstack.com/en/deve
 - Add support for setting timezone
 - Add logrotate support
 - Add supervisor support
+- Addressed a bug that caused the container to crash when `/home/salt/data/keys/minions` was not present
 
 **2018.3.2**
 
diff --git a/assets/runtime/functions.sh b/assets/runtime/functions.sh
index 0f4cad6..1779604 100755
--- a/assets/runtime/functions.sh
+++ b/assets/runtime/functions.sh
@@ -182,6 +182,10 @@ function initialize_datadir()
   mkdir -p /var/cache/salt/master
   chown -R ${SALT_USER}: /var/cache/salt
 
+  # Keys directories
+  mkdir -p ${SALT_KEYS_DIR}/minions
+  chown -R ${SALT_USER}: ${SALT_KEYS_DIR}
+
   # Logs directory
   mkdir -p ${SALT_LOGS_DIR}/salt ${SALT_LOGS_DIR}/supervisor
   chmod -R 0755 ${SALT_LOGS_DIR}/supervisor