diff --git a/roles/homeassistant/tasks/main.yml b/roles/homeassistant/tasks/main.yml
index 23aa871..b87dcbd 100644
--- a/roles/homeassistant/tasks/main.yml
+++ b/roles/homeassistant/tasks/main.yml
@@ -74,15 +74,11 @@
     notify:
       - systemctl daemon-reload
 
-  - name: systemctl enable homeassistant
-    systemd:
-      name: homeassistant
-      enabled: true
-
-  - name: ensure homeassistant is running
+  - name: ensure homeassistant is enabled and started
     systemd:
       name: homeassistant
       state: started
+      enabled: true
 
   - name: Wait for port 8123
     wait_for: