diff --git a/ignition/base.bu b/ignition/base.bu
index 1a19c9d..726df02 100644
--- a/ignition/base.bu
+++ b/ignition/base.bu
@@ -19,7 +19,10 @@ storage:
           length_minutes = 60
     - path: /etc/issue.d/35-ssh-blocked.issue
       contents:
-        inline: SSH currently disabled until configuration completes
+        inline: | 
+          
+          SSH currently disabled until configuration completes
+
 
 systemd:
   units:
@@ -48,7 +51,7 @@ systemd:
       contents: |
         [Unit]
         Description=Enable SSH after configuration and reboot
-        After=zincati.service
+        After=multi-user.target
         ConditionPathExists=!/var/lib/%N.stamp
 
         [Service]
diff --git a/ignition/base.ign b/ignition/base.ign
index e6c3c82..51c0087 100644
--- a/ignition/base.ign
+++ b/ignition/base.ign
@@ -22,7 +22,7 @@
         "path": "/etc/issue.d/35-ssh-blocked.issue",
         "contents": {
           "compression": "",
-          "source": "data:,SSH%20currently%20disabled%20until%20configuration%20completes"
+          "source": "data:,%0ASSH%20currently%20disabled%20until%20configuration%20completes%0A"
         }
       }
     ]
@@ -35,7 +35,7 @@
         "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/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",
+        "contents": "[Unit]\nDescription=Enable SSH after configuration and reboot\nAfter=multi-user.target\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"
       },