diff --git a/generator/ServiceModels/inspector2/inspector2-2020-06-08.api.json b/generator/ServiceModels/inspector2/inspector2-2020-06-08.api.json
index 08661ec230cf..1b8e815487c2 100644
--- a/generator/ServiceModels/inspector2/inspector2-2020-06-08.api.json
+++ b/generator/ServiceModels/inspector2/inspector2-2020-06-08.api.json
@@ -5229,7 +5229,7 @@
     },
     "TagValueList":{
       "type":"list",
-      "member":{"shape":"String"},
+      "member":{"shape":"TargetResourceTagsValue"},
       "max":5,
       "min":1
     },
@@ -5250,11 +5250,22 @@
     },
     "TargetResourceTags":{
       "type":"map",
-      "key":{"shape":"NonEmptyString"},
+      "key":{"shape":"TargetResourceTagsKey"},
       "value":{"shape":"TagValueList"},
       "max":5,
       "min":1
     },
+    "TargetResourceTagsKey":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"^[\\p{L}\\p{Z}\\p{N}_.:/=\\-@]*$"
+    },
+    "TargetResourceTagsValue":{
+      "type":"string",
+      "max":256,
+      "min":1
+    },
     "TargetStatusFilterList":{
       "type":"list",
       "member":{"shape":"CisTargetStatusFilter"},
diff --git a/generator/ServiceModels/inspector2/inspector2-2020-06-08.docs.json b/generator/ServiceModels/inspector2/inspector2-2020-06-08.docs.json
index f7a6d0da7b0f..bc5f316eafe4 100644
--- a/generator/ServiceModels/inspector2/inspector2-2020-06-08.docs.json
+++ b/generator/ServiceModels/inspector2/inspector2-2020-06-08.docs.json
@@ -2697,7 +2697,6 @@
         "StringList$member": null,
         "TagFilter$key": "<p>The tag filter key.</p>",
         "TagFilter$value": "<p>The tag filter value.</p>",
-        "TargetResourceTags$key": null,
         "TitleAggregationResponse$title": "<p>The title that the findings were aggregated on.</p>",
         "UpdateEc2DeepInspectionConfigurationResponse$errorMessage": "<p>An error message explaining why new Amazon Inspector deep inspection custom paths could not be added.</p>",
         "Vulnerability$id": "<p>The ID for the specific vulnerability.</p>"
@@ -3462,7 +3461,6 @@
         "ServiceQuotaExceededException$message": null,
         "ServiceQuotaExceededException$resourceId": "<p>The ID of the resource that exceeds a service quota.</p>",
         "TagList$member": null,
-        "TagValueList$member": null,
         "ThrottlingException$message": null,
         "TitleAggregationResponse$vulnerabilityId": "<p>The vulnerability ID of the finding.</p>",
         "ValidationException$message": null,
@@ -3684,6 +3682,18 @@
         "UpdateCisTargets$targetResourceTags": "<p>The target resource tags.</p>"
       }
     },
+    "TargetResourceTagsKey": {
+      "base": null,
+      "refs": {
+        "TargetResourceTags$key": null
+      }
+    },
+    "TargetResourceTagsValue": {
+      "base": null,
+      "refs": {
+        "TagValueList$member": null
+      }
+    },
     "TargetStatusFilterList": {
       "base": null,
       "refs": {
diff --git a/generator/ServiceModels/inspector2/inspector2-2020-06-08.normal.json b/generator/ServiceModels/inspector2/inspector2-2020-06-08.normal.json
index 9c28347bc90a..6e1551274f6c 100644
--- a/generator/ServiceModels/inspector2/inspector2-2020-06-08.normal.json
+++ b/generator/ServiceModels/inspector2/inspector2-2020-06-08.normal.json
@@ -7849,7 +7849,7 @@
     },
     "TagValueList":{
       "type":"list",
-      "member":{"shape":"String"},
+      "member":{"shape":"TargetResourceTagsValue"},
       "max":5,
       "min":1
     },
@@ -7870,11 +7870,22 @@
     },
     "TargetResourceTags":{
       "type":"map",
-      "key":{"shape":"NonEmptyString"},
+      "key":{"shape":"TargetResourceTagsKey"},
       "value":{"shape":"TagValueList"},
       "max":5,
       "min":1
     },
+    "TargetResourceTagsKey":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":"^[\\p{L}\\p{Z}\\p{N}_.:/=\\-@]*$"
+    },
+    "TargetResourceTagsValue":{
+      "type":"string",
+      "max":256,
+      "min":1
+    },
     "TargetStatusFilterList":{
       "type":"list",
       "member":{"shape":"CisTargetStatusFilter"},