diff --git a/tokens/amazon-mws-auth-token-value.yaml b/tokens/amazon-mws-auth-token-value.yaml
index 35aa2226ea..f4f53deaca 100755
--- a/tokens/amazon-mws-auth-token-value.yaml
+++ b/tokens/amazon-mws-auth-token-value.yaml
@@ -10,7 +10,14 @@ requests:
     path:
       - "{{BaseURL}}"
 
-  - extractors:
+  matchers-condition: and
+  matchers:
+      - part: body
+        regex:
+          - "amzn\\.mws\\.[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}"
+        type: regex
+
+  extractors:
       - part: body
         regex:
           - "amzn\\.mws\\.[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}"
diff --git a/tokens/aws-access-key-value.yaml b/tokens/aws-access-key-value.yaml
index 6fb604ca25..3d0b66974e 100755
--- a/tokens/aws-access-key-value.yaml
+++ b/tokens/aws-access-key-value.yaml
@@ -10,6 +10,13 @@ requests:
     path:
       - "{{BaseURL}}"
 
+  matchers-condition: and
+  matchers:
+      - type: regex
+        part: body
+        regex:
+          - "(A3T[A-Z0-9]|AKIA|AGPA|AROA|AIPA|ANPA|ANVA|ASIA)[A-Z0-9]{16}"
+
     extractors:
       - type: regex
         part: body
diff --git a/tokens/google-api-key.yaml b/tokens/google-api-key.yaml
index 4ddbb78563..f70ef27148 100755
--- a/tokens/google-api-key.yaml
+++ b/tokens/google-api-key.yaml
@@ -10,6 +10,13 @@ requests:
     path:
       - "{{BaseURL}}"
 
+  matchers-condition: and
+  matchers:
+      - type: regex
+        part: body
+        regex:
+          - "AIza[0-9A-Za-z\\-_]{35}"
+
     extractors:
       - type: regex
         part: body
diff --git a/tokens/http-username-password.yaml b/tokens/http-username-password.yaml
index 8404dcbfd4..84201ff92a 100644
--- a/tokens/http-username-password.yaml
+++ b/tokens/http-username-password.yaml
@@ -13,6 +13,13 @@ requests:
     path:
       - "{{BaseURL}}"
 
+  matchers-condition: and
+  matchers:
+      - type: regex
+        part: body
+        regex:
+          - "(ftp|ftps|http|https)://[0-9A-Za-z\\-_%]+(:|@)"
+
     extractors:
       - type: regex
         part: body
diff --git a/tokens/mailchimp-api-key.yaml b/tokens/mailchimp-api-key.yaml
index 36bca0caec..026e511df1 100755
--- a/tokens/mailchimp-api-key.yaml
+++ b/tokens/mailchimp-api-key.yaml
@@ -10,6 +10,13 @@ requests:
     path:
       - "{{BaseURL}}"
 
+  matchers-condition: and
+  matchers:
+      - type: regex
+        part: body
+        regex:
+          - "[0-9a-f]{32}-us[0-9]{1,2}"
+
     extractors:
       - type: regex
         part: body
diff --git a/tokens/slack-access-token.yaml b/tokens/slack-access-token.yaml
index 01c2bbebb5..7009db3307 100644
--- a/tokens/slack-access-token.yaml
+++ b/tokens/slack-access-token.yaml
@@ -13,6 +13,15 @@ requests:
     path:
       - "{{BaseURL}}"
 
+  matchers-condition: and
+  matchers:
+
+      - type: regex
+        part: body
+        regex:
+          - "xoxp-[0-9A-Za-z\\-]{72}"  # Person
+          - "xoxb-[0-9A-Za-z\\-]{51}"  # Bot
+
     extractors:
       - type: regex
         part: body