diff --git a/Dockerfile.apt b/Dockerfile.apt
index ab1603d..0aa06de 100644
--- a/Dockerfile.apt
+++ b/Dockerfile.apt
@@ -27,7 +27,10 @@ RUN echo 'locales locales/default_environment_locale select en_US.UTF-8' | debco
 RUN dpkg-reconfigure -f noninteractive locales
 
 RUN curl -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/develop/bootstrap-salt.sh | \
-    sudo sh -s -- -XUdfP -x python$PYTHON_VERSION $SALT_INSTALL_METHOD $SALT_VERSION
+    sudo sh -s -- -XUdfP -x python$PYTHON_VERSION $SALT_INSTALL_METHOD $SALT_VERSION \
+ && for fname in api master minion syndic; do \
+      /bin/systemctl disable salt-$fname.service; \
+    done
 
 RUN rm -rf /var/cache/{salt,apt} \
  && rm -rf /var/lib/apt/lists/* \
diff --git a/Dockerfile.dnf b/Dockerfile.dnf
index 5254b8b..66ee501 100644
--- a/Dockerfile.dnf
+++ b/Dockerfile.dnf
@@ -14,7 +14,10 @@ ARG PKGS="udev git net-tools sudo curl openssh-server openssh-clients which find
 RUN dnf -y update && dnf -y install ${PKGS}
 
 RUN curl -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/develop/bootstrap-salt.sh | \
-    sudo sh -s -- -XUdfP -x python$PYTHON_VERSION $SALT_INSTALL_METHOD $SALT_VERSION
+    sudo sh -s -- -XUdfP -x python$PYTHON_VERSION $SALT_INSTALL_METHOD $SALT_VERSION \
+ && for fname in api master minion syndic; do \
+      /bin/systemctl disable salt-$fname.service; \
+    done
 
 RUN rm -rf /var/cache/{salt,pacman} \
  && (find / -name "*pyc" ; find / -name "__pycache__") |grep -v /proc | xargs rm -rf
diff --git a/Dockerfile.pac b/Dockerfile.pac
index 602fefc..8983e6f 100644
--- a/Dockerfile.pac
+++ b/Dockerfile.pac
@@ -18,7 +18,10 @@ RUN pacman --noconfirm -Sy archlinux-keyring \
 RUN systemctl enable sshd
 
 RUN curl -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/develop/bootstrap-salt.sh | \
-    sudo sh -s -- -XUdfP -x python$PYTHON_VERSION $SALT_INSTALL_METHOD $SALT_VERSION
+    sudo sh -s -- -XUdfP -x python$PYTHON_VERSION $SALT_INSTALL_METHOD $SALT_VERSION \
+ && for fname in api master minion syndic; do \
+      /bin/systemctl disable salt-$fname.service; \
+    done
 
 RUN rm -rf /var/cache/{salt,pacman} \
  && (find / -name "*pyc" ; find / -name "__pycache__") |grep -v /proc | xargs rm -rf
diff --git a/Dockerfile.yum b/Dockerfile.yum
index 6964867..f016762 100644
--- a/Dockerfile.yum
+++ b/Dockerfile.yum
@@ -23,7 +23,10 @@ RUN yum -y update && yum -y install ${PKGS}
 # FIXME: modifying this here is really, really, really horrible and messy
 RUN curl -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/develop/bootstrap-salt.sh | \
     sed "s/python34/python3/g" | \
-    sudo sh -s -- -XUdfP -x python$PYTHON_VERSION $SALT_INSTALL_METHOD $SALT_VERSION
+    sudo sh -s -- -XUdfP -x python$PYTHON_VERSION $SALT_INSTALL_METHOD $SALT_VERSION \
+ && for fname in api master minion syndic; do \
+      /bin/systemctl disable salt-$fname.service; \
+    done
 
 # Centos 6 installs python27-pip from the salt repo
 RUN if [ "${DISTRO_NAME}" = "centos" -a "${DISTRO_VERSION}" = "6" ]; \
diff --git a/Dockerfile.zyp b/Dockerfile.zyp
index 88d79cd..8cfba6f 100644
--- a/Dockerfile.zyp
+++ b/Dockerfile.zyp
@@ -20,7 +20,10 @@ RUN systemctl enable sshd
 RUN if [ ! -e /etc/SuSE-release ]; then ln -s /etc/os-release /etc/SuSE-release; fi
 
 RUN curl -L https://raw.githubusercontent.com/saltstack/salt-bootstrap/develop/bootstrap-salt.sh | \
-    sudo sh -s -- -XUdfP -x python$PYTHON_VERSION $SALT_INSTALL_METHOD $SALT_VERSION
+    sudo sh -s -- -XUdfP -x python$PYTHON_VERSION $SALT_INSTALL_METHOD $SALT_VERSION \
+ && for fname in api master minion syndic; do \
+      /bin/systemctl disable salt-$fname.service; \
+    done
 
 RUN rm -rf /var/cache/{salt,zyp} \
  && (find / -name "*pyc" ; find / -name "__pycache__") |grep -v /proc | xargs rm -rf