diff --git a/ignition/base.bu b/ignition/base.bu
index 3d5e6d3..09fd8d5 100644
--- a/ignition/base.bu
+++ b/ignition/base.bu
@@ -85,5 +85,26 @@ systemd:
         ExecStart=/usr/bin/touch /var/lib/%N.stamp
         ExecStart=/usr/bin/systemctl --no-block reboot
 
+        [Install]
+        WantedBy=multi-user.target
+
+    # Install tools
+    - name: rpm-ostree-install-tools.service
+      enabled: true
+      contents: |
+        [Unit]
+        Description=Install tools
+        Wants=network-online.target
+        After=ignition-start-config.service
+        Before=zincati.service
+        ConditionPathExists=!/var/lib/%N.stamp
+
+        [Service]
+        Type=oneshot
+        RemainAfterExit=yes
+        ExecStart=/usr/bin/rpm-ostree install htop tmux
+        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 d8bb212..c3860a3 100644
--- a/ignition/base.ign
+++ b/ignition/base.ign
@@ -1,49 +1,54 @@
-{
-  "ignition": {
-    "version": "3.5.0"
-  },
-  "storage": {
-    "files": [
-      {
-        "path": "/etc/zincati/config.d/51-rollout-wariness.toml",
-        "contents": {
-          "compression": "",
-          "source": "data:,%5Bidentity%5D%0Arollout_wariness%20%3D%200.8%0A"
-        }
-      },
-      {
-        "path": "/etc/zincati/config.d/55-updates-strategy.toml",
-        "contents": {
-          "compression": "",
-          "source": "data:;base64,W3VwZGF0ZXNdCnN0cmF0ZWd5ID0gInBlcmlvZGljIgpbW3VwZGF0ZXMucGVyaW9kaWMud2luZG93XV0KZGF5cyA9IFsgIlNhdCIsIlN1biIgXQpzdGFydF90aW1lID0gIjA2OjAwIgpsZW5ndGhfbWludXRlcyA9IDYwCg=="
-        }
-      },
-      {
-        "path": "/etc/issue.d/35-ssh-blocked.issue",
-        "contents": {
-          "compression": "",
-          "source": "data:,%0ASSH%20currently%20disabled%20until%20configuration%20completes%0A"
-        }
-      }
-    ]
-  },
-  "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\nExecStart=/usr/bin/systemctl stop sshd\nExecStart=/usr/bin/systemctl disable sshd\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\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"
-      },
-      {
-        "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"
-      }
-    ]
-  }
-}
+{
+  "ignition": {
+    "version": "3.5.0"
+  },
+  "storage": {
+    "files": [
+      {
+        "path": "/etc/zincati/config.d/51-rollout-wariness.toml",
+        "contents": {
+          "compression": "",
+          "source": "data:,%5Bidentity%5D%0Arollout_wariness%20%3D%200.8%0A"
+        }
+      },
+      {
+        "path": "/etc/zincati/config.d/55-updates-strategy.toml",
+        "contents": {
+          "compression": "",
+          "source": "data:;base64,W3VwZGF0ZXNdCnN0cmF0ZWd5ID0gInBlcmlvZGljIgpbW3VwZGF0ZXMucGVyaW9kaWMud2luZG93XV0KZGF5cyA9IFsgIlNhdCIsIlN1biIgXQpzdGFydF90aW1lID0gIjA2OjAwIgpsZW5ndGhfbWludXRlcyA9IDYwCg=="
+        }
+      },
+      {
+        "path": "/etc/issue.d/35-ssh-blocked.issue",
+        "contents": {
+          "compression": "",
+          "source": "data:,%0ASSH%20currently%20disabled%20until%20configuration%20completes%0A"
+        }
+      }
+    ]
+  },
+  "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\nExecStart=/usr/bin/systemctl stop sshd\nExecStart=/usr/bin/systemctl disable sshd\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\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"
+      },
+      {
+        "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\n",
+        "enabled": true,
+        "name": "rpm-ostree-install-qemu-guest-agent.service"
+      },
+      {
+        "contents": "[Unit]\nDescription=Install tools\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 htop tmux\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-tools.service"
+      }
+    ]
+  }
+}