diff --git a/hetzner-cloud/cloud-config.yaml.tftpl b/hetzner-cloud/cloud-config.yaml.tftpl
index 342cc97..9357b32 100644
--- a/hetzner-cloud/cloud-config.yaml.tftpl
+++ b/hetzner-cloud/cloud-config.yaml.tftpl
@@ -81,8 +81,11 @@ write_files:
 %{ endif ~}
 runcmd:
   - chown -R ${username}:${username} /home/${username}
-  - systemctl enable coder-agent
-  - systemctl start coder-agent
+  - systemctl enable --now coder-agent
+%{ if install_terraform_setup ~}
+  - dnf config-manager --add-repo https://rpm.releases.hashicorp.com/fedora/hashicorp.repo
+  - dnf -y install terraform
+%{ endif ~}
 %{ if install_dotnet_setup ~}
   - loginctl enable-linger ${username}
   - mkdir -p /home/${username}/.config/systemd/user/sockets.target.wants
@@ -90,10 +93,6 @@ runcmd:
   - chown -R ${username}:${username} /home/${username}
   - sudo -u ${username} DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/1000/bus" systemctl --user start podman
 %{ endif ~}
-%{ if install_terraform_setup ~}
-  - dnf config-manager --add-repo https://rpm.releases.hashicorp.com/fedora/hashicorp.repo
-  - dnf -y install terraform
-%{ endif ~}
 %{ if code_server_setup ~}
   - dnf install -y $(curl -sL https://api.github.com/repos/coder/code-server/releases/latest | jq -r '.assets[].browser_download_url' | grep "amd64.rpm")
   - systemctl enable --now code-server@${username}