diff --git a/.hashibot.hcl b/.hashibot.hcl
index 230e1e31f2f..1dc5309dd54 100644
--- a/.hashibot.hcl
+++ b/.hashibot.hcl
@@ -240,6 +240,7 @@ behavior "regexp_issue_labeler_v2" "service_labels" {
       "aws_placement_group",
       "aws_spot",
       "aws_route(\"|`|$)",
+      "aws_vpn_",
     ],
     "service/ecr" = [
       "aws_ecr_",
@@ -337,7 +338,7 @@ behavior "regexp_issue_labeler_v2" "service_labels" {
       "aws_kinesis_([^f]|f[^i]|fi[^r]|fir[^e]|fire[^h]|fireh[^o]|fireho[^s]|firehos[^e]|firehose[^_])",
     ],
     "service/kinesisanalytics" = [
-      "aws_kinesisanalytics_",
+      "aws_kinesis_analytics_",
     ],
     "service/kms" = [
       "aws_kms_",
@@ -935,8 +936,8 @@ behavior "pull_request_path_labeler" "service_labels" {
       "website/kinesis_stream*"
     ]
     "service/kinesisanalytics" = [
-      "**/*_kinesisanalytics_*",
-      "**/kinesisanalytics_*"
+      "**/*_kinesis_analytics_*",
+      "**/kinesis_analytics_*"
     ]
     "service/kms" = [
       "**/*_kms_*",