diff --git a/ansible/roles/semaphore/handlers/main.yml b/ansible/roles/semaphore/handlers/main.yml
index c2579d3..3959227 100644
--- a/ansible/roles/semaphore/handlers/main.yml
+++ b/ansible/roles/semaphore/handlers/main.yml
@@ -1,4 +1,7 @@
 ---
-- name: reload systemd
+- name: reload systemd and start semaphore
   ansible.builtin.systemd:
-    daemon_reload: true
\ No newline at end of file
+    daemon_reload: true
+    name: "{{ semaphore_container_name }}.service"
+    state: started
+    enabled: true
\ No newline at end of file
diff --git a/ansible/roles/semaphore/tasks/main.yml b/ansible/roles/semaphore/tasks/main.yml
index 9dee3df..6cd6eca 100644
--- a/ansible/roles/semaphore/tasks/main.yml
+++ b/ansible/roles/semaphore/tasks/main.yml
@@ -31,18 +31,13 @@
     owner: root
     group: root
     mode: "0644"
-  notify: reload systemd
+  notify: reload systemd and start semaphore
+
+- name: Flush handlers so Quadlet is registered
+  meta: flush_handlers
 
 - name: Ensure Semaphore container is started
   ansible.builtin.systemd:
-    name: "{{ semaphore_container_name }}"
+    name: "{{ semaphore_container_name }}.service"
     state: started
-    enabled: true
-    daemon_reload: true
-
-- name: Wait for Semaphore to become available
-  ansible.builtin.wait_for:
-    host: "127.0.0.1"
-    port: "{{ semaphore_port }}"
-    delay: 5
-    timeout: 60
\ No newline at end of file
+    enabled: true
\ No newline at end of file