diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5818999396..ec2f2dd41f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,11 @@
   completions for the `kubectl` command are now provided when `kubectl` is installed
   (PR [#3039](https://github.com/scality/metalk8s/pull/3039))
 
+### Bug fixes
+- [#3022](https://github.com/scality/metalk8s/issues/3022) - Ensure salt-master
+  container can start at reboot even if local salt-minion is down
+  (PR [#3041](https://github.com/scality/metalk8s/pull/3041))
+
 ## Release 2.7.0 (in development)
 ### Enhancements
 - Bump Kubernetes version to 1.18.15 (PR[#3035](https://github.com/scality/metalk8s/pull/3035))
diff --git a/salt/metalk8s/salt/master/files/salt-master-manifest.yaml.j2 b/salt/metalk8s/salt/master/files/salt-master-manifest.yaml.j2
index 0cae79c390..529bba628e 100644
--- a/salt/metalk8s/salt/master/files/salt-master-manifest.yaml.j2
+++ b/salt/metalk8s/salt/master/files/salt-master-manifest.yaml.j2
@@ -118,7 +118,7 @@ spec:
     - name: run
       hostPath:
         path: '/var/run/salt'
-        type: Directory
+        type: DirectoryOrCreate
     {%- for env, archive in archives.items() | sort(attribute='0') %}
     - name: states-{{ env | replace('.', '-') }}
       hostPath: