+# Create non root user
+RUN addgroup -S saltstack && adduser -S saltstack -G saltstack
+# RUN groupadd --system saltstack && useradd --system -g saltstack saltstack
+RUN chown -R saltstack /etc/salt /var/log/salt
+RUN mkdir /var/run/salt && chown saltstack:saltstack /var/run/salt
+RUN mkdir /var/cache/salt && chown saltstack:saltstack /var/cache/salt
+
+USER saltstack
+
+# Run salt-master in foreground (not as a daemon)
+ENTRYPOINT [ "/usr/bin/salt-master" ]
\ No newline at end of file