diff --git a/.github/workflows/validate-terraform.yml b/.github/workflows/validate-terraform.yml
index 28c6b1c..ac00e40 100644
--- a/.github/workflows/validate-terraform.yml
+++ b/.github/workflows/validate-terraform.yml
@@ -2,6 +2,9 @@ name: Validate Terraform
 
 on:
   pull_request:
+    paths:
+      - "terraform/**"
+      - ".github/workflows/validate-terraform.yml"
 
 permissions:
   contents: read
diff --git a/ansible/roles/caddy/handlers/main.yml b/ansible/roles/caddy/handlers/main.yml
index a233e60..99a65a2 100644
--- a/ansible/roles/caddy/handlers/main.yml
+++ b/ansible/roles/caddy/handlers/main.yml
@@ -3,3 +3,7 @@
   ansible.builtin.service:
     name: caddy
     state: reloaded
+  register: caddy_reload_result
+  until: caddy_reload_result is succeeded
+  retries: 3
+  delay: 5