diff --git a/.hashibot.hcl b/.hashibot.hcl
index 6e006b0f20f..3c506296d90 100644
--- a/.hashibot.hcl
+++ b/.hashibot.hcl
@@ -330,6 +330,9 @@ behavior "regexp_issue_labeler_v2" "service_labels" {
     "service/kinesisanalytics" = [
       "aws_kinesis_analytics_",
     ],
+    "service/kinesisanalyticsv2" = [
+      "aws_kinesisanalyticsv2_",
+    ],
     "service/kms" = [
       "aws_kms_",
     ],
@@ -952,6 +955,10 @@ behavior "pull_request_path_labeler" "service_labels" {
       "**/*_kinesis_analytics_*",
       "**/kinesis_analytics_*"
     ]
+    "service/kinesisanalyticsv2" = [
+      "**/*_kinesisanalyticsv2_*",
+      "**/kinesisanalyticsv2_*"
+    ]
     "service/kms" = [
       "**/*_kms_*",
       "**/kms_*"
diff --git a/aws/config.go b/aws/config.go
index 089f63ad1d8..e8247c04468 100644
--- a/aws/config.go
+++ b/aws/config.go
@@ -482,7 +482,7 @@ func (c *Config) Client() (interface{}, error) {
 		ioteventsconn:                       iotevents.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["iotevents"])})),
 		kafkaconn:                           kafka.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["kafka"])})),
 		kinesisanalyticsconn:                kinesisanalytics.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["kinesisanalytics"])})),
-		kinesisanalyticsv2conn:              kinesisanalyticsv2.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["kinesisanalytics"])})),
+		kinesisanalyticsv2conn:              kinesisanalyticsv2.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["kinesisanalyticsv2"])})),
 		kinesisconn:                         kinesis.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["kinesis"])})),
 		kinesisvideoconn:                    kinesisvideo.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["kinesisvideo"])})),
 		kmsconn:                             kms.New(sess.Copy(&aws.Config{Endpoint: aws.String(c.Endpoints["kms"])})),
diff --git a/aws/provider.go b/aws/provider.go
index dd7a7adb1ba..fc5ceba9a5e 100644
--- a/aws/provider.go
+++ b/aws/provider.go
@@ -1066,6 +1066,7 @@ func init() {
 		"kinesis_analytics",
 		"kinesis",
 		"kinesisanalytics",
+		"kinesisanalyticsv2",
 		"kinesisvideo",
 		"kms",
 		"lakeformation",
diff --git a/website/allowed-subcategories.txt b/website/allowed-subcategories.txt
index 191b7117809..9aad9b0fa50 100644
--- a/website/allowed-subcategories.txt
+++ b/website/allowed-subcategories.txt
@@ -59,8 +59,9 @@ IAM
 Inspector
 IoT
 KMS
-Kinesis Firehose
 Kinesis
+Kinesis Data Analytics v2 (SQL and Java Applications)
+Kinesis Firehose
 Kinesis Video
 Lambda
 License Manager
diff --git a/website/docs/guides/custom-service-endpoints.html.md b/website/docs/guides/custom-service-endpoints.html.md
index 2750eada377..cb46a8dd6a2 100644
--- a/website/docs/guides/custom-service-endpoints.html.md
+++ b/website/docs/guides/custom-service-endpoints.html.md
@@ -130,6 +130,7 @@ The Terraform AWS Provider allows the following endpoints to be customized:
   <li><code>kinesis_analytics</code> (<b>DEPRECATED</b> Use <code>kinesisanalytics</code> instead)</li>
   <li><code>kinesis</code></li>
   <li><code>kinesisanalytics</code></li>
+  <li><code>kinesisanalyticsv2</code></li>
   <li><code>kinesisvideo</code></li>
   <li><code>kms</code></li>
   <li><code>lakeformation</code></li>