diff --git a/ansible/roles/gateway/tasks/haproxy.yml b/ansible/roles/gateway/tasks/haproxy.yml
index 092ad9a..3f3266f 100644
--- a/ansible/roles/gateway/tasks/haproxy.yml
+++ b/ansible/roles/gateway/tasks/haproxy.yml
@@ -12,6 +12,12 @@
   become: true
   register: haproxy_config
 
+- name: Enable Haproxy
+  service:
+    name: haproxy
+    enabled: true
+  become: true
+
 - name: Restart Haproxy
   service:
     name: haproxy
diff --git a/ansible/roles/gateway/tasks/wireguard.yml b/ansible/roles/gateway/tasks/wireguard.yml
index e294ed6..fb167f2 100644
--- a/ansible/roles/gateway/tasks/wireguard.yml
+++ b/ansible/roles/gateway/tasks/wireguard.yml
@@ -9,8 +9,13 @@
 - name: Enable wireguard
   service:
     name: wg-quick@wg0
-    state: restarted
     enabled: true
+  become: true
+
+- name: Restart wireguard
+  service:
+    name: wg-quick@wg0
+    state: restarted
   when: wireguard_conf.changed
   become: true
 
diff --git a/ansible/roles/ssh/tasks/main.yml b/ansible/roles/ssh/tasks/main.yml
index 804690f..423160f 100644
--- a/ansible/roles/ssh/tasks/main.yml
+++ b/ansible/roles/ssh/tasks/main.yml
@@ -24,7 +24,13 @@
   become: true
   register: sshd_config
 
-- name: Restart SSH config
+- name: Enable SSH
+  service:
+    name: sshd
+    enabled: true
+  become: true
+
+- name: Restart SSH Daemon
   service:
     name: sshd
     state: reloaded