diff --git a/crates/kingfisher-rules/data/rules/fullstory.yml b/crates/kingfisher-rules/data/rules/fullstory.yml
index 960c997..64481de 100644
--- a/crates/kingfisher-rules/data/rules/fullstory.yml
+++ b/crates/kingfisher-rules/data/rules/fullstory.yml
@@ -32,7 +32,7 @@ rules:
           method: GET
           url: https://api.fullstory.com/me
           headers:
-            Authorization: Basic {{ TOKEN | append: ':' | b64enc }}
+            Authorization: "Basic {{ TOKEN | append: ':' | b64enc }}"
             Accept: application/json
           response_matcher:
             - report_response: true
diff --git a/crates/kingfisher-rules/data/rules/heroku.yml b/crates/kingfisher-rules/data/rules/heroku.yml
index d10ff87..c929e67 100644
--- a/crates/kingfisher-rules/data/rules/heroku.yml
+++ b/crates/kingfisher-rules/data/rules/heroku.yml
@@ -51,7 +51,7 @@ rules:
             extract:
               AUTHORIZATION_ID:
                 type: Regex
-                pattern: '"id":"([^"]+)"(?:.|[\n\r]){0,2048}?"token":"{{ TOKEN }}"'
+                pattern: '"id":"([^"]+)"[^{}]{0,2048}?"token":"{{ TOKEN }}"'
           - name: revoke_authorization
             request:
               method: DELETE
@@ -108,7 +108,7 @@ rules:
             extract:
               AUTHORIZATION_ID:
                 type: Regex
-                pattern: '"id":"([^"]+)"(?:.|[\n\r]){0,2048}?"token":"{{ TOKEN }}"'
+                pattern: '"id":"([^"]+)"[^{}]{0,2048}?"token":"{{ TOKEN }}"'
           - name: revoke_authorization
             request:
               method: DELETE
diff --git a/crates/kingfisher-rules/data/rules/zapier.yml b/crates/kingfisher-rules/data/rules/zapier.yml
index fc84326..83f37f2 100644
--- a/crates/kingfisher-rules/data/rules/zapier.yml
+++ b/crates/kingfisher-rules/data/rules/zapier.yml
@@ -18,13 +18,3 @@ rules:
       - webhook_url="https://hooks.zapier.com/hooks/catch/2929690/ztd17n/"
     references:
       - https://help.zapier.com/hc/en-us/articles/8496288690317-Trigger-Zaps-from-webhooks
-    validation:
-      type: Http
-      content:
-        request:
-          method: GET
-          url: '{{ TOKEN }}'
-          response_matcher:
-            - report_response: true
-            - type: StatusMatch
-              status: [200]
diff --git a/crates/kingfisher-rules/data/rules/zendesk.yml b/crates/kingfisher-rules/data/rules/zendesk.yml
index 473576d..e4fa89a 100644
--- a/crates/kingfisher-rules/data/rules/zendesk.yml
+++ b/crates/kingfisher-rules/data/rules/zendesk.yml
@@ -6,7 +6,10 @@ rules:
       \b
       (
         [a-z0-9]
-        [a-z0-9-]{1,62}
+        (?:
+          [a-z0-9-]{0,61}
+          [a-z0-9]
+        )?
         \.zendesk\.com
       )
       \b
@@ -80,7 +83,7 @@ rules:
       - https://developer.zendesk.com/api-reference/ticketing/account-configuration/current_user/
     depends_on_rule:
       - rule_id: kingfisher.zendesk.1
-        variable: ZENDESK_SUBDOMAIN
+        variable: ZENDESK_HOST
       - rule_id: kingfisher.zendesk.2
         variable: ZENDESK_EMAIL
     validation:
@@ -88,7 +91,7 @@ rules:
       content:
         request:
           method: GET
-          url: 'https://{{ ZENDESK_SUBDOMAIN }}/api/v2/users/me.json'
+          url: 'https://{{ ZENDESK_HOST }}/api/v2/users/me.json'
           headers:
             Accept: application/json
             Authorization: 'Basic {{ ZENDESK_EMAIL | append: "/token:" | append: TOKEN | b64enc }}'