diff --git a/.github/labeler-issue-triage.yml b/.github/labeler-issue-triage.yml
index 8b506731717..03760b4ff8f 100644
--- a/.github/labeler-issue-triage.yml
+++ b/.github/labeler-issue-triage.yml
@@ -14,3 +14,351 @@ bug:
   - "(doesn't support update|failed to satisfy constraint: Member must not be null|Invalid address to set|panic:|produced an (invalid|unexpected) new value|Provider produced inconsistent (final plan|result after apply))"
 crash:
   - 'panic:'
+#
+# AWS Per-Service Labeling
+#
+# Catch the following in issues to prevent false positives:
+# *aws_XXX
+# * aws_XXX
+# * `aws_XXX`
+# -aws_XXX
+# - aws_XXX
+# - `aws_XXX`
+# data aws_XXX
+# data "aws_XXX"
+# resource aws_XXX
+# resource "aws_XXX"
+service/accessanalyzer:
+  - '((\*|-) ?`?|(data|resource) "?)aws_accessanalyzer_'
+service/acm:
+  - '((\*|-) ?`?|(data|resource) "?)aws_acm_'
+service/acmpca:
+  - '((\*|-) ?`?|(data|resource) "?)aws_acmpca_'
+service/alexaforbusiness:
+  - '((\*|-) ?`?|(data|resource) "?)aws_alexaforbusiness_'
+service/amplify:
+  - '((\*|-) ?`?|(data|resource) "?)aws_amplify_'
+service/apigateway:
+  - '((\*|-) ?`?|(data|resource) "?)aws_api_gateway_'
+service/apigatewayv2:
+  - '((\*|-) ?`?|(data|resource) "?)aws_apigatewayv2_'
+service/appconfig:
+  - '((\*|-) ?`?|(data|resource) "?)aws_appconfig_'
+service/applicationautoscaling:
+  - '((\*|-) ?`?|(data|resource) "?)aws_appautoscaling_'
+service/applicationdiscoveryservice:
+  - '((\*|-) ?`?|(data|resource) "?)aws_applicationdiscoveryservice_'
+service/applicationinsights:
+  - '((\*|-) ?`?|(data|resource) "?)aws_applicationinsights_'
+service/appmesh:
+  - '((\*|-) ?`?|(data|resource) "?)aws_appmesh_'
+service/apprunner:
+  - '((\*|-) ?`?|(data|resource) "?)aws_apprunner_'
+service/appstream:
+  - '((\*|-) ?`?|(data|resource) "?)aws_appstream_'
+service/appsync:
+  - '((\*|-) ?`?|(data|resource) "?)aws_appsync_'
+service/athena:
+  - '((\*|-) ?`?|(data|resource) "?)aws_athena_'
+service/auditmanager:
+  - '((\*|-) ?`?|(data|resource) "?)aws_auditmanager_'
+service/autoscaling:
+  - '((\*|-) ?`?|(data|resource) "?)aws_(autoscaling_|launch_configuration)'
+service/autoscalingplans:
+  - '((\*|-) ?`?|(data|resource) "?)aws_autoscalingplans_'
+service/backup:
+  - '((\*|-) ?`?|(data|resource) "?)aws_backup_'
+service/batch:
+  - '((\*|-) ?`?|(data|resource) "?)aws_batch_'
+service/budgets:
+  - '((\*|-) ?`?|(data|resource) "?)aws_budgets_'
+service/chime:
+  - '((\*|-) ?`?|(data|resource) "?)aws_chime_'
+service/cloud9:
+  - '((\*|-) ?`?|(data|resource) "?)aws_cloud9_'
+service/clouddirectory:
+  - '((\*|-) ?`?|(data|resource) "?)aws_clouddirectory_'
+service/cloudformation:
+  - '((\*|-) ?`?|(data|resource) "?)aws_cloudformation_'
+service/cloudfront:
+  - '((\*|-) ?`?|(data|resource) "?)aws_cloudfront_'
+service/cloudhsmv2:
+  - '((\*|-) ?`?|(data|resource) "?)aws_cloudhsm_v2_'
+service/cloudsearch:
+  - '((\*|-) ?`?|(data|resource) "?)aws_cloudsearch_'
+service/cloudtrail:
+  - '((\*|-) ?`?|(data|resource) "?)aws_cloudtrail'
+service/cloudwatch:
+  - '((\*|-) ?`?|(data|resource) "?)aws_cloudwatch_(?!(event_|log_|query_))'
+service/cloudwatchevents:
+  - '((\*|-) ?`?|(data|resource) "?)aws_cloudwatch_event_'
+service/cloudwatchlogs:
+  - '((\*|-) ?`?|(data|resource) "?)aws_cloudwatch_(log_|query_)'
+service/codeartifact:
+  - '((\*|-) ?`?|(data|resource) "?)aws_codeartifact_'
+service/codebuild:
+  - '((\*|-) ?`?|(data|resource) "?)aws_codebuild_'
+service/codecommit:
+  - '((\*|-) ?`?|(data|resource) "?)aws_codecommit_'
+service/codedeploy:
+  - '((\*|-) ?`?|(data|resource) "?)aws_codedeploy_'
+service/codepipeline:
+  - '((\*|-) ?`?|(data|resource) "?)aws_codepipeline'
+service/codestar:
+  - '((\*|-) ?`?|(data|resource) "?)aws_codestar_'
+service/codestarconnections:
+  - '((\*|-) ?`?|(data|resource) "?)aws_codestarconnections_'
+service/codestarnotifications:
+  - '((\*|-) ?`?|(data|resource) "?)aws_codestarnotifications_'
+service/cognito:
+  - '((\*|-) ?`?|(data|resource) "?)aws_cognito_'
+service/configservice:
+  - '((\*|-) ?`?|(data|resource) "?)aws_config_'
+service/connect:
+  - '((\*|-) ?`?|(data|resource) "?)aws_connect_'
+service/databasemigrationservice:
+  - '((\*|-) ?`?|(data|resource) "?)aws_dms_'
+service/dataexchange:
+  - '((\*|-) ?`?|(data|resource) "?)aws_dataexchange_'
+service/datapipeline:
+  - '((\*|-) ?`?|(data|resource) "?)aws_datapipeline_'
+service/datasync:
+  - '((\*|-) ?`?|(data|resource) "?)aws_datasync_'
+service/dax:
+  - '((\*|-) ?`?|(data|resource) "?)aws_dax_'
+service/detective:
+  - '((\*|-) ?`?|(data|resource) "?)aws_detective'
+service/devicefarm:
+  - '((\*|-) ?`?|(data|resource) "?)aws_devicefarm_'
+service/directconnect:
+  - '((\*|-) ?`?|(data|resource) "?)aws_dx_'
+service/directoryservice:
+  - '((\*|-) ?`?|(data|resource) "?)aws_directory_service_'
+service/dlm:
+  - '((\*|-) ?`?|(data|resource) "?)aws_dlm_'
+service/docdb:
+  - '((\*|-) ?`?|(data|resource) "?)aws_docdb_'
+service/dynamodb:
+  - '((\*|-) ?`?|(data|resource) "?)aws_dynamodb_'
+service/ec2:
+  - '((\*|-) ?`?|(data|resource) "?)aws_(ami|availability_zone|customer_gateway|(default_)?(network_acl|route_table|security_group|subnet|vpc)|ebs_|ec2_|egress_only_internet_gateway|eip|flow_log|instance|internet_gateway|key_pair|launch_template|main_route_table_association|network_interface|placement_group|prefix_list|spot|route(\"|`|$)|vpn_|volume_attachment)'
+service/ecr:
+  - '((\*|-) ?`?|(data|resource) "?)aws_ecr_'
+service/ecrpublic:
+  - '((\*|-) ?`?|(data|resource) "?)aws_ecrpublic_'
+service/ecs:
+  - '((\*|-) ?`?|(data|resource) "?)aws_ecs_'
+service/efs:
+  - '((\*|-) ?`?|(data|resource) "?)aws_efs_'
+service/eks:
+  - '((\*|-) ?`?|(data|resource) "?)aws_eks_'
+elastic-transcoder:
+  - '((\*|-) ?`?|(data|resource) "?)aws_elastictranscoder_'
+service/elasticache:
+  - '((\*|-) ?`?|(data|resource) "?)aws_elasticache_'
+service/elasticbeanstalk:
+  - '((\*|-) ?`?|(data|resource) "?)aws_elastic_beanstalk_'
+service/elasticsearch:
+  - '((\*|-) ?`?|(data|resource) "?)aws_elasticsearch_'
+service/elb:
+  - '((\*|-) ?`?|(data|resource) "?)aws_(app_cookie_stickiness_policy|elb|lb_cookie_stickiness_policy|lb_ssl_negotiation_policy|load_balancer_|proxy_protocol_policy)'
+service/elbv2:
+  - '((\*|-) ?`?|(data|resource) "?)aws_(a)?lb(\"|`|_listener|_target_group|$)'
+service/emr:
+  - '((\*|-) ?`?|(data|resource) "?)aws_emr_'
+service/emrcontainers:
+  - '((\*|-) ?`?|(data|resource) "?)aws_emrcontainers_'
+service/eventbridge:
+  - '((\*|-) ?`?|(data|resource) "?)aws_cloudwatch_event_'
+service/firehose:
+  - '((\*|-) ?`?|(data|resource) "?)aws_kinesis_firehose_'
+service/fms:
+  - '((\*|-) ?`?|(data|resource) "?)aws_fms_'
+service/forecast:
+  - '((\*|-) ?`?|(data|resource) "?)aws_forecast_'
+service/fsx:
+  - '((\*|-) ?`?|(data|resource) "?)aws_fsx_'
+service/gamelift:
+  - '((\*|-) ?`?|(data|resource) "?)aws_gamelift_'
+service/glacier:
+  - '((\*|-) ?`?|(data|resource) "?)aws_glacier_'
+service/globalaccelerator:
+  - '((\*|-) ?`?|(data|resource) "?)aws_globalaccelerator_'
+service/glue:
+  - '((\*|-) ?`?|(data|resource) "?)aws_glue_'
+service/greengrass:
+  - '((\*|-) ?`?|(data|resource) "?)aws_greengrass_'
+service/guardduty:
+  - '((\*|-) ?`?|(data|resource) "?)aws_guardduty_'
+service/iam:
+  - '((\*|-) ?`?|(data|resource) "?)aws_iam_'
+service/identitystore:
+  - '((\*|-) ?`?|(data|resource) "?)aws_identitystore_'
+service/imagebuilder:
+  - '((\*|-) ?`?|(data|resource) "?)aws_imagebuilder_'
+service/inspector:
+  - '((\*|-) ?`?|(data|resource) "?)aws_inspector_'
+service/iot:
+  - '((\*|-) ?`?|(data|resource) "?)aws_iot_'
+service/iotanalytics:
+  - '((\*|-) ?`?|(data|resource) "?)aws_iotanalytics_'
+service/iotevents:
+  - '((\*|-) ?`?|(data|resource) "?)aws_iotevents_'
+service/kafka:
+  - '((\*|-) ?`?|(data|resource) "?)aws_msk_'
+service/kinesis:
+  - '((\*|-) ?`?|(data|resource) "?)aws_kinesis_stream'
+service/kinesisanalytics:
+  - '((\*|-) ?`?|(data|resource) "?)aws_kinesis_analytics_'
+service/kinesisanalyticsv2:
+  - '((\*|-) ?`?|(data|resource) "?)aws_kinesisanalyticsv2_'
+service/kms:
+  - '((\*|-) ?`?|(data|resource) "?)aws_kms_'
+service/lakeformation:
+  - '((\*|-) ?`?|(data|resource) "?)aws_lakeformation_'
+service/lambda:
+  - '((\*|-) ?`?|(data|resource) "?)aws_lambda_'
+service/lexmodelbuildingservice:
+  - '((\*|-) ?`?|(data|resource) "?)aws_lex_'
+service/licensemanager:
+  - '((\*|-) ?`?|(data|resource) "?)aws_licensemanager_'
+service/lightsail:
+  - '((\*|-) ?`?|(data|resource) "?)aws_lightsail_'
+service/machinelearning:
+  - '((\*|-) ?`?|(data|resource) "?)aws_machinelearning_'
+service/macie:
+  - '((\*|-) ?`?|(data|resource) "?)aws_macie_'
+service/macie2:
+  - '((\*|-) ?`?|(data|resource) "?)aws_macie2_'
+service/marketplacecatalog:
+  - '((\*|-) ?`?|(data|resource) "?)aws_marketplace_catalog_'
+service/mediaconnect:
+  - '((\*|-) ?`?|(data|resource) "?)aws_media_connect_'
+service/mediaconvert:
+  - '((\*|-) ?`?|(data|resource) "?)aws_media_convert_'
+service/medialive:
+  - '((\*|-) ?`?|(data|resource) "?)aws_media_live_'
+service/mediapackage:
+  - '((\*|-) ?`?|(data|resource) "?)aws_media_package_'
+service/mediastore:
+  - '((\*|-) ?`?|(data|resource) "?)aws_media_store_'
+service/mediatailor:
+  - '((\*|-) ?`?|(data|resource) "?)aws_media_tailor_'
+service/mobile:
+  - '((\*|-) ?`?|(data|resource) "?)aws_mobile_'
+service/mq:
+  - '((\*|-) ?`?|(data|resource) "?)aws_mq_'
+service/mwaa:
+  - '((\*|-) ?`?|(data|resource) "?)aws_mwaa_'
+service/neptune:
+  - '((\*|-) ?`?|(data|resource) "?)aws_neptune_'
+service/networkfirewall:
+  - '((\*|-) ?`?|(data|resource) "?)aws_networkfirewall_'
+service/networkmanager:
+  - '((\*|-) ?`?|(data|resource) "?)aws_networkmanager_'
+service/opsworks:
+  - '((\*|-) ?`?|(data|resource) "?)aws_opsworks_'
+service/organizations:
+  - '((\*|-) ?`?|(data|resource) "?)aws_organizations_'
+service/outposts:
+  - '((\*|-) ?`?|(data|resource) "?)aws_outposts_'
+service/personalize:
+  - '((\*|-) ?`?|(data|resource) "?)aws_personalize_'
+service/pinpoint:
+  - '((\*|-) ?`?|(data|resource) "?)aws_pinpoint_'
+service/polly:
+  - '((\*|-) ?`?|(data|resource) "?)aws_polly_'
+service/pricing:
+  - '((\*|-) ?`?|(data|resource) "?)aws_pricing_'
+service/prometheusservice:
+  - '((\*|-) ?`?|(data|resource) "?)aws_prometheus_'
+service/qldb:
+  - '((\*|-) ?`?|(data|resource) "?)aws_qldb_'
+service/quicksight:
+  - '((\*|-) ?`?|(data|resource) "?)aws_quicksight_'
+service/ram:
+  - '((\*|-) ?`?|(data|resource) "?)aws_ram_'
+service/rds:
+  - '((\*|-) ?`?|(data|resource) "?)aws_(db_|rds_)'
+service/redshift:
+  - '((\*|-) ?`?|(data|resource) "?)aws_redshift_'
+service/resourcegroups:
+  - '((\*|-) ?`?|(data|resource) "?)aws_resourcegroups_'
+service/resourcegroupstaggingapi:
+  - '((\*|-) ?`?|(data|resource) "?)aws_resourcegroupstaggingapi_'
+service/robomaker:
+  - '((\*|-) ?`?|(data|resource) "?)aws_robomaker_'
+service/route53:
+  - '((\*|-) ?`?|(data|resource) "?)aws_route53_(?!resolver_)'
+service/route53domains:
+  - '((\*|-) ?`?|(data|resource) "?)aws_route53domains_'
+service/route53resolver:
+  - '((\*|-) ?`?|(data|resource) "?)aws_route53_resolver_'
+service/s3:
+  - '((\*|-) ?`?|(data|resource) "?)aws_(canonical_user_id|s3_bucket|s3_object)'
+service/s3control:
+  - '((\*|-) ?`?|(data|resource) "?)aws_(s3_account_|s3control_)'
+service/s3outposts:
+  - '((\*|-) ?`?|(data|resource) "?)aws_s3outposts_'
+service/sagemaker:
+  - '((\*|-) ?`?|(data|resource) "?)aws_sagemaker_'
+service/schemas:
+  - '((\*|-) ?`?|(data|resource) "?)aws_schemas_'
+service/secretsmanager:
+  - '((\*|-) ?`?|(data|resource) "?)aws_secretsmanager_'
+service/securityhub:
+  - '((\*|-) ?`?|(data|resource) "?)aws_securityhub_'
+service/serverlessapplicationrepository:
+  - '((\*|-) ?`?|(data|resource) "?)aws_serverlessapplicationrepository_'
+service/servicecatalog:
+  - '((\*|-) ?`?|(data|resource) "?)aws_servicecatalog_'
+service/servicediscovery:
+  - '((\*|-) ?`?|(data|resource) "?)aws_service_discovery_'
+service/servicequotas:
+  - '((\*|-) ?`?|(data|resource) "?)aws_servicequotas_'
+service/ses:
+  - '((\*|-) ?`?|(data|resource) "?)aws_ses_'
+service/sfn:
+  - '((\*|-) ?`?|(data|resource) "?)aws_sfn_'
+service/shield:
+  - '((\*|-) ?`?|(data|resource) "?)aws_shield_'
+service/signer:
+  - '((\*|-) ?`?|(data|resource) "?)aws_signer_'
+service/simpledb:
+  - '((\*|-) ?`?|(data|resource) "?)aws_simpledb_'
+service/snowball:
+  - '((\*|-) ?`?|(data|resource) "?)aws_snowball_'
+service/sns:
+  - '((\*|-) ?`?|(data|resource) "?)aws_sns_'
+service/sqs:
+  - '((\*|-) ?`?|(data|resource) "?)aws_sqs_'
+service/ssm:
+  - '((\*|-) ?`?|(data|resource) "?)aws_ssm_'
+service/ssoadmin:
+  - '((\*|-) ?`?|(data|resource) "?)aws_ssoadmin_'
+service/storagegateway:
+  - '((\*|-) ?`?|(data|resource) "?)aws_storagegateway_'
+service/sts:
+  - '((\*|-) ?`?|(data|resource) "?)aws_caller_identity'
+service/swf:
+  - '((\*|-) ?`?|(data|resource) "?)aws_swf_'
+service/synthetics:
+  - '((\*|-) ?`?|(data|resource) "?)aws_synthetics_'
+service/timestreamwrite:
+  - '((\*|-) ?`?|(data|resource) "?)aws_timestreamwrite_'
+service/transfer:
+  - '((\*|-) ?`?|(data|resource) "?)aws_transfer_'
+service/waf:
+  - '((\*|-) ?`?|(data|resource) "?)aws_waf(regional)?_'
+service/wafv2:
+  - '((\*|-) ?`?|(data|resource) "?)aws_wafv2_'
+service/workdocs:
+  - '((\*|-) ?`?|(data|resource) "?)aws_workdocs_'
+service/worklink:
+  - '((\*|-) ?`?|(data|resource) "?)aws_worklink_'
+service/workmail:
+  - '((\*|-) ?`?|(data|resource) "?)aws_workmail_'
+service/workspaces:
+  - '((\*|-) ?`?|(data|resource) "?)aws_workspaces_'
+service/xray:
+  - '((\*|-) ?`?|(data|resource) "?)aws_xray_'
diff --git a/.hashibot.hcl b/.hashibot.hcl
index 73046cefac0..18f7fba7237 100644
--- a/.hashibot.hcl
+++ b/.hashibot.hcl
@@ -8,563 +8,6 @@ queued_behavior "release_commenter" "releases" {
   EOF
 }
 
-# Catch the following in issues:
-# *aws_XXX
-# * aws_XXX
-# * `aws_XXX`
-# -aws_XXX
-# - aws_XXX
-# - `aws_XXX`
-# data "aws_XXX"
-# resource "aws_XXX"
-# NOTE: Go regexp does not support negative lookaheads
-behavior "regexp_issue_labeler_v2" "service_labels" {
-  regexp = "(\\* ?`?|- ?`?|data \"|resource \")aws_(\\w+)"
-
-  label_map = {
-    "service/accessanalyzer" = [
-      "aws_accessanalyzer_",
-    ],
-    "service/acm" = [
-      "aws_acm_",
-    ],
-    "service/acmpca" = [
-      "aws_acmpca_",
-    ],
-    "service/alexaforbusiness" = [
-      "aws_alexaforbusiness_",
-    ],
-    "service/amplify" = [
-      "aws_amplify_",
-    ],
-    "service/apigateway" = [
-      # Catch aws_api_gateway_XXX but not aws_api_gateway_v2_
-      "aws_api_gateway_([^v]|v[^2]|v2[^_])",
-    ],
-    "service/apigatewayv2" = [
-      "aws_api_gateway_v2_",
-      "aws_apigatewayv2_",
-    ],
-    "service/appconfig" = [
-      "aws_appconfig_",
-    ],
-    "service/applicationautoscaling" = [
-      "aws_appautoscaling_",
-    ],
-    "service/applicationdiscoveryservice" = [
-      "aws_applicationdiscoveryservice_",
-    ],
-    "service/applicationinsights" = [
-      "aws_applicationinsights_",
-    ],
-    "service/appmesh" = [
-      "aws_appmesh_",
-    ],
-    "service/apprunner" = [
-      "aws_apprunner_",
-    ],
-    "service/appstream" = [
-      "aws_appstream_",
-    ],
-    "service/appsync" = [
-      "aws_appsync_",
-    ],
-    "service/athena" = [
-      "aws_athena_",
-    ],
-    "service/auditmanager" = [
-      "aws_auditmanager_",
-    ],
-    "service/autoscaling" = [
-      "aws_autoscaling_",
-      "aws_launch_configuration",
-    ],
-    "service/autoscalingplans" = [
-      "aws_autoscalingplans_",
-    ],
-    "service/backup" = [
-      "aws_backup_",
-    ],
-    "service/batch" = [
-      "aws_batch_",
-    ],
-    "service/budgets" = [
-      "aws_budgets_",
-    ],
-    "service/chime" = [
-      "aws_chime_",
-    ],
-    "service/cloud9" = [
-      "aws_cloud9_",
-    ],
-    "service/clouddirectory" = [
-      "aws_clouddirectory_",
-    ],
-    "service/cloudformation" = [
-      "aws_cloudformation_",
-    ],
-    "service/cloudfront" = [
-      "aws_cloudfront_",
-    ],
-    "service/cloudhsmv2" = [
-      "aws_cloudhsm_v2_",
-    ],
-    "service/cloudsearch" = [
-      "aws_cloudsearch_",
-    ],
-    "service/cloudtrail" = [
-      "aws_cloudtrail",
-    ],
-    "service/cloudwatch" = [
-      "aws_cloudwatch_([^e]|e[^v]|ev[^e]|eve[^n]|even[^t]|event[^_]|[^l]|l[^o]|lo[^g]|log[^_])",
-    ],
-    "service/cloudwatchevents" = [
-      "aws_cloudwatch_event_",
-    ],
-    "service/cloudwatchlogs" = [
-      "aws_cloudwatch_log_",
-      "aws_cloudwatch_query_definition",
-    ],
-    "service/codeartifact" = [
-      "aws_codeartifact_",
-    ],
-    "service/codebuild" = [
-      "aws_codebuild_",
-    ],
-    "service/codecommit" = [
-      "aws_codecommit_",
-    ],
-    "service/codedeploy" = [
-      "aws_codedeploy_",
-    ],
-    "service/codepipeline" = [
-      "aws_codepipeline",
-    ],
-    "service/codestar" = [
-      "aws_codestar_",
-    ],
-    "service/codestarconnections" = [
-      "aws_codestarconnections_",
-    ],
-    "service/codestarnotifications" = [
-      "aws_codestarnotifications_",
-    ],
-    "service/cognito" = [
-      "aws_cognito_",
-    ],
-    "service/configservice" = [
-      "aws_config_",
-    ],
-    "service/connect" = [
-      "aws_connect_",
-    ],
-    "service/databasemigrationservice" = [
-      "aws_dms_",
-    ],
-    "service/dataexchange" = [
-      "aws_dataexchange_",
-    ],
-    "service/datapipeline" = [
-      "aws_datapipeline_",
-    ],
-    "service/datasync" = [
-      "aws_datasync_",
-    ],
-    "service/dax" = [
-      "aws_dax_",
-    ],
-    "service/detective" = [
-      "aws_detective_"
-    ],
-    "service/devicefarm" = [
-      "aws_devicefarm_",
-    ],
-    "service/directconnect" = [
-      "aws_dx_",
-    ],
-    "service/directoryservice" = [
-      "aws_directory_service_",
-    ],
-    "service/dlm" = [
-      "aws_dlm_",
-    ],
-    "service/docdb" = [
-      "aws_docdb_",
-    ],
-    "service/dynamodb" = [
-      "aws_dynamodb_",
-    ],
-    "service/ec2" = [
-      "aws_ami",
-      "aws_availability_zone",
-      "aws_customer_gateway",
-      "aws_(default_)?(network_acl|route_table|security_group|subnet|vpc)",
-      "aws_ebs_",
-      "aws_ec2_",
-      "aws_egress_only_internet_gateway",
-      "aws_eip",
-      "aws_flow_log",
-      "aws_instance",
-      "aws_internet_gateway",
-      "aws_key_pair",
-      "aws_launch_template",
-      "aws_main_route_table_association",
-      "aws_network_interface",
-      "aws_placement_group",
-      "aws_prefix_list",
-      "aws_spot",
-      "aws_route(\"|`|$)",
-      "aws_vpn_",
-      "aws_volume_attachment",
-    ],
-    "service/ecr" = [
-      "aws_ecr_",
-    ],
-    "service/ecrpublic" = [
-      "aws_ecrpublic_",
-    ],
-    "service/ecs" = [
-      "aws_ecs_",
-    ],
-    "service/efs" = [
-      "aws_efs_",
-    ],
-    "service/eks" = [
-      "aws_eks_",
-    ],
-    "service/elastic-transcoder" = [
-      "aws_elastictranscoder_",
-    ],
-    "service/elasticache" = [
-      "aws_elasticache_",
-    ],
-    "service/elasticbeanstalk" = [
-      "aws_elastic_beanstalk_",
-    ],
-    "service/elasticsearch" = [
-      "aws_elasticsearch_",
-    ],
-    "service/elb" = [
-      "aws_app_cookie_stickiness_policy",
-      "aws_elb",
-      "aws_lb_cookie_stickiness_policy",
-      "aws_lb_ssl_negotiation_policy",
-      "aws_load_balancer_",
-      "aws_proxy_protocol_policy",
-    ],
-    "service/elbv2" = [
-      "aws_(a)?lb(\"|`|$)",
-      # Catch aws_lb_XXX but not aws_lb_cookie_ or aws_lb_ssl_ (Classic ELB)
-      "aws_(a)?lb_([^c]|c[^o]|co[^o]|coo[^k]|cook[^i]|cooki[^e]|cookie[^_]|[^s]|s[^s]|ss[^l]|ssl[^_])",
-    ],
-    "service/emr" = [
-      "aws_emr_",
-    ],
-    "service/emrcontainers" = [
-      "aws_emrcontainers_",
-    ],
-    "service/eventbridge" = [
-      # EventBridge is rebranded CloudWatch Events
-      "aws_cloudwatch_event_",
-    ],
-    "service/firehose" = [
-      "aws_kinesis_firehose_",
-    ],
-    "service/fms" = [
-      "aws_fms_",
-    ],
-    "service/forecast" = [
-      "aws_forecast_",
-    ],
-    "service/fsx" = [
-      "aws_fsx_",
-    ],
-    "service/gamelift" = [
-      "aws_gamelift_",
-    ],
-    "service/glacier" = [
-      "aws_glacier_",
-    ],
-    "service/globalaccelerator" = [
-      "aws_globalaccelerator_",
-    ],
-    "service/glue" = [
-      "aws_glue_",
-    ],
-    "service/greengrass" = [
-      "aws_greengrass_",
-    ],
-    "service/guardduty" = [
-      "aws_guardduty_",
-    ],
-    "service/iam" = [
-      "aws_iam_",
-    ],
-    "service/identitystore" = [
-      "aws_identitystore_",
-    ],
-    "service/imagebuilder" = [
-      "aws_imagebuilder_",
-    ],
-    "service/inspector" = [
-      "aws_inspector_",
-    ],
-    "service/iot" = [
-      "aws_iot_",
-    ],
-    "service/iotanalytics" = [
-      "aws_iotanalytics_",
-    ],
-    "service/iotevents" = [
-      "aws_iotevents_",
-    ],
-    "service/kafka" = [
-      "aws_msk_",
-    ],
-    "service/kinesis" = [
-      # Catch aws_kinesis_XXX but not aws_kinesis_firehose_
-      "aws_kinesis_([^f]|f[^i]|fi[^r]|fir[^e]|fire[^h]|fireh[^o]|fireho[^s]|firehos[^e]|firehose[^_])",
-    ],
-    "service/kinesisanalytics" = [
-      "aws_kinesis_analytics_",
-    ],
-    "service/kinesisanalyticsv2" = [
-      "aws_kinesisanalyticsv2_",
-    ],
-    "service/kms" = [
-      "aws_kms_",
-    ],
-    "service/lakeformation" = [
-      "aws_lakeformation_",
-    ],
-    "service/lambda" = [
-      "aws_lambda_",
-    ],
-    "service/lexmodelbuildingservice" = [
-      "aws_lex_",
-    ],
-    "service/licensemanager" = [
-      "aws_licensemanager_",
-    ],
-    "service/lightsail" = [
-      "aws_lightsail_",
-    ],
-    "service/machinelearning" = [
-      "aws_machinelearning_",
-    ],
-    "service/macie" = [
-      "aws_macie_",
-    ],
-    "service/macie2" = [
-      "aws_macie2_",
-    ],
-    "service/marketplacecatalog" = [
-      "aws_marketplace_catalog_",
-    ],
-    "service/mediaconnect" = [
-      "aws_media_connect_",
-    ],
-    "service/mediaconvert" = [
-      "aws_media_convert_",
-    ],
-    "service/medialive" = [
-      "aws_media_live_",
-    ],
-    "service/mediapackage" = [
-      "aws_media_package_",
-    ],
-    "service/mediastore" = [
-      "aws_media_store_",
-    ],
-    "service/mediatailor" = [
-      "aws_media_tailor_",
-    ],
-    "service/mobile" = [
-      "aws_mobile_",
-    ],
-    "service/mq" = [
-      "aws_mq_",
-    ],
-    "service/mwaa" = [
-      "aws_mwaa_",
-    ],
-    "service/neptune" = [
-      "aws_neptune_",
-    ],
-    "service/networkfirewall" = [
-      "aws_networkfirewall_",
-    ],
-    "service/networkmanager" = [
-      "aws_networkmanager_",
-    ],
-    "service/opsworks" = [
-      "aws_opsworks_",
-    ],
-    "service/organizations" = [
-      "aws_organizations_",
-    ],
-    "service/outposts" = [
-      "aws_outposts_",
-    ],
-    "service/personalize" = [
-      "aws_personalize_",
-    ],
-    "service/pinpoint" = [
-      "aws_pinpoint_",
-    ],
-    "service/polly" = [
-      "aws_polly_",
-    ],
-    "service/pricing" = [
-      "aws_pricing_",
-    ],
-    "service/prometheusservice" = [
-      "aws_prometheus_",
-    ],
-    "service/qldb" = [
-      "aws_qldb_",
-    ],
-    "service/quicksight" = [
-      "aws_quicksight_",
-    ],
-    "service/ram" = [
-      "aws_ram_",
-    ],
-    "service/rds" = [
-      "aws_db_",
-      "aws_rds_",
-    ],
-    "service/redshift" = [
-      "aws_redshift_",
-    ],
-    "service/resourcegroups" = [
-      "aws_resourcegroups_",
-    ],
-    "service/resourcegroupstaggingapi" = [
-      "aws_resourcegroupstaggingapi_",
-    ],
-    "service/robomaker" = [
-      "aws_robomaker_",
-    ],
-    "service/route53" = [
-      # Catch aws_route53_XXX but not aws_route53_domains_ or aws_route53_resolver_
-      "aws_route53_([^d]|d[^o]|do[^m]|dom[^a]|doma[^i]|domai[^n]|domain[^s]|domains[^_]|[^r]|r[^e]|re[^s]|res[^o]|reso[^l]|resol[^v]|resolv[^e]|resolve[^r]|resolver[^_])",
-    ],
-    "service/route53domains" = [
-      "aws_route53domains_",
-    ],
-    "service/route53resolver" = [
-      "aws_route53_resolver_",
-    ],
-    "service/s3" = [
-      "aws_canonical_user_id",
-      "aws_s3_bucket",
-      "aws_s3_object",
-    ],
-    "service/s3control" = [
-      "aws_s3_account_",
-      "aws_s3control_",
-    ],
-    "service/s3outposts" = [
-      "aws_s3outposts_",
-    ],
-    "service/sagemaker" = [
-      "aws_sagemaker_",
-    ],
-    "service/schemas" = [
-      "aws_schemas_",
-    ],
-    "service/secretsmanager" = [
-      "aws_secretsmanager_",
-    ],
-    "service/securityhub" = [
-      "aws_securityhub_",
-    ],
-    "service/serverlessapplicationrepository" = [
-      "aws_serverlessapplicationrepository_",
-    ],
-    "service/servicecatalog" = [
-      "aws_servicecatalog_",
-    ],
-    "service/servicediscovery" = [
-      "aws_service_discovery_",
-    ],
-    "service/servicequotas" = [
-      "aws_servicequotas_",
-    ],
-    "service/ses" = [
-      "aws_ses_",
-    ],
-    "service/sfn" = [
-      "aws_sfn_",
-    ],
-    "service/shield" = [
-      "aws_shield_",
-    ],
-    "service/signer" = [
-      "aws_signer_",
-    ],
-    "service/simpledb" = [
-      "aws_simpledb_",
-    ],
-    "service/snowball" = [
-      "aws_snowball_",
-    ],
-    "service/sns" = [
-      "aws_sns_",
-    ],
-    "service/sqs" = [
-      "aws_sqs_",
-    ],
-    "service/ssm" = [
-      "aws_ssm_",
-    ],
-    "service/ssoadmin" = [
-      "aws_ssoadmin_",
-    ],
-    "service/storagegateway" = [
-      "aws_storagegateway_",
-    ],
-    "service/sts" = [
-      "aws_caller_identity",
-    ],
-    "service/swf" = [
-      "aws_swf_",
-    ],
-    "service/synthetics" = [
-      "aws_synthetics_",
-    ],
-    "service/timestreamwrite" = [
-      "aws_timestreamwrite_",
-    ],
-    "service/transfer" = [
-      "aws_transfer_",
-    ],
-    "service/waf" = [
-      "aws_waf_",
-      "aws_wafregional_",
-    ],
-    "service/wafv2" = [
-      "aws_wafv2_",
-    ],
-    "service/workdocs" = [
-      "aws_workdocs_",
-    ],
-    "service/worklink" = [
-      "aws_worklink_",
-    ],
-    "service/workmail" = [
-      "aws_workmail_",
-    ],
-    "service/workspaces" = [
-      "aws_workspaces_",
-    ],
-    "service/xray" = [
-      "aws_xray_",
-    ],
-  }
-}
-
 behavior "remove_labels_on_reply" "remove_stale" {
     labels = ["waiting-response", "stale"]
     only_non_maintainers = true
diff --git a/docs/contributing/contribution-checklists.md b/docs/contributing/contribution-checklists.md
index 63048478a51..5c50ea6ec66 100644
--- a/docs/contributing/contribution-checklists.md
+++ b/docs/contributing/contribution-checklists.md
@@ -623,20 +623,13 @@ into Terraform.
     - In `website/docs/guides/custom-service-endpoints.html.md`: Add the service
     name in the list of customizable endpoints.
     - In `infrastructure/repository/labels-service.tf`: Add the new service to create a repository label.
-    - In `.hashibot.hcl`: Add the new service to automated issue labeling. e.g. with the `quicksight` service
-
-  ```hcl
-  behavior "regexp_issue_labeler_v2" "service_labels" {
-    # ... other configuration ...
-
-    label_map = {
-      # ... other services ...
-      "service/quicksight" = [
-        "aws_quicksight_",
-      ],
-      # ... other services ...
-    }
-  }
+    - In `.github/labeler-issue-triage.yml`: Add the new service to automated issue labeling. e.g. with the `quicksight` service
+
+  ```yaml
+  # ... other services ...
+  service/quicksight:
+    - '((\*|-) ?`?|(data|resource) "?)aws_quicksight_'
+  # ... other services ...
   ```
 
     - In `.github/labeler-pr-triage.yml`: Add the new service to automated pull request labeling. e.g. with the `quicksight` service