diff --git a/ignition/base-install-docker.bu b/ignition/base-install-docker.bu
index a7a4a56..2739f4d 100644
--- a/ignition/base-install-docker.bu
+++ b/ignition/base-install-docker.bu
@@ -39,6 +39,7 @@ systemd:
         ExecStart=/usr/bin/rpm-ostree override remove moby-engine containerd runc docker-cli --install docker-ce
         ExecStart=/usr/bin/touch /var/lib/%N.stamp
         ExecStart=/usr/bin/systemctl enable docker.service
+        ExecStart=/usr/bin/systemctl --no-block reboot
 
         [Install]
         WantedBy=multi-user.target
\ No newline at end of file
diff --git a/ignition/base-install-docker.ign b/ignition/base-install-docker.ign
index 35a592b..e91d783 100644
--- a/ignition/base-install-docker.ign
+++ b/ignition/base-install-docker.ign
@@ -39,7 +39,7 @@
   "systemd": {
     "units": [
       {
-        "contents": "[Unit]\nDescription=Install Docker CE\nWants=network-online.target\nAfter=ignition-start-config.service\nBefore=zincati.service\nConditionPathExists=!/var/lib/%N.stamp\n\n[Service]\nType=oneshot\nRemainAfterExit=yes\nExecStart=/usr/bin/curl --output-dir \"/etc/yum.repos.d\" --remote-name https://download.docker.com/linux/fedora/docker-ce.repo\nExecStart=/usr/bin/rpm-ostree override remove moby-engine containerd runc docker-cli --install docker-ce\nExecStart=/usr/bin/touch /var/lib/%N.stamp\nExecStart=/usr/bin/systemctl enable docker.service\n\n[Install]\nWantedBy=multi-user.target",
+        "contents": "[Unit]\nDescription=Install Docker CE\nWants=network-online.target\nAfter=ignition-start-config.service\nBefore=zincati.service\nConditionPathExists=!/var/lib/%N.stamp\n\n[Service]\nType=oneshot\nRemainAfterExit=yes\nExecStart=/usr/bin/curl --output-dir \"/etc/yum.repos.d\" --remote-name https://download.docker.com/linux/fedora/docker-ce.repo\nExecStart=/usr/bin/rpm-ostree override remove moby-engine containerd runc docker-cli --install docker-ce\nExecStart=/usr/bin/touch /var/lib/%N.stamp\nExecStart=/usr/bin/systemctl enable docker.service\nExecStart=/usr/bin/systemctl --no-block reboot\n\n[Install]\nWantedBy=multi-user.target",
         "enabled": true,
         "name": "rpm-ostree-install-docker-ce.service"
       }
diff --git a/ignition/base.bu b/ignition/base.bu
index fc2cfcd..1226b9e 100644
--- a/ignition/base.bu
+++ b/ignition/base.bu
@@ -35,9 +35,9 @@ systemd:
         RemainAfterExit=yes
         #ExecStart=/usr/bin/systemctl stop sshd
         #ExecStart=/usr/bin/systemctl disable sshd
-        ExecStart=/usr/bin/touch /var/lib/%N.stamp
-        ExecStart=/usr/bin/echo "SSH currently disabled until configuration completes" | /usr/bin/tee /etc/issue.d/35-ssh-blocked.issue
+        ExecStart=bin/sh -c "/usr/bin/echo SSH currently disabled until configuration completes | /usr/bin/tee /etc/issue.d/35-ssh-blocked.issue"
         ExecStart=/usr/bin/systemctl restart getty@tty1
+        ExecStart=/usr/bin/touch /var/lib/%N.stamp
 
         [Install]
         WantedBy=multi-user.target
@@ -54,9 +54,10 @@ systemd:
         Type=oneshot
         RemainAfterExit=yes
         ExecStart=/usr/bin/systemctl enable sshd
-        ExecStart=/usr/bin/touch /var/lib/%N.stamp
+        ExecStart=/usr/bin/systemctl start sshd
         ExecStart=/usr/bin/rm /etc/issue.d/35-ssh-blocked.issue
-        ExecStart=/usr/bin/systemctl --no-block reboot
+        ExecStart=/usr/bin/systemctl restart getty@tty1
+        ExecStart=/usr/bin/touch /var/lib/%N.stamp
 
         [Install]
         WantedBy=multi-user.target
@@ -77,6 +78,7 @@ systemd:
         RemainAfterExit=yes
         ExecStart=/usr/bin/rpm-ostree install qemu-guest-agent
         ExecStart=/usr/bin/touch /var/lib/%N.stamp
+        ExecStart=/usr/bin/systemctl --no-block reboot
 
         [Install]
         WantedBy=multi-user.target
\ No newline at end of file
diff --git a/ignition/base.ign b/ignition/base.ign
index 7dd79e7..6647368 100644
--- a/ignition/base.ign
+++ b/ignition/base.ign
@@ -23,17 +23,17 @@
   "systemd": {
     "units": [
       {
-        "contents": "[Unit]\nDescription=Block SSH during configuration\nAfter=network-online.target\nBefore=zincati.service\nConditionPathExists=!/var/lib/%N.stamp\n\n[Service]\nType=oneshot\nRemainAfterExit=yes\n#ExecStart=/usr/bin/systemctl stop sshd\n#ExecStart=/usr/bin/systemctl disable sshd\nExecStart=/usr/bin/touch /var/lib/%N.stamp\nExecStart=/usr/bin/echo \"SSH currently disabled until configuration completes\" | /usr/bin/tee /etc/issue.d/35-ssh-blocked.issue\nExecStart=/usr/bin/systemctl restart getty@tty1\n\n[Install]\nWantedBy=multi-user.target\n",
+        "contents": "[Unit]\nDescription=Block SSH during configuration\nAfter=network-online.target\nBefore=zincati.service\nConditionPathExists=!/var/lib/%N.stamp\n\n[Service]\nType=oneshot\nRemainAfterExit=yes\n#ExecStart=/usr/bin/systemctl stop sshd\n#ExecStart=/usr/bin/systemctl disable sshd\nExecStart=bin/sh -c \"/usr/bin/echo SSH currently disabled until configuration completes | /usr/bin/tee /etc/issue.d/35-ssh-blocked.issue\"\nExecStart=/usr/bin/systemctl restart getty@tty1\nExecStart=/usr/bin/touch /var/lib/%N.stamp\n\n[Install]\nWantedBy=multi-user.target\n",
         "enabled": true,
         "name": "ignition-start-config.service"
       },
       {
-        "contents": "[Unit]\nDescription=Enable SSH after configuration and reboot\nAfter=zincati.service\nConditionPathExists=!/var/lib/%N.stamp\n\n[Service]\nType=oneshot\nRemainAfterExit=yes\nExecStart=/usr/bin/systemctl enable sshd\nExecStart=/usr/bin/touch /var/lib/%N.stamp\nExecStart=/usr/bin/rm /etc/issue.d/35-ssh-blocked.issue\nExecStart=/usr/bin/systemctl --no-block reboot\n\n[Install]\nWantedBy=multi-user.target\n",
+        "contents": "[Unit]\nDescription=Enable SSH after configuration and reboot\nAfter=zincati.service\nConditionPathExists=!/var/lib/%N.stamp\n\n[Service]\nType=oneshot\nRemainAfterExit=yes\nExecStart=/usr/bin/systemctl enable sshd\nExecStart=/usr/bin/systemctl start sshd\nExecStart=/usr/bin/rm /etc/issue.d/35-ssh-blocked.issue\nExecStart=/usr/bin/systemctl restart getty@tty1\nExecStart=/usr/bin/touch /var/lib/%N.stamp\n\n[Install]\nWantedBy=multi-user.target\n",
         "enabled": true,
         "name": "ignition-finish-config.service"
       },
       {
-        "contents": "[Unit]\nDescription=Install QEMU Guest Agent\nWants=network-online.target\nAfter=ignition-start-config.service\nBefore=zincati.service\nConditionPathExists=!/var/lib/%N.stamp\n\n[Service]\nType=oneshot\nRemainAfterExit=yes\nExecStart=/usr/bin/rpm-ostree install qemu-guest-agent\nExecStart=/usr/bin/touch /var/lib/%N.stamp\n\n[Install]\nWantedBy=multi-user.target",
+        "contents": "[Unit]\nDescription=Install QEMU Guest Agent\nWants=network-online.target\nAfter=ignition-start-config.service\nBefore=zincati.service\nConditionPathExists=!/var/lib/%N.stamp\n\n[Service]\nType=oneshot\nRemainAfterExit=yes\nExecStart=/usr/bin/rpm-ostree install qemu-guest-agent\nExecStart=/usr/bin/touch /var/lib/%N.stamp\nExecStart=/usr/bin/systemctl --no-block reboot\n\n[Install]\nWantedBy=multi-user.target",
         "enabled": true,
         "name": "rpm-ostree-install-qemu-guest-agent.service"
       }