diff --git a/roles/saltmaster/account/init.sls b/roles/saltmaster/account/init.sls
--- a/roles/saltmaster/account/init.sls
+++ b/roles/saltmaster/account/init.sls
@@ -40,6 +40,13 @@
     - home: /var/run/deploy
 
 #   -------------------------------------------------------------
+#   Directories
+#   -------------------------------------------------------------
+
+/opt/salt:
+  file.directory
+
+#   -------------------------------------------------------------
 #   SSH key for deployment account
 #
 #   This key should be added to:
diff --git a/roles/saltmaster/staging/init.sls b/roles/saltmaster/staging/init.sls
--- a/roles/saltmaster/staging/init.sls
+++ b/roles/saltmaster/staging/init.sls
@@ -16,6 +16,7 @@
     - user: deploy
     - group: deployment
     - dir_mode: 775
+    - makedirs: True
   git.latest:
     - name: https://devcentral.nasqueron.org/source/staging.git
     - target: /opt/salt/staging
@@ -29,6 +30,7 @@
     - user: deploy
     - group: deployment
     - dir_mode: 770
+    - makedirs: True
   git.latest:
     - name: ssh://vcs@devcentral.nasqueron.org:5022/source/private-staging.git
     - target: /opt/salt/private/staging