diff --git a/src/cfnlint/data/AdditionalSpecs/Policies.json b/src/cfnlint/data/AdditionalSpecs/Policies.json
index ef08f6e4b2..a24580d7e2 100644
--- a/src/cfnlint/data/AdditionalSpecs/Policies.json
+++ b/src/cfnlint/data/AdditionalSpecs/Policies.json
@@ -4113,8 +4113,8 @@
    ]
   },
   "AWS Elemental Appliances and Software": {
-   "ARNFormat": "arn:aws:elemental-appliances-software:${Region}:${Account}:${ResourceType}/${ResourceName}",
-   "ARNRegex": "^arn:aws:elemental-appliances-software:.+:.+:.+",
+   "ARNFormat": "arn:aws:elemental-appliances-software::${Account}:${ResourceType}/${ResourceId}",
+   "ARNRegex": "^arn:aws:elemental-appliances-software::.+:.+",
    "Actions": [
     "CompleteUpload",
     "CreateOrderV1",
@@ -4127,24 +4127,16 @@
     "GetQuote",
     "GetTaxes",
     "ListQuotes",
-    "ListTagsForResource",
     "StartUpload",
     "SubmitOrderV1",
-    "TagResource",
-    "UntagResource",
     "UpdateQuote"
    ],
    "HasResource": true,
-   "StringPrefix": "elemental-appliances-software",
-   "conditionKeys": [
-    "aws:RequestTag/${TagKey}",
-    "aws:ResourceTag/${TagKey}",
-    "aws:TagKeys"
-   ]
+   "StringPrefix": "elemental-appliances-software"
   },
   "AWS Elemental Appliances and Software Activation Service": {
-   "ARNFormat": "arn:aws:elemental-activations:${Region}:${Account}:${ResourceType}/${ResourceName}",
-   "ARNRegex": "^arn:aws:elemental-activations:.+:.+:.+",
+   "ARNFormat": "arn:${Partition}:elemental-activations::${Account}:${ResourceType}/${ResourceId}",
+   "ARNRegex": "^arn:${Partition}:elemental-activations::.+:.+",
    "Actions": [
     "CompleteAccountRegistration",
     "CompleteFileUpload",
@@ -4153,25 +4145,15 @@
     "DownloadSoftware",
     "GenerateLicense",
     "GenerateLicenses",
-    "GetActivation",
     "GetArtifactGroupSoftwareVersions",
     "GetAsset",
     "GetAssets",
     "GetProductAdvisories",
     "GetSoftwareVersions",
-    "ListTagsForResource",
-    "StartAccountRegistration",
-    "StartFileUpload",
-    "TagResource",
-    "UntagResource"
+    "StartFileUpload"
    ],
-   "HasResource": true,
-   "StringPrefix": "elemental-activations",
-   "conditionKeys": [
-    "aws:RequestTag/${TagKey}",
-    "aws:ResourceTag/${TagKey}",
-    "aws:TagKeys"
-   ]
+   "HasResource": false,
+   "StringPrefix": "elemental-activations"
   },
   "AWS Elemental MediaConnect": {
    "ARNFormat": "arn:aws:mediaconnect:${Region}:${Account}:${Namespace}:${RelativeId}:${RelativeName}",
@@ -8452,6 +8434,38 @@
     "aws:TagKeys"
    ]
   },
+  "AWS Parallel Computing Service": {
+   "ARNFormat": "arn:aws:pcs:${Region}:${Account}:${ResourceType}/${ResourcePath}",
+   "ARNRegex": "^arn:aws:pcs:.+:.+:.+",
+   "Actions": [
+    "AllowVendedLogDeliveryForResource",
+    "CreateCluster",
+    "CreateComputeNodeGroup",
+    "CreateQueue",
+    "DeleteCluster",
+    "DeleteComputeNodeGroup",
+    "DeleteQueue",
+    "GetCluster",
+    "GetComputeNodeGroup",
+    "GetQueue",
+    "ListClusters",
+    "ListComputeNodeGroups",
+    "ListQueues",
+    "ListTagsForResource",
+    "RegisterComputeNodeGroupInstance",
+    "TagResource",
+    "UntagResource",
+    "UpdateComputeNodeGroup",
+    "UpdateQueue"
+   ],
+   "HasResource": true,
+   "StringPrefix": "pcs",
+   "conditionKeys": [
+    "aws:RequestTag/${TagKey}",
+    "aws:ResourceTag/${TagKey}",
+    "aws:TagKeys"
+   ]
+  },
   "AWS Partner central account management": {
    "Actions": [
     "AssociatePartnerAccount",
@@ -11095,6 +11109,7 @@
    "Actions": [
     "CreateAdminSession",
     "CreateNetwork",
+    "DeleteNetwork",
     "ListNetworks",
     "ListTagsForResource",
     "TagResource",
@@ -11729,6 +11744,7 @@
     "CreateModelCopyJob",
     "CreateModelCustomizationJob",
     "CreateModelEvaluationJob",
+    "CreateModelImportJob",
     "CreateModelInvocationJob",
     "CreatePrompt",
     "CreatePromptVersion",
@@ -11745,6 +11761,7 @@
     "DeleteFlowVersion",
     "DeleteFoundationModelAgreement",
     "DeleteGuardrail",
+    "DeleteImportedModel",
     "DeleteKnowledgeBase",
     "DeleteModelInvocationLoggingConfiguration",
     "DeletePrompt",
@@ -11767,11 +11784,14 @@
     "GetFoundationModel",
     "GetFoundationModelAvailability",
     "GetGuardrail",
+    "GetImportedModel",
+    "GetInferenceProfile",
     "GetIngestionJob",
     "GetKnowledgeBase",
     "GetModelCopyJob",
     "GetModelCustomizationJob",
     "GetModelEvaluationJob",
+    "GetModelImportJob",
     "GetModelInvocationJob",
     "GetModelInvocationLoggingConfiguration",
     "GetPrompt",
@@ -11796,11 +11816,14 @@
     "ListFoundationModelAgreementOffers",
     "ListFoundationModels",
     "ListGuardrails",
+    "ListImportedModels",
+    "ListInferenceProfiles",
     "ListIngestionJobs",
     "ListKnowledgeBases",
     "ListModelCopyJobs",
     "ListModelCustomizationJobs",
     "ListModelEvaluationJobs",
+    "ListModelImportJobs",
     "ListModelInvocationJobs",
     "ListPrompts",
     "ListProvisionedModelThroughputs",
@@ -11837,6 +11860,7 @@
     "aws:RequestTag/${TagKey}",
     "aws:ResourceTag/${TagKey}",
     "aws:TagKeys",
+    "bedrock:InferenceProfileArn",
     "bedrock:ThirdPartyKnowledgeBaseCredentialsSecretArn"
    ]
   },
@@ -15462,6 +15486,7 @@
     "DescribeRegistry",
     "DescribeRepositories",
     "DescribeRepositoryCreationTemplates",
+    "GetAccountSetting",
     "GetAuthorizationToken",
     "GetDownloadUrlForLayer",
     "GetLifecyclePolicy",
@@ -15472,6 +15497,7 @@
     "InitiateLayerUpload",
     "ListImages",
     "ListTagsForResource",
+    "PutAccountSetting",
     "PutImage",
     "PutImageScanningConfiguration",
     "PutImageTagMutability",
@@ -19633,6 +19659,7 @@
     "ListDataSources",
     "ListFolderMembers",
     "ListFolders",
+    "ListFoldersForResource",
     "ListGroupMemberships",
     "ListGroups",
     "ListIAMPolicyAssignments",
@@ -20168,6 +20195,7 @@
    "StringPrefix": "redshift-data",
    "conditionKeys": [
     "aws:ResourceTag/${TagKey}",
+    "redshift-data:session-owner-iam-userid",
     "redshift-data:statement-owner-iam-userid"
    ]
   },
diff --git a/src/cfnlint/data/DownloadsMetadata/123ba181485ae293d5bd09722af0c19d5a0d14c62111ff864923fc7b7960dda6.meta.json b/src/cfnlint/data/DownloadsMetadata/123ba181485ae293d5bd09722af0c19d5a0d14c62111ff864923fc7b7960dda6.meta.json
index 1adce5efdc..f19dcf8709 100644
--- a/src/cfnlint/data/DownloadsMetadata/123ba181485ae293d5bd09722af0c19d5a0d14c62111ff864923fc7b7960dda6.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/123ba181485ae293d5bd09722af0c19d5a0d14c62111ff864923fc7b7960dda6.meta.json
@@ -1 +1 @@
-{"etag": "\"20cfb66c1ca1da796cef898a4efa20a3\"", "url": "https://schema.cloudformation.eu-south-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"cb244828575169dbd23c8391bc18051d\"", "url": "https://schema.cloudformation.eu-south-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/164e1bfc2823fbd49d8d0e7163ebf32b2b6653d7edfe98a64577daae0b481c38.meta.json b/src/cfnlint/data/DownloadsMetadata/164e1bfc2823fbd49d8d0e7163ebf32b2b6653d7edfe98a64577daae0b481c38.meta.json
index 557e402918..b6bdc49e09 100644
--- a/src/cfnlint/data/DownloadsMetadata/164e1bfc2823fbd49d8d0e7163ebf32b2b6653d7edfe98a64577daae0b481c38.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/164e1bfc2823fbd49d8d0e7163ebf32b2b6653d7edfe98a64577daae0b481c38.meta.json
@@ -1 +1 @@
-{"etag": "\"d0e230daace723c25654cd00cd19cfdf\"", "url": "https://schema.cloudformation.cn-north-1.amazonaws.com.cn/CloudformationSchema.zip"}
+{"etag": "\"e1179281aa6af8aa64869a8976c04642\"", "url": "https://schema.cloudformation.cn-north-1.amazonaws.com.cn/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/18624fcc4a1c571691d10b2508e6be565e4752bbc10d9552de8df8f81348c42b.meta.json b/src/cfnlint/data/DownloadsMetadata/18624fcc4a1c571691d10b2508e6be565e4752bbc10d9552de8df8f81348c42b.meta.json
index 0e54f3836f..0ff969ccac 100644
--- a/src/cfnlint/data/DownloadsMetadata/18624fcc4a1c571691d10b2508e6be565e4752bbc10d9552de8df8f81348c42b.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/18624fcc4a1c571691d10b2508e6be565e4752bbc10d9552de8df8f81348c42b.meta.json
@@ -1 +1 @@
-{"etag": "\"dce80ee4c28b677f6e3933a181676b81\"", "url": "https://schema.cloudformation.us-gov-east-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"97b56e42e3452acba4ce37ec808a94a2\"", "url": "https://schema.cloudformation.us-gov-east-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/227d6e59c86482f7153466759080e65963a1bf4413531ad420ff60a5a0d7965d.meta.json b/src/cfnlint/data/DownloadsMetadata/227d6e59c86482f7153466759080e65963a1bf4413531ad420ff60a5a0d7965d.meta.json
index 7479a2c891..e84b8de644 100644
--- a/src/cfnlint/data/DownloadsMetadata/227d6e59c86482f7153466759080e65963a1bf4413531ad420ff60a5a0d7965d.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/227d6e59c86482f7153466759080e65963a1bf4413531ad420ff60a5a0d7965d.meta.json
@@ -1 +1 @@
-{"etag": "\"b9f1ae98d2b7d5d2c02e00fbee736a2e\"", "url": "https://schema.cloudformation.me-south-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"ae3cfdea6b21f35aadead9d81b516e64\"", "url": "https://schema.cloudformation.me-south-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/23be708e675cb6098b08969e4dbbc3f54cfc32461d10e077e7e5de1fc25d8b8f.meta.json b/src/cfnlint/data/DownloadsMetadata/23be708e675cb6098b08969e4dbbc3f54cfc32461d10e077e7e5de1fc25d8b8f.meta.json
index 0876fc5391..152d24a140 100644
--- a/src/cfnlint/data/DownloadsMetadata/23be708e675cb6098b08969e4dbbc3f54cfc32461d10e077e7e5de1fc25d8b8f.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/23be708e675cb6098b08969e4dbbc3f54cfc32461d10e077e7e5de1fc25d8b8f.meta.json
@@ -1 +1 @@
-{"etag": "\"6646f2b1aa5c72ccebe90bac624aa69d\"", "url": "https://schema.cloudformation.us-gov-west-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"dae8a22d27f93924a6c0f1107c15c1d0\"", "url": "https://schema.cloudformation.us-gov-west-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/26cf4521b683d3267844178a6bcd1d0ad3fe2e7838c23f6acd054944cb2b1618.meta.json b/src/cfnlint/data/DownloadsMetadata/26cf4521b683d3267844178a6bcd1d0ad3fe2e7838c23f6acd054944cb2b1618.meta.json
index 734f4487a6..41fc046d8d 100644
--- a/src/cfnlint/data/DownloadsMetadata/26cf4521b683d3267844178a6bcd1d0ad3fe2e7838c23f6acd054944cb2b1618.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/26cf4521b683d3267844178a6bcd1d0ad3fe2e7838c23f6acd054944cb2b1618.meta.json
@@ -1 +1 @@
-{"etag": "\"0c08142f4e08488353394a615a51a99f\"", "url": "https://schema.cloudformation.me-central-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"0a8ef063c0a56b8e6daeb50075110309\"", "url": "https://schema.cloudformation.me-central-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/276cecfeb1ec5e608e2aaa06925a2da57e9907e4a512c10ddae70b98b4dada43.meta.json b/src/cfnlint/data/DownloadsMetadata/276cecfeb1ec5e608e2aaa06925a2da57e9907e4a512c10ddae70b98b4dada43.meta.json
index b9d2a846a3..78f710425a 100644
--- a/src/cfnlint/data/DownloadsMetadata/276cecfeb1ec5e608e2aaa06925a2da57e9907e4a512c10ddae70b98b4dada43.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/276cecfeb1ec5e608e2aaa06925a2da57e9907e4a512c10ddae70b98b4dada43.meta.json
@@ -1 +1 @@
-{"etag": "\"0f12bf603c4800ae16c18a3ea8b1c1ad\"", "url": "https://schema.cloudformation.eu-west-2.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"0b50a6c3ca98f503ed0d74dbe8b4d99f\"", "url": "https://schema.cloudformation.eu-west-2.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/371e40c90b2e47c99f6e275e060ee83a3fbf0a0fb76625ba46dbe42abd34333c.meta.json b/src/cfnlint/data/DownloadsMetadata/371e40c90b2e47c99f6e275e060ee83a3fbf0a0fb76625ba46dbe42abd34333c.meta.json
index 10f83c4463..006d0d758a 100644
--- a/src/cfnlint/data/DownloadsMetadata/371e40c90b2e47c99f6e275e060ee83a3fbf0a0fb76625ba46dbe42abd34333c.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/371e40c90b2e47c99f6e275e060ee83a3fbf0a0fb76625ba46dbe42abd34333c.meta.json
@@ -1 +1 @@
-{"etag": "\"0d9afd59bf04cbde0e2e87a7d19ce413\"", "url": "https://schema.cloudformation.cn-northwest-1.amazonaws.com.cn/CloudformationSchema.zip"}
+{"etag": "\"379f8faec922d6179523dbb35658db99\"", "url": "https://schema.cloudformation.cn-northwest-1.amazonaws.com.cn/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/42155835f382d82337be3d2bf832bada376aa3fe15197e3bb0e9290ff8719b4e.meta.json b/src/cfnlint/data/DownloadsMetadata/42155835f382d82337be3d2bf832bada376aa3fe15197e3bb0e9290ff8719b4e.meta.json
index 63a97fe46d..f1ddf2fd75 100644
--- a/src/cfnlint/data/DownloadsMetadata/42155835f382d82337be3d2bf832bada376aa3fe15197e3bb0e9290ff8719b4e.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/42155835f382d82337be3d2bf832bada376aa3fe15197e3bb0e9290ff8719b4e.meta.json
@@ -1 +1 @@
-{"etag": "\"51883e1fd6d952caa1c68579f3181f78\"", "url": "https://schema.cloudformation.af-south-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"d6eecd3549ca4d30cfe90352e4f2e2d8\"", "url": "https://schema.cloudformation.af-south-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/42e9df95722b6524cd001503b6750b86f60a7b5acfc406ebb10d5748cbb8ed41.meta.json b/src/cfnlint/data/DownloadsMetadata/42e9df95722b6524cd001503b6750b86f60a7b5acfc406ebb10d5748cbb8ed41.meta.json
index 831d92038f..f9bc578861 100644
--- a/src/cfnlint/data/DownloadsMetadata/42e9df95722b6524cd001503b6750b86f60a7b5acfc406ebb10d5748cbb8ed41.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/42e9df95722b6524cd001503b6750b86f60a7b5acfc406ebb10d5748cbb8ed41.meta.json
@@ -1 +1 @@
-{"etag": "\"899a4badd3d8440a6d654b86028d982b\"", "url": "https://schema.cloudformation.us-west-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"46abb24012deca7f7cdee909373e4247\"", "url": "https://schema.cloudformation.us-west-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/49ed0265aaab90ce485c07e02ea671e5aa3b299156f53fa9d1fd8eeabec5a268.meta.json b/src/cfnlint/data/DownloadsMetadata/49ed0265aaab90ce485c07e02ea671e5aa3b299156f53fa9d1fd8eeabec5a268.meta.json
index b0a0cb8a5f..3f1d0e74aa 100644
--- a/src/cfnlint/data/DownloadsMetadata/49ed0265aaab90ce485c07e02ea671e5aa3b299156f53fa9d1fd8eeabec5a268.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/49ed0265aaab90ce485c07e02ea671e5aa3b299156f53fa9d1fd8eeabec5a268.meta.json
@@ -1 +1 @@
-{"etag": "\"4982ab81e335b913ed62c8ee9bc37848\"", "url": "https://schema.cloudformation.ap-southeast-5.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"4231ba3180ec4cb9c5bbba05b4931c22\"", "url": "https://schema.cloudformation.ap-southeast-5.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/4fbb29b69678acdd32c5758ed43ead9bf35136af536e92a84ccbaf062c315066.meta.json b/src/cfnlint/data/DownloadsMetadata/4fbb29b69678acdd32c5758ed43ead9bf35136af536e92a84ccbaf062c315066.meta.json
index e9c7383a48..64bd42b8c9 100644
--- a/src/cfnlint/data/DownloadsMetadata/4fbb29b69678acdd32c5758ed43ead9bf35136af536e92a84ccbaf062c315066.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/4fbb29b69678acdd32c5758ed43ead9bf35136af536e92a84ccbaf062c315066.meta.json
@@ -1 +1 @@
-{"etag": "\"2f613ec40e5f4a92a7f7f7fc8dcae3b5\"", "url": "https://schema.cloudformation.eu-central-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"f46c8a99f6924c350ac96de522d08d8f\"", "url": "https://schema.cloudformation.eu-central-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/56584c7d00e444de640bef01fc2c630804470222e5e4c690bacef5312891581d.meta.json b/src/cfnlint/data/DownloadsMetadata/56584c7d00e444de640bef01fc2c630804470222e5e4c690bacef5312891581d.meta.json
index 568d2901b9..0030bcb274 100644
--- a/src/cfnlint/data/DownloadsMetadata/56584c7d00e444de640bef01fc2c630804470222e5e4c690bacef5312891581d.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/56584c7d00e444de640bef01fc2c630804470222e5e4c690bacef5312891581d.meta.json
@@ -1 +1 @@
-{"etag": "\"96ff47d525317a096e3e4bb11caa94a7\"", "url": "https://schema.cloudformation.ap-south-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"c46eeff4384ef7ad8a1ca47beb0bab54\"", "url": "https://schema.cloudformation.ap-south-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/583721567eccd1d5855daa623819df1a646b563d773e34b020d0ddeab2fe195b.meta.json b/src/cfnlint/data/DownloadsMetadata/583721567eccd1d5855daa623819df1a646b563d773e34b020d0ddeab2fe195b.meta.json
index c22d1fd164..c116837e03 100644
--- a/src/cfnlint/data/DownloadsMetadata/583721567eccd1d5855daa623819df1a646b563d773e34b020d0ddeab2fe195b.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/583721567eccd1d5855daa623819df1a646b563d773e34b020d0ddeab2fe195b.meta.json
@@ -1 +1 @@
-{"etag": "\"5cd19c34c7f9012da6c9ab97da7156d8\"", "url": "https://schema.cloudformation.ap-southeast-4.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"c2044314a90a8c25db278f6dae78867d\"", "url": "https://schema.cloudformation.ap-southeast-4.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/6316ae24f21cb620947aa250bebbee69548d44cc32e246ec9d7742088a2c17f8.meta.json b/src/cfnlint/data/DownloadsMetadata/6316ae24f21cb620947aa250bebbee69548d44cc32e246ec9d7742088a2c17f8.meta.json
index c05b11fd4c..a7dbd5be14 100644
--- a/src/cfnlint/data/DownloadsMetadata/6316ae24f21cb620947aa250bebbee69548d44cc32e246ec9d7742088a2c17f8.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/6316ae24f21cb620947aa250bebbee69548d44cc32e246ec9d7742088a2c17f8.meta.json
@@ -1 +1 @@
-{"etag": "\"f4354610e92cc770c7f34252306e740f\"", "url": "https://schema.cloudformation.us-east-2.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"c0c2f57abe3236e7cc810087ea8be945\"", "url": "https://schema.cloudformation.us-east-2.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/81e1cc73ff2daf7d1e1eca393c2d1fdd98ac34d4109512e0e0947ef752dcb9c9.meta.json b/src/cfnlint/data/DownloadsMetadata/81e1cc73ff2daf7d1e1eca393c2d1fdd98ac34d4109512e0e0947ef752dcb9c9.meta.json
index 4dc5169a7a..0ae746a97e 100644
--- a/src/cfnlint/data/DownloadsMetadata/81e1cc73ff2daf7d1e1eca393c2d1fdd98ac34d4109512e0e0947ef752dcb9c9.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/81e1cc73ff2daf7d1e1eca393c2d1fdd98ac34d4109512e0e0947ef752dcb9c9.meta.json
@@ -1 +1 @@
-{"etag": "\"7b4980320a59871f7ebb338fc5d2c9d3\"", "url": "https://schema.cloudformation.ap-southeast-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"342dc56ad5e833f9fb46f5d9b7532c3a\"", "url": "https://schema.cloudformation.ap-southeast-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/8adeabf0a09b37a8ed924aea799005947e4a4542365d35fd75466abcf306eeca.meta.json b/src/cfnlint/data/DownloadsMetadata/8adeabf0a09b37a8ed924aea799005947e4a4542365d35fd75466abcf306eeca.meta.json
index d338f6bcee..afb4742b20 100644
--- a/src/cfnlint/data/DownloadsMetadata/8adeabf0a09b37a8ed924aea799005947e4a4542365d35fd75466abcf306eeca.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/8adeabf0a09b37a8ed924aea799005947e4a4542365d35fd75466abcf306eeca.meta.json
@@ -1 +1 @@
-{"etag": "\"15d5cde75e3e87b63f16e2a3d3fa9432\"", "url": "https://schema.cloudformation.ap-northeast-2.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"010617485b30b705e5df3b3f74b70f77\"", "url": "https://schema.cloudformation.ap-northeast-2.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/8b8b0cee4df1ef0947a8289e8ec0c67869b7533eabab32ecfc0a00cb19e55a5f.meta.json b/src/cfnlint/data/DownloadsMetadata/8b8b0cee4df1ef0947a8289e8ec0c67869b7533eabab32ecfc0a00cb19e55a5f.meta.json
index d73ad53532..c13175be27 100644
--- a/src/cfnlint/data/DownloadsMetadata/8b8b0cee4df1ef0947a8289e8ec0c67869b7533eabab32ecfc0a00cb19e55a5f.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/8b8b0cee4df1ef0947a8289e8ec0c67869b7533eabab32ecfc0a00cb19e55a5f.meta.json
@@ -1 +1 @@
-{"etag": "\"2db69d1fe313eef5d7b507a95bc70a4c\"", "url": "https://schema.cloudformation.ap-southeast-3.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"5cb20cc9753c895f35fb35242ce31fca\"", "url": "https://schema.cloudformation.ap-southeast-3.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/b1f069477cd577cde04dfe1b323c0bb0e783fe32b6bb6b13774c32fcca1d303a.meta.json b/src/cfnlint/data/DownloadsMetadata/b1f069477cd577cde04dfe1b323c0bb0e783fe32b6bb6b13774c32fcca1d303a.meta.json
index f940b26868..6f48a6f1bf 100644
--- a/src/cfnlint/data/DownloadsMetadata/b1f069477cd577cde04dfe1b323c0bb0e783fe32b6bb6b13774c32fcca1d303a.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/b1f069477cd577cde04dfe1b323c0bb0e783fe32b6bb6b13774c32fcca1d303a.meta.json
@@ -1 +1 @@
-{"etag": "\"88f7597b5a1041b88bfbb70c559e1ad6\"", "url": "https://schema.cloudformation.ap-east-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"666b6426119d343cdc2d619838351da0\"", "url": "https://schema.cloudformation.ap-east-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/c7ada205073390b33b7593ef8f304b9705f2567698dfdfa979bf0ccdb68cb856.meta.json b/src/cfnlint/data/DownloadsMetadata/c7ada205073390b33b7593ef8f304b9705f2567698dfdfa979bf0ccdb68cb856.meta.json
index 19dc215511..5844c29672 100644
--- a/src/cfnlint/data/DownloadsMetadata/c7ada205073390b33b7593ef8f304b9705f2567698dfdfa979bf0ccdb68cb856.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/c7ada205073390b33b7593ef8f304b9705f2567698dfdfa979bf0ccdb68cb856.meta.json
@@ -1 +1 @@
-{"etag": "\"ad81b4c8f90f144df274cf71c406d473\"", "url": "https://schema.cloudformation.sa-east-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"038c8cfb262e2c73955d6034ade0ef42\"", "url": "https://schema.cloudformation.sa-east-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/d24ce9a45a014b1ff04d479422ea956e92030ae5c03d7451980a15735e557edb.meta.json b/src/cfnlint/data/DownloadsMetadata/d24ce9a45a014b1ff04d479422ea956e92030ae5c03d7451980a15735e557edb.meta.json
index e67768ecb4..020cfa9286 100644
--- a/src/cfnlint/data/DownloadsMetadata/d24ce9a45a014b1ff04d479422ea956e92030ae5c03d7451980a15735e557edb.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/d24ce9a45a014b1ff04d479422ea956e92030ae5c03d7451980a15735e557edb.meta.json
@@ -1 +1 @@
-{"etag": "\"c3475310840673053add92cb5e246655\"", "url": "https://schema.cloudformation.ap-southeast-2.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"041ce20e798e90ccc4b252a8a7a7694c\"", "url": "https://schema.cloudformation.ap-southeast-2.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/d85e2e061cacfcffe4902adb1074a04e6bb7f975b606f8db57532faddfcdd8c8.meta.json b/src/cfnlint/data/DownloadsMetadata/d85e2e061cacfcffe4902adb1074a04e6bb7f975b606f8db57532faddfcdd8c8.meta.json
index bd31a67fc4..159fa9599c 100644
--- a/src/cfnlint/data/DownloadsMetadata/d85e2e061cacfcffe4902adb1074a04e6bb7f975b606f8db57532faddfcdd8c8.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/d85e2e061cacfcffe4902adb1074a04e6bb7f975b606f8db57532faddfcdd8c8.meta.json
@@ -1 +1 @@
-{"etag": "\"997796b0157d1a6f55302a13d9ee7c9a\"", "url": "https://schema.cloudformation.ca-west-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"9fdafb8cf932fd53f5b4872dfbcc5e98\"", "url": "https://schema.cloudformation.ca-west-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/d8e41d35f4f8922b66525dea2c66d72a73ff097c685cda0a63c08a6416dc58ed.meta.json b/src/cfnlint/data/DownloadsMetadata/d8e41d35f4f8922b66525dea2c66d72a73ff097c685cda0a63c08a6416dc58ed.meta.json
index 6ff8486106..a24bc713e5 100644
--- a/src/cfnlint/data/DownloadsMetadata/d8e41d35f4f8922b66525dea2c66d72a73ff097c685cda0a63c08a6416dc58ed.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/d8e41d35f4f8922b66525dea2c66d72a73ff097c685cda0a63c08a6416dc58ed.meta.json
@@ -1 +1 @@
-{"etag": "\"60c371355ad9791d1a5349deecd3e084\"", "url": "https://schema.cloudformation.eu-central-2.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"e3a0980aa806433319a6a0e72f14afe5\"", "url": "https://schema.cloudformation.eu-central-2.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/dd98171253ebc36f5b78e247f3132b5f25c8d66a1f84939600616bab42579541.meta.json b/src/cfnlint/data/DownloadsMetadata/dd98171253ebc36f5b78e247f3132b5f25c8d66a1f84939600616bab42579541.meta.json
index fef46e521c..948ce36400 100644
--- a/src/cfnlint/data/DownloadsMetadata/dd98171253ebc36f5b78e247f3132b5f25c8d66a1f84939600616bab42579541.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/dd98171253ebc36f5b78e247f3132b5f25c8d66a1f84939600616bab42579541.meta.json
@@ -1 +1 @@
-{"etag": "\"cdd016c9a576406fa8c465edd9b63378\"", "url": "https://schema.cloudformation.eu-north-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"6e7b24c4cacbebe9f7542a0880005a2b\"", "url": "https://schema.cloudformation.eu-north-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/df4945435575c690a2651bb31e7a9b48972142778e1ff452383ede2ad4bac3d7.meta.json b/src/cfnlint/data/DownloadsMetadata/df4945435575c690a2651bb31e7a9b48972142778e1ff452383ede2ad4bac3d7.meta.json
index 29c803d150..b2100bebad 100644
--- a/src/cfnlint/data/DownloadsMetadata/df4945435575c690a2651bb31e7a9b48972142778e1ff452383ede2ad4bac3d7.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/df4945435575c690a2651bb31e7a9b48972142778e1ff452383ede2ad4bac3d7.meta.json
@@ -1 +1 @@
-{"etag": "\"0bc1b34e5bc3c820663959f50bb8a9df\"", "url": "https://schema.cloudformation.eu-south-2.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"77bc8594ea6cb20a61704f356495229a\"", "url": "https://schema.cloudformation.eu-south-2.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/e5301e07e25fa2c35d2c7e1f9dcf720826b315ef6f38515840537c02de23abe2.meta.json b/src/cfnlint/data/DownloadsMetadata/e5301e07e25fa2c35d2c7e1f9dcf720826b315ef6f38515840537c02de23abe2.meta.json
index 84b19e38fd..57d2e4b321 100644
--- a/src/cfnlint/data/DownloadsMetadata/e5301e07e25fa2c35d2c7e1f9dcf720826b315ef6f38515840537c02de23abe2.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/e5301e07e25fa2c35d2c7e1f9dcf720826b315ef6f38515840537c02de23abe2.meta.json
@@ -1 +1 @@
-{"etag": "\"0efefc99abc9358691df799c55a6a5fe\"", "url": "https://schema.cloudformation.ca-central-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"de6b730dc197002d0194d095ace63096\"", "url": "https://schema.cloudformation.ca-central-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/e8b3dacc1675b478e8c7392b51f41467cf908a34e6b4c3fb3e97e2b584f651ca.meta.json b/src/cfnlint/data/DownloadsMetadata/e8b3dacc1675b478e8c7392b51f41467cf908a34e6b4c3fb3e97e2b584f651ca.meta.json
index d2e29744d9..e99c9e9a0d 100644
--- a/src/cfnlint/data/DownloadsMetadata/e8b3dacc1675b478e8c7392b51f41467cf908a34e6b4c3fb3e97e2b584f651ca.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/e8b3dacc1675b478e8c7392b51f41467cf908a34e6b4c3fb3e97e2b584f651ca.meta.json
@@ -1 +1 @@
-{"etag": "\"2fbcc7c2e25e4c715ec5cfd52521d702\"", "url": "https://schema.cloudformation.eu-west-3.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"8e6d442bd013f225ddf1035aff892013\"", "url": "https://schema.cloudformation.eu-west-3.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/ea0f7b8f144feb225afe73a24dfdf993318c41c71c21b0a17d4f68d82c5aee21.meta.json b/src/cfnlint/data/DownloadsMetadata/ea0f7b8f144feb225afe73a24dfdf993318c41c71c21b0a17d4f68d82c5aee21.meta.json
index 3ceba3a507..b956744c6a 100644
--- a/src/cfnlint/data/DownloadsMetadata/ea0f7b8f144feb225afe73a24dfdf993318c41c71c21b0a17d4f68d82c5aee21.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/ea0f7b8f144feb225afe73a24dfdf993318c41c71c21b0a17d4f68d82c5aee21.meta.json
@@ -1 +1 @@
-{"etag": "\"5d144f08a317f58a1ce95d89d373a085\"", "url": "https://schema.cloudformation.ap-northeast-3.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"a4c096782c71b1d9351874893ea729ec\"", "url": "https://schema.cloudformation.ap-northeast-3.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/f1896c9151984eec294af1eddf64260f6cd7e4ced378cacdb93f76ed227b5c5d.meta.json b/src/cfnlint/data/DownloadsMetadata/f1896c9151984eec294af1eddf64260f6cd7e4ced378cacdb93f76ed227b5c5d.meta.json
index 874d0fdfe0..f5da482b7e 100644
--- a/src/cfnlint/data/DownloadsMetadata/f1896c9151984eec294af1eddf64260f6cd7e4ced378cacdb93f76ed227b5c5d.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/f1896c9151984eec294af1eddf64260f6cd7e4ced378cacdb93f76ed227b5c5d.meta.json
@@ -1 +1 @@
-{"etag": "\"cd7597dbf51a476e980316584525f54a\"", "url": "https://schema.cloudformation.us-west-2.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"456a8d202e60cfaaa1eeede1e580d66a\"", "url": "https://schema.cloudformation.us-west-2.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/f49718b210ea89ff182ae51cb7004366b9e2e4d5e38136a5be83b6a55e7a82a1.meta.json b/src/cfnlint/data/DownloadsMetadata/f49718b210ea89ff182ae51cb7004366b9e2e4d5e38136a5be83b6a55e7a82a1.meta.json
index 1d86883467..fbea42df20 100644
--- a/src/cfnlint/data/DownloadsMetadata/f49718b210ea89ff182ae51cb7004366b9e2e4d5e38136a5be83b6a55e7a82a1.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/f49718b210ea89ff182ae51cb7004366b9e2e4d5e38136a5be83b6a55e7a82a1.meta.json
@@ -1 +1 @@
-{"etag": "\"26fb44bb556d7f655b439b7211d0046f\"", "url": "https://schema.cloudformation.ap-south-2.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"1ff2d895b4ddc56a50c8f0040d74fc73\"", "url": "https://schema.cloudformation.ap-south-2.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/f54eee6f8ad9619f41835b700369cdbb41c64a9c91b2fa5b4928c0d9b2f780b0.meta.json b/src/cfnlint/data/DownloadsMetadata/f54eee6f8ad9619f41835b700369cdbb41c64a9c91b2fa5b4928c0d9b2f780b0.meta.json
index edab651380..2dedaf19f2 100644
--- a/src/cfnlint/data/DownloadsMetadata/f54eee6f8ad9619f41835b700369cdbb41c64a9c91b2fa5b4928c0d9b2f780b0.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/f54eee6f8ad9619f41835b700369cdbb41c64a9c91b2fa5b4928c0d9b2f780b0.meta.json
@@ -1 +1 @@
-{"etag": "\"ba96d4ce06d92ce4599318fbd3ad5422\"", "url": "https://schema.cloudformation.us-east-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"ab5ac309e70e155456fd8c136faba1d0\"", "url": "https://schema.cloudformation.us-east-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/f6f35a459759d6c132fa2fe798cefbd5b2d398fe33547eed780b9b70f10eb4a2.meta.json b/src/cfnlint/data/DownloadsMetadata/f6f35a459759d6c132fa2fe798cefbd5b2d398fe33547eed780b9b70f10eb4a2.meta.json
index 71b317c865..c603317e39 100644
--- a/src/cfnlint/data/DownloadsMetadata/f6f35a459759d6c132fa2fe798cefbd5b2d398fe33547eed780b9b70f10eb4a2.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/f6f35a459759d6c132fa2fe798cefbd5b2d398fe33547eed780b9b70f10eb4a2.meta.json
@@ -1 +1 @@
-{"etag": "\"22477cde1d5465e11ac481f6c2bfcaa0\"", "url": "https://schema.cloudformation.il-central-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"a0438711c8ee597ec50a4908cb9baac6\"", "url": "https://schema.cloudformation.il-central-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/fa657351d8e89c40ba6b82c4b1f5e1b5e50a1638ffe0a5dba0d8805c190a05f8.meta.json b/src/cfnlint/data/DownloadsMetadata/fa657351d8e89c40ba6b82c4b1f5e1b5e50a1638ffe0a5dba0d8805c190a05f8.meta.json
index b722d9a422..c76205e74c 100644
--- a/src/cfnlint/data/DownloadsMetadata/fa657351d8e89c40ba6b82c4b1f5e1b5e50a1638ffe0a5dba0d8805c190a05f8.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/fa657351d8e89c40ba6b82c4b1f5e1b5e50a1638ffe0a5dba0d8805c190a05f8.meta.json
@@ -1 +1 @@
-{"etag": "\"50552d949e4ec3c3d1d9b8b5c59de2e7\"", "url": "https://schema.cloudformation.eu-west-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"9dbe60c5fd935adb43d31f134b617351\"", "url": "https://schema.cloudformation.eu-west-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/ff02b7d808c1c00053f09aa43a50addf3b69878d351cffd417dc9a457df808af.meta.json b/src/cfnlint/data/DownloadsMetadata/ff02b7d808c1c00053f09aa43a50addf3b69878d351cffd417dc9a457df808af.meta.json
index a4d11897c3..f1cba6ae06 100644
--- a/src/cfnlint/data/DownloadsMetadata/ff02b7d808c1c00053f09aa43a50addf3b69878d351cffd417dc9a457df808af.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/ff02b7d808c1c00053f09aa43a50addf3b69878d351cffd417dc9a457df808af.meta.json
@@ -1 +1 @@
-{"etag": "\"1752b952b381c834d5e40e07f848046c\"", "url": "https://schema.cloudformation.ap-northeast-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"6d7bf81725555153eba880a79178c257\"", "url": "https://schema.cloudformation.ap-northeast-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/Serverless/ManagedPolicies.json b/src/cfnlint/data/Serverless/ManagedPolicies.json
index d123e297a0..e7473c8789 100644
--- a/src/cfnlint/data/Serverless/ManagedPolicies.json
+++ b/src/cfnlint/data/Serverless/ManagedPolicies.json
@@ -143,6 +143,7 @@
  "AWSCodeStarServiceRole": "arn:aws:iam::aws:policy/service-role/AWSCodeStarServiceRole",
  "AWSCompromisedKeyQuarantine": "arn:aws:iam::aws:policy/AWSCompromisedKeyQuarantine",
  "AWSCompromisedKeyQuarantineV2": "arn:aws:iam::aws:policy/AWSCompromisedKeyQuarantineV2",
+ "AWSCompromisedKeyQuarantineV3": "arn:aws:iam::aws:policy/AWSCompromisedKeyQuarantineV3",
  "AWSConfigMultiAccountSetupPolicy": "arn:aws:iam::aws:policy/aws-service-role/AWSConfigMultiAccountSetupPolicy",
  "AWSConfigRemediationServiceRolePolicy": "arn:aws:iam::aws:policy/aws-service-role/AWSConfigRemediationServiceRolePolicy",
  "AWSConfigRole": "arn:aws:iam::aws:policy/service-role/AWSConfigRole",
@@ -412,6 +413,7 @@
  "AWSOrganizationsServiceTrustPolicy": "arn:aws:iam::aws:policy/aws-service-role/AWSOrganizationsServiceTrustPolicy",
  "AWSOutpostsAuthorizeServerPolicy": "arn:aws:iam::aws:policy/AWSOutpostsAuthorizeServerPolicy",
  "AWSOutpostsServiceRolePolicy": "arn:aws:iam::aws:policy/aws-service-role/AWSOutpostsServiceRolePolicy",
+ "AWSPCSServiceRolePolicy": "arn:aws:iam::aws:policy/aws-service-role/AWSPCSServiceRolePolicy",
  "AWSPanoramaApplianceRolePolicy": "arn:aws:iam::aws:policy/service-role/AWSPanoramaApplianceRolePolicy",
  "AWSPanoramaApplianceServiceRolePolicy": "arn:aws:iam::aws:policy/service-role/AWSPanoramaApplianceServiceRolePolicy",
  "AWSPanoramaFullAccess": "arn:aws:iam::aws:policy/AWSPanoramaFullAccess",
diff --git a/src/cfnlint/data/schemas/extensions/aws_ec2_instance/instancetype_enum.json b/src/cfnlint/data/schemas/extensions/aws_ec2_instance/instancetype_enum.json
index 2e0446703c..2f88f866b3 100644
--- a/src/cfnlint/data/schemas/extensions/aws_ec2_instance/instancetype_enum.json
+++ b/src/cfnlint/data/schemas/extensions/aws_ec2_instance/instancetype_enum.json
@@ -9152,6 +9152,838 @@
    "z1d.xlarge"
   ]
  },
+ "ap-southeast-5": {
+  "enum": [
+   "a1.2xlarge",
+   "a1.4xlarge",
+   "a1.large",
+   "a1.medium",
+   "a1.metal",
+   "a1.xlarge",
+   "c1.medium",
+   "c1.xlarge",
+   "c3.2xlarge",
+   "c3.4xlarge",
+   "c3.8xlarge",
+   "c3.large",
+   "c3.xlarge",
+   "c4.2xlarge",
+   "c4.4xlarge",
+   "c4.8xlarge",
+   "c4.large",
+   "c4.xlarge",
+   "c5.12xlarge",
+   "c5.18xlarge",
+   "c5.24xlarge",
+   "c5.2xlarge",
+   "c5.4xlarge",
+   "c5.9xlarge",
+   "c5.large",
+   "c5.metal",
+   "c5.xlarge",
+   "c5a.12xlarge",
+   "c5a.16xlarge",
+   "c5a.24xlarge",
+   "c5a.2xlarge",
+   "c5a.4xlarge",
+   "c5a.8xlarge",
+   "c5a.large",
+   "c5a.xlarge",
+   "c5ad.12xlarge",
+   "c5ad.16xlarge",
+   "c5ad.24xlarge",
+   "c5ad.2xlarge",
+   "c5ad.4xlarge",
+   "c5ad.8xlarge",
+   "c5ad.large",
+   "c5ad.xlarge",
+   "c5d.12xlarge",
+   "c5d.18xlarge",
+   "c5d.24xlarge",
+   "c5d.2xlarge",
+   "c5d.4xlarge",
+   "c5d.9xlarge",
+   "c5d.large",
+   "c5d.metal",
+   "c5d.xlarge",
+   "c5n.18xlarge",
+   "c5n.2xlarge",
+   "c5n.4xlarge",
+   "c5n.9xlarge",
+   "c5n.large",
+   "c5n.metal",
+   "c5n.xlarge",
+   "c6a.12xlarge",
+   "c6a.16xlarge",
+   "c6a.24xlarge",
+   "c6a.2xlarge",
+   "c6a.32xlarge",
+   "c6a.48xlarge",
+   "c6a.4xlarge",
+   "c6a.8xlarge",
+   "c6a.large",
+   "c6a.metal",
+   "c6a.xlarge",
+   "c6g.12xlarge",
+   "c6g.16xlarge",
+   "c6g.2xlarge",
+   "c6g.4xlarge",
+   "c6g.8xlarge",
+   "c6g.large",
+   "c6g.medium",
+   "c6g.metal",
+   "c6g.xlarge",
+   "c6gd.12xlarge",
+   "c6gd.16xlarge",
+   "c6gd.2xlarge",
+   "c6gd.4xlarge",
+   "c6gd.8xlarge",
+   "c6gd.large",
+   "c6gd.medium",
+   "c6gd.metal",
+   "c6gd.xlarge",
+   "c6gn.12xlarge",
+   "c6gn.16xlarge",
+   "c6gn.2xlarge",
+   "c6gn.4xlarge",
+   "c6gn.8xlarge",
+   "c6gn.large",
+   "c6gn.medium",
+   "c6gn.metal",
+   "c6gn.xlarge",
+   "c6i.12xlarge",
+   "c6i.16xlarge",
+   "c6i.24xlarge",
+   "c6i.2xlarge",
+   "c6i.32xlarge",
+   "c6i.4xlarge",
+   "c6i.8xlarge",
+   "c6i.large",
+   "c6i.metal",
+   "c6i.xlarge",
+   "c6id.12xlarge",
+   "c6id.16xlarge",
+   "c6id.24xlarge",
+   "c6id.2xlarge",
+   "c6id.32xlarge",
+   "c6id.4xlarge",
+   "c6id.8xlarge",
+   "c6id.large",
+   "c6id.metal",
+   "c6id.xlarge",
+   "c6in.12xlarge",
+   "c6in.16xlarge",
+   "c6in.24xlarge",
+   "c6in.2xlarge",
+   "c6in.32xlarge",
+   "c6in.4xlarge",
+   "c6in.8xlarge",
+   "c6in.large",
+   "c6in.metal",
+   "c6in.xlarge",
+   "c7a.12xlarge",
+   "c7a.16xlarge",
+   "c7a.24xlarge",
+   "c7a.2xlarge",
+   "c7a.32xlarge",
+   "c7a.48xlarge",
+   "c7a.4xlarge",
+   "c7a.8xlarge",
+   "c7a.large",
+   "c7a.medium",
+   "c7a.metal-48xl",
+   "c7a.xlarge",
+   "c7g.12xlarge",
+   "c7g.16xlarge",
+   "c7g.2xlarge",
+   "c7g.4xlarge",
+   "c7g.8xlarge",
+   "c7g.large",
+   "c7g.medium",
+   "c7g.metal",
+   "c7g.xlarge",
+   "c7gd.12xlarge",
+   "c7gd.16xlarge",
+   "c7gd.2xlarge",
+   "c7gd.4xlarge",
+   "c7gd.8xlarge",
+   "c7gd.large",
+   "c7gd.medium",
+   "c7gd.metal",
+   "c7gd.xlarge",
+   "c7gn.12xlarge",
+   "c7gn.16xlarge",
+   "c7gn.2xlarge",
+   "c7gn.4xlarge",
+   "c7gn.8xlarge",
+   "c7gn.large",
+   "c7gn.medium",
+   "c7gn.metal",
+   "c7gn.xlarge",
+   "c7i-flex.2xlarge",
+   "c7i-flex.4xlarge",
+   "c7i-flex.8xlarge",
+   "c7i-flex.large",
+   "c7i-flex.xlarge",
+   "c7i.12xlarge",
+   "c7i.16xlarge",
+   "c7i.24xlarge",
+   "c7i.2xlarge",
+   "c7i.48xlarge",
+   "c7i.4xlarge",
+   "c7i.8xlarge",
+   "c7i.large",
+   "c7i.metal-24xl",
+   "c7i.metal-48xl",
+   "c7i.xlarge",
+   "cc2.8xlarge",
+   "cr1.8xlarge",
+   "d2.2xlarge",
+   "d2.4xlarge",
+   "d2.8xlarge",
+   "d2.xlarge",
+   "d3.2xlarge",
+   "d3.4xlarge",
+   "d3.8xlarge",
+   "d3.xlarge",
+   "d3en.12xlarge",
+   "d3en.2xlarge",
+   "d3en.4xlarge",
+   "d3en.6xlarge",
+   "d3en.8xlarge",
+   "d3en.large",
+   "d3en.xlarge",
+   "dl1.24xlarge",
+   "dl2q.24xlarge",
+   "f1.16xlarge",
+   "f1.2xlarge",
+   "f1.4xlarge",
+   "g2.2xlarge",
+   "g2.8xlarge",
+   "g3.16xlarge",
+   "g3.4xlarge",
+   "g3.8xlarge",
+   "g3s.xlarge",
+   "g4ad.16xlarge",
+   "g4ad.2xlarge",
+   "g4ad.4xlarge",
+   "g4ad.8xlarge",
+   "g4ad.xlarge",
+   "g4dn.12xlarge",
+   "g4dn.16xlarge",
+   "g4dn.2xlarge",
+   "g4dn.4xlarge",
+   "g4dn.8xlarge",
+   "g4dn.metal",
+   "g4dn.xlarge",
+   "g5.12xlarge",
+   "g5.16xlarge",
+   "g5.24xlarge",
+   "g5.2xlarge",
+   "g5.48xlarge",
+   "g5.4xlarge",
+   "g5.8xlarge",
+   "g5.xlarge",
+   "g5g.16xlarge",
+   "g5g.2xlarge",
+   "g5g.4xlarge",
+   "g5g.8xlarge",
+   "g5g.metal",
+   "g5g.xlarge",
+   "g6.12xlarge",
+   "g6.16xlarge",
+   "g6.24xlarge",
+   "g6.2xlarge",
+   "g6.48xlarge",
+   "g6.4xlarge",
+   "g6.8xlarge",
+   "g6.xlarge",
+   "g6e.12xlarge",
+   "g6e.16xlarge",
+   "g6e.24xlarge",
+   "g6e.2xlarge",
+   "g6e.48xlarge",
+   "g6e.4xlarge",
+   "g6e.8xlarge",
+   "g6e.xlarge",
+   "gr6.4xlarge",
+   "gr6.8xlarge",
+   "h1.16xlarge",
+   "h1.2xlarge",
+   "h1.4xlarge",
+   "h1.8xlarge",
+   "hpc6a.48xlarge",
+   "hpc6id.32xlarge",
+   "hpc7a.12xlarge",
+   "hpc7a.24xlarge",
+   "hpc7a.48xlarge",
+   "hpc7a.96xlarge",
+   "hpc7g.16xlarge",
+   "hpc7g.4xlarge",
+   "hpc7g.8xlarge",
+   "hs1.8xlarge",
+   "i2.2xlarge",
+   "i2.4xlarge",
+   "i2.8xlarge",
+   "i2.large",
+   "i2.xlarge",
+   "i3.16xlarge",
+   "i3.2xlarge",
+   "i3.4xlarge",
+   "i3.8xlarge",
+   "i3.large",
+   "i3.metal",
+   "i3.xlarge",
+   "i3en.12xlarge",
+   "i3en.24xlarge",
+   "i3en.2xlarge",
+   "i3en.3xlarge",
+   "i3en.6xlarge",
+   "i3en.large",
+   "i3en.metal",
+   "i3en.xlarge",
+   "i3p.16xlarge",
+   "i4g.16xlarge",
+   "i4g.2xlarge",
+   "i4g.4xlarge",
+   "i4g.8xlarge",
+   "i4g.large",
+   "i4g.xlarge",
+   "i4i.12xlarge",
+   "i4i.16xlarge",
+   "i4i.24xlarge",
+   "i4i.2xlarge",
+   "i4i.32xlarge",
+   "i4i.4xlarge",
+   "i4i.8xlarge",
+   "i4i.large",
+   "i4i.metal",
+   "i4i.xlarge",
+   "im4gn.16xlarge",
+   "im4gn.2xlarge",
+   "im4gn.4xlarge",
+   "im4gn.8xlarge",
+   "im4gn.large",
+   "im4gn.xlarge",
+   "inf1.24xlarge",
+   "inf1.2xlarge",
+   "inf1.6xlarge",
+   "inf1.xlarge",
+   "inf2.24xlarge",
+   "inf2.48xlarge",
+   "inf2.8xlarge",
+   "inf2.xlarge",
+   "is4gen.2xlarge",
+   "is4gen.4xlarge",
+   "is4gen.8xlarge",
+   "is4gen.large",
+   "is4gen.medium",
+   "is4gen.xlarge",
+   "m1.large",
+   "m1.medium",
+   "m1.small",
+   "m1.xlarge",
+   "m2.2xlarge",
+   "m2.4xlarge",
+   "m2.xlarge",
+   "m3.2xlarge",
+   "m3.large",
+   "m3.medium",
+   "m3.xlarge",
+   "m4.10xlarge",
+   "m4.16xlarge",
+   "m4.2xlarge",
+   "m4.4xlarge",
+   "m4.large",
+   "m4.xlarge",
+   "m5.12xlarge",
+   "m5.16xlarge",
+   "m5.24xlarge",
+   "m5.2xlarge",
+   "m5.4xlarge",
+   "m5.8xlarge",
+   "m5.large",
+   "m5.metal",
+   "m5.xlarge",
+   "m5a.12xlarge",
+   "m5a.16xlarge",
+   "m5a.24xlarge",
+   "m5a.2xlarge",
+   "m5a.4xlarge",
+   "m5a.8xlarge",
+   "m5a.large",
+   "m5a.xlarge",
+   "m5ad.12xlarge",
+   "m5ad.16xlarge",
+   "m5ad.24xlarge",
+   "m5ad.2xlarge",
+   "m5ad.4xlarge",
+   "m5ad.8xlarge",
+   "m5ad.large",
+   "m5ad.xlarge",
+   "m5d.12xlarge",
+   "m5d.16xlarge",
+   "m5d.24xlarge",
+   "m5d.2xlarge",
+   "m5d.4xlarge",
+   "m5d.8xlarge",
+   "m5d.large",
+   "m5d.metal",
+   "m5d.xlarge",
+   "m5dn.12xlarge",
+   "m5dn.16xlarge",
+   "m5dn.24xlarge",
+   "m5dn.2xlarge",
+   "m5dn.4xlarge",
+   "m5dn.8xlarge",
+   "m5dn.large",
+   "m5dn.metal",
+   "m5dn.xlarge",
+   "m5n.12xlarge",
+   "m5n.16xlarge",
+   "m5n.24xlarge",
+   "m5n.2xlarge",
+   "m5n.4xlarge",
+   "m5n.8xlarge",
+   "m5n.large",
+   "m5n.metal",
+   "m5n.xlarge",
+   "m5zn.12xlarge",
+   "m5zn.2xlarge",
+   "m5zn.3xlarge",
+   "m5zn.6xlarge",
+   "m5zn.large",
+   "m5zn.metal",
+   "m5zn.xlarge",
+   "m6a.12xlarge",
+   "m6a.16xlarge",
+   "m6a.24xlarge",
+   "m6a.2xlarge",
+   "m6a.32xlarge",
+   "m6a.48xlarge",
+   "m6a.4xlarge",
+   "m6a.8xlarge",
+   "m6a.large",
+   "m6a.metal",
+   "m6a.xlarge",
+   "m6g.12xlarge",
+   "m6g.16xlarge",
+   "m6g.2xlarge",
+   "m6g.4xlarge",
+   "m6g.8xlarge",
+   "m6g.large",
+   "m6g.medium",
+   "m6g.metal",
+   "m6g.xlarge",
+   "m6gd.12xlarge",
+   "m6gd.16xlarge",
+   "m6gd.2xlarge",
+   "m6gd.4xlarge",
+   "m6gd.8xlarge",
+   "m6gd.large",
+   "m6gd.medium",
+   "m6gd.metal",
+   "m6gd.xlarge",
+   "m6i.12xlarge",
+   "m6i.16xlarge",
+   "m6i.24xlarge",
+   "m6i.2xlarge",
+   "m6i.32xlarge",
+   "m6i.4xlarge",
+   "m6i.8xlarge",
+   "m6i.large",
+   "m6i.metal",
+   "m6i.xlarge",
+   "m6id.12xlarge",
+   "m6id.16xlarge",
+   "m6id.24xlarge",
+   "m6id.2xlarge",
+   "m6id.32xlarge",
+   "m6id.4xlarge",
+   "m6id.8xlarge",
+   "m6id.large",
+   "m6id.metal",
+   "m6id.xlarge",
+   "m6idn.12xlarge",
+   "m6idn.16xlarge",
+   "m6idn.24xlarge",
+   "m6idn.2xlarge",
+   "m6idn.32xlarge",
+   "m6idn.4xlarge",
+   "m6idn.8xlarge",
+   "m6idn.large",
+   "m6idn.metal",
+   "m6idn.xlarge",
+   "m6in.12xlarge",
+   "m6in.16xlarge",
+   "m6in.24xlarge",
+   "m6in.2xlarge",
+   "m6in.32xlarge",
+   "m6in.4xlarge",
+   "m6in.8xlarge",
+   "m6in.large",
+   "m6in.metal",
+   "m6in.xlarge",
+   "m7a.12xlarge",
+   "m7a.16xlarge",
+   "m7a.24xlarge",
+   "m7a.2xlarge",
+   "m7a.32xlarge",
+   "m7a.48xlarge",
+   "m7a.4xlarge",
+   "m7a.8xlarge",
+   "m7a.large",
+   "m7a.medium",
+   "m7a.metal-48xl",
+   "m7a.xlarge",
+   "m7g.12xlarge",
+   "m7g.16xlarge",
+   "m7g.2xlarge",
+   "m7g.4xlarge",
+   "m7g.8xlarge",
+   "m7g.large",
+   "m7g.medium",
+   "m7g.metal",
+   "m7g.xlarge",
+   "m7gd.12xlarge",
+   "m7gd.16xlarge",
+   "m7gd.2xlarge",
+   "m7gd.4xlarge",
+   "m7gd.8xlarge",
+   "m7gd.large",
+   "m7gd.medium",
+   "m7gd.metal",
+   "m7gd.xlarge",
+   "m7i-flex.2xlarge",
+   "m7i-flex.4xlarge",
+   "m7i-flex.8xlarge",
+   "m7i-flex.large",
+   "m7i-flex.xlarge",
+   "m7i.12xlarge",
+   "m7i.16xlarge",
+   "m7i.24xlarge",
+   "m7i.2xlarge",
+   "m7i.48xlarge",
+   "m7i.4xlarge",
+   "m7i.8xlarge",
+   "m7i.large",
+   "m7i.metal-24xl",
+   "m7i.metal-48xl",
+   "m7i.xlarge",
+   "mac1.metal",
+   "mac2-m1ultra.metal",
+   "mac2-m2.metal",
+   "mac2-m2pro.metal",
+   "mac2.metal",
+   "p2.16xlarge",
+   "p2.8xlarge",
+   "p2.xlarge",
+   "p3.16xlarge",
+   "p3.2xlarge",
+   "p3.8xlarge",
+   "p3dn.24xlarge",
+   "p4d.24xlarge",
+   "p4de.24xlarge",
+   "p5.48xlarge",
+   "r3.2xlarge",
+   "r3.4xlarge",
+   "r3.8xlarge",
+   "r3.large",
+   "r3.xlarge",
+   "r4.16xlarge",
+   "r4.2xlarge",
+   "r4.4xlarge",
+   "r4.8xlarge",
+   "r4.large",
+   "r4.xlarge",
+   "r5.12xlarge",
+   "r5.16xlarge",
+   "r5.24xlarge",
+   "r5.2xlarge",
+   "r5.4xlarge",
+   "r5.8xlarge",
+   "r5.large",
+   "r5.metal",
+   "r5.xlarge",
+   "r5a.12xlarge",
+   "r5a.16xlarge",
+   "r5a.24xlarge",
+   "r5a.2xlarge",
+   "r5a.4xlarge",
+   "r5a.8xlarge",
+   "r5a.large",
+   "r5a.xlarge",
+   "r5ad.12xlarge",
+   "r5ad.16xlarge",
+   "r5ad.24xlarge",
+   "r5ad.2xlarge",
+   "r5ad.4xlarge",
+   "r5ad.8xlarge",
+   "r5ad.large",
+   "r5ad.xlarge",
+   "r5b.12xlarge",
+   "r5b.16xlarge",
+   "r5b.24xlarge",
+   "r5b.2xlarge",
+   "r5b.4xlarge",
+   "r5b.8xlarge",
+   "r5b.large",
+   "r5b.metal",
+   "r5b.xlarge",
+   "r5d.12xlarge",
+   "r5d.16xlarge",
+   "r5d.24xlarge",
+   "r5d.2xlarge",
+   "r5d.4xlarge",
+   "r5d.8xlarge",
+   "r5d.large",
+   "r5d.metal",
+   "r5d.xlarge",
+   "r5dn.12xlarge",
+   "r5dn.16xlarge",
+   "r5dn.24xlarge",
+   "r5dn.2xlarge",
+   "r5dn.4xlarge",
+   "r5dn.8xlarge",
+   "r5dn.large",
+   "r5dn.metal",
+   "r5dn.xlarge",
+   "r5n.12xlarge",
+   "r5n.16xlarge",
+   "r5n.24xlarge",
+   "r5n.2xlarge",
+   "r5n.4xlarge",
+   "r5n.8xlarge",
+   "r5n.large",
+   "r5n.metal",
+   "r5n.xlarge",
+   "r6a.12xlarge",
+   "r6a.16xlarge",
+   "r6a.24xlarge",
+   "r6a.2xlarge",
+   "r6a.32xlarge",
+   "r6a.48xlarge",
+   "r6a.4xlarge",
+   "r6a.8xlarge",
+   "r6a.large",
+   "r6a.metal",
+   "r6a.xlarge",
+   "r6g.12xlarge",
+   "r6g.16xlarge",
+   "r6g.2xlarge",
+   "r6g.4xlarge",
+   "r6g.8xlarge",
+   "r6g.large",
+   "r6g.medium",
+   "r6g.metal",
+   "r6g.xlarge",
+   "r6gd.12xlarge",
+   "r6gd.16xlarge",
+   "r6gd.2xlarge",
+   "r6gd.4xlarge",
+   "r6gd.8xlarge",
+   "r6gd.large",
+   "r6gd.medium",
+   "r6gd.metal",
+   "r6gd.xlarge",
+   "r6i.12xlarge",
+   "r6i.16xlarge",
+   "r6i.24xlarge",
+   "r6i.2xlarge",
+   "r6i.32xlarge",
+   "r6i.4xlarge",
+   "r6i.8xlarge",
+   "r6i.large",
+   "r6i.metal",
+   "r6i.xlarge",
+   "r6id.12xlarge",
+   "r6id.16xlarge",
+   "r6id.24xlarge",
+   "r6id.2xlarge",
+   "r6id.32xlarge",
+   "r6id.4xlarge",
+   "r6id.8xlarge",
+   "r6id.large",
+   "r6id.metal",
+   "r6id.xlarge",
+   "r6idn.12xlarge",
+   "r6idn.16xlarge",
+   "r6idn.24xlarge",
+   "r6idn.2xlarge",
+   "r6idn.32xlarge",
+   "r6idn.4xlarge",
+   "r6idn.8xlarge",
+   "r6idn.large",
+   "r6idn.metal",
+   "r6idn.xlarge",
+   "r6in.12xlarge",
+   "r6in.16xlarge",
+   "r6in.24xlarge",
+   "r6in.2xlarge",
+   "r6in.32xlarge",
+   "r6in.4xlarge",
+   "r6in.8xlarge",
+   "r6in.large",
+   "r6in.metal",
+   "r6in.xlarge",
+   "r7a.12xlarge",
+   "r7a.16xlarge",
+   "r7a.24xlarge",
+   "r7a.2xlarge",
+   "r7a.32xlarge",
+   "r7a.48xlarge",
+   "r7a.4xlarge",
+   "r7a.8xlarge",
+   "r7a.large",
+   "r7a.medium",
+   "r7a.metal-48xl",
+   "r7a.xlarge",
+   "r7g.12xlarge",
+   "r7g.16xlarge",
+   "r7g.2xlarge",
+   "r7g.4xlarge",
+   "r7g.8xlarge",
+   "r7g.large",
+   "r7g.medium",
+   "r7g.metal",
+   "r7g.xlarge",
+   "r7gd.12xlarge",
+   "r7gd.16xlarge",
+   "r7gd.2xlarge",
+   "r7gd.4xlarge",
+   "r7gd.8xlarge",
+   "r7gd.large",
+   "r7gd.medium",
+   "r7gd.metal",
+   "r7gd.xlarge",
+   "r7i.12xlarge",
+   "r7i.16xlarge",
+   "r7i.24xlarge",
+   "r7i.2xlarge",
+   "r7i.48xlarge",
+   "r7i.4xlarge",
+   "r7i.8xlarge",
+   "r7i.large",
+   "r7i.metal-24xl",
+   "r7i.metal-48xl",
+   "r7i.xlarge",
+   "r7iz.12xlarge",
+   "r7iz.16xlarge",
+   "r7iz.2xlarge",
+   "r7iz.32xlarge",
+   "r7iz.4xlarge",
+   "r7iz.8xlarge",
+   "r7iz.large",
+   "r7iz.metal-16xl",
+   "r7iz.metal-32xl",
+   "r7iz.xlarge",
+   "r8g.12xlarge",
+   "r8g.16xlarge",
+   "r8g.24xlarge",
+   "r8g.2xlarge",
+   "r8g.48xlarge",
+   "r8g.4xlarge",
+   "r8g.8xlarge",
+   "r8g.large",
+   "r8g.medium",
+   "r8g.metal-24xl",
+   "r8g.metal-48xl",
+   "r8g.xlarge",
+   "t1.micro",
+   "t2.2xlarge",
+   "t2.large",
+   "t2.medium",
+   "t2.micro",
+   "t2.nano",
+   "t2.small",
+   "t2.xlarge",
+   "t3.2xlarge",
+   "t3.large",
+   "t3.medium",
+   "t3.micro",
+   "t3.nano",
+   "t3.small",
+   "t3.xlarge",
+   "t3a.2xlarge",
+   "t3a.large",
+   "t3a.medium",
+   "t3a.micro",
+   "t3a.nano",
+   "t3a.small",
+   "t3a.xlarge",
+   "t4g.2xlarge",
+   "t4g.large",
+   "t4g.medium",
+   "t4g.micro",
+   "t4g.nano",
+   "t4g.small",
+   "t4g.xlarge",
+   "trn1.2xlarge",
+   "trn1.32xlarge",
+   "trn1n.32xlarge",
+   "u-12tb1.112xlarge",
+   "u-12tb1.metal",
+   "u-18tb1.112xlarge",
+   "u-18tb1.metal",
+   "u-24tb1.112xlarge",
+   "u-24tb1.metal",
+   "u-3tb1.56xlarge",
+   "u-6tb1.112xlarge",
+   "u-6tb1.56xlarge",
+   "u-6tb1.metal",
+   "u-9tb1.112xlarge",
+   "u-9tb1.metal",
+   "u7i-12tb.224xlarge",
+   "u7in-16tb.224xlarge",
+   "u7in-24tb.224xlarge",
+   "u7in-32tb.224xlarge",
+   "vt1.24xlarge",
+   "vt1.3xlarge",
+   "vt1.6xlarge",
+   "x1.16xlarge",
+   "x1.32xlarge",
+   "x1e.16xlarge",
+   "x1e.2xlarge",
+   "x1e.32xlarge",
+   "x1e.4xlarge",
+   "x1e.8xlarge",
+   "x1e.xlarge",
+   "x2gd.12xlarge",
+   "x2gd.16xlarge",
+   "x2gd.2xlarge",
+   "x2gd.4xlarge",
+   "x2gd.8xlarge",
+   "x2gd.large",
+   "x2gd.medium",
+   "x2gd.metal",
+   "x2gd.xlarge",
+   "x2idn.16xlarge",
+   "x2idn.24xlarge",
+   "x2idn.32xlarge",
+   "x2idn.metal",
+   "x2iedn.16xlarge",
+   "x2iedn.24xlarge",
+   "x2iedn.2xlarge",
+   "x2iedn.32xlarge",
+   "x2iedn.4xlarge",
+   "x2iedn.8xlarge",
+   "x2iedn.metal",
+   "x2iedn.xlarge",
+   "x2iezn.12xlarge",
+   "x2iezn.2xlarge",
+   "x2iezn.4xlarge",
+   "x2iezn.6xlarge",
+   "x2iezn.8xlarge",
+   "x2iezn.metal",
+   "z1d.12xlarge",
+   "z1d.2xlarge",
+   "z1d.3xlarge",
+   "z1d.6xlarge",
+   "z1d.large",
+   "z1d.metal",
+   "z1d.xlarge"
+  ]
+ },
  "ca-central-1": {
   "enum": [
    "a1.2xlarge",
diff --git a/src/cfnlint/data/schemas/extensions/aws_elasticache_cachecluster/cachenodetype_enum.json b/src/cfnlint/data/schemas/extensions/aws_elasticache_cachecluster/cachenodetype_enum.json
index 90f05b0037..c42b062923 100644
--- a/src/cfnlint/data/schemas/extensions/aws_elasticache_cachecluster/cachenodetype_enum.json
+++ b/src/cfnlint/data/schemas/extensions/aws_elasticache_cachecluster/cachenodetype_enum.json
@@ -1045,6 +1045,101 @@
    "cache.t4g.small"
   ]
  },
+ "ap-southeast-5": {
+  "enum": [
+   "cache.c1.xlarge",
+   "cache.c7gn.12xlarge",
+   "cache.c7gn.16xlarge",
+   "cache.c7gn.2xlarge",
+   "cache.c7gn.4xlarge",
+   "cache.c7gn.8xlarge",
+   "cache.c7gn.large",
+   "cache.c7gn.xlarge",
+   "cache.m1.large",
+   "cache.m1.medium",
+   "cache.m1.small",
+   "cache.m1.xlarge",
+   "cache.m2.2xlarge",
+   "cache.m2.4xlarge",
+   "cache.m2.xlarge",
+   "cache.m3.2xlarge",
+   "cache.m3.large",
+   "cache.m3.medium",
+   "cache.m3.xlarge",
+   "cache.m4.10xlarge",
+   "cache.m4.2xlarge",
+   "cache.m4.4xlarge",
+   "cache.m4.large",
+   "cache.m4.xlarge",
+   "cache.m5.12xlarge",
+   "cache.m5.24xlarge",
+   "cache.m5.2xlarge",
+   "cache.m5.4xlarge",
+   "cache.m5.large",
+   "cache.m5.xlarge",
+   "cache.m6g.12xlarge",
+   "cache.m6g.16xlarge",
+   "cache.m6g.2xlarge",
+   "cache.m6g.4xlarge",
+   "cache.m6g.8xlarge",
+   "cache.m6g.large",
+   "cache.m6g.xlarge",
+   "cache.m7g.12xlarge",
+   "cache.m7g.16xlarge",
+   "cache.m7g.2xlarge",
+   "cache.m7g.4xlarge",
+   "cache.m7g.8xlarge",
+   "cache.m7g.large",
+   "cache.m7g.xlarge",
+   "cache.r3.2xlarge",
+   "cache.r3.4xlarge",
+   "cache.r3.8xlarge",
+   "cache.r3.large",
+   "cache.r3.xlarge",
+   "cache.r4.16xlarge",
+   "cache.r4.2xlarge",
+   "cache.r4.4xlarge",
+   "cache.r4.8xlarge",
+   "cache.r4.large",
+   "cache.r4.xlarge",
+   "cache.r5.12xlarge",
+   "cache.r5.24xlarge",
+   "cache.r5.2xlarge",
+   "cache.r5.4xlarge",
+   "cache.r5.large",
+   "cache.r5.xlarge",
+   "cache.r6g.12xlarge",
+   "cache.r6g.16xlarge",
+   "cache.r6g.2xlarge",
+   "cache.r6g.4xlarge",
+   "cache.r6g.8xlarge",
+   "cache.r6g.large",
+   "cache.r6g.xlarge",
+   "cache.r6gd.12xlarge",
+   "cache.r6gd.16xlarge",
+   "cache.r6gd.2xlarge",
+   "cache.r6gd.4xlarge",
+   "cache.r6gd.8xlarge",
+   "cache.r6gd.xlarge",
+   "cache.r7g.12xlarge",
+   "cache.r7g.16xlarge",
+   "cache.r7g.2xlarge",
+   "cache.r7g.4xlarge",
+   "cache.r7g.8xlarge",
+   "cache.r7g.large",
+   "cache.r7g.xlarge",
+   "cache.t1.micro",
+   "cache.t2.medium",
+   "cache.t2.micro",
+   "cache.t2.small",
+   "cache.t3.medium",
+   "cache.t3.micro",
+   "cache.t3.small",
+   "cache.t4g.medium",
+   "cache.t4g.micro",
+   "cache.t4g.small"
+  ]
+ },
  "ca-central-1": {
   "enum": [
    "cache.c1.xlarge",
diff --git a/src/cfnlint/data/schemas/extensions/aws_emr_cluster/instancetypeconfig_instancetype_enum.json b/src/cfnlint/data/schemas/extensions/aws_emr_cluster/instancetypeconfig_instancetype_enum.json
index f356b27332..b5b4ca7949 100644
--- a/src/cfnlint/data/schemas/extensions/aws_emr_cluster/instancetypeconfig_instancetype_enum.json
+++ b/src/cfnlint/data/schemas/extensions/aws_emr_cluster/instancetypeconfig_instancetype_enum.json
@@ -6127,6 +6127,563 @@
    "z1d.xlarge"
   ]
  },
+ "ap-southeast-5": {
+  "enum": [
+   "c1.medium",
+   "c1.xlarge",
+   "c3.2xlarge",
+   "c3.4xlarge",
+   "c3.8xlarge",
+   "c3.large",
+   "c3.xlarge",
+   "c4.2xlarge",
+   "c4.4xlarge",
+   "c4.8xlarge",
+   "c4.large",
+   "c4.xlarge",
+   "c5.12xlarge",
+   "c5.18xlarge",
+   "c5.24xlarge",
+   "c5.2xlarge",
+   "c5.4xlarge",
+   "c5.9xlarge",
+   "c5.xlarge",
+   "c5a.12xlarge",
+   "c5a.16xlarge",
+   "c5a.24xlarge",
+   "c5a.2xlarge",
+   "c5a.4xlarge",
+   "c5a.8xlarge",
+   "c5a.xlarge",
+   "c5ad.12xlarge",
+   "c5ad.16xlarge",
+   "c5ad.24xlarge",
+   "c5ad.2xlarge",
+   "c5ad.4xlarge",
+   "c5ad.8xlarge",
+   "c5ad.xlarge",
+   "c5d.12xlarge",
+   "c5d.18xlarge",
+   "c5d.24xlarge",
+   "c5d.2xlarge",
+   "c5d.4xlarge",
+   "c5d.9xlarge",
+   "c5d.xlarge",
+   "c5n.18xlarge",
+   "c5n.2xlarge",
+   "c5n.4xlarge",
+   "c5n.9xlarge",
+   "c5n.xlarge",
+   "c6a.12xlarge",
+   "c6a.16xlarge",
+   "c6a.24xlarge",
+   "c6a.2xlarge",
+   "c6a.32xlarge",
+   "c6a.48xlarge",
+   "c6a.4xlarge",
+   "c6a.8xlarge",
+   "c6a.xlarge",
+   "c6g.12xlarge",
+   "c6g.16xlarge",
+   "c6g.2xlarge",
+   "c6g.4xlarge",
+   "c6g.8xlarge",
+   "c6g.xlarge",
+   "c6gd.12xlarge",
+   "c6gd.16xlarge",
+   "c6gd.2xlarge",
+   "c6gd.4xlarge",
+   "c6gd.8xlarge",
+   "c6gd.xlarge",
+   "c6gn.12xlarge",
+   "c6gn.16xlarge",
+   "c6gn.2xlarge",
+   "c6gn.4xlarge",
+   "c6gn.8xlarge",
+   "c6gn.xlarge",
+   "c6i.12xlarge",
+   "c6i.16xlarge",
+   "c6i.24xlarge",
+   "c6i.2xlarge",
+   "c6i.32xlarge",
+   "c6i.4xlarge",
+   "c6i.8xlarge",
+   "c6i.xlarge",
+   "c6id.12xlarge",
+   "c6id.16xlarge",
+   "c6id.24xlarge",
+   "c6id.2xlarge",
+   "c6id.32xlarge",
+   "c6id.4xlarge",
+   "c6id.8xlarge",
+   "c6id.xlarge",
+   "c6in.12xlarge",
+   "c6in.16xlarge",
+   "c6in.24xlarge",
+   "c6in.2xlarge",
+   "c6in.32xlarge",
+   "c6in.4xlarge",
+   "c6in.8xlarge",
+   "c6in.xlarge",
+   "c7a.12xlarge",
+   "c7a.16xlarge",
+   "c7a.24xlarge",
+   "c7a.2xlarge",
+   "c7a.32xlarge",
+   "c7a.48xlarge",
+   "c7a.4xlarge",
+   "c7a.8xlarge",
+   "c7a.xlarge",
+   "c7g.12xlarge",
+   "c7g.16xlarge",
+   "c7g.2xlarge",
+   "c7g.4xlarge",
+   "c7g.8xlarge",
+   "c7g.xlarge",
+   "c7gd.12xlarge",
+   "c7gd.16xlarge",
+   "c7gd.2xlarge",
+   "c7gd.4xlarge",
+   "c7gd.8xlarge",
+   "c7gd.xlarge",
+   "c7gn.12xlarge",
+   "c7gn.16xlarge",
+   "c7gn.2xlarge",
+   "c7gn.4xlarge",
+   "c7gn.8xlarge",
+   "c7gn.xlarge",
+   "c7i.12xlarge",
+   "c7i.16xlarge",
+   "c7i.24xlarge",
+   "c7i.2xlarge",
+   "c7i.48xlarge",
+   "c7i.4xlarge",
+   "c7i.8xlarge",
+   "c7i.xlarge",
+   "cc1.4xlarge",
+   "cg1.4xlarge",
+   "cr1.8xlarge",
+   "d2.2xlarge",
+   "d2.4xlarge",
+   "d2.8xlarge",
+   "d2.xlarge",
+   "d3.2xlarge",
+   "d3.4xlarge",
+   "d3.8xlarge",
+   "d3.xlarge",
+   "d3en.12xlarge",
+   "d3en.2xlarge",
+   "d3en.4xlarge",
+   "d3en.6xlarge",
+   "d3en.8xlarge",
+   "d3en.xlarge",
+   "g3.16xlarge",
+   "g3.4xlarge",
+   "g3.8xlarge",
+   "g3s.xlarge",
+   "g4dn.12xlarge",
+   "g4dn.16xlarge",
+   "g4dn.2xlarge",
+   "g4dn.4xlarge",
+   "g4dn.8xlarge",
+   "g4dn.xlarge",
+   "g5.12xlarge",
+   "g5.16xlarge",
+   "g5.24xlarge",
+   "g5.2xlarge",
+   "g5.48xlarge",
+   "g5.4xlarge",
+   "g5.8xlarge",
+   "g5.xlarge",
+   "g6.12xlarge",
+   "g6.16xlarge",
+   "g6.24xlarge",
+   "g6.2xlarge",
+   "g6.48xlarge",
+   "g6.4xlarge",
+   "g6.8xlarge",
+   "g6.xlarge",
+   "gr6.4xlarge",
+   "gr6.8xlarge",
+   "h1.16xlarge",
+   "h1.2xlarge",
+   "h1.4xlarge",
+   "h1.8xlarge",
+   "hi1.4xlarge",
+   "hs1.8xlarge",
+   "i2.2xlarge",
+   "i2.4xlarge",
+   "i2.8xlarge",
+   "i2.xlarge",
+   "i3.16xlarge",
+   "i3.2xlarge",
+   "i3.4xlarge",
+   "i3.8xlarge",
+   "i3.xlarge",
+   "i3en.12xlarge",
+   "i3en.24xlarge",
+   "i3en.2xlarge",
+   "i3en.3xlarge",
+   "i3en.6xlarge",
+   "i3en.xlarge",
+   "i4g.16xlarge",
+   "i4g.2xlarge",
+   "i4g.4xlarge",
+   "i4g.8xlarge",
+   "i4g.xlarge",
+   "i4i.12xlarge",
+   "i4i.16xlarge",
+   "i4i.24xlarge",
+   "i4i.2xlarge",
+   "i4i.32xlarge",
+   "i4i.4xlarge",
+   "i4i.8xlarge",
+   "i4i.xlarge",
+   "im4gn.16xlarge",
+   "im4gn.2xlarge",
+   "im4gn.4xlarge",
+   "im4gn.8xlarge",
+   "im4gn.xlarge",
+   "is4gen.2xlarge",
+   "is4gen.4xlarge",
+   "is4gen.8xlarge",
+   "is4gen.xlarge",
+   "m1.large",
+   "m1.medium",
+   "m1.small",
+   "m1.xlarge",
+   "m2.2xlarge",
+   "m2.4xlarge",
+   "m2.xlarge",
+   "m3.2xlarge",
+   "m3.large",
+   "m3.medium",
+   "m3.xlarge",
+   "m4.10xlarge",
+   "m4.16xlarge",
+   "m4.2xlarge",
+   "m4.4xlarge",
+   "m4.large",
+   "m4.xlarge",
+   "m5.12xlarge",
+   "m5.16xlarge",
+   "m5.24xlarge",
+   "m5.2xlarge",
+   "m5.4xlarge",
+   "m5.8xlarge",
+   "m5.xlarge",
+   "m5a.12xlarge",
+   "m5a.16xlarge",
+   "m5a.24xlarge",
+   "m5a.2xlarge",
+   "m5a.4xlarge",
+   "m5a.8xlarge",
+   "m5a.xlarge",
+   "m5ad.12xlarge",
+   "m5ad.16xlarge",
+   "m5ad.24xlarge",
+   "m5ad.2xlarge",
+   "m5ad.4xlarge",
+   "m5ad.8xlarge",
+   "m5ad.xlarge",
+   "m5d.12xlarge",
+   "m5d.16xlarge",
+   "m5d.24xlarge",
+   "m5d.2xlarge",
+   "m5d.4xlarge",
+   "m5d.8xlarge",
+   "m5d.xlarge",
+   "m5dn.12xlarge",
+   "m5dn.16xlarge",
+   "m5dn.24xlarge",
+   "m5dn.2xlarge",
+   "m5dn.4xlarge",
+   "m5dn.8xlarge",
+   "m5dn.xlarge",
+   "m5n.12xlarge",
+   "m5n.16xlarge",
+   "m5n.24xlarge",
+   "m5n.2xlarge",
+   "m5n.4xlarge",
+   "m5n.8xlarge",
+   "m5n.xlarge",
+   "m5zn.12xlarge",
+   "m5zn.2xlarge",
+   "m5zn.3xlarge",
+   "m5zn.6xlarge",
+   "m5zn.xlarge",
+   "m6a.12xlarge",
+   "m6a.16xlarge",
+   "m6a.24xlarge",
+   "m6a.2xlarge",
+   "m6a.32xlarge",
+   "m6a.48xlarge",
+   "m6a.4xlarge",
+   "m6a.8xlarge",
+   "m6a.xlarge",
+   "m6g.12xlarge",
+   "m6g.16xlarge",
+   "m6g.2xlarge",
+   "m6g.4xlarge",
+   "m6g.8xlarge",
+   "m6g.xlarge",
+   "m6gd.12xlarge",
+   "m6gd.16xlarge",
+   "m6gd.2xlarge",
+   "m6gd.4xlarge",
+   "m6gd.8xlarge",
+   "m6gd.xlarge",
+   "m6i.12xlarge",
+   "m6i.16xlarge",
+   "m6i.24xlarge",
+   "m6i.2xlarge",
+   "m6i.32xlarge",
+   "m6i.4xlarge",
+   "m6i.8xlarge",
+   "m6i.xlarge",
+   "m6id.12xlarge",
+   "m6id.16xlarge",
+   "m6id.24xlarge",
+   "m6id.2xlarge",
+   "m6id.32xlarge",
+   "m6id.4xlarge",
+   "m6id.8xlarge",
+   "m6id.xlarge",
+   "m6idn.12xlarge",
+   "m6idn.16xlarge",
+   "m6idn.24xlarge",
+   "m6idn.2xlarge",
+   "m6idn.32xlarge",
+   "m6idn.4xlarge",
+   "m6idn.8xlarge",
+   "m6idn.xlarge",
+   "m6in.12xlarge",
+   "m6in.16xlarge",
+   "m6in.24xlarge",
+   "m6in.2xlarge",
+   "m6in.32xlarge",
+   "m6in.4xlarge",
+   "m6in.8xlarge",
+   "m6in.xlarge",
+   "m7a.12xlarge",
+   "m7a.16xlarge",
+   "m7a.24xlarge",
+   "m7a.2xlarge",
+   "m7a.32xlarge",
+   "m7a.48xlarge",
+   "m7a.4xlarge",
+   "m7a.8xlarge",
+   "m7a.xlarge",
+   "m7g.12xlarge",
+   "m7g.16xlarge",
+   "m7g.2xlarge",
+   "m7g.4xlarge",
+   "m7g.8xlarge",
+   "m7g.xlarge",
+   "m7gd.12xlarge",
+   "m7gd.16xlarge",
+   "m7gd.2xlarge",
+   "m7gd.4xlarge",
+   "m7gd.8xlarge",
+   "m7gd.xlarge",
+   "m7i-flex.2xlarge",
+   "m7i-flex.4xlarge",
+   "m7i-flex.8xlarge",
+   "m7i-flex.xlarge",
+   "m7i.12xlarge",
+   "m7i.16xlarge",
+   "m7i.24xlarge",
+   "m7i.2xlarge",
+   "m7i.48xlarge",
+   "m7i.4xlarge",
+   "m7i.8xlarge",
+   "m7i.xlarge",
+   "p2.16xlarge",
+   "p2.8xlarge",
+   "p2.xlarge",
+   "p3.16xlarge",
+   "p3.2xlarge",
+   "p3.8xlarge",
+   "p5.48xlarge",
+   "r3.2xlarge",
+   "r3.4xlarge",
+   "r3.8xlarge",
+   "r3.xlarge",
+   "r4.16xlarge",
+   "r4.2xlarge",
+   "r4.4xlarge",
+   "r4.8xlarge",
+   "r4.xlarge",
+   "r5.12xlarge",
+   "r5.16xlarge",
+   "r5.24xlarge",
+   "r5.2xlarge",
+   "r5.4xlarge",
+   "r5.8xlarge",
+   "r5.xlarge",
+   "r5a.12xlarge",
+   "r5a.16xlarge",
+   "r5a.24xlarge",
+   "r5a.2xlarge",
+   "r5a.4xlarge",
+   "r5a.8xlarge",
+   "r5a.xlarge",
+   "r5ad.12xlarge",
+   "r5ad.16xlarge",
+   "r5ad.24xlarge",
+   "r5ad.2xlarge",
+   "r5ad.4xlarge",
+   "r5ad.8xlarge",
+   "r5ad.xlarge",
+   "r5b.12xlarge",
+   "r5b.16xlarge",
+   "r5b.24xlarge",
+   "r5b.2xlarge",
+   "r5b.4xlarge",
+   "r5b.8xlarge",
+   "r5b.xlarge",
+   "r5d.12xlarge",
+   "r5d.16xlarge",
+   "r5d.24xlarge",
+   "r5d.2xlarge",
+   "r5d.4xlarge",
+   "r5d.8xlarge",
+   "r5d.xlarge",
+   "r5dn.12xlarge",
+   "r5dn.16xlarge",
+   "r5dn.24xlarge",
+   "r5dn.2xlarge",
+   "r5dn.4xlarge",
+   "r5dn.8xlarge",
+   "r5dn.xlarge",
+   "r5n.12xlarge",
+   "r5n.16xlarge",
+   "r5n.24xlarge",
+   "r5n.2xlarge",
+   "r5n.4xlarge",
+   "r5n.8xlarge",
+   "r5n.xlarge",
+   "r6a.12xlarge",
+   "r6a.16xlarge",
+   "r6a.24xlarge",
+   "r6a.2xlarge",
+   "r6a.32xlarge",
+   "r6a.48xlarge",
+   "r6a.4xlarge",
+   "r6a.8xlarge",
+   "r6a.xlarge",
+   "r6g.12xlarge",
+   "r6g.16xlarge",
+   "r6g.2xlarge",
+   "r6g.4xlarge",
+   "r6g.8xlarge",
+   "r6g.xlarge",
+   "r6gd.12xlarge",
+   "r6gd.16xlarge",
+   "r6gd.2xlarge",
+   "r6gd.4xlarge",
+   "r6gd.8xlarge",
+   "r6gd.xlarge",
+   "r6i.12xlarge",
+   "r6i.16xlarge",
+   "r6i.24xlarge",
+   "r6i.2xlarge",
+   "r6i.32xlarge",
+   "r6i.4xlarge",
+   "r6i.8xlarge",
+   "r6i.xlarge",
+   "r6id.12xlarge",
+   "r6id.16xlarge",
+   "r6id.24xlarge",
+   "r6id.2xlarge",
+   "r6id.32xlarge",
+   "r6id.4xlarge",
+   "r6id.8xlarge",
+   "r6id.xlarge",
+   "r6idn.12xlarge",
+   "r6idn.16xlarge",
+   "r6idn.24xlarge",
+   "r6idn.2xlarge",
+   "r6idn.32xlarge",
+   "r6idn.4xlarge",
+   "r6idn.8xlarge",
+   "r6idn.xlarge",
+   "r6in.12xlarge",
+   "r6in.16xlarge",
+   "r6in.24xlarge",
+   "r6in.2xlarge",
+   "r6in.32xlarge",
+   "r6in.4xlarge",
+   "r6in.8xlarge",
+   "r6in.xlarge",
+   "r7a.12xlarge",
+   "r7a.16xlarge",
+   "r7a.24xlarge",
+   "r7a.2xlarge",
+   "r7a.32xlarge",
+   "r7a.48xlarge",
+   "r7a.4xlarge",
+   "r7a.8xlarge",
+   "r7a.xlarge",
+   "r7g.12xlarge",
+   "r7g.16xlarge",
+   "r7g.2xlarge",
+   "r7g.4xlarge",
+   "r7g.8xlarge",
+   "r7g.xlarge",
+   "r7gd.12xlarge",
+   "r7gd.16xlarge",
+   "r7gd.2xlarge",
+   "r7gd.4xlarge",
+   "r7gd.8xlarge",
+   "r7gd.xlarge",
+   "r7i.12xlarge",
+   "r7i.16xlarge",
+   "r7i.24xlarge",
+   "r7i.2xlarge",
+   "r7i.48xlarge",
+   "r7i.4xlarge",
+   "r7i.8xlarge",
+   "r7i.xlarge",
+   "r7iz.12xlarge",
+   "r7iz.16xlarge",
+   "r7iz.2xlarge",
+   "r7iz.32xlarge",
+   "r7iz.4xlarge",
+   "r7iz.8xlarge",
+   "r7iz.xlarge",
+   "t1.micro",
+   "x1.16xlarge",
+   "x1.32xlarge",
+   "x1e.16xlarge",
+   "x1e.2xlarge",
+   "x1e.32xlarge",
+   "x1e.4xlarge",
+   "x1e.8xlarge",
+   "x1e.xlarge",
+   "x2gd.12xlarge",
+   "x2gd.16xlarge",
+   "x2gd.2xlarge",
+   "x2gd.4xlarge",
+   "x2gd.8xlarge",
+   "x2gd.xlarge",
+   "x2idn.16xlarge",
+   "x2idn.24xlarge",
+   "x2idn.32xlarge",
+   "x2iedn.16xlarge",
+   "x2iedn.24xlarge",
+   "x2iedn.2xlarge",
+   "x2iedn.32xlarge",
+   "x2iedn.4xlarge",
+   "x2iedn.8xlarge",
+   "x2iedn.xlarge",
+   "z1d.12xlarge",
+   "z1d.2xlarge",
+   "z1d.3xlarge",
+   "z1d.6xlarge",
+   "z1d.xlarge"
+  ]
+ },
  "ca-central-1": {
   "enum": [
    "c1.medium",
diff --git a/src/cfnlint/data/schemas/extensions/aws_rds_dbcluster/dbclusterinstanceclass_enum.json b/src/cfnlint/data/schemas/extensions/aws_rds_dbcluster/dbclusterinstanceclass_enum.json
index 4518a11f63..2fcd1a868d 100644
--- a/src/cfnlint/data/schemas/extensions/aws_rds_dbcluster/dbclusterinstanceclass_enum.json
+++ b/src/cfnlint/data/schemas/extensions/aws_rds_dbcluster/dbclusterinstanceclass_enum.json
@@ -1293,6 +1293,160 @@
    }
   ]
  },
+ "ap-southeast-5": {
+  "allOf": [
+   {
+    "if": {
+     "properties": {
+      "DBClusterInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "mysql"
+      }
+     },
+     "required": [
+      "Engine",
+      "DBClusterInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBClusterInstanceClass": {
+       "enum": [
+        "db.m6gd.12xlarge",
+        "db.m6gd.16xlarge",
+        "db.m6gd.2xlarge",
+        "db.m6gd.4xlarge",
+        "db.m6gd.8xlarge",
+        "db.m6gd.large",
+        "db.m6gd.xlarge",
+        "db.m6id.12xlarge",
+        "db.m6id.16xlarge",
+        "db.m6id.24xlarge",
+        "db.m6id.2xlarge",
+        "db.m6id.32xlarge",
+        "db.m6id.4xlarge",
+        "db.m6id.8xlarge",
+        "db.m6id.large",
+        "db.m6id.xlarge",
+        "db.r6gd.12xlarge",
+        "db.r6gd.16xlarge",
+        "db.r6gd.2xlarge",
+        "db.r6gd.4xlarge",
+        "db.r6gd.8xlarge",
+        "db.r6gd.large",
+        "db.r6gd.xlarge",
+        "db.r6id.12xlarge",
+        "db.r6id.16xlarge",
+        "db.r6id.24xlarge",
+        "db.r6id.2xlarge",
+        "db.r6id.32xlarge",
+        "db.r6id.4xlarge",
+        "db.r6id.8xlarge",
+        "db.r6id.large",
+        "db.r6id.xlarge"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBClusterInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "mariadb"
+      }
+     },
+     "required": [
+      "Engine",
+      "DBClusterInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBClusterInstanceClass": {
+       "enum": [
+        "db.m6gd.12xlarge",
+        "db.m6gd.16xlarge",
+        "db.m6gd.2xlarge",
+        "db.m6gd.4xlarge",
+        "db.m6gd.8xlarge",
+        "db.m6gd.large",
+        "db.m6gd.xlarge",
+        "db.r6gd.12xlarge",
+        "db.r6gd.16xlarge",
+        "db.r6gd.2xlarge",
+        "db.r6gd.4xlarge",
+        "db.r6gd.8xlarge",
+        "db.r6gd.large",
+        "db.r6gd.xlarge"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBClusterInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "postgres"
+      }
+     },
+     "required": [
+      "Engine",
+      "DBClusterInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBClusterInstanceClass": {
+       "enum": [
+        "db.m6gd.12xlarge",
+        "db.m6gd.16xlarge",
+        "db.m6gd.2xlarge",
+        "db.m6gd.4xlarge",
+        "db.m6gd.8xlarge",
+        "db.m6gd.large",
+        "db.m6gd.xlarge",
+        "db.m6id.12xlarge",
+        "db.m6id.16xlarge",
+        "db.m6id.24xlarge",
+        "db.m6id.2xlarge",
+        "db.m6id.32xlarge",
+        "db.m6id.4xlarge",
+        "db.m6id.8xlarge",
+        "db.m6id.large",
+        "db.m6id.xlarge",
+        "db.r6gd.12xlarge",
+        "db.r6gd.16xlarge",
+        "db.r6gd.2xlarge",
+        "db.r6gd.4xlarge",
+        "db.r6gd.8xlarge",
+        "db.r6gd.large",
+        "db.r6gd.xlarge",
+        "db.r6id.12xlarge",
+        "db.r6id.16xlarge",
+        "db.r6id.24xlarge",
+        "db.r6id.2xlarge",
+        "db.r6id.32xlarge",
+        "db.r6id.4xlarge",
+        "db.r6id.8xlarge",
+        "db.r6id.large",
+        "db.r6id.xlarge"
+       ]
+      }
+     }
+    }
+   }
+  ]
+ },
  "ca-central-1": {
   "allOf": [
    {
diff --git a/src/cfnlint/data/schemas/extensions/aws_rds_dbcluster/engine_version.json b/src/cfnlint/data/schemas/extensions/aws_rds_dbcluster/engine_version.json
index be976f0e71..5fb18003de 100644
--- a/src/cfnlint/data/schemas/extensions/aws_rds_dbcluster/engine_version.json
+++ b/src/cfnlint/data/schemas/extensions/aws_rds_dbcluster/engine_version.json
@@ -60,10 +60,6 @@
        "5.7.mysql_aurora.2.12.1",
        "5.7.mysql_aurora.2.12.2",
        "5.7.mysql_aurora.2.12.3",
-       "8.0.mysql_aurora.3.03.0",
-       "8.0.mysql_aurora.3.03.1",
-       "8.0.mysql_aurora.3.03.2",
-       "8.0.mysql_aurora.3.03.3",
        "8.0.mysql_aurora.3.04.0",
        "8.0.mysql_aurora.3.04.1",
        "8.0.mysql_aurora.3.04.2",
@@ -171,6 +167,7 @@
        "5.7.44",
        "5.7.44-rds.20240408",
        "5.7.44-rds.20240529",
+       "5.7.44-rds.20240808",
        "8.0.32",
        "8.0.33",
        "8.0.34",
@@ -208,6 +205,7 @@
        "11.22",
        "11.22-rds.20240418",
        "11.22-rds.20240509",
+       "11.22-rds.20240808",
        "12.15",
        "12.16",
        "12.17",
diff --git a/src/cfnlint/data/schemas/extensions/aws_rds_dbinstance/dbinstanceclass_enum.json b/src/cfnlint/data/schemas/extensions/aws_rds_dbinstance/dbinstanceclass_enum.json
index bdcf7d28fb..dd4d9129b8 100644
--- a/src/cfnlint/data/schemas/extensions/aws_rds_dbinstance/dbinstanceclass_enum.json
+++ b/src/cfnlint/data/schemas/extensions/aws_rds_dbinstance/dbinstanceclass_enum.json
@@ -34661,6 +34661,2426 @@
    }
   ]
  },
+ "ap-southeast-5": {
+  "allOf": [
+   {
+    "if": {
+     "properties": {
+      "DBInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "mariadb"
+      },
+      "LicenseModel": false
+     },
+     "required": [
+      "Engine",
+      "DBInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBInstanceClass": {
+       "enum": [
+        "db.m6g.12xlarge",
+        "db.m6g.16xlarge",
+        "db.m6g.2xlarge",
+        "db.m6g.4xlarge",
+        "db.m6g.8xlarge",
+        "db.m6g.large",
+        "db.m6g.xlarge",
+        "db.m6gd.12xlarge",
+        "db.m6gd.16xlarge",
+        "db.m6gd.2xlarge",
+        "db.m6gd.4xlarge",
+        "db.m6gd.8xlarge",
+        "db.m6gd.large",
+        "db.m6gd.xlarge",
+        "db.m6i.12xlarge",
+        "db.m6i.16xlarge",
+        "db.m6i.24xlarge",
+        "db.m6i.2xlarge",
+        "db.m6i.32xlarge",
+        "db.m6i.4xlarge",
+        "db.m6i.8xlarge",
+        "db.m6i.large",
+        "db.m6i.xlarge",
+        "db.m6id.12xlarge",
+        "db.m6id.16xlarge",
+        "db.m6id.24xlarge",
+        "db.m6id.2xlarge",
+        "db.m6id.32xlarge",
+        "db.m6id.4xlarge",
+        "db.m6id.8xlarge",
+        "db.m6id.large",
+        "db.m6id.xlarge",
+        "db.m7g.12xlarge",
+        "db.m7g.16xlarge",
+        "db.m7g.2xlarge",
+        "db.m7g.4xlarge",
+        "db.m7g.8xlarge",
+        "db.m7g.large",
+        "db.m7g.xlarge",
+        "db.r6g.12xlarge",
+        "db.r6g.16xlarge",
+        "db.r6g.2xlarge",
+        "db.r6g.4xlarge",
+        "db.r6g.8xlarge",
+        "db.r6g.large",
+        "db.r6g.xlarge",
+        "db.r6gd.12xlarge",
+        "db.r6gd.16xlarge",
+        "db.r6gd.2xlarge",
+        "db.r6gd.4xlarge",
+        "db.r6gd.8xlarge",
+        "db.r6gd.large",
+        "db.r6gd.xlarge",
+        "db.r6i.12xlarge",
+        "db.r6i.16xlarge",
+        "db.r6i.24xlarge",
+        "db.r6i.2xlarge",
+        "db.r6i.32xlarge",
+        "db.r6i.4xlarge",
+        "db.r6i.8xlarge",
+        "db.r6i.large",
+        "db.r6i.xlarge",
+        "db.r6id.12xlarge",
+        "db.r6id.16xlarge",
+        "db.r6id.24xlarge",
+        "db.r6id.2xlarge",
+        "db.r6id.32xlarge",
+        "db.r6id.4xlarge",
+        "db.r6id.8xlarge",
+        "db.r6id.large",
+        "db.r6id.xlarge",
+        "db.r7g.12xlarge",
+        "db.r7g.16xlarge",
+        "db.r7g.2xlarge",
+        "db.r7g.4xlarge",
+        "db.r7g.8xlarge",
+        "db.r7g.large",
+        "db.r7g.xlarge",
+        "db.t3.2xlarge",
+        "db.t3.large",
+        "db.t3.medium",
+        "db.t3.micro",
+        "db.t3.small",
+        "db.t3.xlarge",
+        "db.t4g.2xlarge",
+        "db.t4g.large",
+        "db.t4g.medium",
+        "db.t4g.micro",
+        "db.t4g.small",
+        "db.t4g.xlarge"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "mariadb"
+      },
+      "LicenseModel": {
+       "const": "general-public-license"
+      }
+     },
+     "required": [
+      "Engine",
+      "LicenseModel",
+      "DBInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBInstanceClass": {
+       "enum": [
+        "db.m6g.12xlarge",
+        "db.m6g.16xlarge",
+        "db.m6g.2xlarge",
+        "db.m6g.4xlarge",
+        "db.m6g.8xlarge",
+        "db.m6g.large",
+        "db.m6g.xlarge",
+        "db.m6gd.12xlarge",
+        "db.m6gd.16xlarge",
+        "db.m6gd.2xlarge",
+        "db.m6gd.4xlarge",
+        "db.m6gd.8xlarge",
+        "db.m6gd.large",
+        "db.m6gd.xlarge",
+        "db.m6i.12xlarge",
+        "db.m6i.16xlarge",
+        "db.m6i.24xlarge",
+        "db.m6i.2xlarge",
+        "db.m6i.32xlarge",
+        "db.m6i.4xlarge",
+        "db.m6i.8xlarge",
+        "db.m6i.large",
+        "db.m6i.xlarge",
+        "db.m6id.12xlarge",
+        "db.m6id.16xlarge",
+        "db.m6id.24xlarge",
+        "db.m6id.2xlarge",
+        "db.m6id.32xlarge",
+        "db.m6id.4xlarge",
+        "db.m6id.8xlarge",
+        "db.m6id.large",
+        "db.m6id.xlarge",
+        "db.m7g.12xlarge",
+        "db.m7g.16xlarge",
+        "db.m7g.2xlarge",
+        "db.m7g.4xlarge",
+        "db.m7g.8xlarge",
+        "db.m7g.large",
+        "db.m7g.xlarge",
+        "db.r6g.12xlarge",
+        "db.r6g.16xlarge",
+        "db.r6g.2xlarge",
+        "db.r6g.4xlarge",
+        "db.r6g.8xlarge",
+        "db.r6g.large",
+        "db.r6g.xlarge",
+        "db.r6gd.12xlarge",
+        "db.r6gd.16xlarge",
+        "db.r6gd.2xlarge",
+        "db.r6gd.4xlarge",
+        "db.r6gd.8xlarge",
+        "db.r6gd.large",
+        "db.r6gd.xlarge",
+        "db.r6i.12xlarge",
+        "db.r6i.16xlarge",
+        "db.r6i.24xlarge",
+        "db.r6i.2xlarge",
+        "db.r6i.32xlarge",
+        "db.r6i.4xlarge",
+        "db.r6i.8xlarge",
+        "db.r6i.large",
+        "db.r6i.xlarge",
+        "db.r6id.12xlarge",
+        "db.r6id.16xlarge",
+        "db.r6id.24xlarge",
+        "db.r6id.2xlarge",
+        "db.r6id.32xlarge",
+        "db.r6id.4xlarge",
+        "db.r6id.8xlarge",
+        "db.r6id.large",
+        "db.r6id.xlarge",
+        "db.r7g.12xlarge",
+        "db.r7g.16xlarge",
+        "db.r7g.2xlarge",
+        "db.r7g.4xlarge",
+        "db.r7g.8xlarge",
+        "db.r7g.large",
+        "db.r7g.xlarge",
+        "db.t3.2xlarge",
+        "db.t3.large",
+        "db.t3.medium",
+        "db.t3.micro",
+        "db.t3.small",
+        "db.t3.xlarge",
+        "db.t4g.2xlarge",
+        "db.t4g.large",
+        "db.t4g.medium",
+        "db.t4g.micro",
+        "db.t4g.small",
+        "db.t4g.xlarge"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "postgres"
+      },
+      "LicenseModel": false
+     },
+     "required": [
+      "Engine",
+      "DBInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBInstanceClass": {
+       "enum": [
+        "db.m6g.12xlarge",
+        "db.m6g.16xlarge",
+        "db.m6g.2xlarge",
+        "db.m6g.4xlarge",
+        "db.m6g.8xlarge",
+        "db.m6g.large",
+        "db.m6g.xlarge",
+        "db.m6gd.12xlarge",
+        "db.m6gd.16xlarge",
+        "db.m6gd.2xlarge",
+        "db.m6gd.4xlarge",
+        "db.m6gd.8xlarge",
+        "db.m6gd.large",
+        "db.m6gd.xlarge",
+        "db.m6i.12xlarge",
+        "db.m6i.16xlarge",
+        "db.m6i.24xlarge",
+        "db.m6i.2xlarge",
+        "db.m6i.32xlarge",
+        "db.m6i.4xlarge",
+        "db.m6i.8xlarge",
+        "db.m6i.large",
+        "db.m6i.xlarge",
+        "db.m6id.12xlarge",
+        "db.m6id.16xlarge",
+        "db.m6id.24xlarge",
+        "db.m6id.2xlarge",
+        "db.m6id.32xlarge",
+        "db.m6id.4xlarge",
+        "db.m6id.8xlarge",
+        "db.m6id.large",
+        "db.m6id.xlarge",
+        "db.m7g.12xlarge",
+        "db.m7g.16xlarge",
+        "db.m7g.2xlarge",
+        "db.m7g.4xlarge",
+        "db.m7g.8xlarge",
+        "db.m7g.large",
+        "db.m7g.xlarge",
+        "db.r6g.12xlarge",
+        "db.r6g.16xlarge",
+        "db.r6g.2xlarge",
+        "db.r6g.4xlarge",
+        "db.r6g.8xlarge",
+        "db.r6g.large",
+        "db.r6g.xlarge",
+        "db.r6gd.12xlarge",
+        "db.r6gd.16xlarge",
+        "db.r6gd.2xlarge",
+        "db.r6gd.4xlarge",
+        "db.r6gd.8xlarge",
+        "db.r6gd.large",
+        "db.r6gd.xlarge",
+        "db.r6i.12xlarge",
+        "db.r6i.16xlarge",
+        "db.r6i.24xlarge",
+        "db.r6i.2xlarge",
+        "db.r6i.32xlarge",
+        "db.r6i.4xlarge",
+        "db.r6i.8xlarge",
+        "db.r6i.large",
+        "db.r6i.xlarge",
+        "db.r6id.12xlarge",
+        "db.r6id.16xlarge",
+        "db.r6id.24xlarge",
+        "db.r6id.2xlarge",
+        "db.r6id.32xlarge",
+        "db.r6id.4xlarge",
+        "db.r6id.8xlarge",
+        "db.r6id.large",
+        "db.r6id.xlarge",
+        "db.r7g.12xlarge",
+        "db.r7g.16xlarge",
+        "db.r7g.2xlarge",
+        "db.r7g.4xlarge",
+        "db.r7g.8xlarge",
+        "db.r7g.large",
+        "db.r7g.xlarge",
+        "db.t3.2xlarge",
+        "db.t3.large",
+        "db.t3.medium",
+        "db.t3.micro",
+        "db.t3.small",
+        "db.t3.xlarge",
+        "db.t4g.2xlarge",
+        "db.t4g.large",
+        "db.t4g.medium",
+        "db.t4g.micro",
+        "db.t4g.small",
+        "db.t4g.xlarge"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "postgres"
+      },
+      "LicenseModel": {
+       "const": "general-public-license"
+      }
+     },
+     "required": [
+      "Engine",
+      "LicenseModel",
+      "DBInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBInstanceClass": {
+       "enum": [
+        "db.m6g.12xlarge",
+        "db.m6g.16xlarge",
+        "db.m6g.2xlarge",
+        "db.m6g.4xlarge",
+        "db.m6g.8xlarge",
+        "db.m6g.large",
+        "db.m6g.xlarge",
+        "db.m6gd.12xlarge",
+        "db.m6gd.16xlarge",
+        "db.m6gd.2xlarge",
+        "db.m6gd.4xlarge",
+        "db.m6gd.8xlarge",
+        "db.m6gd.large",
+        "db.m6gd.xlarge",
+        "db.m6i.12xlarge",
+        "db.m6i.16xlarge",
+        "db.m6i.24xlarge",
+        "db.m6i.2xlarge",
+        "db.m6i.32xlarge",
+        "db.m6i.4xlarge",
+        "db.m6i.8xlarge",
+        "db.m6i.large",
+        "db.m6i.xlarge",
+        "db.m6id.12xlarge",
+        "db.m6id.16xlarge",
+        "db.m6id.24xlarge",
+        "db.m6id.2xlarge",
+        "db.m6id.32xlarge",
+        "db.m6id.4xlarge",
+        "db.m6id.8xlarge",
+        "db.m6id.large",
+        "db.m6id.xlarge",
+        "db.m7g.12xlarge",
+        "db.m7g.16xlarge",
+        "db.m7g.2xlarge",
+        "db.m7g.4xlarge",
+        "db.m7g.8xlarge",
+        "db.m7g.large",
+        "db.m7g.xlarge",
+        "db.r6g.12xlarge",
+        "db.r6g.16xlarge",
+        "db.r6g.2xlarge",
+        "db.r6g.4xlarge",
+        "db.r6g.8xlarge",
+        "db.r6g.large",
+        "db.r6g.xlarge",
+        "db.r6gd.12xlarge",
+        "db.r6gd.16xlarge",
+        "db.r6gd.2xlarge",
+        "db.r6gd.4xlarge",
+        "db.r6gd.8xlarge",
+        "db.r6gd.large",
+        "db.r6gd.xlarge",
+        "db.r6i.12xlarge",
+        "db.r6i.16xlarge",
+        "db.r6i.24xlarge",
+        "db.r6i.2xlarge",
+        "db.r6i.32xlarge",
+        "db.r6i.4xlarge",
+        "db.r6i.8xlarge",
+        "db.r6i.large",
+        "db.r6i.xlarge",
+        "db.r6id.12xlarge",
+        "db.r6id.16xlarge",
+        "db.r6id.24xlarge",
+        "db.r6id.2xlarge",
+        "db.r6id.32xlarge",
+        "db.r6id.4xlarge",
+        "db.r6id.8xlarge",
+        "db.r6id.large",
+        "db.r6id.xlarge",
+        "db.r7g.12xlarge",
+        "db.r7g.16xlarge",
+        "db.r7g.2xlarge",
+        "db.r7g.4xlarge",
+        "db.r7g.8xlarge",
+        "db.r7g.large",
+        "db.r7g.xlarge",
+        "db.t3.2xlarge",
+        "db.t3.large",
+        "db.t3.medium",
+        "db.t3.micro",
+        "db.t3.small",
+        "db.t3.xlarge",
+        "db.t4g.2xlarge",
+        "db.t4g.large",
+        "db.t4g.medium",
+        "db.t4g.micro",
+        "db.t4g.small",
+        "db.t4g.xlarge"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "mysql"
+      },
+      "LicenseModel": false
+     },
+     "required": [
+      "Engine",
+      "DBInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBInstanceClass": {
+       "enum": [
+        "db.m6g.12xlarge",
+        "db.m6g.16xlarge",
+        "db.m6g.2xlarge",
+        "db.m6g.4xlarge",
+        "db.m6g.8xlarge",
+        "db.m6g.large",
+        "db.m6g.xlarge",
+        "db.m6gd.12xlarge",
+        "db.m6gd.16xlarge",
+        "db.m6gd.2xlarge",
+        "db.m6gd.4xlarge",
+        "db.m6gd.8xlarge",
+        "db.m6gd.large",
+        "db.m6gd.xlarge",
+        "db.m6i.12xlarge",
+        "db.m6i.16xlarge",
+        "db.m6i.24xlarge",
+        "db.m6i.2xlarge",
+        "db.m6i.32xlarge",
+        "db.m6i.4xlarge",
+        "db.m6i.8xlarge",
+        "db.m6i.large",
+        "db.m6i.xlarge",
+        "db.m6id.12xlarge",
+        "db.m6id.16xlarge",
+        "db.m6id.24xlarge",
+        "db.m6id.2xlarge",
+        "db.m6id.32xlarge",
+        "db.m6id.4xlarge",
+        "db.m6id.8xlarge",
+        "db.m6id.large",
+        "db.m6id.xlarge",
+        "db.m7g.12xlarge",
+        "db.m7g.16xlarge",
+        "db.m7g.2xlarge",
+        "db.m7g.4xlarge",
+        "db.m7g.8xlarge",
+        "db.m7g.large",
+        "db.m7g.xlarge",
+        "db.r6g.12xlarge",
+        "db.r6g.16xlarge",
+        "db.r6g.2xlarge",
+        "db.r6g.4xlarge",
+        "db.r6g.8xlarge",
+        "db.r6g.large",
+        "db.r6g.xlarge",
+        "db.r6gd.12xlarge",
+        "db.r6gd.16xlarge",
+        "db.r6gd.2xlarge",
+        "db.r6gd.4xlarge",
+        "db.r6gd.8xlarge",
+        "db.r6gd.large",
+        "db.r6gd.xlarge",
+        "db.r6i.12xlarge",
+        "db.r6i.16xlarge",
+        "db.r6i.24xlarge",
+        "db.r6i.2xlarge",
+        "db.r6i.32xlarge",
+        "db.r6i.4xlarge",
+        "db.r6i.8xlarge",
+        "db.r6i.large",
+        "db.r6i.xlarge",
+        "db.r6id.12xlarge",
+        "db.r6id.16xlarge",
+        "db.r6id.24xlarge",
+        "db.r6id.2xlarge",
+        "db.r6id.32xlarge",
+        "db.r6id.4xlarge",
+        "db.r6id.8xlarge",
+        "db.r6id.large",
+        "db.r6id.xlarge",
+        "db.r7g.12xlarge",
+        "db.r7g.16xlarge",
+        "db.r7g.2xlarge",
+        "db.r7g.4xlarge",
+        "db.r7g.8xlarge",
+        "db.r7g.large",
+        "db.r7g.xlarge",
+        "db.t3.2xlarge",
+        "db.t3.large",
+        "db.t3.medium",
+        "db.t3.micro",
+        "db.t3.small",
+        "db.t3.xlarge",
+        "db.t4g.2xlarge",
+        "db.t4g.large",
+        "db.t4g.medium",
+        "db.t4g.micro",
+        "db.t4g.small",
+        "db.t4g.xlarge"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "mysql"
+      },
+      "LicenseModel": {
+       "const": "general-public-license"
+      }
+     },
+     "required": [
+      "Engine",
+      "LicenseModel",
+      "DBInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBInstanceClass": {
+       "enum": [
+        "db.m6g.12xlarge",
+        "db.m6g.16xlarge",
+        "db.m6g.2xlarge",
+        "db.m6g.4xlarge",
+        "db.m6g.8xlarge",
+        "db.m6g.large",
+        "db.m6g.xlarge",
+        "db.m6gd.12xlarge",
+        "db.m6gd.16xlarge",
+        "db.m6gd.2xlarge",
+        "db.m6gd.4xlarge",
+        "db.m6gd.8xlarge",
+        "db.m6gd.large",
+        "db.m6gd.xlarge",
+        "db.m6i.12xlarge",
+        "db.m6i.16xlarge",
+        "db.m6i.24xlarge",
+        "db.m6i.2xlarge",
+        "db.m6i.32xlarge",
+        "db.m6i.4xlarge",
+        "db.m6i.8xlarge",
+        "db.m6i.large",
+        "db.m6i.xlarge",
+        "db.m6id.12xlarge",
+        "db.m6id.16xlarge",
+        "db.m6id.24xlarge",
+        "db.m6id.2xlarge",
+        "db.m6id.32xlarge",
+        "db.m6id.4xlarge",
+        "db.m6id.8xlarge",
+        "db.m6id.large",
+        "db.m6id.xlarge",
+        "db.m7g.12xlarge",
+        "db.m7g.16xlarge",
+        "db.m7g.2xlarge",
+        "db.m7g.4xlarge",
+        "db.m7g.8xlarge",
+        "db.m7g.large",
+        "db.m7g.xlarge",
+        "db.r6g.12xlarge",
+        "db.r6g.16xlarge",
+        "db.r6g.2xlarge",
+        "db.r6g.4xlarge",
+        "db.r6g.8xlarge",
+        "db.r6g.large",
+        "db.r6g.xlarge",
+        "db.r6gd.12xlarge",
+        "db.r6gd.16xlarge",
+        "db.r6gd.2xlarge",
+        "db.r6gd.4xlarge",
+        "db.r6gd.8xlarge",
+        "db.r6gd.large",
+        "db.r6gd.xlarge",
+        "db.r6i.12xlarge",
+        "db.r6i.16xlarge",
+        "db.r6i.24xlarge",
+        "db.r6i.2xlarge",
+        "db.r6i.32xlarge",
+        "db.r6i.4xlarge",
+        "db.r6i.8xlarge",
+        "db.r6i.large",
+        "db.r6i.xlarge",
+        "db.r6id.12xlarge",
+        "db.r6id.16xlarge",
+        "db.r6id.24xlarge",
+        "db.r6id.2xlarge",
+        "db.r6id.32xlarge",
+        "db.r6id.4xlarge",
+        "db.r6id.8xlarge",
+        "db.r6id.large",
+        "db.r6id.xlarge",
+        "db.r7g.12xlarge",
+        "db.r7g.16xlarge",
+        "db.r7g.2xlarge",
+        "db.r7g.4xlarge",
+        "db.r7g.8xlarge",
+        "db.r7g.large",
+        "db.r7g.xlarge",
+        "db.t3.2xlarge",
+        "db.t3.large",
+        "db.t3.medium",
+        "db.t3.micro",
+        "db.t3.small",
+        "db.t3.xlarge",
+        "db.t4g.2xlarge",
+        "db.t4g.large",
+        "db.t4g.medium",
+        "db.t4g.micro",
+        "db.t4g.small",
+        "db.t4g.xlarge"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "sqlserver-ee"
+      },
+      "LicenseModel": {
+       "const": "license-included"
+      }
+     },
+     "required": [
+      "Engine",
+      "LicenseModel",
+      "DBInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBInstanceClass": {
+       "enum": [
+        "db.m6i.12xlarge",
+        "db.m6i.16xlarge",
+        "db.m6i.24xlarge",
+        "db.m6i.2xlarge",
+        "db.m6i.32xlarge",
+        "db.m6i.4xlarge",
+        "db.m6i.8xlarge",
+        "db.m6i.xlarge",
+        "db.r6i.12xlarge",
+        "db.r6i.16xlarge",
+        "db.r6i.24xlarge",
+        "db.r6i.2xlarge",
+        "db.r6i.32xlarge",
+        "db.r6i.4xlarge",
+        "db.r6i.8xlarge",
+        "db.r6i.xlarge",
+        "db.t3.2xlarge",
+        "db.t3.xlarge"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "sqlserver-se"
+      },
+      "LicenseModel": {
+       "const": "license-included"
+      }
+     },
+     "required": [
+      "Engine",
+      "LicenseModel",
+      "DBInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBInstanceClass": {
+       "enum": [
+        "db.m6i.2xlarge",
+        "db.m6i.4xlarge",
+        "db.m6i.8xlarge",
+        "db.m6i.large",
+        "db.m6i.xlarge",
+        "db.r6i.2xlarge",
+        "db.r6i.4xlarge",
+        "db.r6i.8xlarge",
+        "db.r6i.large",
+        "db.r6i.xlarge",
+        "db.t3.2xlarge",
+        "db.t3.large",
+        "db.t3.xlarge"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "oracle-se2"
+      },
+      "LicenseModel": {
+       "const": "bring-your-own-license"
+      }
+     },
+     "required": [
+      "Engine",
+      "LicenseModel",
+      "DBInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBInstanceClass": {
+       "enum": [
+        "db.m6i.12xlarge",
+        "db.m6i.16xlarge",
+        "db.m6i.24xlarge",
+        "db.m6i.2xlarge",
+        "db.m6i.32xlarge",
+        "db.m6i.4xlarge",
+        "db.m6i.8xlarge",
+        "db.m6i.large",
+        "db.m6i.xlarge",
+        "db.r6i.12xlarge",
+        "db.r6i.16xlarge",
+        "db.r6i.24xlarge",
+        "db.r6i.2xlarge",
+        "db.r6i.2xlarge.tpc1.mem2x",
+        "db.r6i.2xlarge.tpc2.mem4x",
+        "db.r6i.2xlarge.tpc2.mem8x",
+        "db.r6i.32xlarge",
+        "db.r6i.4xlarge",
+        "db.r6i.4xlarge.tpc2.mem2x",
+        "db.r6i.4xlarge.tpc2.mem3x",
+        "db.r6i.4xlarge.tpc2.mem4x",
+        "db.r6i.8xlarge",
+        "db.r6i.large",
+        "db.r6i.large.tpc1.mem2x",
+        "db.r6i.xlarge",
+        "db.r6i.xlarge.tpc2.mem2x",
+        "db.r6i.xlarge.tpc2.mem4x",
+        "db.t3.2xlarge",
+        "db.t3.large",
+        "db.t3.medium",
+        "db.t3.small",
+        "db.t3.xlarge"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "oracle-se1"
+      },
+      "LicenseModel": {
+       "const": "bring-your-own-license"
+      }
+     },
+     "required": [
+      "Engine",
+      "LicenseModel",
+      "DBInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBInstanceClass": {
+       "enum": [
+        "db.t3.2xlarge",
+        "db.t3.large",
+        "db.t3.medium",
+        "db.t3.small",
+        "db.t3.xlarge"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "oracle-ee"
+      },
+      "LicenseModel": {
+       "const": "bring-your-own-license"
+      }
+     },
+     "required": [
+      "Engine",
+      "LicenseModel",
+      "DBInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBInstanceClass": {
+       "enum": [
+        "db.m6i.12xlarge",
+        "db.m6i.16xlarge",
+        "db.m6i.24xlarge",
+        "db.m6i.2xlarge",
+        "db.m6i.32xlarge",
+        "db.m6i.4xlarge",
+        "db.m6i.8xlarge",
+        "db.m6i.large",
+        "db.m6i.xlarge",
+        "db.r6i.12xlarge",
+        "db.r6i.12xlarge.tpc2.mem2x",
+        "db.r6i.16xlarge",
+        "db.r6i.24xlarge",
+        "db.r6i.2xlarge",
+        "db.r6i.2xlarge.tpc1.mem2x",
+        "db.r6i.2xlarge.tpc2.mem4x",
+        "db.r6i.2xlarge.tpc2.mem8x",
+        "db.r6i.32xlarge",
+        "db.r6i.4xlarge",
+        "db.r6i.4xlarge.tpc2.mem2x",
+        "db.r6i.4xlarge.tpc2.mem3x",
+        "db.r6i.4xlarge.tpc2.mem4x",
+        "db.r6i.4xlarge.tpc2.mem8x",
+        "db.r6i.6xlarge.tpc2.mem4x",
+        "db.r6i.8xlarge",
+        "db.r6i.8xlarge.tpc2.mem3x",
+        "db.r6i.8xlarge.tpc2.mem4x",
+        "db.r6i.large",
+        "db.r6i.large.tpc1.mem2x",
+        "db.r6i.xlarge",
+        "db.r6i.xlarge.tpc2.mem2x",
+        "db.r6i.xlarge.tpc2.mem4x",
+        "db.t3.2xlarge",
+        "db.t3.large",
+        "db.t3.medium",
+        "db.t3.small",
+        "db.t3.xlarge"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "oracle-se"
+      },
+      "LicenseModel": {
+       "const": "bring-your-own-license"
+      }
+     },
+     "required": [
+      "Engine",
+      "LicenseModel",
+      "DBInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBInstanceClass": {
+       "enum": [
+        "db.t3.2xlarge",
+        "db.t3.large",
+        "db.t3.medium",
+        "db.t3.small",
+        "db.t3.xlarge"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "mysql"
+      },
+      "LicenseModel": false
+     },
+     "required": [
+      "Engine",
+      "DBInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBInstanceClass": {
+       "enum": [
+        "db.m6g.12xlarge",
+        "db.m6g.16xlarge",
+        "db.m6g.2xlarge",
+        "db.m6g.4xlarge",
+        "db.m6g.8xlarge",
+        "db.m6g.large",
+        "db.m6g.xlarge",
+        "db.m6gd.12xlarge",
+        "db.m6gd.16xlarge",
+        "db.m6gd.2xlarge",
+        "db.m6gd.4xlarge",
+        "db.m6gd.8xlarge",
+        "db.m6gd.large",
+        "db.m6gd.xlarge",
+        "db.m6i.12xlarge",
+        "db.m6i.16xlarge",
+        "db.m6i.24xlarge",
+        "db.m6i.2xlarge",
+        "db.m6i.32xlarge",
+        "db.m6i.4xlarge",
+        "db.m6i.8xlarge",
+        "db.m6i.large",
+        "db.m6i.xlarge",
+        "db.m6id.12xlarge",
+        "db.m6id.16xlarge",
+        "db.m6id.24xlarge",
+        "db.m6id.2xlarge",
+        "db.m6id.32xlarge",
+        "db.m6id.4xlarge",
+        "db.m6id.8xlarge",
+        "db.m6id.large",
+        "db.m6id.xlarge",
+        "db.m7g.12xlarge",
+        "db.m7g.16xlarge",
+        "db.m7g.2xlarge",
+        "db.m7g.4xlarge",
+        "db.m7g.8xlarge",
+        "db.m7g.large",
+        "db.m7g.xlarge",
+        "db.r6g.12xlarge",
+        "db.r6g.16xlarge",
+        "db.r6g.2xlarge",
+        "db.r6g.4xlarge",
+        "db.r6g.8xlarge",
+        "db.r6g.large",
+        "db.r6g.xlarge",
+        "db.r6gd.12xlarge",
+        "db.r6gd.16xlarge",
+        "db.r6gd.2xlarge",
+        "db.r6gd.4xlarge",
+        "db.r6gd.8xlarge",
+        "db.r6gd.large",
+        "db.r6gd.xlarge",
+        "db.r6i.12xlarge",
+        "db.r6i.16xlarge",
+        "db.r6i.24xlarge",
+        "db.r6i.2xlarge",
+        "db.r6i.32xlarge",
+        "db.r6i.4xlarge",
+        "db.r6i.8xlarge",
+        "db.r6i.large",
+        "db.r6i.xlarge",
+        "db.r6id.12xlarge",
+        "db.r6id.16xlarge",
+        "db.r6id.24xlarge",
+        "db.r6id.2xlarge",
+        "db.r6id.32xlarge",
+        "db.r6id.4xlarge",
+        "db.r6id.8xlarge",
+        "db.r6id.large",
+        "db.r6id.xlarge",
+        "db.r7g.12xlarge",
+        "db.r7g.16xlarge",
+        "db.r7g.2xlarge",
+        "db.r7g.4xlarge",
+        "db.r7g.8xlarge",
+        "db.r7g.large",
+        "db.r7g.xlarge",
+        "db.t3.2xlarge",
+        "db.t3.large",
+        "db.t3.medium",
+        "db.t3.micro",
+        "db.t3.small",
+        "db.t3.xlarge",
+        "db.t4g.2xlarge",
+        "db.t4g.large",
+        "db.t4g.medium",
+        "db.t4g.micro",
+        "db.t4g.small",
+        "db.t4g.xlarge"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "mysql"
+      },
+      "LicenseModel": {
+       "const": "general-public-license"
+      }
+     },
+     "required": [
+      "Engine",
+      "LicenseModel",
+      "DBInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBInstanceClass": {
+       "enum": [
+        "db.m6g.12xlarge",
+        "db.m6g.16xlarge",
+        "db.m6g.2xlarge",
+        "db.m6g.4xlarge",
+        "db.m6g.8xlarge",
+        "db.m6g.large",
+        "db.m6g.xlarge",
+        "db.m6gd.12xlarge",
+        "db.m6gd.16xlarge",
+        "db.m6gd.2xlarge",
+        "db.m6gd.4xlarge",
+        "db.m6gd.8xlarge",
+        "db.m6gd.large",
+        "db.m6gd.xlarge",
+        "db.m6i.12xlarge",
+        "db.m6i.16xlarge",
+        "db.m6i.24xlarge",
+        "db.m6i.2xlarge",
+        "db.m6i.32xlarge",
+        "db.m6i.4xlarge",
+        "db.m6i.8xlarge",
+        "db.m6i.large",
+        "db.m6i.xlarge",
+        "db.m6id.12xlarge",
+        "db.m6id.16xlarge",
+        "db.m6id.24xlarge",
+        "db.m6id.2xlarge",
+        "db.m6id.32xlarge",
+        "db.m6id.4xlarge",
+        "db.m6id.8xlarge",
+        "db.m6id.large",
+        "db.m6id.xlarge",
+        "db.m7g.12xlarge",
+        "db.m7g.16xlarge",
+        "db.m7g.2xlarge",
+        "db.m7g.4xlarge",
+        "db.m7g.8xlarge",
+        "db.m7g.large",
+        "db.m7g.xlarge",
+        "db.r6g.12xlarge",
+        "db.r6g.16xlarge",
+        "db.r6g.2xlarge",
+        "db.r6g.4xlarge",
+        "db.r6g.8xlarge",
+        "db.r6g.large",
+        "db.r6g.xlarge",
+        "db.r6gd.12xlarge",
+        "db.r6gd.16xlarge",
+        "db.r6gd.2xlarge",
+        "db.r6gd.4xlarge",
+        "db.r6gd.8xlarge",
+        "db.r6gd.large",
+        "db.r6gd.xlarge",
+        "db.r6i.12xlarge",
+        "db.r6i.16xlarge",
+        "db.r6i.24xlarge",
+        "db.r6i.2xlarge",
+        "db.r6i.32xlarge",
+        "db.r6i.4xlarge",
+        "db.r6i.8xlarge",
+        "db.r6i.large",
+        "db.r6i.xlarge",
+        "db.r6id.12xlarge",
+        "db.r6id.16xlarge",
+        "db.r6id.24xlarge",
+        "db.r6id.2xlarge",
+        "db.r6id.32xlarge",
+        "db.r6id.4xlarge",
+        "db.r6id.8xlarge",
+        "db.r6id.large",
+        "db.r6id.xlarge",
+        "db.r7g.12xlarge",
+        "db.r7g.16xlarge",
+        "db.r7g.2xlarge",
+        "db.r7g.4xlarge",
+        "db.r7g.8xlarge",
+        "db.r7g.large",
+        "db.r7g.xlarge",
+        "db.t3.2xlarge",
+        "db.t3.large",
+        "db.t3.medium",
+        "db.t3.micro",
+        "db.t3.small",
+        "db.t3.xlarge",
+        "db.t4g.2xlarge",
+        "db.t4g.large",
+        "db.t4g.medium",
+        "db.t4g.micro",
+        "db.t4g.small",
+        "db.t4g.xlarge"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "aurora-mysql"
+      },
+      "LicenseModel": false
+     },
+     "required": [
+      "Engine",
+      "DBInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBInstanceClass": {
+       "enum": [
+        "db.r6g.12xlarge",
+        "db.r6g.16xlarge",
+        "db.r6g.2xlarge",
+        "db.r6g.4xlarge",
+        "db.r6g.8xlarge",
+        "db.r6g.large",
+        "db.r6g.xlarge",
+        "db.r6gd.12xlarge",
+        "db.r6gd.16xlarge",
+        "db.r6gd.2xlarge",
+        "db.r6gd.4xlarge",
+        "db.r6gd.8xlarge",
+        "db.r6gd.xlarge",
+        "db.r6i.12xlarge",
+        "db.r6i.16xlarge",
+        "db.r6i.24xlarge",
+        "db.r6i.2xlarge",
+        "db.r6i.32xlarge",
+        "db.r6i.4xlarge",
+        "db.r6i.8xlarge",
+        "db.r6i.large",
+        "db.r6i.xlarge",
+        "db.r6id.24xlarge",
+        "db.r6id.32xlarge",
+        "db.r7g.12xlarge",
+        "db.r7g.16xlarge",
+        "db.r7g.2xlarge",
+        "db.r7g.4xlarge",
+        "db.r7g.8xlarge",
+        "db.r7g.large",
+        "db.r7g.xlarge",
+        "db.serverless",
+        "db.t3.large",
+        "db.t3.medium",
+        "db.t3.small",
+        "db.t4g.large",
+        "db.t4g.medium"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "aurora-mysql"
+      },
+      "LicenseModel": {
+       "const": "general-public-license"
+      }
+     },
+     "required": [
+      "Engine",
+      "LicenseModel",
+      "DBInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBInstanceClass": {
+       "enum": [
+        "db.r6g.12xlarge",
+        "db.r6g.16xlarge",
+        "db.r6g.2xlarge",
+        "db.r6g.4xlarge",
+        "db.r6g.8xlarge",
+        "db.r6g.large",
+        "db.r6g.xlarge",
+        "db.r6gd.12xlarge",
+        "db.r6gd.16xlarge",
+        "db.r6gd.2xlarge",
+        "db.r6gd.4xlarge",
+        "db.r6gd.8xlarge",
+        "db.r6gd.xlarge",
+        "db.r6i.12xlarge",
+        "db.r6i.16xlarge",
+        "db.r6i.24xlarge",
+        "db.r6i.2xlarge",
+        "db.r6i.32xlarge",
+        "db.r6i.4xlarge",
+        "db.r6i.8xlarge",
+        "db.r6i.large",
+        "db.r6i.xlarge",
+        "db.r6id.24xlarge",
+        "db.r6id.32xlarge",
+        "db.r7g.12xlarge",
+        "db.r7g.16xlarge",
+        "db.r7g.2xlarge",
+        "db.r7g.4xlarge",
+        "db.r7g.8xlarge",
+        "db.r7g.large",
+        "db.r7g.xlarge",
+        "db.serverless",
+        "db.t3.large",
+        "db.t3.medium",
+        "db.t3.small",
+        "db.t4g.large",
+        "db.t4g.medium"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "aurora"
+      },
+      "LicenseModel": false
+     },
+     "required": [
+      "Engine",
+      "DBInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBInstanceClass": {
+       "enum": [
+        "db.r6g.12xlarge",
+        "db.r6g.16xlarge",
+        "db.r6g.2xlarge",
+        "db.r6g.4xlarge",
+        "db.r6g.8xlarge",
+        "db.r6g.large",
+        "db.r6g.xlarge",
+        "db.r6gd.12xlarge",
+        "db.r6gd.16xlarge",
+        "db.r6gd.2xlarge",
+        "db.r6gd.4xlarge",
+        "db.r6gd.8xlarge",
+        "db.r6gd.xlarge",
+        "db.r6i.12xlarge",
+        "db.r6i.16xlarge",
+        "db.r6i.24xlarge",
+        "db.r6i.2xlarge",
+        "db.r6i.32xlarge",
+        "db.r6i.4xlarge",
+        "db.r6i.8xlarge",
+        "db.r6i.large",
+        "db.r6i.xlarge",
+        "db.r6id.24xlarge",
+        "db.r6id.32xlarge",
+        "db.r7g.12xlarge",
+        "db.r7g.16xlarge",
+        "db.r7g.2xlarge",
+        "db.r7g.4xlarge",
+        "db.r7g.8xlarge",
+        "db.r7g.large",
+        "db.r7g.xlarge",
+        "db.t3.large",
+        "db.t3.medium",
+        "db.t3.small",
+        "db.t4g.large",
+        "db.t4g.medium"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "aurora"
+      },
+      "LicenseModel": {
+       "const": "general-public-license"
+      }
+     },
+     "required": [
+      "Engine",
+      "LicenseModel",
+      "DBInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBInstanceClass": {
+       "enum": [
+        "db.r6g.12xlarge",
+        "db.r6g.16xlarge",
+        "db.r6g.2xlarge",
+        "db.r6g.4xlarge",
+        "db.r6g.8xlarge",
+        "db.r6g.large",
+        "db.r6g.xlarge",
+        "db.r6gd.12xlarge",
+        "db.r6gd.16xlarge",
+        "db.r6gd.2xlarge",
+        "db.r6gd.4xlarge",
+        "db.r6gd.8xlarge",
+        "db.r6gd.xlarge",
+        "db.r6i.12xlarge",
+        "db.r6i.16xlarge",
+        "db.r6i.24xlarge",
+        "db.r6i.2xlarge",
+        "db.r6i.32xlarge",
+        "db.r6i.4xlarge",
+        "db.r6i.8xlarge",
+        "db.r6i.large",
+        "db.r6i.xlarge",
+        "db.r6id.24xlarge",
+        "db.r6id.32xlarge",
+        "db.r7g.12xlarge",
+        "db.r7g.16xlarge",
+        "db.r7g.2xlarge",
+        "db.r7g.4xlarge",
+        "db.r7g.8xlarge",
+        "db.r7g.large",
+        "db.r7g.xlarge",
+        "db.t3.large",
+        "db.t3.medium",
+        "db.t3.small",
+        "db.t4g.large",
+        "db.t4g.medium"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "aurora-postgresql"
+      },
+      "LicenseModel": false
+     },
+     "required": [
+      "Engine",
+      "DBInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBInstanceClass": {
+       "enum": [
+        "db.r6g.12xlarge",
+        "db.r6g.16xlarge",
+        "db.r6g.2xlarge",
+        "db.r6g.4xlarge",
+        "db.r6g.8xlarge",
+        "db.r6g.large",
+        "db.r6g.xlarge",
+        "db.r6gd.12xlarge",
+        "db.r6gd.16xlarge",
+        "db.r6gd.2xlarge",
+        "db.r6gd.4xlarge",
+        "db.r6gd.8xlarge",
+        "db.r6gd.xlarge",
+        "db.r6i.12xlarge",
+        "db.r6i.16xlarge",
+        "db.r6i.24xlarge",
+        "db.r6i.2xlarge",
+        "db.r6i.32xlarge",
+        "db.r6i.4xlarge",
+        "db.r6i.8xlarge",
+        "db.r6i.large",
+        "db.r6i.xlarge",
+        "db.r6id.24xlarge",
+        "db.r6id.32xlarge",
+        "db.r7g.12xlarge",
+        "db.r7g.16xlarge",
+        "db.r7g.2xlarge",
+        "db.r7g.4xlarge",
+        "db.r7g.8xlarge",
+        "db.r7g.large",
+        "db.r7g.xlarge",
+        "db.serverless",
+        "db.t3.large",
+        "db.t3.medium",
+        "db.t4g.large",
+        "db.t4g.medium"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "aurora-postgresql"
+      },
+      "LicenseModel": {
+       "const": "general-public-license"
+      }
+     },
+     "required": [
+      "Engine",
+      "LicenseModel",
+      "DBInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBInstanceClass": {
+       "enum": [
+        "db.r6g.12xlarge",
+        "db.r6g.16xlarge",
+        "db.r6g.2xlarge",
+        "db.r6g.4xlarge",
+        "db.r6g.8xlarge",
+        "db.r6g.large",
+        "db.r6g.xlarge",
+        "db.r6gd.12xlarge",
+        "db.r6gd.16xlarge",
+        "db.r6gd.2xlarge",
+        "db.r6gd.4xlarge",
+        "db.r6gd.8xlarge",
+        "db.r6gd.xlarge",
+        "db.r6i.12xlarge",
+        "db.r6i.16xlarge",
+        "db.r6i.24xlarge",
+        "db.r6i.2xlarge",
+        "db.r6i.32xlarge",
+        "db.r6i.4xlarge",
+        "db.r6i.8xlarge",
+        "db.r6i.large",
+        "db.r6i.xlarge",
+        "db.r6id.24xlarge",
+        "db.r6id.32xlarge",
+        "db.r7g.12xlarge",
+        "db.r7g.16xlarge",
+        "db.r7g.2xlarge",
+        "db.r7g.4xlarge",
+        "db.r7g.8xlarge",
+        "db.r7g.large",
+        "db.r7g.xlarge",
+        "db.serverless",
+        "db.t3.large",
+        "db.t3.medium",
+        "db.t4g.large",
+        "db.t4g.medium"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "mariadb"
+      },
+      "LicenseModel": false
+     },
+     "required": [
+      "Engine",
+      "DBInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBInstanceClass": {
+       "enum": [
+        "db.m6g.12xlarge",
+        "db.m6g.16xlarge",
+        "db.m6g.2xlarge",
+        "db.m6g.4xlarge",
+        "db.m6g.8xlarge",
+        "db.m6g.large",
+        "db.m6g.xlarge",
+        "db.m6gd.12xlarge",
+        "db.m6gd.16xlarge",
+        "db.m6gd.2xlarge",
+        "db.m6gd.4xlarge",
+        "db.m6gd.8xlarge",
+        "db.m6gd.large",
+        "db.m6gd.xlarge",
+        "db.m6i.12xlarge",
+        "db.m6i.16xlarge",
+        "db.m6i.24xlarge",
+        "db.m6i.2xlarge",
+        "db.m6i.32xlarge",
+        "db.m6i.4xlarge",
+        "db.m6i.8xlarge",
+        "db.m6i.large",
+        "db.m6i.xlarge",
+        "db.m6id.12xlarge",
+        "db.m6id.16xlarge",
+        "db.m6id.24xlarge",
+        "db.m6id.2xlarge",
+        "db.m6id.32xlarge",
+        "db.m6id.4xlarge",
+        "db.m6id.8xlarge",
+        "db.m6id.large",
+        "db.m6id.xlarge",
+        "db.m7g.12xlarge",
+        "db.m7g.16xlarge",
+        "db.m7g.2xlarge",
+        "db.m7g.4xlarge",
+        "db.m7g.8xlarge",
+        "db.m7g.large",
+        "db.m7g.xlarge",
+        "db.r6g.12xlarge",
+        "db.r6g.16xlarge",
+        "db.r6g.2xlarge",
+        "db.r6g.4xlarge",
+        "db.r6g.8xlarge",
+        "db.r6g.large",
+        "db.r6g.xlarge",
+        "db.r6gd.12xlarge",
+        "db.r6gd.16xlarge",
+        "db.r6gd.2xlarge",
+        "db.r6gd.4xlarge",
+        "db.r6gd.8xlarge",
+        "db.r6gd.large",
+        "db.r6gd.xlarge",
+        "db.r6i.12xlarge",
+        "db.r6i.16xlarge",
+        "db.r6i.24xlarge",
+        "db.r6i.2xlarge",
+        "db.r6i.32xlarge",
+        "db.r6i.4xlarge",
+        "db.r6i.8xlarge",
+        "db.r6i.large",
+        "db.r6i.xlarge",
+        "db.r6id.12xlarge",
+        "db.r6id.16xlarge",
+        "db.r6id.24xlarge",
+        "db.r6id.2xlarge",
+        "db.r6id.32xlarge",
+        "db.r6id.4xlarge",
+        "db.r6id.8xlarge",
+        "db.r6id.large",
+        "db.r6id.xlarge",
+        "db.r7g.12xlarge",
+        "db.r7g.16xlarge",
+        "db.r7g.2xlarge",
+        "db.r7g.4xlarge",
+        "db.r7g.8xlarge",
+        "db.r7g.large",
+        "db.r7g.xlarge",
+        "db.t3.2xlarge",
+        "db.t3.large",
+        "db.t3.medium",
+        "db.t3.micro",
+        "db.t3.small",
+        "db.t3.xlarge",
+        "db.t4g.2xlarge",
+        "db.t4g.large",
+        "db.t4g.medium",
+        "db.t4g.micro",
+        "db.t4g.small",
+        "db.t4g.xlarge"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "mariadb"
+      },
+      "LicenseModel": {
+       "const": "general-public-license"
+      }
+     },
+     "required": [
+      "Engine",
+      "LicenseModel",
+      "DBInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBInstanceClass": {
+       "enum": [
+        "db.m6g.12xlarge",
+        "db.m6g.16xlarge",
+        "db.m6g.2xlarge",
+        "db.m6g.4xlarge",
+        "db.m6g.8xlarge",
+        "db.m6g.large",
+        "db.m6g.xlarge",
+        "db.m6gd.12xlarge",
+        "db.m6gd.16xlarge",
+        "db.m6gd.2xlarge",
+        "db.m6gd.4xlarge",
+        "db.m6gd.8xlarge",
+        "db.m6gd.large",
+        "db.m6gd.xlarge",
+        "db.m6i.12xlarge",
+        "db.m6i.16xlarge",
+        "db.m6i.24xlarge",
+        "db.m6i.2xlarge",
+        "db.m6i.32xlarge",
+        "db.m6i.4xlarge",
+        "db.m6i.8xlarge",
+        "db.m6i.large",
+        "db.m6i.xlarge",
+        "db.m6id.12xlarge",
+        "db.m6id.16xlarge",
+        "db.m6id.24xlarge",
+        "db.m6id.2xlarge",
+        "db.m6id.32xlarge",
+        "db.m6id.4xlarge",
+        "db.m6id.8xlarge",
+        "db.m6id.large",
+        "db.m6id.xlarge",
+        "db.m7g.12xlarge",
+        "db.m7g.16xlarge",
+        "db.m7g.2xlarge",
+        "db.m7g.4xlarge",
+        "db.m7g.8xlarge",
+        "db.m7g.large",
+        "db.m7g.xlarge",
+        "db.r6g.12xlarge",
+        "db.r6g.16xlarge",
+        "db.r6g.2xlarge",
+        "db.r6g.4xlarge",
+        "db.r6g.8xlarge",
+        "db.r6g.large",
+        "db.r6g.xlarge",
+        "db.r6gd.12xlarge",
+        "db.r6gd.16xlarge",
+        "db.r6gd.2xlarge",
+        "db.r6gd.4xlarge",
+        "db.r6gd.8xlarge",
+        "db.r6gd.large",
+        "db.r6gd.xlarge",
+        "db.r6i.12xlarge",
+        "db.r6i.16xlarge",
+        "db.r6i.24xlarge",
+        "db.r6i.2xlarge",
+        "db.r6i.32xlarge",
+        "db.r6i.4xlarge",
+        "db.r6i.8xlarge",
+        "db.r6i.large",
+        "db.r6i.xlarge",
+        "db.r6id.12xlarge",
+        "db.r6id.16xlarge",
+        "db.r6id.24xlarge",
+        "db.r6id.2xlarge",
+        "db.r6id.32xlarge",
+        "db.r6id.4xlarge",
+        "db.r6id.8xlarge",
+        "db.r6id.large",
+        "db.r6id.xlarge",
+        "db.r7g.12xlarge",
+        "db.r7g.16xlarge",
+        "db.r7g.2xlarge",
+        "db.r7g.4xlarge",
+        "db.r7g.8xlarge",
+        "db.r7g.large",
+        "db.r7g.xlarge",
+        "db.t3.2xlarge",
+        "db.t3.large",
+        "db.t3.medium",
+        "db.t3.micro",
+        "db.t3.small",
+        "db.t3.xlarge",
+        "db.t4g.2xlarge",
+        "db.t4g.large",
+        "db.t4g.medium",
+        "db.t4g.micro",
+        "db.t4g.small",
+        "db.t4g.xlarge"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "postgres"
+      },
+      "LicenseModel": false
+     },
+     "required": [
+      "Engine",
+      "DBInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBInstanceClass": {
+       "enum": [
+        "db.m6g.12xlarge",
+        "db.m6g.16xlarge",
+        "db.m6g.2xlarge",
+        "db.m6g.4xlarge",
+        "db.m6g.8xlarge",
+        "db.m6g.large",
+        "db.m6g.xlarge",
+        "db.m6gd.12xlarge",
+        "db.m6gd.16xlarge",
+        "db.m6gd.2xlarge",
+        "db.m6gd.4xlarge",
+        "db.m6gd.8xlarge",
+        "db.m6gd.large",
+        "db.m6gd.xlarge",
+        "db.m6i.12xlarge",
+        "db.m6i.16xlarge",
+        "db.m6i.24xlarge",
+        "db.m6i.2xlarge",
+        "db.m6i.32xlarge",
+        "db.m6i.4xlarge",
+        "db.m6i.8xlarge",
+        "db.m6i.large",
+        "db.m6i.xlarge",
+        "db.m6id.12xlarge",
+        "db.m6id.16xlarge",
+        "db.m6id.24xlarge",
+        "db.m6id.2xlarge",
+        "db.m6id.32xlarge",
+        "db.m6id.4xlarge",
+        "db.m6id.8xlarge",
+        "db.m6id.large",
+        "db.m6id.xlarge",
+        "db.m7g.12xlarge",
+        "db.m7g.16xlarge",
+        "db.m7g.2xlarge",
+        "db.m7g.4xlarge",
+        "db.m7g.8xlarge",
+        "db.m7g.large",
+        "db.m7g.xlarge",
+        "db.r6g.12xlarge",
+        "db.r6g.16xlarge",
+        "db.r6g.2xlarge",
+        "db.r6g.4xlarge",
+        "db.r6g.8xlarge",
+        "db.r6g.large",
+        "db.r6g.xlarge",
+        "db.r6gd.12xlarge",
+        "db.r6gd.16xlarge",
+        "db.r6gd.2xlarge",
+        "db.r6gd.4xlarge",
+        "db.r6gd.8xlarge",
+        "db.r6gd.large",
+        "db.r6gd.xlarge",
+        "db.r6i.12xlarge",
+        "db.r6i.16xlarge",
+        "db.r6i.24xlarge",
+        "db.r6i.2xlarge",
+        "db.r6i.32xlarge",
+        "db.r6i.4xlarge",
+        "db.r6i.8xlarge",
+        "db.r6i.large",
+        "db.r6i.xlarge",
+        "db.r6id.12xlarge",
+        "db.r6id.16xlarge",
+        "db.r6id.24xlarge",
+        "db.r6id.2xlarge",
+        "db.r6id.32xlarge",
+        "db.r6id.4xlarge",
+        "db.r6id.8xlarge",
+        "db.r6id.large",
+        "db.r6id.xlarge",
+        "db.r7g.12xlarge",
+        "db.r7g.16xlarge",
+        "db.r7g.2xlarge",
+        "db.r7g.4xlarge",
+        "db.r7g.8xlarge",
+        "db.r7g.large",
+        "db.r7g.xlarge",
+        "db.t3.2xlarge",
+        "db.t3.large",
+        "db.t3.medium",
+        "db.t3.micro",
+        "db.t3.small",
+        "db.t3.xlarge",
+        "db.t4g.2xlarge",
+        "db.t4g.large",
+        "db.t4g.medium",
+        "db.t4g.micro",
+        "db.t4g.small",
+        "db.t4g.xlarge"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "postgres"
+      },
+      "LicenseModel": {
+       "const": "general-public-license"
+      }
+     },
+     "required": [
+      "Engine",
+      "LicenseModel",
+      "DBInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBInstanceClass": {
+       "enum": [
+        "db.m6g.12xlarge",
+        "db.m6g.16xlarge",
+        "db.m6g.2xlarge",
+        "db.m6g.4xlarge",
+        "db.m6g.8xlarge",
+        "db.m6g.large",
+        "db.m6g.xlarge",
+        "db.m6gd.12xlarge",
+        "db.m6gd.16xlarge",
+        "db.m6gd.2xlarge",
+        "db.m6gd.4xlarge",
+        "db.m6gd.8xlarge",
+        "db.m6gd.large",
+        "db.m6gd.xlarge",
+        "db.m6i.12xlarge",
+        "db.m6i.16xlarge",
+        "db.m6i.24xlarge",
+        "db.m6i.2xlarge",
+        "db.m6i.32xlarge",
+        "db.m6i.4xlarge",
+        "db.m6i.8xlarge",
+        "db.m6i.large",
+        "db.m6i.xlarge",
+        "db.m6id.12xlarge",
+        "db.m6id.16xlarge",
+        "db.m6id.24xlarge",
+        "db.m6id.2xlarge",
+        "db.m6id.32xlarge",
+        "db.m6id.4xlarge",
+        "db.m6id.8xlarge",
+        "db.m6id.large",
+        "db.m6id.xlarge",
+        "db.m7g.12xlarge",
+        "db.m7g.16xlarge",
+        "db.m7g.2xlarge",
+        "db.m7g.4xlarge",
+        "db.m7g.8xlarge",
+        "db.m7g.large",
+        "db.m7g.xlarge",
+        "db.r6g.12xlarge",
+        "db.r6g.16xlarge",
+        "db.r6g.2xlarge",
+        "db.r6g.4xlarge",
+        "db.r6g.8xlarge",
+        "db.r6g.large",
+        "db.r6g.xlarge",
+        "db.r6gd.12xlarge",
+        "db.r6gd.16xlarge",
+        "db.r6gd.2xlarge",
+        "db.r6gd.4xlarge",
+        "db.r6gd.8xlarge",
+        "db.r6gd.large",
+        "db.r6gd.xlarge",
+        "db.r6i.12xlarge",
+        "db.r6i.16xlarge",
+        "db.r6i.24xlarge",
+        "db.r6i.2xlarge",
+        "db.r6i.32xlarge",
+        "db.r6i.4xlarge",
+        "db.r6i.8xlarge",
+        "db.r6i.large",
+        "db.r6i.xlarge",
+        "db.r6id.12xlarge",
+        "db.r6id.16xlarge",
+        "db.r6id.24xlarge",
+        "db.r6id.2xlarge",
+        "db.r6id.32xlarge",
+        "db.r6id.4xlarge",
+        "db.r6id.8xlarge",
+        "db.r6id.large",
+        "db.r6id.xlarge",
+        "db.r7g.12xlarge",
+        "db.r7g.16xlarge",
+        "db.r7g.2xlarge",
+        "db.r7g.4xlarge",
+        "db.r7g.8xlarge",
+        "db.r7g.large",
+        "db.r7g.xlarge",
+        "db.t3.2xlarge",
+        "db.t3.large",
+        "db.t3.medium",
+        "db.t3.micro",
+        "db.t3.small",
+        "db.t3.xlarge",
+        "db.t4g.2xlarge",
+        "db.t4g.large",
+        "db.t4g.medium",
+        "db.t4g.micro",
+        "db.t4g.small",
+        "db.t4g.xlarge"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "oracle-se2"
+      },
+      "LicenseModel": {
+       "const": "bring-your-own-license"
+      }
+     },
+     "required": [
+      "Engine",
+      "LicenseModel",
+      "DBInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBInstanceClass": {
+       "enum": [
+        "db.m6i.12xlarge",
+        "db.m6i.16xlarge",
+        "db.m6i.24xlarge",
+        "db.m6i.2xlarge",
+        "db.m6i.32xlarge",
+        "db.m6i.4xlarge",
+        "db.m6i.8xlarge",
+        "db.m6i.large",
+        "db.m6i.xlarge",
+        "db.r6i.12xlarge",
+        "db.r6i.16xlarge",
+        "db.r6i.24xlarge",
+        "db.r6i.2xlarge",
+        "db.r6i.2xlarge.tpc1.mem2x",
+        "db.r6i.2xlarge.tpc2.mem4x",
+        "db.r6i.2xlarge.tpc2.mem8x",
+        "db.r6i.32xlarge",
+        "db.r6i.4xlarge",
+        "db.r6i.4xlarge.tpc2.mem2x",
+        "db.r6i.4xlarge.tpc2.mem3x",
+        "db.r6i.4xlarge.tpc2.mem4x",
+        "db.r6i.8xlarge",
+        "db.r6i.large",
+        "db.r6i.large.tpc1.mem2x",
+        "db.r6i.xlarge",
+        "db.r6i.xlarge.tpc2.mem2x",
+        "db.r6i.xlarge.tpc2.mem4x",
+        "db.t3.2xlarge",
+        "db.t3.large",
+        "db.t3.medium",
+        "db.t3.small",
+        "db.t3.xlarge"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "oracle-ee"
+      },
+      "LicenseModel": {
+       "const": "bring-your-own-license"
+      }
+     },
+     "required": [
+      "Engine",
+      "LicenseModel",
+      "DBInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBInstanceClass": {
+       "enum": [
+        "db.m6i.12xlarge",
+        "db.m6i.16xlarge",
+        "db.m6i.24xlarge",
+        "db.m6i.2xlarge",
+        "db.m6i.32xlarge",
+        "db.m6i.4xlarge",
+        "db.m6i.8xlarge",
+        "db.m6i.large",
+        "db.m6i.xlarge",
+        "db.r6i.12xlarge",
+        "db.r6i.12xlarge.tpc2.mem2x",
+        "db.r6i.16xlarge",
+        "db.r6i.24xlarge",
+        "db.r6i.2xlarge",
+        "db.r6i.2xlarge.tpc1.mem2x",
+        "db.r6i.2xlarge.tpc2.mem4x",
+        "db.r6i.2xlarge.tpc2.mem8x",
+        "db.r6i.32xlarge",
+        "db.r6i.4xlarge",
+        "db.r6i.4xlarge.tpc2.mem2x",
+        "db.r6i.4xlarge.tpc2.mem3x",
+        "db.r6i.4xlarge.tpc2.mem4x",
+        "db.r6i.4xlarge.tpc2.mem8x",
+        "db.r6i.6xlarge.tpc2.mem4x",
+        "db.r6i.8xlarge",
+        "db.r6i.8xlarge.tpc2.mem3x",
+        "db.r6i.8xlarge.tpc2.mem4x",
+        "db.r6i.large",
+        "db.r6i.large.tpc1.mem2x",
+        "db.r6i.xlarge",
+        "db.r6i.xlarge.tpc2.mem2x",
+        "db.r6i.xlarge.tpc2.mem4x",
+        "db.t3.2xlarge",
+        "db.t3.large",
+        "db.t3.medium",
+        "db.t3.small",
+        "db.t3.xlarge"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "oracle-se1"
+      },
+      "LicenseModel": {
+       "const": "bring-your-own-license"
+      }
+     },
+     "required": [
+      "Engine",
+      "LicenseModel",
+      "DBInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBInstanceClass": {
+       "enum": [
+        "db.t3.2xlarge",
+        "db.t3.large",
+        "db.t3.medium",
+        "db.t3.small",
+        "db.t3.xlarge"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "oracle-se"
+      },
+      "LicenseModel": {
+       "const": "bring-your-own-license"
+      }
+     },
+     "required": [
+      "Engine",
+      "LicenseModel",
+      "DBInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBInstanceClass": {
+       "enum": [
+        "db.t3.2xlarge",
+        "db.t3.large",
+        "db.t3.medium",
+        "db.t3.small",
+        "db.t3.xlarge"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "sqlserver-ee"
+      },
+      "LicenseModel": {
+       "const": "license-included"
+      }
+     },
+     "required": [
+      "Engine",
+      "LicenseModel",
+      "DBInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBInstanceClass": {
+       "enum": [
+        "db.m6i.12xlarge",
+        "db.m6i.16xlarge",
+        "db.m6i.24xlarge",
+        "db.m6i.2xlarge",
+        "db.m6i.32xlarge",
+        "db.m6i.4xlarge",
+        "db.m6i.8xlarge",
+        "db.m6i.large",
+        "db.m6i.xlarge",
+        "db.r6i.12xlarge",
+        "db.r6i.16xlarge",
+        "db.r6i.24xlarge",
+        "db.r6i.2xlarge",
+        "db.r6i.32xlarge",
+        "db.r6i.4xlarge",
+        "db.r6i.8xlarge",
+        "db.r6i.large",
+        "db.r6i.xlarge",
+        "db.t3.2xlarge",
+        "db.t3.xlarge"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "sqlserver-se"
+      },
+      "LicenseModel": {
+       "const": "license-included"
+      }
+     },
+     "required": [
+      "Engine",
+      "LicenseModel",
+      "DBInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBInstanceClass": {
+       "enum": [
+        "db.m6i.12xlarge",
+        "db.m6i.16xlarge",
+        "db.m6i.24xlarge",
+        "db.m6i.2xlarge",
+        "db.m6i.32xlarge",
+        "db.m6i.4xlarge",
+        "db.m6i.8xlarge",
+        "db.m6i.large",
+        "db.m6i.xlarge",
+        "db.r6i.12xlarge",
+        "db.r6i.16xlarge",
+        "db.r6i.24xlarge",
+        "db.r6i.2xlarge",
+        "db.r6i.32xlarge",
+        "db.r6i.4xlarge",
+        "db.r6i.8xlarge",
+        "db.r6i.large",
+        "db.r6i.xlarge",
+        "db.t3.2xlarge",
+        "db.t3.large",
+        "db.t3.xlarge"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "sqlserver-web"
+      },
+      "LicenseModel": {
+       "const": "license-included"
+      }
+     },
+     "required": [
+      "Engine",
+      "LicenseModel",
+      "DBInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBInstanceClass": {
+       "enum": [
+        "db.m6i.2xlarge",
+        "db.m6i.4xlarge",
+        "db.m6i.large",
+        "db.m6i.xlarge",
+        "db.r6i.2xlarge",
+        "db.r6i.4xlarge",
+        "db.r6i.large",
+        "db.r6i.xlarge",
+        "db.t3.2xlarge",
+        "db.t3.large",
+        "db.t3.medium",
+        "db.t3.small",
+        "db.t3.xlarge"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "sqlserver-ex"
+      },
+      "LicenseModel": {
+       "const": "license-included"
+      }
+     },
+     "required": [
+      "Engine",
+      "LicenseModel",
+      "DBInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBInstanceClass": {
+       "enum": [
+        "db.t3.2xlarge",
+        "db.t3.large",
+        "db.t3.medium",
+        "db.t3.micro",
+        "db.t3.small",
+        "db.t3.xlarge"
+       ]
+      }
+     }
+    }
+   }
+  ]
+ },
  "ca-central-1": {
   "allOf": [
    {
@@ -90991,11 +93411,23 @@
         "db.r6i.16xlarge",
         "db.r6i.24xlarge",
         "db.r6i.2xlarge",
+        "db.r6i.2xlarge.tpc1.mem2x",
+        "db.r6i.2xlarge.tpc2.mem4x",
+        "db.r6i.2xlarge.tpc2.mem8x",
         "db.r6i.32xlarge",
         "db.r6i.4xlarge",
+        "db.r6i.4xlarge.tpc2.mem2x",
+        "db.r6i.4xlarge.tpc2.mem3x",
+        "db.r6i.4xlarge.tpc2.mem4x",
+        "db.r6i.6xlarge.tpc2.mem4x",
         "db.r6i.8xlarge",
+        "db.r6i.8xlarge.tpc2.mem3x",
+        "db.r6i.8xlarge.tpc2.mem4x",
         "db.r6i.large",
+        "db.r6i.large.tpc1.mem2x",
         "db.r6i.xlarge",
+        "db.r6i.xlarge.tpc2.mem2x",
+        "db.r6i.xlarge.tpc2.mem4x",
         "db.t2.2xlarge",
         "db.t2.large",
         "db.t2.medium",
@@ -92343,7 +94775,6 @@
         "db.t3.2xlarge",
         "db.t3.large",
         "db.t3.medium",
-        "db.t3.small",
         "db.t3.xlarge",
         "db.t4g.large",
         "db.t4g.medium"
@@ -92409,7 +94840,6 @@
         "db.t3.2xlarge",
         "db.t3.large",
         "db.t3.medium",
-        "db.t3.small",
         "db.t3.xlarge",
         "db.t4g.large",
         "db.t4g.medium"
@@ -92652,12 +95082,15 @@
        "type": "string"
       },
       "Engine": {
-       "const": "postgres"
+       "const": "oracle-ee"
       },
-      "LicenseModel": false
+      "LicenseModel": {
+       "const": "bring-your-own-license"
+      }
      },
      "required": [
       "Engine",
+      "LicenseModel",
       "DBInstanceClass"
      ]
     },
@@ -92681,20 +95114,15 @@
         "db.m5d.8xlarge",
         "db.m5d.large",
         "db.m5d.xlarge",
-        "db.m6g.12xlarge",
-        "db.m6g.16xlarge",
-        "db.m6g.2xlarge",
-        "db.m6g.4xlarge",
-        "db.m6g.8xlarge",
-        "db.m6g.large",
-        "db.m6g.xlarge",
-        "db.m6gd.12xlarge",
-        "db.m6gd.16xlarge",
-        "db.m6gd.2xlarge",
-        "db.m6gd.4xlarge",
-        "db.m6gd.8xlarge",
-        "db.m6gd.large",
-        "db.m6gd.xlarge",
+        "db.m6i.12xlarge",
+        "db.m6i.16xlarge",
+        "db.m6i.24xlarge",
+        "db.m6i.2xlarge",
+        "db.m6i.32xlarge",
+        "db.m6i.4xlarge",
+        "db.m6i.8xlarge",
+        "db.m6i.large",
+        "db.m6i.xlarge",
         "db.r4.16xlarge",
         "db.r4.2xlarge",
         "db.r4.4xlarge",
@@ -92702,13 +95130,25 @@
         "db.r4.large",
         "db.r4.xlarge",
         "db.r5.12xlarge",
+        "db.r5.12xlarge.tpc2.mem2x",
         "db.r5.16xlarge",
         "db.r5.24xlarge",
         "db.r5.2xlarge",
+        "db.r5.2xlarge.tpc1.mem2x",
+        "db.r5.2xlarge.tpc2.mem4x",
+        "db.r5.2xlarge.tpc2.mem8x",
         "db.r5.4xlarge",
+        "db.r5.4xlarge.tpc2.mem2x",
+        "db.r5.4xlarge.tpc2.mem3x",
+        "db.r5.4xlarge.tpc2.mem4x",
+        "db.r5.6xlarge.tpc2.mem4x",
         "db.r5.8xlarge",
+        "db.r5.8xlarge.tpc2.mem3x",
         "db.r5.large",
+        "db.r5.large.tpc1.mem2x",
         "db.r5.xlarge",
+        "db.r5.xlarge.tpc2.mem2x",
+        "db.r5.xlarge.tpc2.mem4x",
         "db.r5d.12xlarge",
         "db.r5d.16xlarge",
         "db.r5d.24xlarge",
@@ -92717,20 +95157,27 @@
         "db.r5d.8xlarge",
         "db.r5d.large",
         "db.r5d.xlarge",
-        "db.r6g.12xlarge",
-        "db.r6g.16xlarge",
-        "db.r6g.2xlarge",
-        "db.r6g.4xlarge",
-        "db.r6g.8xlarge",
-        "db.r6g.large",
-        "db.r6g.xlarge",
-        "db.r6gd.12xlarge",
-        "db.r6gd.16xlarge",
-        "db.r6gd.2xlarge",
-        "db.r6gd.4xlarge",
-        "db.r6gd.8xlarge",
-        "db.r6gd.large",
-        "db.r6gd.xlarge",
+        "db.r6i.12xlarge",
+        "db.r6i.16xlarge",
+        "db.r6i.24xlarge",
+        "db.r6i.2xlarge",
+        "db.r6i.2xlarge.tpc1.mem2x",
+        "db.r6i.2xlarge.tpc2.mem4x",
+        "db.r6i.2xlarge.tpc2.mem8x",
+        "db.r6i.32xlarge",
+        "db.r6i.4xlarge",
+        "db.r6i.4xlarge.tpc2.mem2x",
+        "db.r6i.4xlarge.tpc2.mem3x",
+        "db.r6i.4xlarge.tpc2.mem4x",
+        "db.r6i.6xlarge.tpc2.mem4x",
+        "db.r6i.8xlarge",
+        "db.r6i.8xlarge.tpc2.mem3x",
+        "db.r6i.8xlarge.tpc2.mem4x",
+        "db.r6i.large",
+        "db.r6i.large.tpc1.mem2x",
+        "db.r6i.xlarge",
+        "db.r6i.xlarge.tpc2.mem2x",
+        "db.r6i.xlarge.tpc2.mem4x",
         "db.t2.2xlarge",
         "db.t2.large",
         "db.t2.medium",
@@ -92740,15 +95187,23 @@
         "db.t3.2xlarge",
         "db.t3.large",
         "db.t3.medium",
-        "db.t3.micro",
         "db.t3.small",
         "db.t3.xlarge",
-        "db.t4g.2xlarge",
-        "db.t4g.large",
-        "db.t4g.medium",
-        "db.t4g.micro",
-        "db.t4g.small",
-        "db.t4g.xlarge"
+        "db.x1.16xlarge",
+        "db.x1.32xlarge",
+        "db.x1e.16xlarge",
+        "db.x1e.2xlarge",
+        "db.x1e.32xlarge",
+        "db.x1e.4xlarge",
+        "db.x1e.8xlarge",
+        "db.x1e.xlarge",
+        "db.x2iedn.16xlarge",
+        "db.x2iedn.24xlarge",
+        "db.x2iedn.2xlarge",
+        "db.x2iedn.32xlarge",
+        "db.x2iedn.4xlarge",
+        "db.x2iedn.8xlarge",
+        "db.x2iedn.xlarge"
        ]
       }
      }
@@ -92761,10 +95216,10 @@
        "type": "string"
       },
       "Engine": {
-       "const": "postgres"
+       "const": "oracle-se2"
       },
       "LicenseModel": {
-       "const": "general-public-license"
+       "const": "bring-your-own-license"
       }
      },
      "required": [
@@ -92777,72 +95232,43 @@
      "properties": {
       "DBInstanceClass": {
        "enum": [
-        "db.m5.12xlarge",
-        "db.m5.16xlarge",
-        "db.m5.24xlarge",
         "db.m5.2xlarge",
         "db.m5.4xlarge",
-        "db.m5.8xlarge",
         "db.m5.large",
         "db.m5.xlarge",
-        "db.m5d.12xlarge",
-        "db.m5d.16xlarge",
-        "db.m5d.24xlarge",
         "db.m5d.2xlarge",
         "db.m5d.4xlarge",
-        "db.m5d.8xlarge",
         "db.m5d.large",
         "db.m5d.xlarge",
-        "db.m6g.12xlarge",
-        "db.m6g.16xlarge",
-        "db.m6g.2xlarge",
-        "db.m6g.4xlarge",
-        "db.m6g.8xlarge",
-        "db.m6g.large",
-        "db.m6g.xlarge",
-        "db.m6gd.12xlarge",
-        "db.m6gd.16xlarge",
-        "db.m6gd.2xlarge",
-        "db.m6gd.4xlarge",
-        "db.m6gd.8xlarge",
-        "db.m6gd.large",
-        "db.m6gd.xlarge",
-        "db.r4.16xlarge",
+        "db.m6i.2xlarge",
+        "db.m6i.4xlarge",
+        "db.m6i.large",
+        "db.m6i.xlarge",
         "db.r4.2xlarge",
         "db.r4.4xlarge",
-        "db.r4.8xlarge",
         "db.r4.large",
         "db.r4.xlarge",
-        "db.r5.12xlarge",
-        "db.r5.16xlarge",
-        "db.r5.24xlarge",
         "db.r5.2xlarge",
+        "db.r5.2xlarge.tpc1.mem2x",
+        "db.r5.2xlarge.tpc2.mem4x",
+        "db.r5.2xlarge.tpc2.mem8x",
         "db.r5.4xlarge",
-        "db.r5.8xlarge",
+        "db.r5.4xlarge.tpc2.mem2x",
+        "db.r5.4xlarge.tpc2.mem3x",
+        "db.r5.4xlarge.tpc2.mem4x",
         "db.r5.large",
+        "db.r5.large.tpc1.mem2x",
         "db.r5.xlarge",
-        "db.r5d.12xlarge",
-        "db.r5d.16xlarge",
-        "db.r5d.24xlarge",
+        "db.r5.xlarge.tpc2.mem2x",
+        "db.r5.xlarge.tpc2.mem4x",
         "db.r5d.2xlarge",
         "db.r5d.4xlarge",
-        "db.r5d.8xlarge",
         "db.r5d.large",
         "db.r5d.xlarge",
-        "db.r6g.12xlarge",
-        "db.r6g.16xlarge",
-        "db.r6g.2xlarge",
-        "db.r6g.4xlarge",
-        "db.r6g.8xlarge",
-        "db.r6g.large",
-        "db.r6g.xlarge",
-        "db.r6gd.12xlarge",
-        "db.r6gd.16xlarge",
-        "db.r6gd.2xlarge",
-        "db.r6gd.4xlarge",
-        "db.r6gd.8xlarge",
-        "db.r6gd.large",
-        "db.r6gd.xlarge",
+        "db.r6i.2xlarge",
+        "db.r6i.4xlarge",
+        "db.r6i.large",
+        "db.r6i.xlarge",
         "db.t2.2xlarge",
         "db.t2.large",
         "db.t2.medium",
@@ -92852,15 +95278,14 @@
         "db.t3.2xlarge",
         "db.t3.large",
         "db.t3.medium",
-        "db.t3.micro",
         "db.t3.small",
         "db.t3.xlarge",
-        "db.t4g.2xlarge",
-        "db.t4g.large",
-        "db.t4g.medium",
-        "db.t4g.micro",
-        "db.t4g.small",
-        "db.t4g.xlarge"
+        "db.x1e.2xlarge",
+        "db.x1e.4xlarge",
+        "db.x1e.xlarge",
+        "db.x2iedn.2xlarge",
+        "db.x2iedn.4xlarge",
+        "db.x2iedn.xlarge"
        ]
       }
      }
@@ -92873,7 +95298,7 @@
        "type": "string"
       },
       "Engine": {
-       "const": "mysql"
+       "const": "postgres"
       },
       "LicenseModel": false
      },
@@ -92894,6 +95319,14 @@
         "db.m5.8xlarge",
         "db.m5.large",
         "db.m5.xlarge",
+        "db.m5d.12xlarge",
+        "db.m5d.16xlarge",
+        "db.m5d.24xlarge",
+        "db.m5d.2xlarge",
+        "db.m5d.4xlarge",
+        "db.m5d.8xlarge",
+        "db.m5d.large",
+        "db.m5d.xlarge",
         "db.m6g.12xlarge",
         "db.m6g.16xlarge",
         "db.m6g.2xlarge",
@@ -92922,6 +95355,14 @@
         "db.r5.8xlarge",
         "db.r5.large",
         "db.r5.xlarge",
+        "db.r5d.12xlarge",
+        "db.r5d.16xlarge",
+        "db.r5d.24xlarge",
+        "db.r5d.2xlarge",
+        "db.r5d.4xlarge",
+        "db.r5d.8xlarge",
+        "db.r5d.large",
+        "db.r5d.xlarge",
         "db.r6g.12xlarge",
         "db.r6g.16xlarge",
         "db.r6g.2xlarge",
@@ -92966,7 +95407,7 @@
        "type": "string"
       },
       "Engine": {
-       "const": "mysql"
+       "const": "postgres"
       },
       "LicenseModel": {
        "const": "general-public-license"
@@ -92990,6 +95431,14 @@
         "db.m5.8xlarge",
         "db.m5.large",
         "db.m5.xlarge",
+        "db.m5d.12xlarge",
+        "db.m5d.16xlarge",
+        "db.m5d.24xlarge",
+        "db.m5d.2xlarge",
+        "db.m5d.4xlarge",
+        "db.m5d.8xlarge",
+        "db.m5d.large",
+        "db.m5d.xlarge",
         "db.m6g.12xlarge",
         "db.m6g.16xlarge",
         "db.m6g.2xlarge",
@@ -93018,6 +95467,14 @@
         "db.r5.8xlarge",
         "db.r5.large",
         "db.r5.xlarge",
+        "db.r5d.12xlarge",
+        "db.r5d.16xlarge",
+        "db.r5d.24xlarge",
+        "db.r5d.2xlarge",
+        "db.r5d.4xlarge",
+        "db.r5d.8xlarge",
+        "db.r5d.large",
+        "db.r5d.xlarge",
         "db.r6g.12xlarge",
         "db.r6g.16xlarge",
         "db.r6g.2xlarge",
@@ -93062,7 +95519,7 @@
        "type": "string"
       },
       "Engine": {
-       "const": "mariadb"
+       "const": "mysql"
       },
       "LicenseModel": false
      },
@@ -93155,106 +95612,10 @@
        "type": "string"
       },
       "Engine": {
-       "const": "mariadb"
-      },
-      "LicenseModel": {
-       "const": "general-public-license"
-      }
-     },
-     "required": [
-      "Engine",
-      "LicenseModel",
-      "DBInstanceClass"
-     ]
-    },
-    "then": {
-     "properties": {
-      "DBInstanceClass": {
-       "enum": [
-        "db.m5.12xlarge",
-        "db.m5.16xlarge",
-        "db.m5.24xlarge",
-        "db.m5.2xlarge",
-        "db.m5.4xlarge",
-        "db.m5.8xlarge",
-        "db.m5.large",
-        "db.m5.xlarge",
-        "db.m6g.12xlarge",
-        "db.m6g.16xlarge",
-        "db.m6g.2xlarge",
-        "db.m6g.4xlarge",
-        "db.m6g.8xlarge",
-        "db.m6g.large",
-        "db.m6g.xlarge",
-        "db.m6gd.12xlarge",
-        "db.m6gd.16xlarge",
-        "db.m6gd.2xlarge",
-        "db.m6gd.4xlarge",
-        "db.m6gd.8xlarge",
-        "db.m6gd.large",
-        "db.m6gd.xlarge",
-        "db.r4.16xlarge",
-        "db.r4.2xlarge",
-        "db.r4.4xlarge",
-        "db.r4.8xlarge",
-        "db.r4.large",
-        "db.r4.xlarge",
-        "db.r5.12xlarge",
-        "db.r5.16xlarge",
-        "db.r5.24xlarge",
-        "db.r5.2xlarge",
-        "db.r5.4xlarge",
-        "db.r5.8xlarge",
-        "db.r5.large",
-        "db.r5.xlarge",
-        "db.r6g.12xlarge",
-        "db.r6g.16xlarge",
-        "db.r6g.2xlarge",
-        "db.r6g.4xlarge",
-        "db.r6g.8xlarge",
-        "db.r6g.large",
-        "db.r6g.xlarge",
-        "db.r6gd.12xlarge",
-        "db.r6gd.16xlarge",
-        "db.r6gd.2xlarge",
-        "db.r6gd.4xlarge",
-        "db.r6gd.8xlarge",
-        "db.r6gd.large",
-        "db.r6gd.xlarge",
-        "db.t2.2xlarge",
-        "db.t2.large",
-        "db.t2.medium",
-        "db.t2.micro",
-        "db.t2.small",
-        "db.t2.xlarge",
-        "db.t3.2xlarge",
-        "db.t3.large",
-        "db.t3.medium",
-        "db.t3.micro",
-        "db.t3.small",
-        "db.t3.xlarge",
-        "db.t4g.2xlarge",
-        "db.t4g.large",
-        "db.t4g.medium",
-        "db.t4g.micro",
-        "db.t4g.small",
-        "db.t4g.xlarge"
-       ]
-      }
-     }
-    }
-   },
-   {
-    "if": {
-     "properties": {
-      "DBInstanceClass": {
-       "type": "string"
-      },
-      "Engine": {
-       "const": "oracle-ee"
+       "const": "mysql"
       },
       "LicenseModel": {
-       "const": "bring-your-own-license"
+       "const": "general-public-license"
       }
      },
      "required": [
@@ -93275,23 +95636,20 @@
         "db.m5.8xlarge",
         "db.m5.large",
         "db.m5.xlarge",
-        "db.m5d.12xlarge",
-        "db.m5d.16xlarge",
-        "db.m5d.24xlarge",
-        "db.m5d.2xlarge",
-        "db.m5d.4xlarge",
-        "db.m5d.8xlarge",
-        "db.m5d.large",
-        "db.m5d.xlarge",
-        "db.m6i.12xlarge",
-        "db.m6i.16xlarge",
-        "db.m6i.24xlarge",
-        "db.m6i.2xlarge",
-        "db.m6i.32xlarge",
-        "db.m6i.4xlarge",
-        "db.m6i.8xlarge",
-        "db.m6i.large",
-        "db.m6i.xlarge",
+        "db.m6g.12xlarge",
+        "db.m6g.16xlarge",
+        "db.m6g.2xlarge",
+        "db.m6g.4xlarge",
+        "db.m6g.8xlarge",
+        "db.m6g.large",
+        "db.m6g.xlarge",
+        "db.m6gd.12xlarge",
+        "db.m6gd.16xlarge",
+        "db.m6gd.2xlarge",
+        "db.m6gd.4xlarge",
+        "db.m6gd.8xlarge",
+        "db.m6gd.large",
+        "db.m6gd.xlarge",
         "db.r4.16xlarge",
         "db.r4.2xlarge",
         "db.r4.4xlarge",
@@ -93299,42 +95657,27 @@
         "db.r4.large",
         "db.r4.xlarge",
         "db.r5.12xlarge",
-        "db.r5.12xlarge.tpc2.mem2x",
         "db.r5.16xlarge",
         "db.r5.24xlarge",
         "db.r5.2xlarge",
-        "db.r5.2xlarge.tpc1.mem2x",
-        "db.r5.2xlarge.tpc2.mem4x",
-        "db.r5.2xlarge.tpc2.mem8x",
         "db.r5.4xlarge",
-        "db.r5.4xlarge.tpc2.mem2x",
-        "db.r5.4xlarge.tpc2.mem3x",
-        "db.r5.4xlarge.tpc2.mem4x",
-        "db.r5.6xlarge.tpc2.mem4x",
         "db.r5.8xlarge",
-        "db.r5.8xlarge.tpc2.mem3x",
         "db.r5.large",
-        "db.r5.large.tpc1.mem2x",
         "db.r5.xlarge",
-        "db.r5.xlarge.tpc2.mem2x",
-        "db.r5.xlarge.tpc2.mem4x",
-        "db.r5d.12xlarge",
-        "db.r5d.16xlarge",
-        "db.r5d.24xlarge",
-        "db.r5d.2xlarge",
-        "db.r5d.4xlarge",
-        "db.r5d.8xlarge",
-        "db.r5d.large",
-        "db.r5d.xlarge",
-        "db.r6i.12xlarge",
-        "db.r6i.16xlarge",
-        "db.r6i.24xlarge",
-        "db.r6i.2xlarge",
-        "db.r6i.32xlarge",
-        "db.r6i.4xlarge",
-        "db.r6i.8xlarge",
-        "db.r6i.large",
-        "db.r6i.xlarge",
+        "db.r6g.12xlarge",
+        "db.r6g.16xlarge",
+        "db.r6g.2xlarge",
+        "db.r6g.4xlarge",
+        "db.r6g.8xlarge",
+        "db.r6g.large",
+        "db.r6g.xlarge",
+        "db.r6gd.12xlarge",
+        "db.r6gd.16xlarge",
+        "db.r6gd.2xlarge",
+        "db.r6gd.4xlarge",
+        "db.r6gd.8xlarge",
+        "db.r6gd.large",
+        "db.r6gd.xlarge",
         "db.t2.2xlarge",
         "db.t2.large",
         "db.t2.medium",
@@ -93344,23 +95687,15 @@
         "db.t3.2xlarge",
         "db.t3.large",
         "db.t3.medium",
+        "db.t3.micro",
         "db.t3.small",
         "db.t3.xlarge",
-        "db.x1.16xlarge",
-        "db.x1.32xlarge",
-        "db.x1e.16xlarge",
-        "db.x1e.2xlarge",
-        "db.x1e.32xlarge",
-        "db.x1e.4xlarge",
-        "db.x1e.8xlarge",
-        "db.x1e.xlarge",
-        "db.x2iedn.16xlarge",
-        "db.x2iedn.24xlarge",
-        "db.x2iedn.2xlarge",
-        "db.x2iedn.32xlarge",
-        "db.x2iedn.4xlarge",
-        "db.x2iedn.8xlarge",
-        "db.x2iedn.xlarge"
+        "db.t4g.2xlarge",
+        "db.t4g.large",
+        "db.t4g.medium",
+        "db.t4g.micro",
+        "db.t4g.small",
+        "db.t4g.xlarge"
        ]
       }
      }
@@ -93373,10 +95708,103 @@
        "type": "string"
       },
       "Engine": {
-       "const": "oracle-se2"
+       "const": "mariadb"
+      },
+      "LicenseModel": false
+     },
+     "required": [
+      "Engine",
+      "DBInstanceClass"
+     ]
+    },
+    "then": {
+     "properties": {
+      "DBInstanceClass": {
+       "enum": [
+        "db.m5.12xlarge",
+        "db.m5.16xlarge",
+        "db.m5.24xlarge",
+        "db.m5.2xlarge",
+        "db.m5.4xlarge",
+        "db.m5.8xlarge",
+        "db.m5.large",
+        "db.m5.xlarge",
+        "db.m6g.12xlarge",
+        "db.m6g.16xlarge",
+        "db.m6g.2xlarge",
+        "db.m6g.4xlarge",
+        "db.m6g.8xlarge",
+        "db.m6g.large",
+        "db.m6g.xlarge",
+        "db.m6gd.12xlarge",
+        "db.m6gd.16xlarge",
+        "db.m6gd.2xlarge",
+        "db.m6gd.4xlarge",
+        "db.m6gd.8xlarge",
+        "db.m6gd.large",
+        "db.m6gd.xlarge",
+        "db.r4.16xlarge",
+        "db.r4.2xlarge",
+        "db.r4.4xlarge",
+        "db.r4.8xlarge",
+        "db.r4.large",
+        "db.r4.xlarge",
+        "db.r5.12xlarge",
+        "db.r5.16xlarge",
+        "db.r5.24xlarge",
+        "db.r5.2xlarge",
+        "db.r5.4xlarge",
+        "db.r5.8xlarge",
+        "db.r5.large",
+        "db.r5.xlarge",
+        "db.r6g.12xlarge",
+        "db.r6g.16xlarge",
+        "db.r6g.2xlarge",
+        "db.r6g.4xlarge",
+        "db.r6g.8xlarge",
+        "db.r6g.large",
+        "db.r6g.xlarge",
+        "db.r6gd.12xlarge",
+        "db.r6gd.16xlarge",
+        "db.r6gd.2xlarge",
+        "db.r6gd.4xlarge",
+        "db.r6gd.8xlarge",
+        "db.r6gd.large",
+        "db.r6gd.xlarge",
+        "db.t2.2xlarge",
+        "db.t2.large",
+        "db.t2.medium",
+        "db.t2.micro",
+        "db.t2.small",
+        "db.t2.xlarge",
+        "db.t3.2xlarge",
+        "db.t3.large",
+        "db.t3.medium",
+        "db.t3.micro",
+        "db.t3.small",
+        "db.t3.xlarge",
+        "db.t4g.2xlarge",
+        "db.t4g.large",
+        "db.t4g.medium",
+        "db.t4g.micro",
+        "db.t4g.small",
+        "db.t4g.xlarge"
+       ]
+      }
+     }
+    }
+   },
+   {
+    "if": {
+     "properties": {
+      "DBInstanceClass": {
+       "type": "string"
+      },
+      "Engine": {
+       "const": "mariadb"
       },
       "LicenseModel": {
-       "const": "bring-your-own-license"
+       "const": "general-public-license"
       }
      },
      "required": [
@@ -93389,43 +95817,56 @@
      "properties": {
       "DBInstanceClass": {
        "enum": [
+        "db.m5.12xlarge",
+        "db.m5.16xlarge",
+        "db.m5.24xlarge",
         "db.m5.2xlarge",
         "db.m5.4xlarge",
+        "db.m5.8xlarge",
         "db.m5.large",
         "db.m5.xlarge",
-        "db.m5d.2xlarge",
-        "db.m5d.4xlarge",
-        "db.m5d.large",
-        "db.m5d.xlarge",
-        "db.m6i.2xlarge",
-        "db.m6i.4xlarge",
-        "db.m6i.large",
-        "db.m6i.xlarge",
+        "db.m6g.12xlarge",
+        "db.m6g.16xlarge",
+        "db.m6g.2xlarge",
+        "db.m6g.4xlarge",
+        "db.m6g.8xlarge",
+        "db.m6g.large",
+        "db.m6g.xlarge",
+        "db.m6gd.12xlarge",
+        "db.m6gd.16xlarge",
+        "db.m6gd.2xlarge",
+        "db.m6gd.4xlarge",
+        "db.m6gd.8xlarge",
+        "db.m6gd.large",
+        "db.m6gd.xlarge",
+        "db.r4.16xlarge",
         "db.r4.2xlarge",
         "db.r4.4xlarge",
+        "db.r4.8xlarge",
         "db.r4.large",
         "db.r4.xlarge",
+        "db.r5.12xlarge",
+        "db.r5.16xlarge",
+        "db.r5.24xlarge",
         "db.r5.2xlarge",
-        "db.r5.2xlarge.tpc1.mem2x",
-        "db.r5.2xlarge.tpc2.mem4x",
-        "db.r5.2xlarge.tpc2.mem8x",
         "db.r5.4xlarge",
-        "db.r5.4xlarge.tpc2.mem2x",
-        "db.r5.4xlarge.tpc2.mem3x",
-        "db.r5.4xlarge.tpc2.mem4x",
+        "db.r5.8xlarge",
         "db.r5.large",
-        "db.r5.large.tpc1.mem2x",
         "db.r5.xlarge",
-        "db.r5.xlarge.tpc2.mem2x",
-        "db.r5.xlarge.tpc2.mem4x",
-        "db.r5d.2xlarge",
-        "db.r5d.4xlarge",
-        "db.r5d.large",
-        "db.r5d.xlarge",
-        "db.r6i.2xlarge",
-        "db.r6i.4xlarge",
-        "db.r6i.large",
-        "db.r6i.xlarge",
+        "db.r6g.12xlarge",
+        "db.r6g.16xlarge",
+        "db.r6g.2xlarge",
+        "db.r6g.4xlarge",
+        "db.r6g.8xlarge",
+        "db.r6g.large",
+        "db.r6g.xlarge",
+        "db.r6gd.12xlarge",
+        "db.r6gd.16xlarge",
+        "db.r6gd.2xlarge",
+        "db.r6gd.4xlarge",
+        "db.r6gd.8xlarge",
+        "db.r6gd.large",
+        "db.r6gd.xlarge",
         "db.t2.2xlarge",
         "db.t2.large",
         "db.t2.medium",
@@ -93435,14 +95876,15 @@
         "db.t3.2xlarge",
         "db.t3.large",
         "db.t3.medium",
+        "db.t3.micro",
         "db.t3.small",
         "db.t3.xlarge",
-        "db.x1e.2xlarge",
-        "db.x1e.4xlarge",
-        "db.x1e.xlarge",
-        "db.x2iedn.2xlarge",
-        "db.x2iedn.4xlarge",
-        "db.x2iedn.xlarge"
+        "db.t4g.2xlarge",
+        "db.t4g.large",
+        "db.t4g.medium",
+        "db.t4g.micro",
+        "db.t4g.small",
+        "db.t4g.xlarge"
        ]
       }
      }
@@ -93788,11 +96230,23 @@
         "db.r6i.16xlarge",
         "db.r6i.24xlarge",
         "db.r6i.2xlarge",
+        "db.r6i.2xlarge.tpc1.mem2x",
+        "db.r6i.2xlarge.tpc2.mem4x",
+        "db.r6i.2xlarge.tpc2.mem8x",
         "db.r6i.32xlarge",
         "db.r6i.4xlarge",
+        "db.r6i.4xlarge.tpc2.mem2x",
+        "db.r6i.4xlarge.tpc2.mem3x",
+        "db.r6i.4xlarge.tpc2.mem4x",
+        "db.r6i.6xlarge.tpc2.mem4x",
         "db.r6i.8xlarge",
+        "db.r6i.8xlarge.tpc2.mem3x",
+        "db.r6i.8xlarge.tpc2.mem4x",
         "db.r6i.large",
+        "db.r6i.large.tpc1.mem2x",
         "db.r6i.xlarge",
+        "db.r6i.xlarge.tpc2.mem2x",
+        "db.r6i.xlarge.tpc2.mem4x",
         "db.t2.2xlarge",
         "db.t2.large",
         "db.t2.medium",
@@ -94838,11 +97292,23 @@
         "db.r6i.16xlarge",
         "db.r6i.24xlarge",
         "db.r6i.2xlarge",
+        "db.r6i.2xlarge.tpc1.mem2x",
+        "db.r6i.2xlarge.tpc2.mem4x",
+        "db.r6i.2xlarge.tpc2.mem8x",
         "db.r6i.32xlarge",
         "db.r6i.4xlarge",
+        "db.r6i.4xlarge.tpc2.mem2x",
+        "db.r6i.4xlarge.tpc2.mem3x",
+        "db.r6i.4xlarge.tpc2.mem4x",
+        "db.r6i.6xlarge.tpc2.mem4x",
         "db.r6i.8xlarge",
+        "db.r6i.8xlarge.tpc2.mem3x",
+        "db.r6i.8xlarge.tpc2.mem4x",
         "db.r6i.large",
+        "db.r6i.large.tpc1.mem2x",
         "db.r6i.xlarge",
+        "db.r6i.xlarge.tpc2.mem2x",
+        "db.r6i.xlarge.tpc2.mem4x",
         "db.t2.2xlarge",
         "db.t2.large",
         "db.t2.medium",
diff --git a/src/cfnlint/data/schemas/extensions/aws_rds_dbinstance/engine_version.json b/src/cfnlint/data/schemas/extensions/aws_rds_dbinstance/engine_version.json
index dfd4b9ab8a..8fb3b6acdd 100644
--- a/src/cfnlint/data/schemas/extensions/aws_rds_dbinstance/engine_version.json
+++ b/src/cfnlint/data/schemas/extensions/aws_rds_dbinstance/engine_version.json
@@ -76,10 +76,6 @@
        "5.7.mysql_aurora.2.12.1",
        "5.7.mysql_aurora.2.12.2",
        "5.7.mysql_aurora.2.12.3",
-       "8.0.mysql_aurora.3.03.0",
-       "8.0.mysql_aurora.3.03.1",
-       "8.0.mysql_aurora.3.03.2",
-       "8.0.mysql_aurora.3.03.3",
        "8.0.mysql_aurora.3.04.0",
        "8.0.mysql_aurora.3.04.1",
        "8.0.mysql_aurora.3.04.2",
@@ -375,6 +371,7 @@
        "10.5.23",
        "10.5.24",
        "10.5.25",
+       "10.5.26",
        "10.6.13",
        "10.6.14",
        "10.6.15",
@@ -411,6 +408,7 @@
        "5.7.44",
        "5.7.44-rds.20240408",
        "5.7.44-rds.20240529",
+       "5.7.44-rds.20240808",
        "8.0.32",
        "8.0.33",
        "8.0.34",
@@ -448,6 +446,7 @@
        "11.22",
        "11.22-rds.20240418",
        "11.22-rds.20240509",
+       "11.22-rds.20240808",
        "12.15",
        "12.16",
        "12.17",
@@ -530,13 +529,15 @@
        "15.00.4365.2.v1",
        "15.00.4375.4.v1",
        "15.00.4382.1.v1",
+       "15.00.4385.2.v1",
        "16.00.4085.2.v1",
        "16.00.4095.4.v1",
        "16.00.4105.2.v1",
        "16.00.4115.5.v1",
        "16.00.4120.1.v1",
        "16.00.4125.3.v1",
-       "16.00.4131.2.v1"
+       "16.00.4131.2.v1",
+       "16.00.4135.4.v1"
       ]
      }
     }
@@ -593,13 +594,15 @@
        "15.00.4365.2.v1",
        "15.00.4375.4.v1",
        "15.00.4382.1.v1",
+       "15.00.4385.2.v1",
        "16.00.4085.2.v1",
        "16.00.4095.4.v1",
        "16.00.4105.2.v1",
        "16.00.4115.5.v1",
        "16.00.4120.1.v1",
        "16.00.4125.3.v1",
-       "16.00.4131.2.v1"
+       "16.00.4131.2.v1",
+       "16.00.4135.4.v1"
       ]
      }
     }
@@ -656,13 +659,15 @@
        "15.00.4365.2.v1",
        "15.00.4375.4.v1",
        "15.00.4382.1.v1",
+       "15.00.4385.2.v1",
        "16.00.4085.2.v1",
        "16.00.4095.4.v1",
        "16.00.4105.2.v1",
        "16.00.4115.5.v1",
        "16.00.4120.1.v1",
        "16.00.4125.3.v1",
-       "16.00.4131.2.v1"
+       "16.00.4131.2.v1",
+       "16.00.4135.4.v1"
       ]
      }
     }
@@ -719,13 +724,15 @@
        "15.00.4365.2.v1",
        "15.00.4375.4.v1",
        "15.00.4382.1.v1",
+       "15.00.4385.2.v1",
        "16.00.4085.2.v1",
        "16.00.4095.4.v1",
        "16.00.4105.2.v1",
        "16.00.4115.5.v1",
        "16.00.4120.1.v1",
        "16.00.4125.3.v1",
-       "16.00.4131.2.v1"
+       "16.00.4131.2.v1",
+       "16.00.4135.4.v1"
       ]
      }
     }
diff --git a/src/cfnlint/data/schemas/extensions/aws_redshift_cluster/nodetype_enum.json b/src/cfnlint/data/schemas/extensions/aws_redshift_cluster/nodetype_enum.json
index 145bade885..6083509907 100644
--- a/src/cfnlint/data/schemas/extensions/aws_redshift_cluster/nodetype_enum.json
+++ b/src/cfnlint/data/schemas/extensions/aws_redshift_cluster/nodetype_enum.json
@@ -12,7 +12,6 @@
    "ds2.xlarge",
    "ra3.16xlarge",
    "ra3.4xlarge",
-   "ra3.large",
    "ra3.xlplus"
   ]
  },
@@ -28,7 +27,6 @@
    "ds2.xlarge",
    "ra3.16xlarge",
    "ra3.4xlarge",
-   "ra3.large",
    "ra3.xlplus"
   ]
  },
@@ -44,7 +42,6 @@
    "ds2.xlarge",
    "ra3.16xlarge",
    "ra3.4xlarge",
-   "ra3.large",
    "ra3.xlplus"
   ]
  },
@@ -60,7 +57,6 @@
    "ds2.xlarge",
    "ra3.16xlarge",
    "ra3.4xlarge",
-   "ra3.large",
    "ra3.xlplus"
   ]
  },
@@ -76,7 +72,6 @@
    "ds2.xlarge",
    "ra3.16xlarge",
    "ra3.4xlarge",
-   "ra3.large",
    "ra3.xlplus"
   ]
  },
@@ -92,7 +87,6 @@
    "ds2.xlarge",
    "ra3.16xlarge",
    "ra3.4xlarge",
-   "ra3.large",
    "ra3.xlplus"
   ]
  },
@@ -108,7 +102,6 @@
    "ds2.xlarge",
    "ra3.16xlarge",
    "ra3.4xlarge",
-   "ra3.large",
    "ra3.xlplus"
   ]
  },
@@ -124,7 +117,6 @@
    "ds2.xlarge",
    "ra3.16xlarge",
    "ra3.4xlarge",
-   "ra3.large",
    "ra3.xlplus"
   ]
  },
@@ -140,7 +132,6 @@
    "ds2.xlarge",
    "ra3.16xlarge",
    "ra3.4xlarge",
-   "ra3.large",
    "ra3.xlplus"
   ]
  },
@@ -156,7 +147,6 @@
    "ds2.xlarge",
    "ra3.16xlarge",
    "ra3.4xlarge",
-   "ra3.large",
    "ra3.xlplus"
   ]
  },
@@ -172,7 +162,21 @@
    "ds2.xlarge",
    "ra3.16xlarge",
    "ra3.4xlarge",
-   "ra3.large",
+   "ra3.xlplus"
+  ]
+ },
+ "ap-southeast-5": {
+  "enum": [
+   "dc1.8xlarge",
+   "dc1.large",
+   "dc2.8xlarge",
+   "dc2.large",
+   "ds1.8xlarge",
+   "ds1.xlarge",
+   "ds2.8xlarge",
+   "ds2.xlarge",
+   "ra3.16xlarge",
+   "ra3.4xlarge",
    "ra3.xlplus"
   ]
  },
@@ -188,7 +192,6 @@
    "ds2.xlarge",
    "ra3.16xlarge",
    "ra3.4xlarge",
-   "ra3.large",
    "ra3.xlplus"
   ]
  },
@@ -204,7 +207,6 @@
    "ds2.xlarge",
    "ra3.16xlarge",
    "ra3.4xlarge",
-   "ra3.large",
    "ra3.xlplus"
   ]
  },
@@ -220,7 +222,6 @@
    "ds2.xlarge",
    "ra3.16xlarge",
    "ra3.4xlarge",
-   "ra3.large",
    "ra3.xlplus"
   ]
  },
@@ -236,7 +237,6 @@
    "ds2.xlarge",
    "ra3.16xlarge",
    "ra3.4xlarge",
-   "ra3.large",
    "ra3.xlplus"
   ]
  },
@@ -252,7 +252,6 @@
    "ds2.xlarge",
    "ra3.16xlarge",
    "ra3.4xlarge",
-   "ra3.large",
    "ra3.xlplus"
   ]
  },
@@ -268,7 +267,6 @@
    "ds2.xlarge",
    "ra3.16xlarge",
    "ra3.4xlarge",
-   "ra3.large",
    "ra3.xlplus"
   ]
  },
@@ -284,7 +282,6 @@
    "ds2.xlarge",
    "ra3.16xlarge",
    "ra3.4xlarge",
-   "ra3.large",
    "ra3.xlplus"
   ]
  },
@@ -300,7 +297,6 @@
    "ds2.xlarge",
    "ra3.16xlarge",
    "ra3.4xlarge",
-   "ra3.large",
    "ra3.xlplus"
   ]
  },
@@ -316,7 +312,6 @@
    "ds2.xlarge",
    "ra3.16xlarge",
    "ra3.4xlarge",
-   "ra3.large",
    "ra3.xlplus"
   ]
  },
@@ -332,7 +327,6 @@
    "ds2.xlarge",
    "ra3.16xlarge",
    "ra3.4xlarge",
-   "ra3.large",
    "ra3.xlplus"
   ]
  },
@@ -348,7 +342,6 @@
    "ds2.xlarge",
    "ra3.16xlarge",
    "ra3.4xlarge",
-   "ra3.large",
    "ra3.xlplus"
   ]
  },
@@ -364,7 +357,6 @@
    "ds2.xlarge",
    "ra3.16xlarge",
    "ra3.4xlarge",
-   "ra3.large",
    "ra3.xlplus"
   ]
  },
@@ -380,7 +372,6 @@
    "ds2.xlarge",
    "ra3.16xlarge",
    "ra3.4xlarge",
-   "ra3.large",
    "ra3.xlplus"
   ]
  },
@@ -396,7 +387,6 @@
    "ds2.xlarge",
    "ra3.16xlarge",
    "ra3.4xlarge",
-   "ra3.large",
    "ra3.xlplus"
   ]
  },
@@ -412,7 +402,6 @@
    "ds2.xlarge",
    "ra3.16xlarge",
    "ra3.4xlarge",
-   "ra3.large",
    "ra3.xlplus"
   ]
  },
@@ -428,7 +417,6 @@
    "ds2.xlarge",
    "ra3.16xlarge",
    "ra3.4xlarge",
-   "ra3.large",
    "ra3.xlplus"
   ]
  },
@@ -444,7 +432,6 @@
    "ds2.xlarge",
    "ra3.16xlarge",
    "ra3.4xlarge",
-   "ra3.large",
    "ra3.xlplus"
   ]
  },
@@ -460,7 +447,6 @@
    "ds2.xlarge",
    "ra3.16xlarge",
    "ra3.4xlarge",
-   "ra3.large",
    "ra3.xlplus"
   ]
  },
@@ -476,7 +462,6 @@
    "ds2.xlarge",
    "ra3.16xlarge",
    "ra3.4xlarge",
-   "ra3.large",
    "ra3.xlplus"
   ]
  },
@@ -492,7 +477,6 @@
    "ds2.xlarge",
    "ra3.16xlarge",
    "ra3.4xlarge",
-   "ra3.large",
    "ra3.xlplus"
   ]
  },
@@ -508,7 +492,6 @@
    "ds2.xlarge",
    "ra3.16xlarge",
    "ra3.4xlarge",
-   "ra3.large",
    "ra3.xlplus"
   ]
  },
@@ -524,7 +507,6 @@
    "ds2.xlarge",
    "ra3.16xlarge",
    "ra3.4xlarge",
-   "ra3.large",
    "ra3.xlplus"
   ]
  }
diff --git a/src/cfnlint/data/schemas/providers/af_south_1/__init__.py b/src/cfnlint/data/schemas/providers/af_south_1/__init__.py
index 472265ab3f..4f29e1f5b1 100644
--- a/src/cfnlint/data/schemas/providers/af_south_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/af_south_1/__init__.py
@@ -1367,6 +1367,7 @@
     "aws-networkmanager-vpcattachment.json",
     "aws-oam-link.json",
     "aws-oam-sink.json",
+    "aws-opensearchservice-domain.json",
     "aws-opsworks-app.json",
     "aws-opsworks-elasticloadbalancerattachment.json",
     "aws-opsworks-userprofile.json",
diff --git a/src/cfnlint/data/schemas/providers/af_south_1/aws-opensearchservice-domain.json b/src/cfnlint/data/schemas/providers/af_south_1/aws-opensearchservice-domain.json
deleted file mode 100644
index c8aa358cc0..0000000000
--- a/src/cfnlint/data/schemas/providers/af_south_1/aws-opensearchservice-domain.json
+++ /dev/null
@@ -1,538 +0,0 @@
-{
- "additionalProperties": false,
- "conditionalCreateOnlyProperties": [
-  "/properties/EncryptionAtRestOptions/Enabled",
-  "/properties/EncryptionAtRestOptions/KmsKeyId",
-  "/properties/AdvancedSecurityOptions/Enabled"
- ],
- "createOnlyProperties": [
-  "/properties/DomainName"
- ],
- "definitions": {
-  "AdvancedSecurityOptionsInput": {
-   "additionalProperties": false,
-   "properties": {
-    "AnonymousAuthDisableDate": {
-     "type": "string"
-    },
-    "AnonymousAuthEnabled": {
-     "type": "boolean"
-    },
-    "Enabled": {
-     "type": "boolean"
-    },
-    "InternalUserDatabaseEnabled": {
-     "type": "boolean"
-    },
-    "MasterUserOptions": {
-     "$ref": "#/definitions/MasterUserOptions"
-    },
-    "SAMLOptions": {
-     "$ref": "#/definitions/SAMLOptions"
-    }
-   },
-   "type": "object"
-  },
-  "ClusterConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "ColdStorageOptions": {
-     "$ref": "#/definitions/ColdStorageOptions"
-    },
-    "DedicatedMasterCount": {
-     "type": "integer"
-    },
-    "DedicatedMasterEnabled": {
-     "type": "boolean"
-    },
-    "DedicatedMasterType": {
-     "type": "string"
-    },
-    "InstanceCount": {
-     "type": "integer"
-    },
-    "InstanceType": {
-     "type": "string"
-    },
-    "MultiAZWithStandbyEnabled": {
-     "type": "boolean"
-    },
-    "WarmCount": {
-     "type": "integer"
-    },
-    "WarmEnabled": {
-     "type": "boolean"
-    },
-    "WarmType": {
-     "type": "string"
-    },
-    "ZoneAwarenessConfig": {
-     "$ref": "#/definitions/ZoneAwarenessConfig"
-    },
-    "ZoneAwarenessEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "CognitoOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "IdentityPoolId": {
-     "type": "string"
-    },
-    "RoleArn": {
-     "type": "string"
-    },
-    "UserPoolId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ColdStorageOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "DomainEndpointOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomEndpoint": {
-     "type": "string"
-    },
-    "CustomEndpointCertificateArn": {
-     "type": "string"
-    },
-    "CustomEndpointEnabled": {
-     "type": "boolean"
-    },
-    "EnforceHTTPS": {
-     "type": "boolean"
-    },
-    "TLSSecurityPolicy": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EBSOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "EBSEnabled": {
-     "type": "boolean"
-    },
-    "Iops": {
-     "type": "integer"
-    },
-    "Throughput": {
-     "type": "integer"
-    },
-    "VolumeSize": {
-     "type": "integer"
-    },
-    "VolumeType": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EncryptionAtRestOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "KmsKeyId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Idp": {
-   "additionalProperties": false,
-   "properties": {
-    "EntityId": {
-     "type": "string"
-    },
-    "MetadataContent": {
-     "maxLength": 1048576,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "MetadataContent",
-    "EntityId"
-   ],
-   "type": "object"
-  },
-  "LogPublishingOption": {
-   "additionalProperties": false,
-   "properties": {
-    "CloudWatchLogsLogGroupArn": {
-     "type": "string"
-    },
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "MasterUserOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "MasterUserARN": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "MasterUserPassword": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindow": {
-   "additionalProperties": false,
-   "properties": {
-    "WindowStartTime": {
-     "$ref": "#/definitions/WindowStartTime"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindowOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "OffPeakWindow": {
-     "$ref": "#/definitions/OffPeakWindow"
-    }
-   },
-   "type": "object"
-  },
-  "SAMLOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "Idp": {
-     "$ref": "#/definitions/Idp"
-    },
-    "MasterBackendRole": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "RolesKey": {
-     "type": "string"
-    },
-    "SessionTimeoutMinutes": {
-     "type": "integer"
-    },
-    "SubjectKey": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ServiceSoftwareOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedUpdateDate": {
-     "type": "string"
-    },
-    "Cancellable": {
-     "type": "boolean"
-    },
-    "CurrentVersion": {
-     "type": "string"
-    },
-    "Description": {
-     "type": "string"
-    },
-    "NewVersion": {
-     "type": "string"
-    },
-    "OptionalDeployment": {
-     "type": "boolean"
-    },
-    "UpdateAvailable": {
-     "type": "boolean"
-    },
-    "UpdateStatus": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SnapshotOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedSnapshotStartHour": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "SoftwareUpdateOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutoSoftwareUpdateEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 0,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "minLength": 0,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "VPCOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "SecurityGroupIds": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.GroupId",
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    },
-    "SubnetIds": {
-     "items": {
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "type": "object"
-  },
-  "WindowStartTime": {
-   "additionalProperties": false,
-   "properties": {
-    "Hours": {
-     "maximum": 23,
-     "minimum": 0,
-     "type": "integer"
-    },
-    "Minutes": {
-     "maximum": 59,
-     "minimum": 0,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "Hours",
-    "Minutes"
-   ],
-   "type": "object"
-  },
-  "ZoneAwarenessConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "AvailabilityZoneCount": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "es:CreateDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:ListTags"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "es:DeleteDomain",
-    "es:DescribeDomain"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "es:DescribeDomain",
-    "es:ListTags"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "es:UpdateDomain",
-    "es:UpgradeDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:RemoveTags",
-    "es:ListTags",
-    "es:DescribeDomainChangeProgress"
-   ],
-   "timeoutInMinutes": 2160
-  }
- },
- "primaryIdentifier": [
-  "/properties/DomainName"
- ],
- "properties": {
-  "AccessPolicies": {
-   "format": "json",
-   "type": [
-    "object",
-    "string"
-   ]
-  },
-  "AdvancedOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "AdvancedSecurityOptions": {
-   "$ref": "#/definitions/AdvancedSecurityOptionsInput"
-  },
-  "Arn": {
-   "type": "string"
-  },
-  "ClusterConfig": {
-   "$ref": "#/definitions/ClusterConfig"
-  },
-  "CognitoOptions": {
-   "$ref": "#/definitions/CognitoOptions"
-  },
-  "DomainArn": {
-   "type": "string"
-  },
-  "DomainEndpoint": {
-   "type": "string"
-  },
-  "DomainEndpointOptions": {
-   "$ref": "#/definitions/DomainEndpointOptions"
-  },
-  "DomainEndpointV2": {
-   "type": "string"
-  },
-  "DomainEndpoints": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "^.*$": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "DomainName": {
-   "type": "string"
-  },
-  "EBSOptions": {
-   "$ref": "#/definitions/EBSOptions"
-  },
-  "EncryptionAtRestOptions": {
-   "$ref": "#/definitions/EncryptionAtRestOptions"
-  },
-  "EngineVersion": {
-   "type": "string"
-  },
-  "IPAddressType": {
-   "type": "string"
-  },
-  "Id": {
-   "type": "string"
-  },
-  "LogPublishingOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "$ref": "#/definitions/LogPublishingOption"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "$ref": "#/definitions/NodeToNodeEncryptionOptions"
-  },
-  "OffPeakWindowOptions": {
-   "$ref": "#/definitions/OffPeakWindowOptions"
-  },
-  "ServiceSoftwareOptions": {
-   "$ref": "#/definitions/ServiceSoftwareOptions"
-  },
-  "SnapshotOptions": {
-   "$ref": "#/definitions/SnapshotOptions"
-  },
-  "SoftwareUpdateOptions": {
-   "$ref": "#/definitions/SoftwareUpdateOptions"
-  },
-  "Tags": {
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "VPCOptions": {
-   "$ref": "#/definitions/VPCOptions"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id",
-  "/properties/Arn",
-  "/properties/DomainArn",
-  "/properties/DomainEndpoint",
-  "/properties/DomainEndpointV2",
-  "/properties/DomainEndpoints",
-  "/properties/ServiceSoftwareOptions",
-  "/properties/AdvancedSecurityOptions/AnonymousAuthDisableDate"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git",
- "typeName": "AWS::OpenSearchService::Domain",
- "writeOnlyProperties": [
-  "/properties/AdvancedSecurityOptions/MasterUserOptions",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterUserName",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterBackendRole"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_east_1/__init__.py b/src/cfnlint/data/schemas/providers/ap_east_1/__init__.py
index 4c2d8ade67..5df5f3d65c 100644
--- a/src/cfnlint/data/schemas/providers/ap_east_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/ap_east_1/__init__.py
@@ -1107,6 +1107,7 @@
     "aws-ecr-pullthroughcacherule.json",
     "aws-ecr-registrypolicy.json",
     "aws-ecr-replicationconfiguration.json",
+    "aws-ecr-repository.json",
     "aws-ecr-repositorycreationtemplate.json",
     "aws-ecs-capacityprovider.json",
     "aws-ecs-cluster.json",
@@ -1341,6 +1342,7 @@
     "aws-networkmanager-transitgatewayregistration.json",
     "aws-oam-link.json",
     "aws-oam-sink.json",
+    "aws-opensearchservice-domain.json",
     "aws-opsworks-app.json",
     "aws-opsworks-elasticloadbalancerattachment.json",
     "aws-opsworks-instance.json",
diff --git a/src/cfnlint/data/schemas/providers/ap_east_1/aws-ecr-repository.json b/src/cfnlint/data/schemas/providers/ap_east_1/aws-ecr-repository.json
deleted file mode 100644
index 062afcc632..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_east_1/aws-ecr-repository.json
+++ /dev/null
@@ -1,212 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/RepositoryName",
-  "/properties/EncryptionConfiguration",
-  "/properties/EncryptionConfiguration/EncryptionType",
-  "/properties/EncryptionConfiguration/KmsKey"
- ],
- "definitions": {
-  "EmptyOnDelete": {
-   "type": "boolean"
-  },
-  "EncryptionConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "EncryptionType": {
-     "$ref": "#/definitions/EncryptionType"
-    },
-    "KmsKey": {
-     "$ref": "#/definitions/KmsKey"
-    }
-   },
-   "required": [
-    "EncryptionType"
-   ],
-   "type": "object"
-  },
-  "EncryptionType": {
-   "enum": [
-    "AES256",
-    "KMS"
-   ],
-   "type": "string"
-  },
-  "ImageScanningConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "ScanOnPush": {
-     "$ref": "#/definitions/ScanOnPush"
-    }
-   },
-   "type": "object"
-  },
-  "KmsKey": {
-   "maxLength": 2048,
-   "minLength": 1,
-   "type": "string"
-  },
-  "LifecyclePolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "LifecyclePolicyText": {
-     "$ref": "#/definitions/LifecyclePolicyText"
-    },
-    "RegistryId": {
-     "$ref": "#/definitions/RegistryId"
-    }
-   },
-   "type": "object"
-  },
-  "LifecyclePolicyText": {
-   "maxLength": 30720,
-   "minLength": 100,
-   "type": "string"
-  },
-  "RegistryId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^[0-9]{12}$",
-   "type": "string"
-  },
-  "ScanOnPush": {
-   "type": "boolean"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 127,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 255,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "ecr:CreateRepository",
-    "ecr:PutLifecyclePolicy",
-    "ecr:SetRepositoryPolicy",
-    "ecr:TagResource",
-    "kms:DescribeKey",
-    "kms:CreateGrant",
-    "kms:RetireGrant"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "ecr:DeleteRepository",
-    "kms:RetireGrant"
-   ]
-  },
-  "list": {
-   "permissions": [
-    "ecr:DescribeRepositories"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "ecr:DescribeRepositories",
-    "ecr:GetLifecyclePolicy",
-    "ecr:GetRepositoryPolicy",
-    "ecr:ListTagsForResource"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "ecr:DescribeRepositories",
-    "ecr:PutLifecyclePolicy",
-    "ecr:SetRepositoryPolicy",
-    "ecr:ListTagsForResource",
-    "ecr:TagResource",
-    "ecr:UntagResource",
-    "ecr:DeleteLifecyclePolicy",
-    "ecr:DeleteRepositoryPolicy",
-    "ecr:PutImageScanningConfiguration",
-    "ecr:PutImageTagMutability",
-    "kms:DescribeKey",
-    "kms:CreateGrant",
-    "kms:RetireGrant"
-   ]
-  }
- },
- "primaryIdentifier": [
-  "/properties/RepositoryName"
- ],
- "properties": {
-  "Arn": {
-   "type": "string"
-  },
-  "EmptyOnDelete": {
-   "$ref": "#/definitions/EmptyOnDelete"
-  },
-  "EncryptionConfiguration": {
-   "$ref": "#/definitions/EncryptionConfiguration"
-  },
-  "ImageScanningConfiguration": {
-   "$ref": "#/definitions/ImageScanningConfiguration"
-  },
-  "ImageTagMutability": {
-   "enum": [
-    "MUTABLE",
-    "IMMUTABLE"
-   ],
-   "type": "string"
-  },
-  "LifecyclePolicy": {
-   "$ref": "#/definitions/LifecyclePolicy"
-  },
-  "RepositoryName": {
-   "maxLength": 256,
-   "minLength": 2,
-   "pattern": "^(?=.{2,256}$)((?:[a-z0-9]+(?:[._-][a-z0-9]+)*/)*[a-z0-9]+(?:[._-][a-z0-9]+)*)$",
-   "type": "string"
-  },
-  "RepositoryPolicyText": {
-   "type": [
-    "object",
-    "string"
-   ]
-  },
-  "RepositoryUri": {
-   "type": "string"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 50,
-   "type": "array",
-   "uniqueItems": true
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/RepositoryUri"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-ecr.git",
- "tagging": {
-  "cloudFormationSystemTags": true,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::ECR::Repository",
- "writeOnlyProperties": [
-  "/properties/EmptyOnDelete"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_east_1/aws-opensearchservice-domain.json b/src/cfnlint/data/schemas/providers/ap_east_1/aws-opensearchservice-domain.json
deleted file mode 100644
index c8aa358cc0..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_east_1/aws-opensearchservice-domain.json
+++ /dev/null
@@ -1,538 +0,0 @@
-{
- "additionalProperties": false,
- "conditionalCreateOnlyProperties": [
-  "/properties/EncryptionAtRestOptions/Enabled",
-  "/properties/EncryptionAtRestOptions/KmsKeyId",
-  "/properties/AdvancedSecurityOptions/Enabled"
- ],
- "createOnlyProperties": [
-  "/properties/DomainName"
- ],
- "definitions": {
-  "AdvancedSecurityOptionsInput": {
-   "additionalProperties": false,
-   "properties": {
-    "AnonymousAuthDisableDate": {
-     "type": "string"
-    },
-    "AnonymousAuthEnabled": {
-     "type": "boolean"
-    },
-    "Enabled": {
-     "type": "boolean"
-    },
-    "InternalUserDatabaseEnabled": {
-     "type": "boolean"
-    },
-    "MasterUserOptions": {
-     "$ref": "#/definitions/MasterUserOptions"
-    },
-    "SAMLOptions": {
-     "$ref": "#/definitions/SAMLOptions"
-    }
-   },
-   "type": "object"
-  },
-  "ClusterConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "ColdStorageOptions": {
-     "$ref": "#/definitions/ColdStorageOptions"
-    },
-    "DedicatedMasterCount": {
-     "type": "integer"
-    },
-    "DedicatedMasterEnabled": {
-     "type": "boolean"
-    },
-    "DedicatedMasterType": {
-     "type": "string"
-    },
-    "InstanceCount": {
-     "type": "integer"
-    },
-    "InstanceType": {
-     "type": "string"
-    },
-    "MultiAZWithStandbyEnabled": {
-     "type": "boolean"
-    },
-    "WarmCount": {
-     "type": "integer"
-    },
-    "WarmEnabled": {
-     "type": "boolean"
-    },
-    "WarmType": {
-     "type": "string"
-    },
-    "ZoneAwarenessConfig": {
-     "$ref": "#/definitions/ZoneAwarenessConfig"
-    },
-    "ZoneAwarenessEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "CognitoOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "IdentityPoolId": {
-     "type": "string"
-    },
-    "RoleArn": {
-     "type": "string"
-    },
-    "UserPoolId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ColdStorageOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "DomainEndpointOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomEndpoint": {
-     "type": "string"
-    },
-    "CustomEndpointCertificateArn": {
-     "type": "string"
-    },
-    "CustomEndpointEnabled": {
-     "type": "boolean"
-    },
-    "EnforceHTTPS": {
-     "type": "boolean"
-    },
-    "TLSSecurityPolicy": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EBSOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "EBSEnabled": {
-     "type": "boolean"
-    },
-    "Iops": {
-     "type": "integer"
-    },
-    "Throughput": {
-     "type": "integer"
-    },
-    "VolumeSize": {
-     "type": "integer"
-    },
-    "VolumeType": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EncryptionAtRestOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "KmsKeyId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Idp": {
-   "additionalProperties": false,
-   "properties": {
-    "EntityId": {
-     "type": "string"
-    },
-    "MetadataContent": {
-     "maxLength": 1048576,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "MetadataContent",
-    "EntityId"
-   ],
-   "type": "object"
-  },
-  "LogPublishingOption": {
-   "additionalProperties": false,
-   "properties": {
-    "CloudWatchLogsLogGroupArn": {
-     "type": "string"
-    },
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "MasterUserOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "MasterUserARN": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "MasterUserPassword": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindow": {
-   "additionalProperties": false,
-   "properties": {
-    "WindowStartTime": {
-     "$ref": "#/definitions/WindowStartTime"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindowOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "OffPeakWindow": {
-     "$ref": "#/definitions/OffPeakWindow"
-    }
-   },
-   "type": "object"
-  },
-  "SAMLOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "Idp": {
-     "$ref": "#/definitions/Idp"
-    },
-    "MasterBackendRole": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "RolesKey": {
-     "type": "string"
-    },
-    "SessionTimeoutMinutes": {
-     "type": "integer"
-    },
-    "SubjectKey": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ServiceSoftwareOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedUpdateDate": {
-     "type": "string"
-    },
-    "Cancellable": {
-     "type": "boolean"
-    },
-    "CurrentVersion": {
-     "type": "string"
-    },
-    "Description": {
-     "type": "string"
-    },
-    "NewVersion": {
-     "type": "string"
-    },
-    "OptionalDeployment": {
-     "type": "boolean"
-    },
-    "UpdateAvailable": {
-     "type": "boolean"
-    },
-    "UpdateStatus": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SnapshotOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedSnapshotStartHour": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "SoftwareUpdateOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutoSoftwareUpdateEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 0,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "minLength": 0,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "VPCOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "SecurityGroupIds": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.GroupId",
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    },
-    "SubnetIds": {
-     "items": {
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "type": "object"
-  },
-  "WindowStartTime": {
-   "additionalProperties": false,
-   "properties": {
-    "Hours": {
-     "maximum": 23,
-     "minimum": 0,
-     "type": "integer"
-    },
-    "Minutes": {
-     "maximum": 59,
-     "minimum": 0,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "Hours",
-    "Minutes"
-   ],
-   "type": "object"
-  },
-  "ZoneAwarenessConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "AvailabilityZoneCount": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "es:CreateDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:ListTags"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "es:DeleteDomain",
-    "es:DescribeDomain"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "es:DescribeDomain",
-    "es:ListTags"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "es:UpdateDomain",
-    "es:UpgradeDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:RemoveTags",
-    "es:ListTags",
-    "es:DescribeDomainChangeProgress"
-   ],
-   "timeoutInMinutes": 2160
-  }
- },
- "primaryIdentifier": [
-  "/properties/DomainName"
- ],
- "properties": {
-  "AccessPolicies": {
-   "format": "json",
-   "type": [
-    "object",
-    "string"
-   ]
-  },
-  "AdvancedOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "AdvancedSecurityOptions": {
-   "$ref": "#/definitions/AdvancedSecurityOptionsInput"
-  },
-  "Arn": {
-   "type": "string"
-  },
-  "ClusterConfig": {
-   "$ref": "#/definitions/ClusterConfig"
-  },
-  "CognitoOptions": {
-   "$ref": "#/definitions/CognitoOptions"
-  },
-  "DomainArn": {
-   "type": "string"
-  },
-  "DomainEndpoint": {
-   "type": "string"
-  },
-  "DomainEndpointOptions": {
-   "$ref": "#/definitions/DomainEndpointOptions"
-  },
-  "DomainEndpointV2": {
-   "type": "string"
-  },
-  "DomainEndpoints": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "^.*$": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "DomainName": {
-   "type": "string"
-  },
-  "EBSOptions": {
-   "$ref": "#/definitions/EBSOptions"
-  },
-  "EncryptionAtRestOptions": {
-   "$ref": "#/definitions/EncryptionAtRestOptions"
-  },
-  "EngineVersion": {
-   "type": "string"
-  },
-  "IPAddressType": {
-   "type": "string"
-  },
-  "Id": {
-   "type": "string"
-  },
-  "LogPublishingOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "$ref": "#/definitions/LogPublishingOption"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "$ref": "#/definitions/NodeToNodeEncryptionOptions"
-  },
-  "OffPeakWindowOptions": {
-   "$ref": "#/definitions/OffPeakWindowOptions"
-  },
-  "ServiceSoftwareOptions": {
-   "$ref": "#/definitions/ServiceSoftwareOptions"
-  },
-  "SnapshotOptions": {
-   "$ref": "#/definitions/SnapshotOptions"
-  },
-  "SoftwareUpdateOptions": {
-   "$ref": "#/definitions/SoftwareUpdateOptions"
-  },
-  "Tags": {
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "VPCOptions": {
-   "$ref": "#/definitions/VPCOptions"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id",
-  "/properties/Arn",
-  "/properties/DomainArn",
-  "/properties/DomainEndpoint",
-  "/properties/DomainEndpointV2",
-  "/properties/DomainEndpoints",
-  "/properties/ServiceSoftwareOptions",
-  "/properties/AdvancedSecurityOptions/AnonymousAuthDisableDate"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git",
- "typeName": "AWS::OpenSearchService::Domain",
- "writeOnlyProperties": [
-  "/properties/AdvancedSecurityOptions/MasterUserOptions",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterUserName",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterBackendRole"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_2/__init__.py b/src/cfnlint/data/schemas/providers/ap_northeast_2/__init__.py
index e1825ed552..d331e45570 100644
--- a/src/cfnlint/data/schemas/providers/ap_northeast_2/__init__.py
+++ b/src/cfnlint/data/schemas/providers/ap_northeast_2/__init__.py
@@ -1893,6 +1893,7 @@
     "aws-networkmanager-vpcattachment.json",
     "aws-oam-link.json",
     "aws-oam-sink.json",
+    "aws-opensearchservice-domain.json",
     "aws-opsworks-app.json",
     "aws-opsworks-elasticloadbalancerattachment.json",
     "aws-opsworks-instance.json",
diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-opensearchservice-domain.json b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-opensearchservice-domain.json
deleted file mode 100644
index c8aa358cc0..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-opensearchservice-domain.json
+++ /dev/null
@@ -1,538 +0,0 @@
-{
- "additionalProperties": false,
- "conditionalCreateOnlyProperties": [
-  "/properties/EncryptionAtRestOptions/Enabled",
-  "/properties/EncryptionAtRestOptions/KmsKeyId",
-  "/properties/AdvancedSecurityOptions/Enabled"
- ],
- "createOnlyProperties": [
-  "/properties/DomainName"
- ],
- "definitions": {
-  "AdvancedSecurityOptionsInput": {
-   "additionalProperties": false,
-   "properties": {
-    "AnonymousAuthDisableDate": {
-     "type": "string"
-    },
-    "AnonymousAuthEnabled": {
-     "type": "boolean"
-    },
-    "Enabled": {
-     "type": "boolean"
-    },
-    "InternalUserDatabaseEnabled": {
-     "type": "boolean"
-    },
-    "MasterUserOptions": {
-     "$ref": "#/definitions/MasterUserOptions"
-    },
-    "SAMLOptions": {
-     "$ref": "#/definitions/SAMLOptions"
-    }
-   },
-   "type": "object"
-  },
-  "ClusterConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "ColdStorageOptions": {
-     "$ref": "#/definitions/ColdStorageOptions"
-    },
-    "DedicatedMasterCount": {
-     "type": "integer"
-    },
-    "DedicatedMasterEnabled": {
-     "type": "boolean"
-    },
-    "DedicatedMasterType": {
-     "type": "string"
-    },
-    "InstanceCount": {
-     "type": "integer"
-    },
-    "InstanceType": {
-     "type": "string"
-    },
-    "MultiAZWithStandbyEnabled": {
-     "type": "boolean"
-    },
-    "WarmCount": {
-     "type": "integer"
-    },
-    "WarmEnabled": {
-     "type": "boolean"
-    },
-    "WarmType": {
-     "type": "string"
-    },
-    "ZoneAwarenessConfig": {
-     "$ref": "#/definitions/ZoneAwarenessConfig"
-    },
-    "ZoneAwarenessEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "CognitoOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "IdentityPoolId": {
-     "type": "string"
-    },
-    "RoleArn": {
-     "type": "string"
-    },
-    "UserPoolId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ColdStorageOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "DomainEndpointOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomEndpoint": {
-     "type": "string"
-    },
-    "CustomEndpointCertificateArn": {
-     "type": "string"
-    },
-    "CustomEndpointEnabled": {
-     "type": "boolean"
-    },
-    "EnforceHTTPS": {
-     "type": "boolean"
-    },
-    "TLSSecurityPolicy": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EBSOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "EBSEnabled": {
-     "type": "boolean"
-    },
-    "Iops": {
-     "type": "integer"
-    },
-    "Throughput": {
-     "type": "integer"
-    },
-    "VolumeSize": {
-     "type": "integer"
-    },
-    "VolumeType": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EncryptionAtRestOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "KmsKeyId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Idp": {
-   "additionalProperties": false,
-   "properties": {
-    "EntityId": {
-     "type": "string"
-    },
-    "MetadataContent": {
-     "maxLength": 1048576,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "MetadataContent",
-    "EntityId"
-   ],
-   "type": "object"
-  },
-  "LogPublishingOption": {
-   "additionalProperties": false,
-   "properties": {
-    "CloudWatchLogsLogGroupArn": {
-     "type": "string"
-    },
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "MasterUserOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "MasterUserARN": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "MasterUserPassword": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindow": {
-   "additionalProperties": false,
-   "properties": {
-    "WindowStartTime": {
-     "$ref": "#/definitions/WindowStartTime"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindowOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "OffPeakWindow": {
-     "$ref": "#/definitions/OffPeakWindow"
-    }
-   },
-   "type": "object"
-  },
-  "SAMLOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "Idp": {
-     "$ref": "#/definitions/Idp"
-    },
-    "MasterBackendRole": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "RolesKey": {
-     "type": "string"
-    },
-    "SessionTimeoutMinutes": {
-     "type": "integer"
-    },
-    "SubjectKey": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ServiceSoftwareOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedUpdateDate": {
-     "type": "string"
-    },
-    "Cancellable": {
-     "type": "boolean"
-    },
-    "CurrentVersion": {
-     "type": "string"
-    },
-    "Description": {
-     "type": "string"
-    },
-    "NewVersion": {
-     "type": "string"
-    },
-    "OptionalDeployment": {
-     "type": "boolean"
-    },
-    "UpdateAvailable": {
-     "type": "boolean"
-    },
-    "UpdateStatus": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SnapshotOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedSnapshotStartHour": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "SoftwareUpdateOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutoSoftwareUpdateEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 0,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "minLength": 0,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "VPCOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "SecurityGroupIds": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.GroupId",
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    },
-    "SubnetIds": {
-     "items": {
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "type": "object"
-  },
-  "WindowStartTime": {
-   "additionalProperties": false,
-   "properties": {
-    "Hours": {
-     "maximum": 23,
-     "minimum": 0,
-     "type": "integer"
-    },
-    "Minutes": {
-     "maximum": 59,
-     "minimum": 0,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "Hours",
-    "Minutes"
-   ],
-   "type": "object"
-  },
-  "ZoneAwarenessConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "AvailabilityZoneCount": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "es:CreateDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:ListTags"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "es:DeleteDomain",
-    "es:DescribeDomain"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "es:DescribeDomain",
-    "es:ListTags"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "es:UpdateDomain",
-    "es:UpgradeDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:RemoveTags",
-    "es:ListTags",
-    "es:DescribeDomainChangeProgress"
-   ],
-   "timeoutInMinutes": 2160
-  }
- },
- "primaryIdentifier": [
-  "/properties/DomainName"
- ],
- "properties": {
-  "AccessPolicies": {
-   "format": "json",
-   "type": [
-    "object",
-    "string"
-   ]
-  },
-  "AdvancedOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "AdvancedSecurityOptions": {
-   "$ref": "#/definitions/AdvancedSecurityOptionsInput"
-  },
-  "Arn": {
-   "type": "string"
-  },
-  "ClusterConfig": {
-   "$ref": "#/definitions/ClusterConfig"
-  },
-  "CognitoOptions": {
-   "$ref": "#/definitions/CognitoOptions"
-  },
-  "DomainArn": {
-   "type": "string"
-  },
-  "DomainEndpoint": {
-   "type": "string"
-  },
-  "DomainEndpointOptions": {
-   "$ref": "#/definitions/DomainEndpointOptions"
-  },
-  "DomainEndpointV2": {
-   "type": "string"
-  },
-  "DomainEndpoints": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "^.*$": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "DomainName": {
-   "type": "string"
-  },
-  "EBSOptions": {
-   "$ref": "#/definitions/EBSOptions"
-  },
-  "EncryptionAtRestOptions": {
-   "$ref": "#/definitions/EncryptionAtRestOptions"
-  },
-  "EngineVersion": {
-   "type": "string"
-  },
-  "IPAddressType": {
-   "type": "string"
-  },
-  "Id": {
-   "type": "string"
-  },
-  "LogPublishingOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "$ref": "#/definitions/LogPublishingOption"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "$ref": "#/definitions/NodeToNodeEncryptionOptions"
-  },
-  "OffPeakWindowOptions": {
-   "$ref": "#/definitions/OffPeakWindowOptions"
-  },
-  "ServiceSoftwareOptions": {
-   "$ref": "#/definitions/ServiceSoftwareOptions"
-  },
-  "SnapshotOptions": {
-   "$ref": "#/definitions/SnapshotOptions"
-  },
-  "SoftwareUpdateOptions": {
-   "$ref": "#/definitions/SoftwareUpdateOptions"
-  },
-  "Tags": {
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "VPCOptions": {
-   "$ref": "#/definitions/VPCOptions"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id",
-  "/properties/Arn",
-  "/properties/DomainArn",
-  "/properties/DomainEndpoint",
-  "/properties/DomainEndpointV2",
-  "/properties/DomainEndpoints",
-  "/properties/ServiceSoftwareOptions",
-  "/properties/AdvancedSecurityOptions/AnonymousAuthDisableDate"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git",
- "typeName": "AWS::OpenSearchService::Domain",
- "writeOnlyProperties": [
-  "/properties/AdvancedSecurityOptions/MasterUserOptions",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterUserName",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterBackendRole"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_3/__init__.py b/src/cfnlint/data/schemas/providers/ap_northeast_3/__init__.py
index f5cd6eda57..1a403832fa 100644
--- a/src/cfnlint/data/schemas/providers/ap_northeast_3/__init__.py
+++ b/src/cfnlint/data/schemas/providers/ap_northeast_3/__init__.py
@@ -1059,6 +1059,7 @@
     "aws-ecr-pullthroughcacherule.json",
     "aws-ecr-registrypolicy.json",
     "aws-ecr-replicationconfiguration.json",
+    "aws-ecr-repository.json",
     "aws-ecr-repositorycreationtemplate.json",
     "aws-ecs-capacityprovider.json",
     "aws-ecs-cluster.json",
diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-ecr-repository.json b/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-ecr-repository.json
deleted file mode 100644
index 062afcc632..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-ecr-repository.json
+++ /dev/null
@@ -1,212 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/RepositoryName",
-  "/properties/EncryptionConfiguration",
-  "/properties/EncryptionConfiguration/EncryptionType",
-  "/properties/EncryptionConfiguration/KmsKey"
- ],
- "definitions": {
-  "EmptyOnDelete": {
-   "type": "boolean"
-  },
-  "EncryptionConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "EncryptionType": {
-     "$ref": "#/definitions/EncryptionType"
-    },
-    "KmsKey": {
-     "$ref": "#/definitions/KmsKey"
-    }
-   },
-   "required": [
-    "EncryptionType"
-   ],
-   "type": "object"
-  },
-  "EncryptionType": {
-   "enum": [
-    "AES256",
-    "KMS"
-   ],
-   "type": "string"
-  },
-  "ImageScanningConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "ScanOnPush": {
-     "$ref": "#/definitions/ScanOnPush"
-    }
-   },
-   "type": "object"
-  },
-  "KmsKey": {
-   "maxLength": 2048,
-   "minLength": 1,
-   "type": "string"
-  },
-  "LifecyclePolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "LifecyclePolicyText": {
-     "$ref": "#/definitions/LifecyclePolicyText"
-    },
-    "RegistryId": {
-     "$ref": "#/definitions/RegistryId"
-    }
-   },
-   "type": "object"
-  },
-  "LifecyclePolicyText": {
-   "maxLength": 30720,
-   "minLength": 100,
-   "type": "string"
-  },
-  "RegistryId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^[0-9]{12}$",
-   "type": "string"
-  },
-  "ScanOnPush": {
-   "type": "boolean"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 127,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 255,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "ecr:CreateRepository",
-    "ecr:PutLifecyclePolicy",
-    "ecr:SetRepositoryPolicy",
-    "ecr:TagResource",
-    "kms:DescribeKey",
-    "kms:CreateGrant",
-    "kms:RetireGrant"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "ecr:DeleteRepository",
-    "kms:RetireGrant"
-   ]
-  },
-  "list": {
-   "permissions": [
-    "ecr:DescribeRepositories"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "ecr:DescribeRepositories",
-    "ecr:GetLifecyclePolicy",
-    "ecr:GetRepositoryPolicy",
-    "ecr:ListTagsForResource"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "ecr:DescribeRepositories",
-    "ecr:PutLifecyclePolicy",
-    "ecr:SetRepositoryPolicy",
-    "ecr:ListTagsForResource",
-    "ecr:TagResource",
-    "ecr:UntagResource",
-    "ecr:DeleteLifecyclePolicy",
-    "ecr:DeleteRepositoryPolicy",
-    "ecr:PutImageScanningConfiguration",
-    "ecr:PutImageTagMutability",
-    "kms:DescribeKey",
-    "kms:CreateGrant",
-    "kms:RetireGrant"
-   ]
-  }
- },
- "primaryIdentifier": [
-  "/properties/RepositoryName"
- ],
- "properties": {
-  "Arn": {
-   "type": "string"
-  },
-  "EmptyOnDelete": {
-   "$ref": "#/definitions/EmptyOnDelete"
-  },
-  "EncryptionConfiguration": {
-   "$ref": "#/definitions/EncryptionConfiguration"
-  },
-  "ImageScanningConfiguration": {
-   "$ref": "#/definitions/ImageScanningConfiguration"
-  },
-  "ImageTagMutability": {
-   "enum": [
-    "MUTABLE",
-    "IMMUTABLE"
-   ],
-   "type": "string"
-  },
-  "LifecyclePolicy": {
-   "$ref": "#/definitions/LifecyclePolicy"
-  },
-  "RepositoryName": {
-   "maxLength": 256,
-   "minLength": 2,
-   "pattern": "^(?=.{2,256}$)((?:[a-z0-9]+(?:[._-][a-z0-9]+)*/)*[a-z0-9]+(?:[._-][a-z0-9]+)*)$",
-   "type": "string"
-  },
-  "RepositoryPolicyText": {
-   "type": [
-    "object",
-    "string"
-   ]
-  },
-  "RepositoryUri": {
-   "type": "string"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 50,
-   "type": "array",
-   "uniqueItems": true
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/RepositoryUri"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-ecr.git",
- "tagging": {
-  "cloudFormationSystemTags": true,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::ECR::Repository",
- "writeOnlyProperties": [
-  "/properties/EmptyOnDelete"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_south_1/__init__.py b/src/cfnlint/data/schemas/providers/ap_south_1/__init__.py
index ac133d71a5..8b01ebf714 100644
--- a/src/cfnlint/data/schemas/providers/ap_south_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/ap_south_1/__init__.py
@@ -1536,6 +1536,7 @@
     "aws-ecr-pullthroughcacherule.json",
     "aws-ecr-registrypolicy.json",
     "aws-ecr-replicationconfiguration.json",
+    "aws-ecr-repository.json",
     "aws-ecr-repositorycreationtemplate.json",
     "aws-ecs-capacityprovider.json",
     "aws-ecs-cluster.json",
@@ -1913,6 +1914,7 @@
     "aws-opensearchserverless-securityconfig.json",
     "aws-opensearchserverless-securitypolicy.json",
     "aws-opensearchserverless-vpcendpoint.json",
+    "aws-opensearchservice-domain.json",
     "aws-opsworks-app.json",
     "aws-opsworks-elasticloadbalancerattachment.json",
     "aws-opsworks-instance.json",
diff --git a/src/cfnlint/data/schemas/providers/ap_south_1/aws-ecr-repository.json b/src/cfnlint/data/schemas/providers/ap_south_1/aws-ecr-repository.json
deleted file mode 100644
index 062afcc632..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_south_1/aws-ecr-repository.json
+++ /dev/null
@@ -1,212 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/RepositoryName",
-  "/properties/EncryptionConfiguration",
-  "/properties/EncryptionConfiguration/EncryptionType",
-  "/properties/EncryptionConfiguration/KmsKey"
- ],
- "definitions": {
-  "EmptyOnDelete": {
-   "type": "boolean"
-  },
-  "EncryptionConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "EncryptionType": {
-     "$ref": "#/definitions/EncryptionType"
-    },
-    "KmsKey": {
-     "$ref": "#/definitions/KmsKey"
-    }
-   },
-   "required": [
-    "EncryptionType"
-   ],
-   "type": "object"
-  },
-  "EncryptionType": {
-   "enum": [
-    "AES256",
-    "KMS"
-   ],
-   "type": "string"
-  },
-  "ImageScanningConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "ScanOnPush": {
-     "$ref": "#/definitions/ScanOnPush"
-    }
-   },
-   "type": "object"
-  },
-  "KmsKey": {
-   "maxLength": 2048,
-   "minLength": 1,
-   "type": "string"
-  },
-  "LifecyclePolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "LifecyclePolicyText": {
-     "$ref": "#/definitions/LifecyclePolicyText"
-    },
-    "RegistryId": {
-     "$ref": "#/definitions/RegistryId"
-    }
-   },
-   "type": "object"
-  },
-  "LifecyclePolicyText": {
-   "maxLength": 30720,
-   "minLength": 100,
-   "type": "string"
-  },
-  "RegistryId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^[0-9]{12}$",
-   "type": "string"
-  },
-  "ScanOnPush": {
-   "type": "boolean"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 127,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 255,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "ecr:CreateRepository",
-    "ecr:PutLifecyclePolicy",
-    "ecr:SetRepositoryPolicy",
-    "ecr:TagResource",
-    "kms:DescribeKey",
-    "kms:CreateGrant",
-    "kms:RetireGrant"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "ecr:DeleteRepository",
-    "kms:RetireGrant"
-   ]
-  },
-  "list": {
-   "permissions": [
-    "ecr:DescribeRepositories"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "ecr:DescribeRepositories",
-    "ecr:GetLifecyclePolicy",
-    "ecr:GetRepositoryPolicy",
-    "ecr:ListTagsForResource"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "ecr:DescribeRepositories",
-    "ecr:PutLifecyclePolicy",
-    "ecr:SetRepositoryPolicy",
-    "ecr:ListTagsForResource",
-    "ecr:TagResource",
-    "ecr:UntagResource",
-    "ecr:DeleteLifecyclePolicy",
-    "ecr:DeleteRepositoryPolicy",
-    "ecr:PutImageScanningConfiguration",
-    "ecr:PutImageTagMutability",
-    "kms:DescribeKey",
-    "kms:CreateGrant",
-    "kms:RetireGrant"
-   ]
-  }
- },
- "primaryIdentifier": [
-  "/properties/RepositoryName"
- ],
- "properties": {
-  "Arn": {
-   "type": "string"
-  },
-  "EmptyOnDelete": {
-   "$ref": "#/definitions/EmptyOnDelete"
-  },
-  "EncryptionConfiguration": {
-   "$ref": "#/definitions/EncryptionConfiguration"
-  },
-  "ImageScanningConfiguration": {
-   "$ref": "#/definitions/ImageScanningConfiguration"
-  },
-  "ImageTagMutability": {
-   "enum": [
-    "MUTABLE",
-    "IMMUTABLE"
-   ],
-   "type": "string"
-  },
-  "LifecyclePolicy": {
-   "$ref": "#/definitions/LifecyclePolicy"
-  },
-  "RepositoryName": {
-   "maxLength": 256,
-   "minLength": 2,
-   "pattern": "^(?=.{2,256}$)((?:[a-z0-9]+(?:[._-][a-z0-9]+)*/)*[a-z0-9]+(?:[._-][a-z0-9]+)*)$",
-   "type": "string"
-  },
-  "RepositoryPolicyText": {
-   "type": [
-    "object",
-    "string"
-   ]
-  },
-  "RepositoryUri": {
-   "type": "string"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 50,
-   "type": "array",
-   "uniqueItems": true
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/RepositoryUri"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-ecr.git",
- "tagging": {
-  "cloudFormationSystemTags": true,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::ECR::Repository",
- "writeOnlyProperties": [
-  "/properties/EmptyOnDelete"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_south_1/aws-opensearchservice-domain.json b/src/cfnlint/data/schemas/providers/ap_south_1/aws-opensearchservice-domain.json
deleted file mode 100644
index c8aa358cc0..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_south_1/aws-opensearchservice-domain.json
+++ /dev/null
@@ -1,538 +0,0 @@
-{
- "additionalProperties": false,
- "conditionalCreateOnlyProperties": [
-  "/properties/EncryptionAtRestOptions/Enabled",
-  "/properties/EncryptionAtRestOptions/KmsKeyId",
-  "/properties/AdvancedSecurityOptions/Enabled"
- ],
- "createOnlyProperties": [
-  "/properties/DomainName"
- ],
- "definitions": {
-  "AdvancedSecurityOptionsInput": {
-   "additionalProperties": false,
-   "properties": {
-    "AnonymousAuthDisableDate": {
-     "type": "string"
-    },
-    "AnonymousAuthEnabled": {
-     "type": "boolean"
-    },
-    "Enabled": {
-     "type": "boolean"
-    },
-    "InternalUserDatabaseEnabled": {
-     "type": "boolean"
-    },
-    "MasterUserOptions": {
-     "$ref": "#/definitions/MasterUserOptions"
-    },
-    "SAMLOptions": {
-     "$ref": "#/definitions/SAMLOptions"
-    }
-   },
-   "type": "object"
-  },
-  "ClusterConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "ColdStorageOptions": {
-     "$ref": "#/definitions/ColdStorageOptions"
-    },
-    "DedicatedMasterCount": {
-     "type": "integer"
-    },
-    "DedicatedMasterEnabled": {
-     "type": "boolean"
-    },
-    "DedicatedMasterType": {
-     "type": "string"
-    },
-    "InstanceCount": {
-     "type": "integer"
-    },
-    "InstanceType": {
-     "type": "string"
-    },
-    "MultiAZWithStandbyEnabled": {
-     "type": "boolean"
-    },
-    "WarmCount": {
-     "type": "integer"
-    },
-    "WarmEnabled": {
-     "type": "boolean"
-    },
-    "WarmType": {
-     "type": "string"
-    },
-    "ZoneAwarenessConfig": {
-     "$ref": "#/definitions/ZoneAwarenessConfig"
-    },
-    "ZoneAwarenessEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "CognitoOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "IdentityPoolId": {
-     "type": "string"
-    },
-    "RoleArn": {
-     "type": "string"
-    },
-    "UserPoolId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ColdStorageOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "DomainEndpointOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomEndpoint": {
-     "type": "string"
-    },
-    "CustomEndpointCertificateArn": {
-     "type": "string"
-    },
-    "CustomEndpointEnabled": {
-     "type": "boolean"
-    },
-    "EnforceHTTPS": {
-     "type": "boolean"
-    },
-    "TLSSecurityPolicy": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EBSOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "EBSEnabled": {
-     "type": "boolean"
-    },
-    "Iops": {
-     "type": "integer"
-    },
-    "Throughput": {
-     "type": "integer"
-    },
-    "VolumeSize": {
-     "type": "integer"
-    },
-    "VolumeType": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EncryptionAtRestOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "KmsKeyId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Idp": {
-   "additionalProperties": false,
-   "properties": {
-    "EntityId": {
-     "type": "string"
-    },
-    "MetadataContent": {
-     "maxLength": 1048576,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "MetadataContent",
-    "EntityId"
-   ],
-   "type": "object"
-  },
-  "LogPublishingOption": {
-   "additionalProperties": false,
-   "properties": {
-    "CloudWatchLogsLogGroupArn": {
-     "type": "string"
-    },
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "MasterUserOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "MasterUserARN": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "MasterUserPassword": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindow": {
-   "additionalProperties": false,
-   "properties": {
-    "WindowStartTime": {
-     "$ref": "#/definitions/WindowStartTime"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindowOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "OffPeakWindow": {
-     "$ref": "#/definitions/OffPeakWindow"
-    }
-   },
-   "type": "object"
-  },
-  "SAMLOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "Idp": {
-     "$ref": "#/definitions/Idp"
-    },
-    "MasterBackendRole": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "RolesKey": {
-     "type": "string"
-    },
-    "SessionTimeoutMinutes": {
-     "type": "integer"
-    },
-    "SubjectKey": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ServiceSoftwareOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedUpdateDate": {
-     "type": "string"
-    },
-    "Cancellable": {
-     "type": "boolean"
-    },
-    "CurrentVersion": {
-     "type": "string"
-    },
-    "Description": {
-     "type": "string"
-    },
-    "NewVersion": {
-     "type": "string"
-    },
-    "OptionalDeployment": {
-     "type": "boolean"
-    },
-    "UpdateAvailable": {
-     "type": "boolean"
-    },
-    "UpdateStatus": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SnapshotOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedSnapshotStartHour": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "SoftwareUpdateOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutoSoftwareUpdateEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 0,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "minLength": 0,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "VPCOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "SecurityGroupIds": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.GroupId",
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    },
-    "SubnetIds": {
-     "items": {
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "type": "object"
-  },
-  "WindowStartTime": {
-   "additionalProperties": false,
-   "properties": {
-    "Hours": {
-     "maximum": 23,
-     "minimum": 0,
-     "type": "integer"
-    },
-    "Minutes": {
-     "maximum": 59,
-     "minimum": 0,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "Hours",
-    "Minutes"
-   ],
-   "type": "object"
-  },
-  "ZoneAwarenessConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "AvailabilityZoneCount": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "es:CreateDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:ListTags"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "es:DeleteDomain",
-    "es:DescribeDomain"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "es:DescribeDomain",
-    "es:ListTags"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "es:UpdateDomain",
-    "es:UpgradeDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:RemoveTags",
-    "es:ListTags",
-    "es:DescribeDomainChangeProgress"
-   ],
-   "timeoutInMinutes": 2160
-  }
- },
- "primaryIdentifier": [
-  "/properties/DomainName"
- ],
- "properties": {
-  "AccessPolicies": {
-   "format": "json",
-   "type": [
-    "object",
-    "string"
-   ]
-  },
-  "AdvancedOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "AdvancedSecurityOptions": {
-   "$ref": "#/definitions/AdvancedSecurityOptionsInput"
-  },
-  "Arn": {
-   "type": "string"
-  },
-  "ClusterConfig": {
-   "$ref": "#/definitions/ClusterConfig"
-  },
-  "CognitoOptions": {
-   "$ref": "#/definitions/CognitoOptions"
-  },
-  "DomainArn": {
-   "type": "string"
-  },
-  "DomainEndpoint": {
-   "type": "string"
-  },
-  "DomainEndpointOptions": {
-   "$ref": "#/definitions/DomainEndpointOptions"
-  },
-  "DomainEndpointV2": {
-   "type": "string"
-  },
-  "DomainEndpoints": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "^.*$": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "DomainName": {
-   "type": "string"
-  },
-  "EBSOptions": {
-   "$ref": "#/definitions/EBSOptions"
-  },
-  "EncryptionAtRestOptions": {
-   "$ref": "#/definitions/EncryptionAtRestOptions"
-  },
-  "EngineVersion": {
-   "type": "string"
-  },
-  "IPAddressType": {
-   "type": "string"
-  },
-  "Id": {
-   "type": "string"
-  },
-  "LogPublishingOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "$ref": "#/definitions/LogPublishingOption"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "$ref": "#/definitions/NodeToNodeEncryptionOptions"
-  },
-  "OffPeakWindowOptions": {
-   "$ref": "#/definitions/OffPeakWindowOptions"
-  },
-  "ServiceSoftwareOptions": {
-   "$ref": "#/definitions/ServiceSoftwareOptions"
-  },
-  "SnapshotOptions": {
-   "$ref": "#/definitions/SnapshotOptions"
-  },
-  "SoftwareUpdateOptions": {
-   "$ref": "#/definitions/SoftwareUpdateOptions"
-  },
-  "Tags": {
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "VPCOptions": {
-   "$ref": "#/definitions/VPCOptions"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id",
-  "/properties/Arn",
-  "/properties/DomainArn",
-  "/properties/DomainEndpoint",
-  "/properties/DomainEndpointV2",
-  "/properties/DomainEndpoints",
-  "/properties/ServiceSoftwareOptions",
-  "/properties/AdvancedSecurityOptions/AnonymousAuthDisableDate"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git",
- "typeName": "AWS::OpenSearchService::Domain",
- "writeOnlyProperties": [
-  "/properties/AdvancedSecurityOptions/MasterUserOptions",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterUserName",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterBackendRole"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_south_2/__init__.py b/src/cfnlint/data/schemas/providers/ap_south_2/__init__.py
index 00ee4fac82..15f34823b3 100644
--- a/src/cfnlint/data/schemas/providers/ap_south_2/__init__.py
+++ b/src/cfnlint/data/schemas/providers/ap_south_2/__init__.py
@@ -851,6 +851,7 @@
     "aws-ecr-pullthroughcacherule.json",
     "aws-ecr-registrypolicy.json",
     "aws-ecr-replicationconfiguration.json",
+    "aws-ecr-repository.json",
     "aws-ecr-repositorycreationtemplate.json",
     "aws-ecs-capacityprovider.json",
     "aws-ecs-cluster.json",
diff --git a/src/cfnlint/data/schemas/providers/ap_south_2/aws-ecr-repository.json b/src/cfnlint/data/schemas/providers/ap_south_2/aws-ecr-repository.json
deleted file mode 100644
index 062afcc632..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_south_2/aws-ecr-repository.json
+++ /dev/null
@@ -1,212 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/RepositoryName",
-  "/properties/EncryptionConfiguration",
-  "/properties/EncryptionConfiguration/EncryptionType",
-  "/properties/EncryptionConfiguration/KmsKey"
- ],
- "definitions": {
-  "EmptyOnDelete": {
-   "type": "boolean"
-  },
-  "EncryptionConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "EncryptionType": {
-     "$ref": "#/definitions/EncryptionType"
-    },
-    "KmsKey": {
-     "$ref": "#/definitions/KmsKey"
-    }
-   },
-   "required": [
-    "EncryptionType"
-   ],
-   "type": "object"
-  },
-  "EncryptionType": {
-   "enum": [
-    "AES256",
-    "KMS"
-   ],
-   "type": "string"
-  },
-  "ImageScanningConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "ScanOnPush": {
-     "$ref": "#/definitions/ScanOnPush"
-    }
-   },
-   "type": "object"
-  },
-  "KmsKey": {
-   "maxLength": 2048,
-   "minLength": 1,
-   "type": "string"
-  },
-  "LifecyclePolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "LifecyclePolicyText": {
-     "$ref": "#/definitions/LifecyclePolicyText"
-    },
-    "RegistryId": {
-     "$ref": "#/definitions/RegistryId"
-    }
-   },
-   "type": "object"
-  },
-  "LifecyclePolicyText": {
-   "maxLength": 30720,
-   "minLength": 100,
-   "type": "string"
-  },
-  "RegistryId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^[0-9]{12}$",
-   "type": "string"
-  },
-  "ScanOnPush": {
-   "type": "boolean"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 127,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 255,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "ecr:CreateRepository",
-    "ecr:PutLifecyclePolicy",
-    "ecr:SetRepositoryPolicy",
-    "ecr:TagResource",
-    "kms:DescribeKey",
-    "kms:CreateGrant",
-    "kms:RetireGrant"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "ecr:DeleteRepository",
-    "kms:RetireGrant"
-   ]
-  },
-  "list": {
-   "permissions": [
-    "ecr:DescribeRepositories"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "ecr:DescribeRepositories",
-    "ecr:GetLifecyclePolicy",
-    "ecr:GetRepositoryPolicy",
-    "ecr:ListTagsForResource"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "ecr:DescribeRepositories",
-    "ecr:PutLifecyclePolicy",
-    "ecr:SetRepositoryPolicy",
-    "ecr:ListTagsForResource",
-    "ecr:TagResource",
-    "ecr:UntagResource",
-    "ecr:DeleteLifecyclePolicy",
-    "ecr:DeleteRepositoryPolicy",
-    "ecr:PutImageScanningConfiguration",
-    "ecr:PutImageTagMutability",
-    "kms:DescribeKey",
-    "kms:CreateGrant",
-    "kms:RetireGrant"
-   ]
-  }
- },
- "primaryIdentifier": [
-  "/properties/RepositoryName"
- ],
- "properties": {
-  "Arn": {
-   "type": "string"
-  },
-  "EmptyOnDelete": {
-   "$ref": "#/definitions/EmptyOnDelete"
-  },
-  "EncryptionConfiguration": {
-   "$ref": "#/definitions/EncryptionConfiguration"
-  },
-  "ImageScanningConfiguration": {
-   "$ref": "#/definitions/ImageScanningConfiguration"
-  },
-  "ImageTagMutability": {
-   "enum": [
-    "MUTABLE",
-    "IMMUTABLE"
-   ],
-   "type": "string"
-  },
-  "LifecyclePolicy": {
-   "$ref": "#/definitions/LifecyclePolicy"
-  },
-  "RepositoryName": {
-   "maxLength": 256,
-   "minLength": 2,
-   "pattern": "^(?=.{2,256}$)((?:[a-z0-9]+(?:[._-][a-z0-9]+)*/)*[a-z0-9]+(?:[._-][a-z0-9]+)*)$",
-   "type": "string"
-  },
-  "RepositoryPolicyText": {
-   "type": [
-    "object",
-    "string"
-   ]
-  },
-  "RepositoryUri": {
-   "type": "string"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 50,
-   "type": "array",
-   "uniqueItems": true
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/RepositoryUri"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-ecr.git",
- "tagging": {
-  "cloudFormationSystemTags": true,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::ECR::Repository",
- "writeOnlyProperties": [
-  "/properties/EmptyOnDelete"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_1/__init__.py b/src/cfnlint/data/schemas/providers/ap_southeast_1/__init__.py
index b108b81eb7..79e78f0afd 100644
--- a/src/cfnlint/data/schemas/providers/ap_southeast_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/ap_southeast_1/__init__.py
@@ -2030,6 +2030,7 @@
     "aws-opensearchserverless-securityconfig.json",
     "aws-opensearchserverless-securitypolicy.json",
     "aws-opensearchserverless-vpcendpoint.json",
+    "aws-opensearchservice-domain.json",
     "aws-opsworks-app.json",
     "aws-opsworks-elasticloadbalancerattachment.json",
     "aws-opsworks-instance.json",
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-opensearchservice-domain.json b/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-opensearchservice-domain.json
deleted file mode 100644
index c8aa358cc0..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-opensearchservice-domain.json
+++ /dev/null
@@ -1,538 +0,0 @@
-{
- "additionalProperties": false,
- "conditionalCreateOnlyProperties": [
-  "/properties/EncryptionAtRestOptions/Enabled",
-  "/properties/EncryptionAtRestOptions/KmsKeyId",
-  "/properties/AdvancedSecurityOptions/Enabled"
- ],
- "createOnlyProperties": [
-  "/properties/DomainName"
- ],
- "definitions": {
-  "AdvancedSecurityOptionsInput": {
-   "additionalProperties": false,
-   "properties": {
-    "AnonymousAuthDisableDate": {
-     "type": "string"
-    },
-    "AnonymousAuthEnabled": {
-     "type": "boolean"
-    },
-    "Enabled": {
-     "type": "boolean"
-    },
-    "InternalUserDatabaseEnabled": {
-     "type": "boolean"
-    },
-    "MasterUserOptions": {
-     "$ref": "#/definitions/MasterUserOptions"
-    },
-    "SAMLOptions": {
-     "$ref": "#/definitions/SAMLOptions"
-    }
-   },
-   "type": "object"
-  },
-  "ClusterConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "ColdStorageOptions": {
-     "$ref": "#/definitions/ColdStorageOptions"
-    },
-    "DedicatedMasterCount": {
-     "type": "integer"
-    },
-    "DedicatedMasterEnabled": {
-     "type": "boolean"
-    },
-    "DedicatedMasterType": {
-     "type": "string"
-    },
-    "InstanceCount": {
-     "type": "integer"
-    },
-    "InstanceType": {
-     "type": "string"
-    },
-    "MultiAZWithStandbyEnabled": {
-     "type": "boolean"
-    },
-    "WarmCount": {
-     "type": "integer"
-    },
-    "WarmEnabled": {
-     "type": "boolean"
-    },
-    "WarmType": {
-     "type": "string"
-    },
-    "ZoneAwarenessConfig": {
-     "$ref": "#/definitions/ZoneAwarenessConfig"
-    },
-    "ZoneAwarenessEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "CognitoOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "IdentityPoolId": {
-     "type": "string"
-    },
-    "RoleArn": {
-     "type": "string"
-    },
-    "UserPoolId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ColdStorageOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "DomainEndpointOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomEndpoint": {
-     "type": "string"
-    },
-    "CustomEndpointCertificateArn": {
-     "type": "string"
-    },
-    "CustomEndpointEnabled": {
-     "type": "boolean"
-    },
-    "EnforceHTTPS": {
-     "type": "boolean"
-    },
-    "TLSSecurityPolicy": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EBSOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "EBSEnabled": {
-     "type": "boolean"
-    },
-    "Iops": {
-     "type": "integer"
-    },
-    "Throughput": {
-     "type": "integer"
-    },
-    "VolumeSize": {
-     "type": "integer"
-    },
-    "VolumeType": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EncryptionAtRestOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "KmsKeyId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Idp": {
-   "additionalProperties": false,
-   "properties": {
-    "EntityId": {
-     "type": "string"
-    },
-    "MetadataContent": {
-     "maxLength": 1048576,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "MetadataContent",
-    "EntityId"
-   ],
-   "type": "object"
-  },
-  "LogPublishingOption": {
-   "additionalProperties": false,
-   "properties": {
-    "CloudWatchLogsLogGroupArn": {
-     "type": "string"
-    },
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "MasterUserOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "MasterUserARN": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "MasterUserPassword": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindow": {
-   "additionalProperties": false,
-   "properties": {
-    "WindowStartTime": {
-     "$ref": "#/definitions/WindowStartTime"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindowOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "OffPeakWindow": {
-     "$ref": "#/definitions/OffPeakWindow"
-    }
-   },
-   "type": "object"
-  },
-  "SAMLOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "Idp": {
-     "$ref": "#/definitions/Idp"
-    },
-    "MasterBackendRole": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "RolesKey": {
-     "type": "string"
-    },
-    "SessionTimeoutMinutes": {
-     "type": "integer"
-    },
-    "SubjectKey": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ServiceSoftwareOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedUpdateDate": {
-     "type": "string"
-    },
-    "Cancellable": {
-     "type": "boolean"
-    },
-    "CurrentVersion": {
-     "type": "string"
-    },
-    "Description": {
-     "type": "string"
-    },
-    "NewVersion": {
-     "type": "string"
-    },
-    "OptionalDeployment": {
-     "type": "boolean"
-    },
-    "UpdateAvailable": {
-     "type": "boolean"
-    },
-    "UpdateStatus": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SnapshotOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedSnapshotStartHour": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "SoftwareUpdateOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutoSoftwareUpdateEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 0,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "minLength": 0,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "VPCOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "SecurityGroupIds": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.GroupId",
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    },
-    "SubnetIds": {
-     "items": {
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "type": "object"
-  },
-  "WindowStartTime": {
-   "additionalProperties": false,
-   "properties": {
-    "Hours": {
-     "maximum": 23,
-     "minimum": 0,
-     "type": "integer"
-    },
-    "Minutes": {
-     "maximum": 59,
-     "minimum": 0,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "Hours",
-    "Minutes"
-   ],
-   "type": "object"
-  },
-  "ZoneAwarenessConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "AvailabilityZoneCount": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "es:CreateDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:ListTags"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "es:DeleteDomain",
-    "es:DescribeDomain"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "es:DescribeDomain",
-    "es:ListTags"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "es:UpdateDomain",
-    "es:UpgradeDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:RemoveTags",
-    "es:ListTags",
-    "es:DescribeDomainChangeProgress"
-   ],
-   "timeoutInMinutes": 2160
-  }
- },
- "primaryIdentifier": [
-  "/properties/DomainName"
- ],
- "properties": {
-  "AccessPolicies": {
-   "format": "json",
-   "type": [
-    "object",
-    "string"
-   ]
-  },
-  "AdvancedOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "AdvancedSecurityOptions": {
-   "$ref": "#/definitions/AdvancedSecurityOptionsInput"
-  },
-  "Arn": {
-   "type": "string"
-  },
-  "ClusterConfig": {
-   "$ref": "#/definitions/ClusterConfig"
-  },
-  "CognitoOptions": {
-   "$ref": "#/definitions/CognitoOptions"
-  },
-  "DomainArn": {
-   "type": "string"
-  },
-  "DomainEndpoint": {
-   "type": "string"
-  },
-  "DomainEndpointOptions": {
-   "$ref": "#/definitions/DomainEndpointOptions"
-  },
-  "DomainEndpointV2": {
-   "type": "string"
-  },
-  "DomainEndpoints": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "^.*$": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "DomainName": {
-   "type": "string"
-  },
-  "EBSOptions": {
-   "$ref": "#/definitions/EBSOptions"
-  },
-  "EncryptionAtRestOptions": {
-   "$ref": "#/definitions/EncryptionAtRestOptions"
-  },
-  "EngineVersion": {
-   "type": "string"
-  },
-  "IPAddressType": {
-   "type": "string"
-  },
-  "Id": {
-   "type": "string"
-  },
-  "LogPublishingOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "$ref": "#/definitions/LogPublishingOption"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "$ref": "#/definitions/NodeToNodeEncryptionOptions"
-  },
-  "OffPeakWindowOptions": {
-   "$ref": "#/definitions/OffPeakWindowOptions"
-  },
-  "ServiceSoftwareOptions": {
-   "$ref": "#/definitions/ServiceSoftwareOptions"
-  },
-  "SnapshotOptions": {
-   "$ref": "#/definitions/SnapshotOptions"
-  },
-  "SoftwareUpdateOptions": {
-   "$ref": "#/definitions/SoftwareUpdateOptions"
-  },
-  "Tags": {
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "VPCOptions": {
-   "$ref": "#/definitions/VPCOptions"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id",
-  "/properties/Arn",
-  "/properties/DomainArn",
-  "/properties/DomainEndpoint",
-  "/properties/DomainEndpointV2",
-  "/properties/DomainEndpoints",
-  "/properties/ServiceSoftwareOptions",
-  "/properties/AdvancedSecurityOptions/AnonymousAuthDisableDate"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git",
- "typeName": "AWS::OpenSearchService::Domain",
- "writeOnlyProperties": [
-  "/properties/AdvancedSecurityOptions/MasterUserOptions",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterUserName",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterBackendRole"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_2/__init__.py b/src/cfnlint/data/schemas/providers/ap_southeast_2/__init__.py
index c7d4413876..7e4c0d3de7 100644
--- a/src/cfnlint/data/schemas/providers/ap_southeast_2/__init__.py
+++ b/src/cfnlint/data/schemas/providers/ap_southeast_2/__init__.py
@@ -1670,6 +1670,7 @@
     "aws-ecr-pullthroughcacherule.json",
     "aws-ecr-registrypolicy.json",
     "aws-ecr-replicationconfiguration.json",
+    "aws-ecr-repository.json",
     "aws-ecr-repositorycreationtemplate.json",
     "aws-ecs-capacityprovider.json",
     "aws-ecs-cluster.json",
@@ -2070,6 +2071,7 @@
     "aws-opensearchserverless-securityconfig.json",
     "aws-opensearchserverless-securitypolicy.json",
     "aws-opensearchserverless-vpcendpoint.json",
+    "aws-opensearchservice-domain.json",
     "aws-opsworks-app.json",
     "aws-opsworks-elasticloadbalancerattachment.json",
     "aws-opsworks-instance.json",
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-ecr-repository.json b/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-ecr-repository.json
deleted file mode 100644
index 062afcc632..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-ecr-repository.json
+++ /dev/null
@@ -1,212 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/RepositoryName",
-  "/properties/EncryptionConfiguration",
-  "/properties/EncryptionConfiguration/EncryptionType",
-  "/properties/EncryptionConfiguration/KmsKey"
- ],
- "definitions": {
-  "EmptyOnDelete": {
-   "type": "boolean"
-  },
-  "EncryptionConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "EncryptionType": {
-     "$ref": "#/definitions/EncryptionType"
-    },
-    "KmsKey": {
-     "$ref": "#/definitions/KmsKey"
-    }
-   },
-   "required": [
-    "EncryptionType"
-   ],
-   "type": "object"
-  },
-  "EncryptionType": {
-   "enum": [
-    "AES256",
-    "KMS"
-   ],
-   "type": "string"
-  },
-  "ImageScanningConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "ScanOnPush": {
-     "$ref": "#/definitions/ScanOnPush"
-    }
-   },
-   "type": "object"
-  },
-  "KmsKey": {
-   "maxLength": 2048,
-   "minLength": 1,
-   "type": "string"
-  },
-  "LifecyclePolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "LifecyclePolicyText": {
-     "$ref": "#/definitions/LifecyclePolicyText"
-    },
-    "RegistryId": {
-     "$ref": "#/definitions/RegistryId"
-    }
-   },
-   "type": "object"
-  },
-  "LifecyclePolicyText": {
-   "maxLength": 30720,
-   "minLength": 100,
-   "type": "string"
-  },
-  "RegistryId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^[0-9]{12}$",
-   "type": "string"
-  },
-  "ScanOnPush": {
-   "type": "boolean"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 127,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 255,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "ecr:CreateRepository",
-    "ecr:PutLifecyclePolicy",
-    "ecr:SetRepositoryPolicy",
-    "ecr:TagResource",
-    "kms:DescribeKey",
-    "kms:CreateGrant",
-    "kms:RetireGrant"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "ecr:DeleteRepository",
-    "kms:RetireGrant"
-   ]
-  },
-  "list": {
-   "permissions": [
-    "ecr:DescribeRepositories"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "ecr:DescribeRepositories",
-    "ecr:GetLifecyclePolicy",
-    "ecr:GetRepositoryPolicy",
-    "ecr:ListTagsForResource"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "ecr:DescribeRepositories",
-    "ecr:PutLifecyclePolicy",
-    "ecr:SetRepositoryPolicy",
-    "ecr:ListTagsForResource",
-    "ecr:TagResource",
-    "ecr:UntagResource",
-    "ecr:DeleteLifecyclePolicy",
-    "ecr:DeleteRepositoryPolicy",
-    "ecr:PutImageScanningConfiguration",
-    "ecr:PutImageTagMutability",
-    "kms:DescribeKey",
-    "kms:CreateGrant",
-    "kms:RetireGrant"
-   ]
-  }
- },
- "primaryIdentifier": [
-  "/properties/RepositoryName"
- ],
- "properties": {
-  "Arn": {
-   "type": "string"
-  },
-  "EmptyOnDelete": {
-   "$ref": "#/definitions/EmptyOnDelete"
-  },
-  "EncryptionConfiguration": {
-   "$ref": "#/definitions/EncryptionConfiguration"
-  },
-  "ImageScanningConfiguration": {
-   "$ref": "#/definitions/ImageScanningConfiguration"
-  },
-  "ImageTagMutability": {
-   "enum": [
-    "MUTABLE",
-    "IMMUTABLE"
-   ],
-   "type": "string"
-  },
-  "LifecyclePolicy": {
-   "$ref": "#/definitions/LifecyclePolicy"
-  },
-  "RepositoryName": {
-   "maxLength": 256,
-   "minLength": 2,
-   "pattern": "^(?=.{2,256}$)((?:[a-z0-9]+(?:[._-][a-z0-9]+)*/)*[a-z0-9]+(?:[._-][a-z0-9]+)*)$",
-   "type": "string"
-  },
-  "RepositoryPolicyText": {
-   "type": [
-    "object",
-    "string"
-   ]
-  },
-  "RepositoryUri": {
-   "type": "string"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 50,
-   "type": "array",
-   "uniqueItems": true
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/RepositoryUri"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-ecr.git",
- "tagging": {
-  "cloudFormationSystemTags": true,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::ECR::Repository",
- "writeOnlyProperties": [
-  "/properties/EmptyOnDelete"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-opensearchservice-domain.json b/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-opensearchservice-domain.json
deleted file mode 100644
index c8aa358cc0..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-opensearchservice-domain.json
+++ /dev/null
@@ -1,538 +0,0 @@
-{
- "additionalProperties": false,
- "conditionalCreateOnlyProperties": [
-  "/properties/EncryptionAtRestOptions/Enabled",
-  "/properties/EncryptionAtRestOptions/KmsKeyId",
-  "/properties/AdvancedSecurityOptions/Enabled"
- ],
- "createOnlyProperties": [
-  "/properties/DomainName"
- ],
- "definitions": {
-  "AdvancedSecurityOptionsInput": {
-   "additionalProperties": false,
-   "properties": {
-    "AnonymousAuthDisableDate": {
-     "type": "string"
-    },
-    "AnonymousAuthEnabled": {
-     "type": "boolean"
-    },
-    "Enabled": {
-     "type": "boolean"
-    },
-    "InternalUserDatabaseEnabled": {
-     "type": "boolean"
-    },
-    "MasterUserOptions": {
-     "$ref": "#/definitions/MasterUserOptions"
-    },
-    "SAMLOptions": {
-     "$ref": "#/definitions/SAMLOptions"
-    }
-   },
-   "type": "object"
-  },
-  "ClusterConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "ColdStorageOptions": {
-     "$ref": "#/definitions/ColdStorageOptions"
-    },
-    "DedicatedMasterCount": {
-     "type": "integer"
-    },
-    "DedicatedMasterEnabled": {
-     "type": "boolean"
-    },
-    "DedicatedMasterType": {
-     "type": "string"
-    },
-    "InstanceCount": {
-     "type": "integer"
-    },
-    "InstanceType": {
-     "type": "string"
-    },
-    "MultiAZWithStandbyEnabled": {
-     "type": "boolean"
-    },
-    "WarmCount": {
-     "type": "integer"
-    },
-    "WarmEnabled": {
-     "type": "boolean"
-    },
-    "WarmType": {
-     "type": "string"
-    },
-    "ZoneAwarenessConfig": {
-     "$ref": "#/definitions/ZoneAwarenessConfig"
-    },
-    "ZoneAwarenessEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "CognitoOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "IdentityPoolId": {
-     "type": "string"
-    },
-    "RoleArn": {
-     "type": "string"
-    },
-    "UserPoolId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ColdStorageOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "DomainEndpointOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomEndpoint": {
-     "type": "string"
-    },
-    "CustomEndpointCertificateArn": {
-     "type": "string"
-    },
-    "CustomEndpointEnabled": {
-     "type": "boolean"
-    },
-    "EnforceHTTPS": {
-     "type": "boolean"
-    },
-    "TLSSecurityPolicy": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EBSOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "EBSEnabled": {
-     "type": "boolean"
-    },
-    "Iops": {
-     "type": "integer"
-    },
-    "Throughput": {
-     "type": "integer"
-    },
-    "VolumeSize": {
-     "type": "integer"
-    },
-    "VolumeType": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EncryptionAtRestOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "KmsKeyId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Idp": {
-   "additionalProperties": false,
-   "properties": {
-    "EntityId": {
-     "type": "string"
-    },
-    "MetadataContent": {
-     "maxLength": 1048576,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "MetadataContent",
-    "EntityId"
-   ],
-   "type": "object"
-  },
-  "LogPublishingOption": {
-   "additionalProperties": false,
-   "properties": {
-    "CloudWatchLogsLogGroupArn": {
-     "type": "string"
-    },
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "MasterUserOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "MasterUserARN": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "MasterUserPassword": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindow": {
-   "additionalProperties": false,
-   "properties": {
-    "WindowStartTime": {
-     "$ref": "#/definitions/WindowStartTime"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindowOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "OffPeakWindow": {
-     "$ref": "#/definitions/OffPeakWindow"
-    }
-   },
-   "type": "object"
-  },
-  "SAMLOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "Idp": {
-     "$ref": "#/definitions/Idp"
-    },
-    "MasterBackendRole": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "RolesKey": {
-     "type": "string"
-    },
-    "SessionTimeoutMinutes": {
-     "type": "integer"
-    },
-    "SubjectKey": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ServiceSoftwareOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedUpdateDate": {
-     "type": "string"
-    },
-    "Cancellable": {
-     "type": "boolean"
-    },
-    "CurrentVersion": {
-     "type": "string"
-    },
-    "Description": {
-     "type": "string"
-    },
-    "NewVersion": {
-     "type": "string"
-    },
-    "OptionalDeployment": {
-     "type": "boolean"
-    },
-    "UpdateAvailable": {
-     "type": "boolean"
-    },
-    "UpdateStatus": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SnapshotOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedSnapshotStartHour": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "SoftwareUpdateOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutoSoftwareUpdateEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 0,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "minLength": 0,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "VPCOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "SecurityGroupIds": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.GroupId",
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    },
-    "SubnetIds": {
-     "items": {
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "type": "object"
-  },
-  "WindowStartTime": {
-   "additionalProperties": false,
-   "properties": {
-    "Hours": {
-     "maximum": 23,
-     "minimum": 0,
-     "type": "integer"
-    },
-    "Minutes": {
-     "maximum": 59,
-     "minimum": 0,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "Hours",
-    "Minutes"
-   ],
-   "type": "object"
-  },
-  "ZoneAwarenessConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "AvailabilityZoneCount": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "es:CreateDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:ListTags"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "es:DeleteDomain",
-    "es:DescribeDomain"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "es:DescribeDomain",
-    "es:ListTags"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "es:UpdateDomain",
-    "es:UpgradeDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:RemoveTags",
-    "es:ListTags",
-    "es:DescribeDomainChangeProgress"
-   ],
-   "timeoutInMinutes": 2160
-  }
- },
- "primaryIdentifier": [
-  "/properties/DomainName"
- ],
- "properties": {
-  "AccessPolicies": {
-   "format": "json",
-   "type": [
-    "object",
-    "string"
-   ]
-  },
-  "AdvancedOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "AdvancedSecurityOptions": {
-   "$ref": "#/definitions/AdvancedSecurityOptionsInput"
-  },
-  "Arn": {
-   "type": "string"
-  },
-  "ClusterConfig": {
-   "$ref": "#/definitions/ClusterConfig"
-  },
-  "CognitoOptions": {
-   "$ref": "#/definitions/CognitoOptions"
-  },
-  "DomainArn": {
-   "type": "string"
-  },
-  "DomainEndpoint": {
-   "type": "string"
-  },
-  "DomainEndpointOptions": {
-   "$ref": "#/definitions/DomainEndpointOptions"
-  },
-  "DomainEndpointV2": {
-   "type": "string"
-  },
-  "DomainEndpoints": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "^.*$": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "DomainName": {
-   "type": "string"
-  },
-  "EBSOptions": {
-   "$ref": "#/definitions/EBSOptions"
-  },
-  "EncryptionAtRestOptions": {
-   "$ref": "#/definitions/EncryptionAtRestOptions"
-  },
-  "EngineVersion": {
-   "type": "string"
-  },
-  "IPAddressType": {
-   "type": "string"
-  },
-  "Id": {
-   "type": "string"
-  },
-  "LogPublishingOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "$ref": "#/definitions/LogPublishingOption"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "$ref": "#/definitions/NodeToNodeEncryptionOptions"
-  },
-  "OffPeakWindowOptions": {
-   "$ref": "#/definitions/OffPeakWindowOptions"
-  },
-  "ServiceSoftwareOptions": {
-   "$ref": "#/definitions/ServiceSoftwareOptions"
-  },
-  "SnapshotOptions": {
-   "$ref": "#/definitions/SnapshotOptions"
-  },
-  "SoftwareUpdateOptions": {
-   "$ref": "#/definitions/SoftwareUpdateOptions"
-  },
-  "Tags": {
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "VPCOptions": {
-   "$ref": "#/definitions/VPCOptions"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id",
-  "/properties/Arn",
-  "/properties/DomainArn",
-  "/properties/DomainEndpoint",
-  "/properties/DomainEndpointV2",
-  "/properties/DomainEndpoints",
-  "/properties/ServiceSoftwareOptions",
-  "/properties/AdvancedSecurityOptions/AnonymousAuthDisableDate"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git",
- "typeName": "AWS::OpenSearchService::Domain",
- "writeOnlyProperties": [
-  "/properties/AdvancedSecurityOptions/MasterUserOptions",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterUserName",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterBackendRole"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_3/__init__.py b/src/cfnlint/data/schemas/providers/ap_southeast_3/__init__.py
index 8590cfa61b..5c5746dc17 100644
--- a/src/cfnlint/data/schemas/providers/ap_southeast_3/__init__.py
+++ b/src/cfnlint/data/schemas/providers/ap_southeast_3/__init__.py
@@ -886,6 +886,7 @@
     "aws-ec2-gatewayroutetableassociation.json",
     "aws-ec2-instance.json",
     "aws-ec2-instanceconnectendpoint.json",
+    "aws-ec2-internetgateway.json",
     "aws-ec2-ipam.json",
     "aws-ec2-ipamallocation.json",
     "aws-ec2-ipampool.json",
@@ -1138,6 +1139,7 @@
     "aws-networkmanager-vpcattachment.json",
     "aws-oam-link.json",
     "aws-oam-sink.json",
+    "aws-opensearchservice-domain.json",
     "aws-opsworks-app.json",
     "aws-opsworks-elasticloadbalancerattachment.json",
     "aws-opsworks-userprofile.json",
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-ec2-internetgateway.json b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-ec2-internetgateway.json
deleted file mode 100644
index f4b93a4397..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-ec2-internetgateway.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
- "additionalProperties": false,
- "definitions": {
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "ec2:CreateInternetGateway",
-    "ec2:CreateTags",
-    "ec2:DescribeInternetGateways"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "ec2:DeleteInternetGateway",
-    "ec2:DescribeInternetGateways"
-   ]
-  },
-  "list": {
-   "permissions": [
-    "ec2:DescribeInternetGateways"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "ec2:DescribeInternetGateways"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "ec2:DeleteTags",
-    "ec2:CreateTags",
-    "ec2:DescribeInternetGateways"
-   ]
-  }
- },
- "primaryIdentifier": [
-  "/properties/InternetGatewayId"
- ],
- "properties": {
-  "InternetGatewayId": {
-   "type": "string"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": false
-  }
- },
- "readOnlyProperties": [
-  "/properties/InternetGatewayId"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git",
- "tagging": {
-  "cloudFormationSystemTags": true,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::EC2::InternetGateway"
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-opensearchservice-domain.json b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-opensearchservice-domain.json
deleted file mode 100644
index c8aa358cc0..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-opensearchservice-domain.json
+++ /dev/null
@@ -1,538 +0,0 @@
-{
- "additionalProperties": false,
- "conditionalCreateOnlyProperties": [
-  "/properties/EncryptionAtRestOptions/Enabled",
-  "/properties/EncryptionAtRestOptions/KmsKeyId",
-  "/properties/AdvancedSecurityOptions/Enabled"
- ],
- "createOnlyProperties": [
-  "/properties/DomainName"
- ],
- "definitions": {
-  "AdvancedSecurityOptionsInput": {
-   "additionalProperties": false,
-   "properties": {
-    "AnonymousAuthDisableDate": {
-     "type": "string"
-    },
-    "AnonymousAuthEnabled": {
-     "type": "boolean"
-    },
-    "Enabled": {
-     "type": "boolean"
-    },
-    "InternalUserDatabaseEnabled": {
-     "type": "boolean"
-    },
-    "MasterUserOptions": {
-     "$ref": "#/definitions/MasterUserOptions"
-    },
-    "SAMLOptions": {
-     "$ref": "#/definitions/SAMLOptions"
-    }
-   },
-   "type": "object"
-  },
-  "ClusterConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "ColdStorageOptions": {
-     "$ref": "#/definitions/ColdStorageOptions"
-    },
-    "DedicatedMasterCount": {
-     "type": "integer"
-    },
-    "DedicatedMasterEnabled": {
-     "type": "boolean"
-    },
-    "DedicatedMasterType": {
-     "type": "string"
-    },
-    "InstanceCount": {
-     "type": "integer"
-    },
-    "InstanceType": {
-     "type": "string"
-    },
-    "MultiAZWithStandbyEnabled": {
-     "type": "boolean"
-    },
-    "WarmCount": {
-     "type": "integer"
-    },
-    "WarmEnabled": {
-     "type": "boolean"
-    },
-    "WarmType": {
-     "type": "string"
-    },
-    "ZoneAwarenessConfig": {
-     "$ref": "#/definitions/ZoneAwarenessConfig"
-    },
-    "ZoneAwarenessEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "CognitoOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "IdentityPoolId": {
-     "type": "string"
-    },
-    "RoleArn": {
-     "type": "string"
-    },
-    "UserPoolId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ColdStorageOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "DomainEndpointOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomEndpoint": {
-     "type": "string"
-    },
-    "CustomEndpointCertificateArn": {
-     "type": "string"
-    },
-    "CustomEndpointEnabled": {
-     "type": "boolean"
-    },
-    "EnforceHTTPS": {
-     "type": "boolean"
-    },
-    "TLSSecurityPolicy": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EBSOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "EBSEnabled": {
-     "type": "boolean"
-    },
-    "Iops": {
-     "type": "integer"
-    },
-    "Throughput": {
-     "type": "integer"
-    },
-    "VolumeSize": {
-     "type": "integer"
-    },
-    "VolumeType": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EncryptionAtRestOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "KmsKeyId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Idp": {
-   "additionalProperties": false,
-   "properties": {
-    "EntityId": {
-     "type": "string"
-    },
-    "MetadataContent": {
-     "maxLength": 1048576,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "MetadataContent",
-    "EntityId"
-   ],
-   "type": "object"
-  },
-  "LogPublishingOption": {
-   "additionalProperties": false,
-   "properties": {
-    "CloudWatchLogsLogGroupArn": {
-     "type": "string"
-    },
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "MasterUserOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "MasterUserARN": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "MasterUserPassword": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindow": {
-   "additionalProperties": false,
-   "properties": {
-    "WindowStartTime": {
-     "$ref": "#/definitions/WindowStartTime"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindowOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "OffPeakWindow": {
-     "$ref": "#/definitions/OffPeakWindow"
-    }
-   },
-   "type": "object"
-  },
-  "SAMLOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "Idp": {
-     "$ref": "#/definitions/Idp"
-    },
-    "MasterBackendRole": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "RolesKey": {
-     "type": "string"
-    },
-    "SessionTimeoutMinutes": {
-     "type": "integer"
-    },
-    "SubjectKey": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ServiceSoftwareOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedUpdateDate": {
-     "type": "string"
-    },
-    "Cancellable": {
-     "type": "boolean"
-    },
-    "CurrentVersion": {
-     "type": "string"
-    },
-    "Description": {
-     "type": "string"
-    },
-    "NewVersion": {
-     "type": "string"
-    },
-    "OptionalDeployment": {
-     "type": "boolean"
-    },
-    "UpdateAvailable": {
-     "type": "boolean"
-    },
-    "UpdateStatus": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SnapshotOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedSnapshotStartHour": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "SoftwareUpdateOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutoSoftwareUpdateEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 0,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "minLength": 0,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "VPCOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "SecurityGroupIds": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.GroupId",
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    },
-    "SubnetIds": {
-     "items": {
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "type": "object"
-  },
-  "WindowStartTime": {
-   "additionalProperties": false,
-   "properties": {
-    "Hours": {
-     "maximum": 23,
-     "minimum": 0,
-     "type": "integer"
-    },
-    "Minutes": {
-     "maximum": 59,
-     "minimum": 0,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "Hours",
-    "Minutes"
-   ],
-   "type": "object"
-  },
-  "ZoneAwarenessConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "AvailabilityZoneCount": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "es:CreateDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:ListTags"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "es:DeleteDomain",
-    "es:DescribeDomain"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "es:DescribeDomain",
-    "es:ListTags"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "es:UpdateDomain",
-    "es:UpgradeDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:RemoveTags",
-    "es:ListTags",
-    "es:DescribeDomainChangeProgress"
-   ],
-   "timeoutInMinutes": 2160
-  }
- },
- "primaryIdentifier": [
-  "/properties/DomainName"
- ],
- "properties": {
-  "AccessPolicies": {
-   "format": "json",
-   "type": [
-    "object",
-    "string"
-   ]
-  },
-  "AdvancedOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "AdvancedSecurityOptions": {
-   "$ref": "#/definitions/AdvancedSecurityOptionsInput"
-  },
-  "Arn": {
-   "type": "string"
-  },
-  "ClusterConfig": {
-   "$ref": "#/definitions/ClusterConfig"
-  },
-  "CognitoOptions": {
-   "$ref": "#/definitions/CognitoOptions"
-  },
-  "DomainArn": {
-   "type": "string"
-  },
-  "DomainEndpoint": {
-   "type": "string"
-  },
-  "DomainEndpointOptions": {
-   "$ref": "#/definitions/DomainEndpointOptions"
-  },
-  "DomainEndpointV2": {
-   "type": "string"
-  },
-  "DomainEndpoints": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "^.*$": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "DomainName": {
-   "type": "string"
-  },
-  "EBSOptions": {
-   "$ref": "#/definitions/EBSOptions"
-  },
-  "EncryptionAtRestOptions": {
-   "$ref": "#/definitions/EncryptionAtRestOptions"
-  },
-  "EngineVersion": {
-   "type": "string"
-  },
-  "IPAddressType": {
-   "type": "string"
-  },
-  "Id": {
-   "type": "string"
-  },
-  "LogPublishingOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "$ref": "#/definitions/LogPublishingOption"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "$ref": "#/definitions/NodeToNodeEncryptionOptions"
-  },
-  "OffPeakWindowOptions": {
-   "$ref": "#/definitions/OffPeakWindowOptions"
-  },
-  "ServiceSoftwareOptions": {
-   "$ref": "#/definitions/ServiceSoftwareOptions"
-  },
-  "SnapshotOptions": {
-   "$ref": "#/definitions/SnapshotOptions"
-  },
-  "SoftwareUpdateOptions": {
-   "$ref": "#/definitions/SoftwareUpdateOptions"
-  },
-  "Tags": {
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "VPCOptions": {
-   "$ref": "#/definitions/VPCOptions"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id",
-  "/properties/Arn",
-  "/properties/DomainArn",
-  "/properties/DomainEndpoint",
-  "/properties/DomainEndpointV2",
-  "/properties/DomainEndpoints",
-  "/properties/ServiceSoftwareOptions",
-  "/properties/AdvancedSecurityOptions/AnonymousAuthDisableDate"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git",
- "typeName": "AWS::OpenSearchService::Domain",
- "writeOnlyProperties": [
-  "/properties/AdvancedSecurityOptions/MasterUserOptions",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterUserName",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterBackendRole"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_4/__init__.py b/src/cfnlint/data/schemas/providers/ap_southeast_4/__init__.py
index 40f4082fd4..b24225feaa 100644
--- a/src/cfnlint/data/schemas/providers/ap_southeast_4/__init__.py
+++ b/src/cfnlint/data/schemas/providers/ap_southeast_4/__init__.py
@@ -785,6 +785,7 @@
     "aws-ec2-gatewayroutetableassociation.json",
     "aws-ec2-instance.json",
     "aws-ec2-instanceconnectendpoint.json",
+    "aws-ec2-internetgateway.json",
     "aws-ec2-ipam.json",
     "aws-ec2-ipamallocation.json",
     "aws-ec2-ipampool.json",
@@ -1009,6 +1010,7 @@
     "aws-networkfirewall-tlsinspectionconfiguration.json",
     "aws-oam-link.json",
     "aws-oam-sink.json",
+    "aws-opensearchservice-domain.json",
     "aws-opsworks-app.json",
     "aws-opsworks-elasticloadbalancerattachment.json",
     "aws-opsworks-userprofile.json",
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-ec2-internetgateway.json b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-ec2-internetgateway.json
deleted file mode 100644
index f4b93a4397..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-ec2-internetgateway.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
- "additionalProperties": false,
- "definitions": {
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "ec2:CreateInternetGateway",
-    "ec2:CreateTags",
-    "ec2:DescribeInternetGateways"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "ec2:DeleteInternetGateway",
-    "ec2:DescribeInternetGateways"
-   ]
-  },
-  "list": {
-   "permissions": [
-    "ec2:DescribeInternetGateways"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "ec2:DescribeInternetGateways"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "ec2:DeleteTags",
-    "ec2:CreateTags",
-    "ec2:DescribeInternetGateways"
-   ]
-  }
- },
- "primaryIdentifier": [
-  "/properties/InternetGatewayId"
- ],
- "properties": {
-  "InternetGatewayId": {
-   "type": "string"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": false
-  }
- },
- "readOnlyProperties": [
-  "/properties/InternetGatewayId"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git",
- "tagging": {
-  "cloudFormationSystemTags": true,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::EC2::InternetGateway"
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-opensearchservice-domain.json b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-opensearchservice-domain.json
deleted file mode 100644
index c8aa358cc0..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-opensearchservice-domain.json
+++ /dev/null
@@ -1,538 +0,0 @@
-{
- "additionalProperties": false,
- "conditionalCreateOnlyProperties": [
-  "/properties/EncryptionAtRestOptions/Enabled",
-  "/properties/EncryptionAtRestOptions/KmsKeyId",
-  "/properties/AdvancedSecurityOptions/Enabled"
- ],
- "createOnlyProperties": [
-  "/properties/DomainName"
- ],
- "definitions": {
-  "AdvancedSecurityOptionsInput": {
-   "additionalProperties": false,
-   "properties": {
-    "AnonymousAuthDisableDate": {
-     "type": "string"
-    },
-    "AnonymousAuthEnabled": {
-     "type": "boolean"
-    },
-    "Enabled": {
-     "type": "boolean"
-    },
-    "InternalUserDatabaseEnabled": {
-     "type": "boolean"
-    },
-    "MasterUserOptions": {
-     "$ref": "#/definitions/MasterUserOptions"
-    },
-    "SAMLOptions": {
-     "$ref": "#/definitions/SAMLOptions"
-    }
-   },
-   "type": "object"
-  },
-  "ClusterConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "ColdStorageOptions": {
-     "$ref": "#/definitions/ColdStorageOptions"
-    },
-    "DedicatedMasterCount": {
-     "type": "integer"
-    },
-    "DedicatedMasterEnabled": {
-     "type": "boolean"
-    },
-    "DedicatedMasterType": {
-     "type": "string"
-    },
-    "InstanceCount": {
-     "type": "integer"
-    },
-    "InstanceType": {
-     "type": "string"
-    },
-    "MultiAZWithStandbyEnabled": {
-     "type": "boolean"
-    },
-    "WarmCount": {
-     "type": "integer"
-    },
-    "WarmEnabled": {
-     "type": "boolean"
-    },
-    "WarmType": {
-     "type": "string"
-    },
-    "ZoneAwarenessConfig": {
-     "$ref": "#/definitions/ZoneAwarenessConfig"
-    },
-    "ZoneAwarenessEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "CognitoOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "IdentityPoolId": {
-     "type": "string"
-    },
-    "RoleArn": {
-     "type": "string"
-    },
-    "UserPoolId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ColdStorageOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "DomainEndpointOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomEndpoint": {
-     "type": "string"
-    },
-    "CustomEndpointCertificateArn": {
-     "type": "string"
-    },
-    "CustomEndpointEnabled": {
-     "type": "boolean"
-    },
-    "EnforceHTTPS": {
-     "type": "boolean"
-    },
-    "TLSSecurityPolicy": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EBSOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "EBSEnabled": {
-     "type": "boolean"
-    },
-    "Iops": {
-     "type": "integer"
-    },
-    "Throughput": {
-     "type": "integer"
-    },
-    "VolumeSize": {
-     "type": "integer"
-    },
-    "VolumeType": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EncryptionAtRestOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "KmsKeyId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Idp": {
-   "additionalProperties": false,
-   "properties": {
-    "EntityId": {
-     "type": "string"
-    },
-    "MetadataContent": {
-     "maxLength": 1048576,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "MetadataContent",
-    "EntityId"
-   ],
-   "type": "object"
-  },
-  "LogPublishingOption": {
-   "additionalProperties": false,
-   "properties": {
-    "CloudWatchLogsLogGroupArn": {
-     "type": "string"
-    },
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "MasterUserOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "MasterUserARN": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "MasterUserPassword": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindow": {
-   "additionalProperties": false,
-   "properties": {
-    "WindowStartTime": {
-     "$ref": "#/definitions/WindowStartTime"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindowOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "OffPeakWindow": {
-     "$ref": "#/definitions/OffPeakWindow"
-    }
-   },
-   "type": "object"
-  },
-  "SAMLOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "Idp": {
-     "$ref": "#/definitions/Idp"
-    },
-    "MasterBackendRole": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "RolesKey": {
-     "type": "string"
-    },
-    "SessionTimeoutMinutes": {
-     "type": "integer"
-    },
-    "SubjectKey": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ServiceSoftwareOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedUpdateDate": {
-     "type": "string"
-    },
-    "Cancellable": {
-     "type": "boolean"
-    },
-    "CurrentVersion": {
-     "type": "string"
-    },
-    "Description": {
-     "type": "string"
-    },
-    "NewVersion": {
-     "type": "string"
-    },
-    "OptionalDeployment": {
-     "type": "boolean"
-    },
-    "UpdateAvailable": {
-     "type": "boolean"
-    },
-    "UpdateStatus": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SnapshotOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedSnapshotStartHour": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "SoftwareUpdateOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutoSoftwareUpdateEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 0,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "minLength": 0,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "VPCOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "SecurityGroupIds": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.GroupId",
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    },
-    "SubnetIds": {
-     "items": {
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "type": "object"
-  },
-  "WindowStartTime": {
-   "additionalProperties": false,
-   "properties": {
-    "Hours": {
-     "maximum": 23,
-     "minimum": 0,
-     "type": "integer"
-    },
-    "Minutes": {
-     "maximum": 59,
-     "minimum": 0,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "Hours",
-    "Minutes"
-   ],
-   "type": "object"
-  },
-  "ZoneAwarenessConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "AvailabilityZoneCount": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "es:CreateDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:ListTags"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "es:DeleteDomain",
-    "es:DescribeDomain"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "es:DescribeDomain",
-    "es:ListTags"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "es:UpdateDomain",
-    "es:UpgradeDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:RemoveTags",
-    "es:ListTags",
-    "es:DescribeDomainChangeProgress"
-   ],
-   "timeoutInMinutes": 2160
-  }
- },
- "primaryIdentifier": [
-  "/properties/DomainName"
- ],
- "properties": {
-  "AccessPolicies": {
-   "format": "json",
-   "type": [
-    "object",
-    "string"
-   ]
-  },
-  "AdvancedOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "AdvancedSecurityOptions": {
-   "$ref": "#/definitions/AdvancedSecurityOptionsInput"
-  },
-  "Arn": {
-   "type": "string"
-  },
-  "ClusterConfig": {
-   "$ref": "#/definitions/ClusterConfig"
-  },
-  "CognitoOptions": {
-   "$ref": "#/definitions/CognitoOptions"
-  },
-  "DomainArn": {
-   "type": "string"
-  },
-  "DomainEndpoint": {
-   "type": "string"
-  },
-  "DomainEndpointOptions": {
-   "$ref": "#/definitions/DomainEndpointOptions"
-  },
-  "DomainEndpointV2": {
-   "type": "string"
-  },
-  "DomainEndpoints": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "^.*$": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "DomainName": {
-   "type": "string"
-  },
-  "EBSOptions": {
-   "$ref": "#/definitions/EBSOptions"
-  },
-  "EncryptionAtRestOptions": {
-   "$ref": "#/definitions/EncryptionAtRestOptions"
-  },
-  "EngineVersion": {
-   "type": "string"
-  },
-  "IPAddressType": {
-   "type": "string"
-  },
-  "Id": {
-   "type": "string"
-  },
-  "LogPublishingOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "$ref": "#/definitions/LogPublishingOption"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "$ref": "#/definitions/NodeToNodeEncryptionOptions"
-  },
-  "OffPeakWindowOptions": {
-   "$ref": "#/definitions/OffPeakWindowOptions"
-  },
-  "ServiceSoftwareOptions": {
-   "$ref": "#/definitions/ServiceSoftwareOptions"
-  },
-  "SnapshotOptions": {
-   "$ref": "#/definitions/SnapshotOptions"
-  },
-  "SoftwareUpdateOptions": {
-   "$ref": "#/definitions/SoftwareUpdateOptions"
-  },
-  "Tags": {
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "VPCOptions": {
-   "$ref": "#/definitions/VPCOptions"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id",
-  "/properties/Arn",
-  "/properties/DomainArn",
-  "/properties/DomainEndpoint",
-  "/properties/DomainEndpointV2",
-  "/properties/DomainEndpoints",
-  "/properties/ServiceSoftwareOptions",
-  "/properties/AdvancedSecurityOptions/AnonymousAuthDisableDate"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git",
- "typeName": "AWS::OpenSearchService::Domain",
- "writeOnlyProperties": [
-  "/properties/AdvancedSecurityOptions/MasterUserOptions",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterUserName",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterBackendRole"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_5/__init__.py b/src/cfnlint/data/schemas/providers/ap_southeast_5/__init__.py
index 31396e6117..072daf2bec 100644
--- a/src/cfnlint/data/schemas/providers/ap_southeast_5/__init__.py
+++ b/src/cfnlint/data/schemas/providers/ap_southeast_5/__init__.py
@@ -417,6 +417,7 @@
     "aws-ec2-eipassociation.json",
     "aws-ec2-flowlog.json",
     "aws-ec2-gatewayroutetableassociation.json",
+    "aws-ec2-internetgateway.json",
     "aws-ec2-keypair.json",
     "aws-ec2-launchtemplate.json",
     "aws-ec2-natgateway.json",
@@ -424,6 +425,7 @@
     "aws-ec2-networkaclentry.json",
     "aws-ec2-networkinterface.json",
     "aws-ec2-networkinterfaceattachment.json",
+    "aws-ec2-placementgroup.json",
     "aws-ec2-prefixlist.json",
     "aws-ec2-routetable.json",
     "aws-ec2-spotfleet.json",
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ec2-internetgateway.json b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ec2-internetgateway.json
deleted file mode 100644
index f4b93a4397..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ec2-internetgateway.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
- "additionalProperties": false,
- "definitions": {
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "ec2:CreateInternetGateway",
-    "ec2:CreateTags",
-    "ec2:DescribeInternetGateways"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "ec2:DeleteInternetGateway",
-    "ec2:DescribeInternetGateways"
-   ]
-  },
-  "list": {
-   "permissions": [
-    "ec2:DescribeInternetGateways"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "ec2:DescribeInternetGateways"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "ec2:DeleteTags",
-    "ec2:CreateTags",
-    "ec2:DescribeInternetGateways"
-   ]
-  }
- },
- "primaryIdentifier": [
-  "/properties/InternetGatewayId"
- ],
- "properties": {
-  "InternetGatewayId": {
-   "type": "string"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": false
-  }
- },
- "readOnlyProperties": [
-  "/properties/InternetGatewayId"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git",
- "tagging": {
-  "cloudFormationSystemTags": true,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::EC2::InternetGateway"
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ec2-placementgroup.json b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ec2-placementgroup.json
deleted file mode 100644
index 65ddb972fc..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ec2-placementgroup.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/Strategy"
- ],
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "Id": {
-   "type": "string"
-  },
-  "Strategy": {
-   "enum": [
-    "cluster",
-    "partition",
-    "spread"
-   ],
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id"
- ],
- "typeName": "AWS::EC2::PlacementGroup"
-}
diff --git a/src/cfnlint/data/schemas/providers/ca_central_1/__init__.py b/src/cfnlint/data/schemas/providers/ca_central_1/__init__.py
index 7df90b9680..8610708e87 100644
--- a/src/cfnlint/data/schemas/providers/ca_central_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/ca_central_1/__init__.py
@@ -1489,6 +1489,7 @@
     "aws-ecr-pullthroughcacherule.json",
     "aws-ecr-registrypolicy.json",
     "aws-ecr-replicationconfiguration.json",
+    "aws-ecr-repository.json",
     "aws-ecr-repositorycreationtemplate.json",
     "aws-ecs-capacityprovider.json",
     "aws-ecs-cluster.json",
@@ -1824,6 +1825,7 @@
     "aws-opensearchserverless-securityconfig.json",
     "aws-opensearchserverless-securitypolicy.json",
     "aws-opensearchserverless-vpcendpoint.json",
+    "aws-opensearchservice-domain.json",
     "aws-opsworks-app.json",
     "aws-opsworks-elasticloadbalancerattachment.json",
     "aws-opsworks-instance.json",
diff --git a/src/cfnlint/data/schemas/providers/ca_central_1/aws-ecr-repository.json b/src/cfnlint/data/schemas/providers/ca_central_1/aws-ecr-repository.json
deleted file mode 100644
index 062afcc632..0000000000
--- a/src/cfnlint/data/schemas/providers/ca_central_1/aws-ecr-repository.json
+++ /dev/null
@@ -1,212 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/RepositoryName",
-  "/properties/EncryptionConfiguration",
-  "/properties/EncryptionConfiguration/EncryptionType",
-  "/properties/EncryptionConfiguration/KmsKey"
- ],
- "definitions": {
-  "EmptyOnDelete": {
-   "type": "boolean"
-  },
-  "EncryptionConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "EncryptionType": {
-     "$ref": "#/definitions/EncryptionType"
-    },
-    "KmsKey": {
-     "$ref": "#/definitions/KmsKey"
-    }
-   },
-   "required": [
-    "EncryptionType"
-   ],
-   "type": "object"
-  },
-  "EncryptionType": {
-   "enum": [
-    "AES256",
-    "KMS"
-   ],
-   "type": "string"
-  },
-  "ImageScanningConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "ScanOnPush": {
-     "$ref": "#/definitions/ScanOnPush"
-    }
-   },
-   "type": "object"
-  },
-  "KmsKey": {
-   "maxLength": 2048,
-   "minLength": 1,
-   "type": "string"
-  },
-  "LifecyclePolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "LifecyclePolicyText": {
-     "$ref": "#/definitions/LifecyclePolicyText"
-    },
-    "RegistryId": {
-     "$ref": "#/definitions/RegistryId"
-    }
-   },
-   "type": "object"
-  },
-  "LifecyclePolicyText": {
-   "maxLength": 30720,
-   "minLength": 100,
-   "type": "string"
-  },
-  "RegistryId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^[0-9]{12}$",
-   "type": "string"
-  },
-  "ScanOnPush": {
-   "type": "boolean"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 127,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 255,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "ecr:CreateRepository",
-    "ecr:PutLifecyclePolicy",
-    "ecr:SetRepositoryPolicy",
-    "ecr:TagResource",
-    "kms:DescribeKey",
-    "kms:CreateGrant",
-    "kms:RetireGrant"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "ecr:DeleteRepository",
-    "kms:RetireGrant"
-   ]
-  },
-  "list": {
-   "permissions": [
-    "ecr:DescribeRepositories"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "ecr:DescribeRepositories",
-    "ecr:GetLifecyclePolicy",
-    "ecr:GetRepositoryPolicy",
-    "ecr:ListTagsForResource"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "ecr:DescribeRepositories",
-    "ecr:PutLifecyclePolicy",
-    "ecr:SetRepositoryPolicy",
-    "ecr:ListTagsForResource",
-    "ecr:TagResource",
-    "ecr:UntagResource",
-    "ecr:DeleteLifecyclePolicy",
-    "ecr:DeleteRepositoryPolicy",
-    "ecr:PutImageScanningConfiguration",
-    "ecr:PutImageTagMutability",
-    "kms:DescribeKey",
-    "kms:CreateGrant",
-    "kms:RetireGrant"
-   ]
-  }
- },
- "primaryIdentifier": [
-  "/properties/RepositoryName"
- ],
- "properties": {
-  "Arn": {
-   "type": "string"
-  },
-  "EmptyOnDelete": {
-   "$ref": "#/definitions/EmptyOnDelete"
-  },
-  "EncryptionConfiguration": {
-   "$ref": "#/definitions/EncryptionConfiguration"
-  },
-  "ImageScanningConfiguration": {
-   "$ref": "#/definitions/ImageScanningConfiguration"
-  },
-  "ImageTagMutability": {
-   "enum": [
-    "MUTABLE",
-    "IMMUTABLE"
-   ],
-   "type": "string"
-  },
-  "LifecyclePolicy": {
-   "$ref": "#/definitions/LifecyclePolicy"
-  },
-  "RepositoryName": {
-   "maxLength": 256,
-   "minLength": 2,
-   "pattern": "^(?=.{2,256}$)((?:[a-z0-9]+(?:[._-][a-z0-9]+)*/)*[a-z0-9]+(?:[._-][a-z0-9]+)*)$",
-   "type": "string"
-  },
-  "RepositoryPolicyText": {
-   "type": [
-    "object",
-    "string"
-   ]
-  },
-  "RepositoryUri": {
-   "type": "string"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 50,
-   "type": "array",
-   "uniqueItems": true
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/RepositoryUri"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-ecr.git",
- "tagging": {
-  "cloudFormationSystemTags": true,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::ECR::Repository",
- "writeOnlyProperties": [
-  "/properties/EmptyOnDelete"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ca_central_1/aws-opensearchservice-domain.json b/src/cfnlint/data/schemas/providers/ca_central_1/aws-opensearchservice-domain.json
deleted file mode 100644
index c8aa358cc0..0000000000
--- a/src/cfnlint/data/schemas/providers/ca_central_1/aws-opensearchservice-domain.json
+++ /dev/null
@@ -1,538 +0,0 @@
-{
- "additionalProperties": false,
- "conditionalCreateOnlyProperties": [
-  "/properties/EncryptionAtRestOptions/Enabled",
-  "/properties/EncryptionAtRestOptions/KmsKeyId",
-  "/properties/AdvancedSecurityOptions/Enabled"
- ],
- "createOnlyProperties": [
-  "/properties/DomainName"
- ],
- "definitions": {
-  "AdvancedSecurityOptionsInput": {
-   "additionalProperties": false,
-   "properties": {
-    "AnonymousAuthDisableDate": {
-     "type": "string"
-    },
-    "AnonymousAuthEnabled": {
-     "type": "boolean"
-    },
-    "Enabled": {
-     "type": "boolean"
-    },
-    "InternalUserDatabaseEnabled": {
-     "type": "boolean"
-    },
-    "MasterUserOptions": {
-     "$ref": "#/definitions/MasterUserOptions"
-    },
-    "SAMLOptions": {
-     "$ref": "#/definitions/SAMLOptions"
-    }
-   },
-   "type": "object"
-  },
-  "ClusterConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "ColdStorageOptions": {
-     "$ref": "#/definitions/ColdStorageOptions"
-    },
-    "DedicatedMasterCount": {
-     "type": "integer"
-    },
-    "DedicatedMasterEnabled": {
-     "type": "boolean"
-    },
-    "DedicatedMasterType": {
-     "type": "string"
-    },
-    "InstanceCount": {
-     "type": "integer"
-    },
-    "InstanceType": {
-     "type": "string"
-    },
-    "MultiAZWithStandbyEnabled": {
-     "type": "boolean"
-    },
-    "WarmCount": {
-     "type": "integer"
-    },
-    "WarmEnabled": {
-     "type": "boolean"
-    },
-    "WarmType": {
-     "type": "string"
-    },
-    "ZoneAwarenessConfig": {
-     "$ref": "#/definitions/ZoneAwarenessConfig"
-    },
-    "ZoneAwarenessEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "CognitoOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "IdentityPoolId": {
-     "type": "string"
-    },
-    "RoleArn": {
-     "type": "string"
-    },
-    "UserPoolId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ColdStorageOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "DomainEndpointOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomEndpoint": {
-     "type": "string"
-    },
-    "CustomEndpointCertificateArn": {
-     "type": "string"
-    },
-    "CustomEndpointEnabled": {
-     "type": "boolean"
-    },
-    "EnforceHTTPS": {
-     "type": "boolean"
-    },
-    "TLSSecurityPolicy": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EBSOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "EBSEnabled": {
-     "type": "boolean"
-    },
-    "Iops": {
-     "type": "integer"
-    },
-    "Throughput": {
-     "type": "integer"
-    },
-    "VolumeSize": {
-     "type": "integer"
-    },
-    "VolumeType": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EncryptionAtRestOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "KmsKeyId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Idp": {
-   "additionalProperties": false,
-   "properties": {
-    "EntityId": {
-     "type": "string"
-    },
-    "MetadataContent": {
-     "maxLength": 1048576,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "MetadataContent",
-    "EntityId"
-   ],
-   "type": "object"
-  },
-  "LogPublishingOption": {
-   "additionalProperties": false,
-   "properties": {
-    "CloudWatchLogsLogGroupArn": {
-     "type": "string"
-    },
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "MasterUserOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "MasterUserARN": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "MasterUserPassword": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindow": {
-   "additionalProperties": false,
-   "properties": {
-    "WindowStartTime": {
-     "$ref": "#/definitions/WindowStartTime"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindowOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "OffPeakWindow": {
-     "$ref": "#/definitions/OffPeakWindow"
-    }
-   },
-   "type": "object"
-  },
-  "SAMLOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "Idp": {
-     "$ref": "#/definitions/Idp"
-    },
-    "MasterBackendRole": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "RolesKey": {
-     "type": "string"
-    },
-    "SessionTimeoutMinutes": {
-     "type": "integer"
-    },
-    "SubjectKey": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ServiceSoftwareOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedUpdateDate": {
-     "type": "string"
-    },
-    "Cancellable": {
-     "type": "boolean"
-    },
-    "CurrentVersion": {
-     "type": "string"
-    },
-    "Description": {
-     "type": "string"
-    },
-    "NewVersion": {
-     "type": "string"
-    },
-    "OptionalDeployment": {
-     "type": "boolean"
-    },
-    "UpdateAvailable": {
-     "type": "boolean"
-    },
-    "UpdateStatus": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SnapshotOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedSnapshotStartHour": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "SoftwareUpdateOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutoSoftwareUpdateEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 0,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "minLength": 0,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "VPCOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "SecurityGroupIds": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.GroupId",
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    },
-    "SubnetIds": {
-     "items": {
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "type": "object"
-  },
-  "WindowStartTime": {
-   "additionalProperties": false,
-   "properties": {
-    "Hours": {
-     "maximum": 23,
-     "minimum": 0,
-     "type": "integer"
-    },
-    "Minutes": {
-     "maximum": 59,
-     "minimum": 0,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "Hours",
-    "Minutes"
-   ],
-   "type": "object"
-  },
-  "ZoneAwarenessConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "AvailabilityZoneCount": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "es:CreateDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:ListTags"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "es:DeleteDomain",
-    "es:DescribeDomain"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "es:DescribeDomain",
-    "es:ListTags"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "es:UpdateDomain",
-    "es:UpgradeDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:RemoveTags",
-    "es:ListTags",
-    "es:DescribeDomainChangeProgress"
-   ],
-   "timeoutInMinutes": 2160
-  }
- },
- "primaryIdentifier": [
-  "/properties/DomainName"
- ],
- "properties": {
-  "AccessPolicies": {
-   "format": "json",
-   "type": [
-    "object",
-    "string"
-   ]
-  },
-  "AdvancedOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "AdvancedSecurityOptions": {
-   "$ref": "#/definitions/AdvancedSecurityOptionsInput"
-  },
-  "Arn": {
-   "type": "string"
-  },
-  "ClusterConfig": {
-   "$ref": "#/definitions/ClusterConfig"
-  },
-  "CognitoOptions": {
-   "$ref": "#/definitions/CognitoOptions"
-  },
-  "DomainArn": {
-   "type": "string"
-  },
-  "DomainEndpoint": {
-   "type": "string"
-  },
-  "DomainEndpointOptions": {
-   "$ref": "#/definitions/DomainEndpointOptions"
-  },
-  "DomainEndpointV2": {
-   "type": "string"
-  },
-  "DomainEndpoints": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "^.*$": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "DomainName": {
-   "type": "string"
-  },
-  "EBSOptions": {
-   "$ref": "#/definitions/EBSOptions"
-  },
-  "EncryptionAtRestOptions": {
-   "$ref": "#/definitions/EncryptionAtRestOptions"
-  },
-  "EngineVersion": {
-   "type": "string"
-  },
-  "IPAddressType": {
-   "type": "string"
-  },
-  "Id": {
-   "type": "string"
-  },
-  "LogPublishingOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "$ref": "#/definitions/LogPublishingOption"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "$ref": "#/definitions/NodeToNodeEncryptionOptions"
-  },
-  "OffPeakWindowOptions": {
-   "$ref": "#/definitions/OffPeakWindowOptions"
-  },
-  "ServiceSoftwareOptions": {
-   "$ref": "#/definitions/ServiceSoftwareOptions"
-  },
-  "SnapshotOptions": {
-   "$ref": "#/definitions/SnapshotOptions"
-  },
-  "SoftwareUpdateOptions": {
-   "$ref": "#/definitions/SoftwareUpdateOptions"
-  },
-  "Tags": {
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "VPCOptions": {
-   "$ref": "#/definitions/VPCOptions"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id",
-  "/properties/Arn",
-  "/properties/DomainArn",
-  "/properties/DomainEndpoint",
-  "/properties/DomainEndpointV2",
-  "/properties/DomainEndpoints",
-  "/properties/ServiceSoftwareOptions",
-  "/properties/AdvancedSecurityOptions/AnonymousAuthDisableDate"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git",
- "typeName": "AWS::OpenSearchService::Domain",
- "writeOnlyProperties": [
-  "/properties/AdvancedSecurityOptions/MasterUserOptions",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterUserName",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterBackendRole"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/__init__.py b/src/cfnlint/data/schemas/providers/ca_west_1/__init__.py
index 24dfaf7577..28d65a739f 100644
--- a/src/cfnlint/data/schemas/providers/ca_west_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/ca_west_1/__init__.py
@@ -860,6 +860,7 @@
     "aws-networkfirewall-tlsinspectionconfiguration.json",
     "aws-oam-link.json",
     "aws-oam-sink.json",
+    "aws-opensearchservice-domain.json",
     "aws-opsworks-app.json",
     "aws-opsworks-elasticloadbalancerattachment.json",
     "aws-opsworks-userprofile.json",
diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/aws-opensearchservice-domain.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-opensearchservice-domain.json
deleted file mode 100644
index c8aa358cc0..0000000000
--- a/src/cfnlint/data/schemas/providers/ca_west_1/aws-opensearchservice-domain.json
+++ /dev/null
@@ -1,538 +0,0 @@
-{
- "additionalProperties": false,
- "conditionalCreateOnlyProperties": [
-  "/properties/EncryptionAtRestOptions/Enabled",
-  "/properties/EncryptionAtRestOptions/KmsKeyId",
-  "/properties/AdvancedSecurityOptions/Enabled"
- ],
- "createOnlyProperties": [
-  "/properties/DomainName"
- ],
- "definitions": {
-  "AdvancedSecurityOptionsInput": {
-   "additionalProperties": false,
-   "properties": {
-    "AnonymousAuthDisableDate": {
-     "type": "string"
-    },
-    "AnonymousAuthEnabled": {
-     "type": "boolean"
-    },
-    "Enabled": {
-     "type": "boolean"
-    },
-    "InternalUserDatabaseEnabled": {
-     "type": "boolean"
-    },
-    "MasterUserOptions": {
-     "$ref": "#/definitions/MasterUserOptions"
-    },
-    "SAMLOptions": {
-     "$ref": "#/definitions/SAMLOptions"
-    }
-   },
-   "type": "object"
-  },
-  "ClusterConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "ColdStorageOptions": {
-     "$ref": "#/definitions/ColdStorageOptions"
-    },
-    "DedicatedMasterCount": {
-     "type": "integer"
-    },
-    "DedicatedMasterEnabled": {
-     "type": "boolean"
-    },
-    "DedicatedMasterType": {
-     "type": "string"
-    },
-    "InstanceCount": {
-     "type": "integer"
-    },
-    "InstanceType": {
-     "type": "string"
-    },
-    "MultiAZWithStandbyEnabled": {
-     "type": "boolean"
-    },
-    "WarmCount": {
-     "type": "integer"
-    },
-    "WarmEnabled": {
-     "type": "boolean"
-    },
-    "WarmType": {
-     "type": "string"
-    },
-    "ZoneAwarenessConfig": {
-     "$ref": "#/definitions/ZoneAwarenessConfig"
-    },
-    "ZoneAwarenessEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "CognitoOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "IdentityPoolId": {
-     "type": "string"
-    },
-    "RoleArn": {
-     "type": "string"
-    },
-    "UserPoolId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ColdStorageOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "DomainEndpointOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomEndpoint": {
-     "type": "string"
-    },
-    "CustomEndpointCertificateArn": {
-     "type": "string"
-    },
-    "CustomEndpointEnabled": {
-     "type": "boolean"
-    },
-    "EnforceHTTPS": {
-     "type": "boolean"
-    },
-    "TLSSecurityPolicy": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EBSOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "EBSEnabled": {
-     "type": "boolean"
-    },
-    "Iops": {
-     "type": "integer"
-    },
-    "Throughput": {
-     "type": "integer"
-    },
-    "VolumeSize": {
-     "type": "integer"
-    },
-    "VolumeType": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EncryptionAtRestOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "KmsKeyId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Idp": {
-   "additionalProperties": false,
-   "properties": {
-    "EntityId": {
-     "type": "string"
-    },
-    "MetadataContent": {
-     "maxLength": 1048576,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "MetadataContent",
-    "EntityId"
-   ],
-   "type": "object"
-  },
-  "LogPublishingOption": {
-   "additionalProperties": false,
-   "properties": {
-    "CloudWatchLogsLogGroupArn": {
-     "type": "string"
-    },
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "MasterUserOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "MasterUserARN": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "MasterUserPassword": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindow": {
-   "additionalProperties": false,
-   "properties": {
-    "WindowStartTime": {
-     "$ref": "#/definitions/WindowStartTime"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindowOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "OffPeakWindow": {
-     "$ref": "#/definitions/OffPeakWindow"
-    }
-   },
-   "type": "object"
-  },
-  "SAMLOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "Idp": {
-     "$ref": "#/definitions/Idp"
-    },
-    "MasterBackendRole": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "RolesKey": {
-     "type": "string"
-    },
-    "SessionTimeoutMinutes": {
-     "type": "integer"
-    },
-    "SubjectKey": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ServiceSoftwareOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedUpdateDate": {
-     "type": "string"
-    },
-    "Cancellable": {
-     "type": "boolean"
-    },
-    "CurrentVersion": {
-     "type": "string"
-    },
-    "Description": {
-     "type": "string"
-    },
-    "NewVersion": {
-     "type": "string"
-    },
-    "OptionalDeployment": {
-     "type": "boolean"
-    },
-    "UpdateAvailable": {
-     "type": "boolean"
-    },
-    "UpdateStatus": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SnapshotOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedSnapshotStartHour": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "SoftwareUpdateOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutoSoftwareUpdateEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 0,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "minLength": 0,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "VPCOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "SecurityGroupIds": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.GroupId",
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    },
-    "SubnetIds": {
-     "items": {
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "type": "object"
-  },
-  "WindowStartTime": {
-   "additionalProperties": false,
-   "properties": {
-    "Hours": {
-     "maximum": 23,
-     "minimum": 0,
-     "type": "integer"
-    },
-    "Minutes": {
-     "maximum": 59,
-     "minimum": 0,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "Hours",
-    "Minutes"
-   ],
-   "type": "object"
-  },
-  "ZoneAwarenessConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "AvailabilityZoneCount": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "es:CreateDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:ListTags"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "es:DeleteDomain",
-    "es:DescribeDomain"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "es:DescribeDomain",
-    "es:ListTags"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "es:UpdateDomain",
-    "es:UpgradeDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:RemoveTags",
-    "es:ListTags",
-    "es:DescribeDomainChangeProgress"
-   ],
-   "timeoutInMinutes": 2160
-  }
- },
- "primaryIdentifier": [
-  "/properties/DomainName"
- ],
- "properties": {
-  "AccessPolicies": {
-   "format": "json",
-   "type": [
-    "object",
-    "string"
-   ]
-  },
-  "AdvancedOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "AdvancedSecurityOptions": {
-   "$ref": "#/definitions/AdvancedSecurityOptionsInput"
-  },
-  "Arn": {
-   "type": "string"
-  },
-  "ClusterConfig": {
-   "$ref": "#/definitions/ClusterConfig"
-  },
-  "CognitoOptions": {
-   "$ref": "#/definitions/CognitoOptions"
-  },
-  "DomainArn": {
-   "type": "string"
-  },
-  "DomainEndpoint": {
-   "type": "string"
-  },
-  "DomainEndpointOptions": {
-   "$ref": "#/definitions/DomainEndpointOptions"
-  },
-  "DomainEndpointV2": {
-   "type": "string"
-  },
-  "DomainEndpoints": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "^.*$": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "DomainName": {
-   "type": "string"
-  },
-  "EBSOptions": {
-   "$ref": "#/definitions/EBSOptions"
-  },
-  "EncryptionAtRestOptions": {
-   "$ref": "#/definitions/EncryptionAtRestOptions"
-  },
-  "EngineVersion": {
-   "type": "string"
-  },
-  "IPAddressType": {
-   "type": "string"
-  },
-  "Id": {
-   "type": "string"
-  },
-  "LogPublishingOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "$ref": "#/definitions/LogPublishingOption"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "$ref": "#/definitions/NodeToNodeEncryptionOptions"
-  },
-  "OffPeakWindowOptions": {
-   "$ref": "#/definitions/OffPeakWindowOptions"
-  },
-  "ServiceSoftwareOptions": {
-   "$ref": "#/definitions/ServiceSoftwareOptions"
-  },
-  "SnapshotOptions": {
-   "$ref": "#/definitions/SnapshotOptions"
-  },
-  "SoftwareUpdateOptions": {
-   "$ref": "#/definitions/SoftwareUpdateOptions"
-  },
-  "Tags": {
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "VPCOptions": {
-   "$ref": "#/definitions/VPCOptions"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id",
-  "/properties/Arn",
-  "/properties/DomainArn",
-  "/properties/DomainEndpoint",
-  "/properties/DomainEndpointV2",
-  "/properties/DomainEndpoints",
-  "/properties/ServiceSoftwareOptions",
-  "/properties/AdvancedSecurityOptions/AnonymousAuthDisableDate"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git",
- "typeName": "AWS::OpenSearchService::Domain",
- "writeOnlyProperties": [
-  "/properties/AdvancedSecurityOptions/MasterUserOptions",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterUserName",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterBackendRole"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/cn_north_1/__init__.py b/src/cfnlint/data/schemas/providers/cn_north_1/__init__.py
index 1ab35bf8db..e09d0bbb88 100644
--- a/src/cfnlint/data/schemas/providers/cn_north_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/cn_north_1/__init__.py
@@ -1337,6 +1337,7 @@
     "aws-stepfunctions-statemachine.json",
     "aws-stepfunctions-statemachinealias.json",
     "aws-stepfunctions-statemachineversion.json",
+    "aws-synthetics-canary.json",
     "aws-transfer-agreement.json",
     "aws-transfer-certificate.json",
     "aws-transfer-connector.json",
diff --git a/src/cfnlint/data/schemas/providers/cn_north_1/aws-synthetics-canary.json b/src/cfnlint/data/schemas/providers/cn_north_1/aws-synthetics-canary.json
deleted file mode 100644
index 0b1a6b8383..0000000000
--- a/src/cfnlint/data/schemas/providers/cn_north_1/aws-synthetics-canary.json
+++ /dev/null
@@ -1,382 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/Name"
- ],
- "definitions": {
-  "ArtifactConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "S3Encryption": {
-     "$ref": "#/definitions/S3Encryption"
-    }
-   },
-   "type": "object"
-  },
-  "BaseScreenshot": {
-   "properties": {
-    "IgnoreCoordinates": {
-     "items": {
-      "type": "string"
-     },
-     "type": "array"
-    },
-    "ScreenshotName": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "ScreenshotName"
-   ],
-   "type": "object"
-  },
-  "Code": {
-   "additionalProperties": false,
-   "oneOf": [
-    {
-     "required": [
-      "S3Bucket",
-      "S3Key"
-     ]
-    },
-    {
-     "required": [
-      "Script"
-     ]
-    }
-   ],
-   "properties": {
-    "Handler": {
-     "type": "string"
-    },
-    "S3Bucket": {
-     "relationshipRef": {
-      "propertyPath": "/properties/BucketName",
-      "typeName": "AWS::S3::Bucket"
-     },
-     "type": "string"
-    },
-    "S3Key": {
-     "type": "string"
-    },
-    "S3ObjectVersion": {
-     "type": "string"
-    },
-    "Script": {
-     "type": "string"
-    },
-    "SourceLocationArn": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "Handler"
-   ],
-   "type": "object"
-  },
-  "RunConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "ActiveTracing": {
-     "type": "boolean"
-    },
-    "EnvironmentVariables": {
-     "additionalProperties": false,
-     "patternProperties": {
-      "[a-zA-Z][a-zA-Z0-9_]+": {
-       "type": "string"
-      }
-     },
-     "type": "object"
-    },
-    "MemoryInMB": {
-     "type": "integer"
-    },
-    "TimeoutInSeconds": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "S3Encryption": {
-   "additionalProperties": false,
-   "properties": {
-    "EncryptionMode": {
-     "type": "string"
-    },
-    "KmsKeyArn": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Schedule": {
-   "additionalProperties": false,
-   "properties": {
-    "DurationInSeconds": {
-     "type": "string"
-    },
-    "Expression": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "Expression"
-   ],
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "minLength": 0,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "VPCConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "SecurityGroupIds": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "items": {
-      "anyOf": [
-       {
-        "relationshipRef": {
-         "propertyPath": "/properties/GroupId",
-         "typeName": "AWS::EC2::SecurityGroup"
-        }
-       },
-       {
-        "relationshipRef": {
-         "propertyPath": "/properties/DefaultSecurityGroup",
-         "typeName": "AWS::EC2::VPC"
-        }
-       }
-      ],
-      "format": "AWS::EC2::SecurityGroup.GroupId",
-      "type": "string"
-     },
-     "type": "array"
-    },
-    "SubnetIds": {
-     "items": {
-      "relationshipRef": {
-       "propertyPath": "/properties/SubnetId",
-       "typeName": "AWS::EC2::Subnet"
-      },
-      "type": "string"
-     },
-     "type": "array"
-    },
-    "VpcId": {
-     "format": "AWS::EC2::VPC.Id",
-     "relationshipRef": {
-      "propertyPath": "/properties/VpcId",
-      "typeName": "AWS::EC2::VPC"
-     },
-     "type": "string"
-    }
-   },
-   "required": [
-    "SubnetIds",
-    "SecurityGroupIds"
-   ],
-   "type": "object"
-  },
-  "VisualReference": {
-   "additionalProperties": false,
-   "properties": {
-    "BaseCanaryRunId": {
-     "type": "string"
-    },
-    "BaseScreenshots": {
-     "items": {
-      "$ref": "#/definitions/BaseScreenshot"
-     },
-     "type": "array"
-    }
-   },
-   "required": [
-    "BaseCanaryRunId"
-   ],
-   "type": "object"
-  }
- },
- "deprecatedProperties": [
-  "/properties/DeleteLambdaResourcesOnCanaryDeletion"
- ],
- "handlers": {
-  "create": {
-   "permissions": [
-    "synthetics:CreateCanary",
-    "synthetics:StartCanary",
-    "synthetics:GetCanary",
-    "synthetics:TagResource",
-    "s3:CreateBucket",
-    "s3:GetObject",
-    "s3:GetObjectVersion",
-    "s3:PutBucketEncryption",
-    "s3:PutEncryptionConfiguration",
-    "s3:GetBucketLocation",
-    "lambda:CreateFunction",
-    "lambda:AddPermission",
-    "lambda:PublishVersion",
-    "lambda:UpdateFunctionConfiguration",
-    "lambda:GetFunctionConfiguration",
-    "lambda:GetLayerVersionByArn",
-    "lambda:GetLayerVersion",
-    "lambda:PublishLayerVersion",
-    "ec2:DescribeVpcs",
-    "ec2:DescribeSubnets",
-    "ec2:DescribeSecurityGroups",
-    "iam:PassRole"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "synthetics:DeleteCanary",
-    "synthetics:GetCanary"
-   ]
-  },
-  "list": {
-   "permissions": [
-    "synthetics:DescribeCanaries"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "synthetics:GetCanary",
-    "synthetics:DescribeCanaries",
-    "synthetics:ListTagsForResource",
-    "iam:ListRoles",
-    "s3:ListAllMyBuckets",
-    "s3:GetBucketLocation"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "synthetics:UpdateCanary",
-    "synthetics:StartCanary",
-    "synthetics:StopCanary",
-    "synthetics:GetCanary",
-    "synthetics:TagResource",
-    "synthetics:UntagResource",
-    "s3:GetObject",
-    "s3:GetObjectVersion",
-    "s3:PutBucketEncryption",
-    "s3:PutEncryptionConfiguration",
-    "s3:GetBucketLocation",
-    "lambda:AddPermission",
-    "lambda:PublishVersion",
-    "lambda:UpdateFunctionConfiguration",
-    "lambda:GetFunctionConfiguration",
-    "lambda:GetLayerVersionByArn",
-    "lambda:GetLayerVersion",
-    "lambda:PublishLayerVersion",
-    "iam:PassRole"
-   ]
-  }
- },
- "primaryIdentifier": [
-  "/properties/Name"
- ],
- "properties": {
-  "ArtifactConfig": {
-   "$ref": "#/definitions/ArtifactConfig"
-  },
-  "ArtifactS3Location": {
-   "pattern": "^(s3|S3)://",
-   "type": "string"
-  },
-  "Code": {
-   "$ref": "#/definitions/Code"
-  },
-  "DeleteLambdaResourcesOnCanaryDeletion": {
-   "type": "boolean"
-  },
-  "ExecutionRoleArn": {
-   "type": "string"
-  },
-  "FailureRetentionPeriod": {
-   "type": "integer"
-  },
-  "Id": {
-   "type": "string"
-  },
-  "Name": {
-   "pattern": "^[0-9a-z_\\-]{1,21}$",
-   "type": "string"
-  },
-  "RunConfig": {
-   "$ref": "#/definitions/RunConfig"
-  },
-  "RuntimeVersion": {
-   "type": "string"
-  },
-  "Schedule": {
-   "$ref": "#/definitions/Schedule"
-  },
-  "StartCanaryAfterCreation": {
-   "type": "boolean"
-  },
-  "State": {
-   "type": "string"
-  },
-  "SuccessRetentionPeriod": {
-   "type": "integer"
-  },
-  "Tags": {
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "VPCConfig": {
-   "$ref": "#/definitions/VPCConfig"
-  },
-  "VisualReference": {
-   "$ref": "#/definitions/VisualReference"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id",
-  "/properties/State",
-  "/properties/Code/SourceLocationArn"
- ],
- "required": [
-  "Name",
-  "Code",
-  "ArtifactS3Location",
-  "ExecutionRoleArn",
-  "Schedule",
-  "RuntimeVersion"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-synthetics",
- "tagging": {
-  "taggable": true
- },
- "typeName": "AWS::Synthetics::Canary",
- "writeOnlyProperties": [
-  "/properties/Code/S3Bucket",
-  "/properties/Code/S3Key",
-  "/properties/Code/S3ObjectVersion",
-  "/properties/Code/Script",
-  "/properties/DeleteLambdaResourcesOnCanaryDeletion",
-  "/properties/StartCanaryAfterCreation",
-  "/properties/RunConfig/EnvironmentVariables",
-  "/properties/VisualReference"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/cn_northwest_1/__init__.py b/src/cfnlint/data/schemas/providers/cn_northwest_1/__init__.py
index 5c09782eae..323a578521 100644
--- a/src/cfnlint/data/schemas/providers/cn_northwest_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/cn_northwest_1/__init__.py
@@ -1098,6 +1098,7 @@
     "aws-networkfirewall-tlsinspectionconfiguration.json",
     "aws-oam-link.json",
     "aws-oam-sink.json",
+    "aws-opensearchservice-domain.json",
     "aws-opsworks-app.json",
     "aws-opsworks-elasticloadbalancerattachment.json",
     "aws-opsworks-instance.json",
diff --git a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-opensearchservice-domain.json b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-opensearchservice-domain.json
deleted file mode 100644
index c8aa358cc0..0000000000
--- a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-opensearchservice-domain.json
+++ /dev/null
@@ -1,538 +0,0 @@
-{
- "additionalProperties": false,
- "conditionalCreateOnlyProperties": [
-  "/properties/EncryptionAtRestOptions/Enabled",
-  "/properties/EncryptionAtRestOptions/KmsKeyId",
-  "/properties/AdvancedSecurityOptions/Enabled"
- ],
- "createOnlyProperties": [
-  "/properties/DomainName"
- ],
- "definitions": {
-  "AdvancedSecurityOptionsInput": {
-   "additionalProperties": false,
-   "properties": {
-    "AnonymousAuthDisableDate": {
-     "type": "string"
-    },
-    "AnonymousAuthEnabled": {
-     "type": "boolean"
-    },
-    "Enabled": {
-     "type": "boolean"
-    },
-    "InternalUserDatabaseEnabled": {
-     "type": "boolean"
-    },
-    "MasterUserOptions": {
-     "$ref": "#/definitions/MasterUserOptions"
-    },
-    "SAMLOptions": {
-     "$ref": "#/definitions/SAMLOptions"
-    }
-   },
-   "type": "object"
-  },
-  "ClusterConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "ColdStorageOptions": {
-     "$ref": "#/definitions/ColdStorageOptions"
-    },
-    "DedicatedMasterCount": {
-     "type": "integer"
-    },
-    "DedicatedMasterEnabled": {
-     "type": "boolean"
-    },
-    "DedicatedMasterType": {
-     "type": "string"
-    },
-    "InstanceCount": {
-     "type": "integer"
-    },
-    "InstanceType": {
-     "type": "string"
-    },
-    "MultiAZWithStandbyEnabled": {
-     "type": "boolean"
-    },
-    "WarmCount": {
-     "type": "integer"
-    },
-    "WarmEnabled": {
-     "type": "boolean"
-    },
-    "WarmType": {
-     "type": "string"
-    },
-    "ZoneAwarenessConfig": {
-     "$ref": "#/definitions/ZoneAwarenessConfig"
-    },
-    "ZoneAwarenessEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "CognitoOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "IdentityPoolId": {
-     "type": "string"
-    },
-    "RoleArn": {
-     "type": "string"
-    },
-    "UserPoolId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ColdStorageOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "DomainEndpointOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomEndpoint": {
-     "type": "string"
-    },
-    "CustomEndpointCertificateArn": {
-     "type": "string"
-    },
-    "CustomEndpointEnabled": {
-     "type": "boolean"
-    },
-    "EnforceHTTPS": {
-     "type": "boolean"
-    },
-    "TLSSecurityPolicy": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EBSOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "EBSEnabled": {
-     "type": "boolean"
-    },
-    "Iops": {
-     "type": "integer"
-    },
-    "Throughput": {
-     "type": "integer"
-    },
-    "VolumeSize": {
-     "type": "integer"
-    },
-    "VolumeType": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EncryptionAtRestOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "KmsKeyId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Idp": {
-   "additionalProperties": false,
-   "properties": {
-    "EntityId": {
-     "type": "string"
-    },
-    "MetadataContent": {
-     "maxLength": 1048576,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "MetadataContent",
-    "EntityId"
-   ],
-   "type": "object"
-  },
-  "LogPublishingOption": {
-   "additionalProperties": false,
-   "properties": {
-    "CloudWatchLogsLogGroupArn": {
-     "type": "string"
-    },
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "MasterUserOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "MasterUserARN": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "MasterUserPassword": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindow": {
-   "additionalProperties": false,
-   "properties": {
-    "WindowStartTime": {
-     "$ref": "#/definitions/WindowStartTime"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindowOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "OffPeakWindow": {
-     "$ref": "#/definitions/OffPeakWindow"
-    }
-   },
-   "type": "object"
-  },
-  "SAMLOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "Idp": {
-     "$ref": "#/definitions/Idp"
-    },
-    "MasterBackendRole": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "RolesKey": {
-     "type": "string"
-    },
-    "SessionTimeoutMinutes": {
-     "type": "integer"
-    },
-    "SubjectKey": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ServiceSoftwareOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedUpdateDate": {
-     "type": "string"
-    },
-    "Cancellable": {
-     "type": "boolean"
-    },
-    "CurrentVersion": {
-     "type": "string"
-    },
-    "Description": {
-     "type": "string"
-    },
-    "NewVersion": {
-     "type": "string"
-    },
-    "OptionalDeployment": {
-     "type": "boolean"
-    },
-    "UpdateAvailable": {
-     "type": "boolean"
-    },
-    "UpdateStatus": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SnapshotOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedSnapshotStartHour": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "SoftwareUpdateOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutoSoftwareUpdateEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 0,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "minLength": 0,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "VPCOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "SecurityGroupIds": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.GroupId",
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    },
-    "SubnetIds": {
-     "items": {
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "type": "object"
-  },
-  "WindowStartTime": {
-   "additionalProperties": false,
-   "properties": {
-    "Hours": {
-     "maximum": 23,
-     "minimum": 0,
-     "type": "integer"
-    },
-    "Minutes": {
-     "maximum": 59,
-     "minimum": 0,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "Hours",
-    "Minutes"
-   ],
-   "type": "object"
-  },
-  "ZoneAwarenessConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "AvailabilityZoneCount": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "es:CreateDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:ListTags"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "es:DeleteDomain",
-    "es:DescribeDomain"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "es:DescribeDomain",
-    "es:ListTags"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "es:UpdateDomain",
-    "es:UpgradeDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:RemoveTags",
-    "es:ListTags",
-    "es:DescribeDomainChangeProgress"
-   ],
-   "timeoutInMinutes": 2160
-  }
- },
- "primaryIdentifier": [
-  "/properties/DomainName"
- ],
- "properties": {
-  "AccessPolicies": {
-   "format": "json",
-   "type": [
-    "object",
-    "string"
-   ]
-  },
-  "AdvancedOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "AdvancedSecurityOptions": {
-   "$ref": "#/definitions/AdvancedSecurityOptionsInput"
-  },
-  "Arn": {
-   "type": "string"
-  },
-  "ClusterConfig": {
-   "$ref": "#/definitions/ClusterConfig"
-  },
-  "CognitoOptions": {
-   "$ref": "#/definitions/CognitoOptions"
-  },
-  "DomainArn": {
-   "type": "string"
-  },
-  "DomainEndpoint": {
-   "type": "string"
-  },
-  "DomainEndpointOptions": {
-   "$ref": "#/definitions/DomainEndpointOptions"
-  },
-  "DomainEndpointV2": {
-   "type": "string"
-  },
-  "DomainEndpoints": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "^.*$": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "DomainName": {
-   "type": "string"
-  },
-  "EBSOptions": {
-   "$ref": "#/definitions/EBSOptions"
-  },
-  "EncryptionAtRestOptions": {
-   "$ref": "#/definitions/EncryptionAtRestOptions"
-  },
-  "EngineVersion": {
-   "type": "string"
-  },
-  "IPAddressType": {
-   "type": "string"
-  },
-  "Id": {
-   "type": "string"
-  },
-  "LogPublishingOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "$ref": "#/definitions/LogPublishingOption"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "$ref": "#/definitions/NodeToNodeEncryptionOptions"
-  },
-  "OffPeakWindowOptions": {
-   "$ref": "#/definitions/OffPeakWindowOptions"
-  },
-  "ServiceSoftwareOptions": {
-   "$ref": "#/definitions/ServiceSoftwareOptions"
-  },
-  "SnapshotOptions": {
-   "$ref": "#/definitions/SnapshotOptions"
-  },
-  "SoftwareUpdateOptions": {
-   "$ref": "#/definitions/SoftwareUpdateOptions"
-  },
-  "Tags": {
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "VPCOptions": {
-   "$ref": "#/definitions/VPCOptions"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id",
-  "/properties/Arn",
-  "/properties/DomainArn",
-  "/properties/DomainEndpoint",
-  "/properties/DomainEndpointV2",
-  "/properties/DomainEndpoints",
-  "/properties/ServiceSoftwareOptions",
-  "/properties/AdvancedSecurityOptions/AnonymousAuthDisableDate"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git",
- "typeName": "AWS::OpenSearchService::Domain",
- "writeOnlyProperties": [
-  "/properties/AdvancedSecurityOptions/MasterUserOptions",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterUserName",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterBackendRole"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/eu_central_2/__init__.py b/src/cfnlint/data/schemas/providers/eu_central_2/__init__.py
index c19411f2e9..f2dd702c8a 100644
--- a/src/cfnlint/data/schemas/providers/eu_central_2/__init__.py
+++ b/src/cfnlint/data/schemas/providers/eu_central_2/__init__.py
@@ -795,6 +795,7 @@
     "aws-ec2-clientvpnendpoint.json",
     "aws-ec2-clientvpnroute.json",
     "aws-ec2-clientvpntargetnetworkassociation.json",
+    "aws-ec2-customergateway.json",
     "aws-ec2-dhcpoptions.json",
     "aws-ec2-ec2fleet.json",
     "aws-ec2-egressonlyinternetgateway.json",
@@ -804,6 +805,7 @@
     "aws-ec2-gatewayroutetableassociation.json",
     "aws-ec2-instance.json",
     "aws-ec2-instanceconnectendpoint.json",
+    "aws-ec2-internetgateway.json",
     "aws-ec2-ipam.json",
     "aws-ec2-ipamallocation.json",
     "aws-ec2-ipampool.json",
@@ -1017,6 +1019,7 @@
     "aws-networkfirewall-tlsinspectionconfiguration.json",
     "aws-oam-link.json",
     "aws-oam-sink.json",
+    "aws-opensearchservice-domain.json",
     "aws-opsworks-app.json",
     "aws-opsworks-elasticloadbalancerattachment.json",
     "aws-opsworks-userprofile.json",
diff --git a/src/cfnlint/data/schemas/providers/eu_central_2/aws-ec2-customergateway.json b/src/cfnlint/data/schemas/providers/eu_central_2/aws-ec2-customergateway.json
deleted file mode 100644
index 522f3d2997..0000000000
--- a/src/cfnlint/data/schemas/providers/eu_central_2/aws-ec2-customergateway.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/CertificateArn",
-  "/properties/BgpAsn",
-  "/properties/BgpAsnExtended",
-  "/properties/Type",
-  "/properties/IpAddress",
-  "/properties/DeviceName"
- ],
- "definitions": {
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "type": "string"
-    },
-    "Value": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "ec2:CreateCustomerGateway",
-    "ec2:DescribeCustomerGateways",
-    "ec2:CreateTags"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "ec2:DeleteCustomerGateway",
-    "ec2:DescribeCustomerGateways",
-    "ec2:DeleteTags"
-   ]
-  },
-  "list": {
-   "permissions": [
-    "ec2:DescribeCustomerGateways"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "ec2:DescribeCustomerGateways"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "ec2:CreateTags",
-    "ec2:DeleteTags",
-    "ec2:DescribeCustomerGateways"
-   ]
-  }
- },
- "primaryIdentifier": [
-  "/properties/CustomerGatewayId"
- ],
- "properties": {
-  "BgpAsn": {
-   "default": 65000,
-   "type": "integer"
-  },
-  "BgpAsnExtended": {
-   "maximum": 4294967294,
-   "minimum": 2147483648,
-   "multipleOf": 1,
-   "type": "number"
-  },
-  "CertificateArn": {
-   "pattern": "^arn:(aws[a-zA-Z-]*)?:acm:[a-z]{2}((-gov)|(-iso(b?)))?-[a-z]+-\\d{1}:\\d{12}:certificate\\/[a-zA-Z0-9-_]+$",
-   "type": "string"
-  },
-  "CustomerGatewayId": {
-   "type": "string"
-  },
-  "DeviceName": {
-   "type": "string"
-  },
-  "IpAddress": {
-   "type": "string"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "Type": {
-   "enum": [
-    "ipsec.1"
-   ],
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/CustomerGatewayId"
- ],
- "required": [
-  "IpAddress",
-  "Type"
- ],
- "tagging": {
-  "cloudFormationSystemTags": true,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::EC2::CustomerGateway"
-}
diff --git a/src/cfnlint/data/schemas/providers/eu_central_2/aws-ec2-internetgateway.json b/src/cfnlint/data/schemas/providers/eu_central_2/aws-ec2-internetgateway.json
deleted file mode 100644
index f4b93a4397..0000000000
--- a/src/cfnlint/data/schemas/providers/eu_central_2/aws-ec2-internetgateway.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
- "additionalProperties": false,
- "definitions": {
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "ec2:CreateInternetGateway",
-    "ec2:CreateTags",
-    "ec2:DescribeInternetGateways"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "ec2:DeleteInternetGateway",
-    "ec2:DescribeInternetGateways"
-   ]
-  },
-  "list": {
-   "permissions": [
-    "ec2:DescribeInternetGateways"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "ec2:DescribeInternetGateways"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "ec2:DeleteTags",
-    "ec2:CreateTags",
-    "ec2:DescribeInternetGateways"
-   ]
-  }
- },
- "primaryIdentifier": [
-  "/properties/InternetGatewayId"
- ],
- "properties": {
-  "InternetGatewayId": {
-   "type": "string"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": false
-  }
- },
- "readOnlyProperties": [
-  "/properties/InternetGatewayId"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git",
- "tagging": {
-  "cloudFormationSystemTags": true,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::EC2::InternetGateway"
-}
diff --git a/src/cfnlint/data/schemas/providers/eu_central_2/aws-opensearchservice-domain.json b/src/cfnlint/data/schemas/providers/eu_central_2/aws-opensearchservice-domain.json
deleted file mode 100644
index c8aa358cc0..0000000000
--- a/src/cfnlint/data/schemas/providers/eu_central_2/aws-opensearchservice-domain.json
+++ /dev/null
@@ -1,538 +0,0 @@
-{
- "additionalProperties": false,
- "conditionalCreateOnlyProperties": [
-  "/properties/EncryptionAtRestOptions/Enabled",
-  "/properties/EncryptionAtRestOptions/KmsKeyId",
-  "/properties/AdvancedSecurityOptions/Enabled"
- ],
- "createOnlyProperties": [
-  "/properties/DomainName"
- ],
- "definitions": {
-  "AdvancedSecurityOptionsInput": {
-   "additionalProperties": false,
-   "properties": {
-    "AnonymousAuthDisableDate": {
-     "type": "string"
-    },
-    "AnonymousAuthEnabled": {
-     "type": "boolean"
-    },
-    "Enabled": {
-     "type": "boolean"
-    },
-    "InternalUserDatabaseEnabled": {
-     "type": "boolean"
-    },
-    "MasterUserOptions": {
-     "$ref": "#/definitions/MasterUserOptions"
-    },
-    "SAMLOptions": {
-     "$ref": "#/definitions/SAMLOptions"
-    }
-   },
-   "type": "object"
-  },
-  "ClusterConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "ColdStorageOptions": {
-     "$ref": "#/definitions/ColdStorageOptions"
-    },
-    "DedicatedMasterCount": {
-     "type": "integer"
-    },
-    "DedicatedMasterEnabled": {
-     "type": "boolean"
-    },
-    "DedicatedMasterType": {
-     "type": "string"
-    },
-    "InstanceCount": {
-     "type": "integer"
-    },
-    "InstanceType": {
-     "type": "string"
-    },
-    "MultiAZWithStandbyEnabled": {
-     "type": "boolean"
-    },
-    "WarmCount": {
-     "type": "integer"
-    },
-    "WarmEnabled": {
-     "type": "boolean"
-    },
-    "WarmType": {
-     "type": "string"
-    },
-    "ZoneAwarenessConfig": {
-     "$ref": "#/definitions/ZoneAwarenessConfig"
-    },
-    "ZoneAwarenessEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "CognitoOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "IdentityPoolId": {
-     "type": "string"
-    },
-    "RoleArn": {
-     "type": "string"
-    },
-    "UserPoolId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ColdStorageOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "DomainEndpointOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomEndpoint": {
-     "type": "string"
-    },
-    "CustomEndpointCertificateArn": {
-     "type": "string"
-    },
-    "CustomEndpointEnabled": {
-     "type": "boolean"
-    },
-    "EnforceHTTPS": {
-     "type": "boolean"
-    },
-    "TLSSecurityPolicy": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EBSOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "EBSEnabled": {
-     "type": "boolean"
-    },
-    "Iops": {
-     "type": "integer"
-    },
-    "Throughput": {
-     "type": "integer"
-    },
-    "VolumeSize": {
-     "type": "integer"
-    },
-    "VolumeType": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EncryptionAtRestOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "KmsKeyId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Idp": {
-   "additionalProperties": false,
-   "properties": {
-    "EntityId": {
-     "type": "string"
-    },
-    "MetadataContent": {
-     "maxLength": 1048576,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "MetadataContent",
-    "EntityId"
-   ],
-   "type": "object"
-  },
-  "LogPublishingOption": {
-   "additionalProperties": false,
-   "properties": {
-    "CloudWatchLogsLogGroupArn": {
-     "type": "string"
-    },
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "MasterUserOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "MasterUserARN": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "MasterUserPassword": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindow": {
-   "additionalProperties": false,
-   "properties": {
-    "WindowStartTime": {
-     "$ref": "#/definitions/WindowStartTime"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindowOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "OffPeakWindow": {
-     "$ref": "#/definitions/OffPeakWindow"
-    }
-   },
-   "type": "object"
-  },
-  "SAMLOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "Idp": {
-     "$ref": "#/definitions/Idp"
-    },
-    "MasterBackendRole": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "RolesKey": {
-     "type": "string"
-    },
-    "SessionTimeoutMinutes": {
-     "type": "integer"
-    },
-    "SubjectKey": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ServiceSoftwareOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedUpdateDate": {
-     "type": "string"
-    },
-    "Cancellable": {
-     "type": "boolean"
-    },
-    "CurrentVersion": {
-     "type": "string"
-    },
-    "Description": {
-     "type": "string"
-    },
-    "NewVersion": {
-     "type": "string"
-    },
-    "OptionalDeployment": {
-     "type": "boolean"
-    },
-    "UpdateAvailable": {
-     "type": "boolean"
-    },
-    "UpdateStatus": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SnapshotOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedSnapshotStartHour": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "SoftwareUpdateOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutoSoftwareUpdateEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 0,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "minLength": 0,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "VPCOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "SecurityGroupIds": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.GroupId",
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    },
-    "SubnetIds": {
-     "items": {
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "type": "object"
-  },
-  "WindowStartTime": {
-   "additionalProperties": false,
-   "properties": {
-    "Hours": {
-     "maximum": 23,
-     "minimum": 0,
-     "type": "integer"
-    },
-    "Minutes": {
-     "maximum": 59,
-     "minimum": 0,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "Hours",
-    "Minutes"
-   ],
-   "type": "object"
-  },
-  "ZoneAwarenessConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "AvailabilityZoneCount": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "es:CreateDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:ListTags"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "es:DeleteDomain",
-    "es:DescribeDomain"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "es:DescribeDomain",
-    "es:ListTags"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "es:UpdateDomain",
-    "es:UpgradeDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:RemoveTags",
-    "es:ListTags",
-    "es:DescribeDomainChangeProgress"
-   ],
-   "timeoutInMinutes": 2160
-  }
- },
- "primaryIdentifier": [
-  "/properties/DomainName"
- ],
- "properties": {
-  "AccessPolicies": {
-   "format": "json",
-   "type": [
-    "object",
-    "string"
-   ]
-  },
-  "AdvancedOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "AdvancedSecurityOptions": {
-   "$ref": "#/definitions/AdvancedSecurityOptionsInput"
-  },
-  "Arn": {
-   "type": "string"
-  },
-  "ClusterConfig": {
-   "$ref": "#/definitions/ClusterConfig"
-  },
-  "CognitoOptions": {
-   "$ref": "#/definitions/CognitoOptions"
-  },
-  "DomainArn": {
-   "type": "string"
-  },
-  "DomainEndpoint": {
-   "type": "string"
-  },
-  "DomainEndpointOptions": {
-   "$ref": "#/definitions/DomainEndpointOptions"
-  },
-  "DomainEndpointV2": {
-   "type": "string"
-  },
-  "DomainEndpoints": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "^.*$": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "DomainName": {
-   "type": "string"
-  },
-  "EBSOptions": {
-   "$ref": "#/definitions/EBSOptions"
-  },
-  "EncryptionAtRestOptions": {
-   "$ref": "#/definitions/EncryptionAtRestOptions"
-  },
-  "EngineVersion": {
-   "type": "string"
-  },
-  "IPAddressType": {
-   "type": "string"
-  },
-  "Id": {
-   "type": "string"
-  },
-  "LogPublishingOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "$ref": "#/definitions/LogPublishingOption"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "$ref": "#/definitions/NodeToNodeEncryptionOptions"
-  },
-  "OffPeakWindowOptions": {
-   "$ref": "#/definitions/OffPeakWindowOptions"
-  },
-  "ServiceSoftwareOptions": {
-   "$ref": "#/definitions/ServiceSoftwareOptions"
-  },
-  "SnapshotOptions": {
-   "$ref": "#/definitions/SnapshotOptions"
-  },
-  "SoftwareUpdateOptions": {
-   "$ref": "#/definitions/SoftwareUpdateOptions"
-  },
-  "Tags": {
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "VPCOptions": {
-   "$ref": "#/definitions/VPCOptions"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id",
-  "/properties/Arn",
-  "/properties/DomainArn",
-  "/properties/DomainEndpoint",
-  "/properties/DomainEndpointV2",
-  "/properties/DomainEndpoints",
-  "/properties/ServiceSoftwareOptions",
-  "/properties/AdvancedSecurityOptions/AnonymousAuthDisableDate"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git",
- "typeName": "AWS::OpenSearchService::Domain",
- "writeOnlyProperties": [
-  "/properties/AdvancedSecurityOptions/MasterUserOptions",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterUserName",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterBackendRole"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/eu_north_1/__init__.py b/src/cfnlint/data/schemas/providers/eu_north_1/__init__.py
index 0fc753c1fd..4a9f9a0cff 100644
--- a/src/cfnlint/data/schemas/providers/eu_north_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/eu_north_1/__init__.py
@@ -1320,6 +1320,7 @@
     "aws-ecr-pullthroughcacherule.json",
     "aws-ecr-registrypolicy.json",
     "aws-ecr-replicationconfiguration.json",
+    "aws-ecr-repository.json",
     "aws-ecr-repositorycreationtemplate.json",
     "aws-ecs-capacityprovider.json",
     "aws-ecs-cluster.json",
diff --git a/src/cfnlint/data/schemas/providers/eu_north_1/aws-ecr-repository.json b/src/cfnlint/data/schemas/providers/eu_north_1/aws-ecr-repository.json
deleted file mode 100644
index 062afcc632..0000000000
--- a/src/cfnlint/data/schemas/providers/eu_north_1/aws-ecr-repository.json
+++ /dev/null
@@ -1,212 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/RepositoryName",
-  "/properties/EncryptionConfiguration",
-  "/properties/EncryptionConfiguration/EncryptionType",
-  "/properties/EncryptionConfiguration/KmsKey"
- ],
- "definitions": {
-  "EmptyOnDelete": {
-   "type": "boolean"
-  },
-  "EncryptionConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "EncryptionType": {
-     "$ref": "#/definitions/EncryptionType"
-    },
-    "KmsKey": {
-     "$ref": "#/definitions/KmsKey"
-    }
-   },
-   "required": [
-    "EncryptionType"
-   ],
-   "type": "object"
-  },
-  "EncryptionType": {
-   "enum": [
-    "AES256",
-    "KMS"
-   ],
-   "type": "string"
-  },
-  "ImageScanningConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "ScanOnPush": {
-     "$ref": "#/definitions/ScanOnPush"
-    }
-   },
-   "type": "object"
-  },
-  "KmsKey": {
-   "maxLength": 2048,
-   "minLength": 1,
-   "type": "string"
-  },
-  "LifecyclePolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "LifecyclePolicyText": {
-     "$ref": "#/definitions/LifecyclePolicyText"
-    },
-    "RegistryId": {
-     "$ref": "#/definitions/RegistryId"
-    }
-   },
-   "type": "object"
-  },
-  "LifecyclePolicyText": {
-   "maxLength": 30720,
-   "minLength": 100,
-   "type": "string"
-  },
-  "RegistryId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^[0-9]{12}$",
-   "type": "string"
-  },
-  "ScanOnPush": {
-   "type": "boolean"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 127,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 255,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "ecr:CreateRepository",
-    "ecr:PutLifecyclePolicy",
-    "ecr:SetRepositoryPolicy",
-    "ecr:TagResource",
-    "kms:DescribeKey",
-    "kms:CreateGrant",
-    "kms:RetireGrant"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "ecr:DeleteRepository",
-    "kms:RetireGrant"
-   ]
-  },
-  "list": {
-   "permissions": [
-    "ecr:DescribeRepositories"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "ecr:DescribeRepositories",
-    "ecr:GetLifecyclePolicy",
-    "ecr:GetRepositoryPolicy",
-    "ecr:ListTagsForResource"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "ecr:DescribeRepositories",
-    "ecr:PutLifecyclePolicy",
-    "ecr:SetRepositoryPolicy",
-    "ecr:ListTagsForResource",
-    "ecr:TagResource",
-    "ecr:UntagResource",
-    "ecr:DeleteLifecyclePolicy",
-    "ecr:DeleteRepositoryPolicy",
-    "ecr:PutImageScanningConfiguration",
-    "ecr:PutImageTagMutability",
-    "kms:DescribeKey",
-    "kms:CreateGrant",
-    "kms:RetireGrant"
-   ]
-  }
- },
- "primaryIdentifier": [
-  "/properties/RepositoryName"
- ],
- "properties": {
-  "Arn": {
-   "type": "string"
-  },
-  "EmptyOnDelete": {
-   "$ref": "#/definitions/EmptyOnDelete"
-  },
-  "EncryptionConfiguration": {
-   "$ref": "#/definitions/EncryptionConfiguration"
-  },
-  "ImageScanningConfiguration": {
-   "$ref": "#/definitions/ImageScanningConfiguration"
-  },
-  "ImageTagMutability": {
-   "enum": [
-    "MUTABLE",
-    "IMMUTABLE"
-   ],
-   "type": "string"
-  },
-  "LifecyclePolicy": {
-   "$ref": "#/definitions/LifecyclePolicy"
-  },
-  "RepositoryName": {
-   "maxLength": 256,
-   "minLength": 2,
-   "pattern": "^(?=.{2,256}$)((?:[a-z0-9]+(?:[._-][a-z0-9]+)*/)*[a-z0-9]+(?:[._-][a-z0-9]+)*)$",
-   "type": "string"
-  },
-  "RepositoryPolicyText": {
-   "type": [
-    "object",
-    "string"
-   ]
-  },
-  "RepositoryUri": {
-   "type": "string"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 50,
-   "type": "array",
-   "uniqueItems": true
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/RepositoryUri"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-ecr.git",
- "tagging": {
-  "cloudFormationSystemTags": true,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::ECR::Repository",
- "writeOnlyProperties": [
-  "/properties/EmptyOnDelete"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/eu_south_1/__init__.py b/src/cfnlint/data/schemas/providers/eu_south_1/__init__.py
index e4ba863e6b..1d9cc42f7e 100644
--- a/src/cfnlint/data/schemas/providers/eu_south_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/eu_south_1/__init__.py
@@ -1295,6 +1295,7 @@
     "aws-networkmanager-vpcattachment.json",
     "aws-oam-link.json",
     "aws-oam-sink.json",
+    "aws-opensearchservice-domain.json",
     "aws-opsworks-app.json",
     "aws-opsworks-elasticloadbalancerattachment.json",
     "aws-opsworks-userprofile.json",
diff --git a/src/cfnlint/data/schemas/providers/eu_south_1/aws-opensearchservice-domain.json b/src/cfnlint/data/schemas/providers/eu_south_1/aws-opensearchservice-domain.json
deleted file mode 100644
index c8aa358cc0..0000000000
--- a/src/cfnlint/data/schemas/providers/eu_south_1/aws-opensearchservice-domain.json
+++ /dev/null
@@ -1,538 +0,0 @@
-{
- "additionalProperties": false,
- "conditionalCreateOnlyProperties": [
-  "/properties/EncryptionAtRestOptions/Enabled",
-  "/properties/EncryptionAtRestOptions/KmsKeyId",
-  "/properties/AdvancedSecurityOptions/Enabled"
- ],
- "createOnlyProperties": [
-  "/properties/DomainName"
- ],
- "definitions": {
-  "AdvancedSecurityOptionsInput": {
-   "additionalProperties": false,
-   "properties": {
-    "AnonymousAuthDisableDate": {
-     "type": "string"
-    },
-    "AnonymousAuthEnabled": {
-     "type": "boolean"
-    },
-    "Enabled": {
-     "type": "boolean"
-    },
-    "InternalUserDatabaseEnabled": {
-     "type": "boolean"
-    },
-    "MasterUserOptions": {
-     "$ref": "#/definitions/MasterUserOptions"
-    },
-    "SAMLOptions": {
-     "$ref": "#/definitions/SAMLOptions"
-    }
-   },
-   "type": "object"
-  },
-  "ClusterConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "ColdStorageOptions": {
-     "$ref": "#/definitions/ColdStorageOptions"
-    },
-    "DedicatedMasterCount": {
-     "type": "integer"
-    },
-    "DedicatedMasterEnabled": {
-     "type": "boolean"
-    },
-    "DedicatedMasterType": {
-     "type": "string"
-    },
-    "InstanceCount": {
-     "type": "integer"
-    },
-    "InstanceType": {
-     "type": "string"
-    },
-    "MultiAZWithStandbyEnabled": {
-     "type": "boolean"
-    },
-    "WarmCount": {
-     "type": "integer"
-    },
-    "WarmEnabled": {
-     "type": "boolean"
-    },
-    "WarmType": {
-     "type": "string"
-    },
-    "ZoneAwarenessConfig": {
-     "$ref": "#/definitions/ZoneAwarenessConfig"
-    },
-    "ZoneAwarenessEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "CognitoOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "IdentityPoolId": {
-     "type": "string"
-    },
-    "RoleArn": {
-     "type": "string"
-    },
-    "UserPoolId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ColdStorageOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "DomainEndpointOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomEndpoint": {
-     "type": "string"
-    },
-    "CustomEndpointCertificateArn": {
-     "type": "string"
-    },
-    "CustomEndpointEnabled": {
-     "type": "boolean"
-    },
-    "EnforceHTTPS": {
-     "type": "boolean"
-    },
-    "TLSSecurityPolicy": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EBSOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "EBSEnabled": {
-     "type": "boolean"
-    },
-    "Iops": {
-     "type": "integer"
-    },
-    "Throughput": {
-     "type": "integer"
-    },
-    "VolumeSize": {
-     "type": "integer"
-    },
-    "VolumeType": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EncryptionAtRestOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "KmsKeyId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Idp": {
-   "additionalProperties": false,
-   "properties": {
-    "EntityId": {
-     "type": "string"
-    },
-    "MetadataContent": {
-     "maxLength": 1048576,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "MetadataContent",
-    "EntityId"
-   ],
-   "type": "object"
-  },
-  "LogPublishingOption": {
-   "additionalProperties": false,
-   "properties": {
-    "CloudWatchLogsLogGroupArn": {
-     "type": "string"
-    },
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "MasterUserOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "MasterUserARN": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "MasterUserPassword": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindow": {
-   "additionalProperties": false,
-   "properties": {
-    "WindowStartTime": {
-     "$ref": "#/definitions/WindowStartTime"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindowOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "OffPeakWindow": {
-     "$ref": "#/definitions/OffPeakWindow"
-    }
-   },
-   "type": "object"
-  },
-  "SAMLOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "Idp": {
-     "$ref": "#/definitions/Idp"
-    },
-    "MasterBackendRole": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "RolesKey": {
-     "type": "string"
-    },
-    "SessionTimeoutMinutes": {
-     "type": "integer"
-    },
-    "SubjectKey": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ServiceSoftwareOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedUpdateDate": {
-     "type": "string"
-    },
-    "Cancellable": {
-     "type": "boolean"
-    },
-    "CurrentVersion": {
-     "type": "string"
-    },
-    "Description": {
-     "type": "string"
-    },
-    "NewVersion": {
-     "type": "string"
-    },
-    "OptionalDeployment": {
-     "type": "boolean"
-    },
-    "UpdateAvailable": {
-     "type": "boolean"
-    },
-    "UpdateStatus": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SnapshotOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedSnapshotStartHour": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "SoftwareUpdateOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutoSoftwareUpdateEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 0,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "minLength": 0,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "VPCOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "SecurityGroupIds": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.GroupId",
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    },
-    "SubnetIds": {
-     "items": {
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "type": "object"
-  },
-  "WindowStartTime": {
-   "additionalProperties": false,
-   "properties": {
-    "Hours": {
-     "maximum": 23,
-     "minimum": 0,
-     "type": "integer"
-    },
-    "Minutes": {
-     "maximum": 59,
-     "minimum": 0,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "Hours",
-    "Minutes"
-   ],
-   "type": "object"
-  },
-  "ZoneAwarenessConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "AvailabilityZoneCount": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "es:CreateDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:ListTags"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "es:DeleteDomain",
-    "es:DescribeDomain"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "es:DescribeDomain",
-    "es:ListTags"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "es:UpdateDomain",
-    "es:UpgradeDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:RemoveTags",
-    "es:ListTags",
-    "es:DescribeDomainChangeProgress"
-   ],
-   "timeoutInMinutes": 2160
-  }
- },
- "primaryIdentifier": [
-  "/properties/DomainName"
- ],
- "properties": {
-  "AccessPolicies": {
-   "format": "json",
-   "type": [
-    "object",
-    "string"
-   ]
-  },
-  "AdvancedOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "AdvancedSecurityOptions": {
-   "$ref": "#/definitions/AdvancedSecurityOptionsInput"
-  },
-  "Arn": {
-   "type": "string"
-  },
-  "ClusterConfig": {
-   "$ref": "#/definitions/ClusterConfig"
-  },
-  "CognitoOptions": {
-   "$ref": "#/definitions/CognitoOptions"
-  },
-  "DomainArn": {
-   "type": "string"
-  },
-  "DomainEndpoint": {
-   "type": "string"
-  },
-  "DomainEndpointOptions": {
-   "$ref": "#/definitions/DomainEndpointOptions"
-  },
-  "DomainEndpointV2": {
-   "type": "string"
-  },
-  "DomainEndpoints": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "^.*$": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "DomainName": {
-   "type": "string"
-  },
-  "EBSOptions": {
-   "$ref": "#/definitions/EBSOptions"
-  },
-  "EncryptionAtRestOptions": {
-   "$ref": "#/definitions/EncryptionAtRestOptions"
-  },
-  "EngineVersion": {
-   "type": "string"
-  },
-  "IPAddressType": {
-   "type": "string"
-  },
-  "Id": {
-   "type": "string"
-  },
-  "LogPublishingOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "$ref": "#/definitions/LogPublishingOption"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "$ref": "#/definitions/NodeToNodeEncryptionOptions"
-  },
-  "OffPeakWindowOptions": {
-   "$ref": "#/definitions/OffPeakWindowOptions"
-  },
-  "ServiceSoftwareOptions": {
-   "$ref": "#/definitions/ServiceSoftwareOptions"
-  },
-  "SnapshotOptions": {
-   "$ref": "#/definitions/SnapshotOptions"
-  },
-  "SoftwareUpdateOptions": {
-   "$ref": "#/definitions/SoftwareUpdateOptions"
-  },
-  "Tags": {
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "VPCOptions": {
-   "$ref": "#/definitions/VPCOptions"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id",
-  "/properties/Arn",
-  "/properties/DomainArn",
-  "/properties/DomainEndpoint",
-  "/properties/DomainEndpointV2",
-  "/properties/DomainEndpoints",
-  "/properties/ServiceSoftwareOptions",
-  "/properties/AdvancedSecurityOptions/AnonymousAuthDisableDate"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git",
- "typeName": "AWS::OpenSearchService::Domain",
- "writeOnlyProperties": [
-  "/properties/AdvancedSecurityOptions/MasterUserOptions",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterUserName",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterBackendRole"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/eu_south_2/__init__.py b/src/cfnlint/data/schemas/providers/eu_south_2/__init__.py
index b7d94b89e8..567f9298cf 100644
--- a/src/cfnlint/data/schemas/providers/eu_south_2/__init__.py
+++ b/src/cfnlint/data/schemas/providers/eu_south_2/__init__.py
@@ -877,6 +877,7 @@
     "aws-ecr-pullthroughcacherule.json",
     "aws-ecr-registrypolicy.json",
     "aws-ecr-replicationconfiguration.json",
+    "aws-ecr-repository.json",
     "aws-ecr-repositorycreationtemplate.json",
     "aws-ecs-capacityprovider.json",
     "aws-ecs-cluster.json",
diff --git a/src/cfnlint/data/schemas/providers/eu_south_2/aws-ecr-repository.json b/src/cfnlint/data/schemas/providers/eu_south_2/aws-ecr-repository.json
deleted file mode 100644
index 062afcc632..0000000000
--- a/src/cfnlint/data/schemas/providers/eu_south_2/aws-ecr-repository.json
+++ /dev/null
@@ -1,212 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/RepositoryName",
-  "/properties/EncryptionConfiguration",
-  "/properties/EncryptionConfiguration/EncryptionType",
-  "/properties/EncryptionConfiguration/KmsKey"
- ],
- "definitions": {
-  "EmptyOnDelete": {
-   "type": "boolean"
-  },
-  "EncryptionConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "EncryptionType": {
-     "$ref": "#/definitions/EncryptionType"
-    },
-    "KmsKey": {
-     "$ref": "#/definitions/KmsKey"
-    }
-   },
-   "required": [
-    "EncryptionType"
-   ],
-   "type": "object"
-  },
-  "EncryptionType": {
-   "enum": [
-    "AES256",
-    "KMS"
-   ],
-   "type": "string"
-  },
-  "ImageScanningConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "ScanOnPush": {
-     "$ref": "#/definitions/ScanOnPush"
-    }
-   },
-   "type": "object"
-  },
-  "KmsKey": {
-   "maxLength": 2048,
-   "minLength": 1,
-   "type": "string"
-  },
-  "LifecyclePolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "LifecyclePolicyText": {
-     "$ref": "#/definitions/LifecyclePolicyText"
-    },
-    "RegistryId": {
-     "$ref": "#/definitions/RegistryId"
-    }
-   },
-   "type": "object"
-  },
-  "LifecyclePolicyText": {
-   "maxLength": 30720,
-   "minLength": 100,
-   "type": "string"
-  },
-  "RegistryId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^[0-9]{12}$",
-   "type": "string"
-  },
-  "ScanOnPush": {
-   "type": "boolean"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 127,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 255,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "ecr:CreateRepository",
-    "ecr:PutLifecyclePolicy",
-    "ecr:SetRepositoryPolicy",
-    "ecr:TagResource",
-    "kms:DescribeKey",
-    "kms:CreateGrant",
-    "kms:RetireGrant"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "ecr:DeleteRepository",
-    "kms:RetireGrant"
-   ]
-  },
-  "list": {
-   "permissions": [
-    "ecr:DescribeRepositories"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "ecr:DescribeRepositories",
-    "ecr:GetLifecyclePolicy",
-    "ecr:GetRepositoryPolicy",
-    "ecr:ListTagsForResource"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "ecr:DescribeRepositories",
-    "ecr:PutLifecyclePolicy",
-    "ecr:SetRepositoryPolicy",
-    "ecr:ListTagsForResource",
-    "ecr:TagResource",
-    "ecr:UntagResource",
-    "ecr:DeleteLifecyclePolicy",
-    "ecr:DeleteRepositoryPolicy",
-    "ecr:PutImageScanningConfiguration",
-    "ecr:PutImageTagMutability",
-    "kms:DescribeKey",
-    "kms:CreateGrant",
-    "kms:RetireGrant"
-   ]
-  }
- },
- "primaryIdentifier": [
-  "/properties/RepositoryName"
- ],
- "properties": {
-  "Arn": {
-   "type": "string"
-  },
-  "EmptyOnDelete": {
-   "$ref": "#/definitions/EmptyOnDelete"
-  },
-  "EncryptionConfiguration": {
-   "$ref": "#/definitions/EncryptionConfiguration"
-  },
-  "ImageScanningConfiguration": {
-   "$ref": "#/definitions/ImageScanningConfiguration"
-  },
-  "ImageTagMutability": {
-   "enum": [
-    "MUTABLE",
-    "IMMUTABLE"
-   ],
-   "type": "string"
-  },
-  "LifecyclePolicy": {
-   "$ref": "#/definitions/LifecyclePolicy"
-  },
-  "RepositoryName": {
-   "maxLength": 256,
-   "minLength": 2,
-   "pattern": "^(?=.{2,256}$)((?:[a-z0-9]+(?:[._-][a-z0-9]+)*/)*[a-z0-9]+(?:[._-][a-z0-9]+)*)$",
-   "type": "string"
-  },
-  "RepositoryPolicyText": {
-   "type": [
-    "object",
-    "string"
-   ]
-  },
-  "RepositoryUri": {
-   "type": "string"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 50,
-   "type": "array",
-   "uniqueItems": true
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/RepositoryUri"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-ecr.git",
- "tagging": {
-  "cloudFormationSystemTags": true,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::ECR::Repository",
- "writeOnlyProperties": [
-  "/properties/EmptyOnDelete"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/eu_west_1/__init__.py b/src/cfnlint/data/schemas/providers/eu_west_1/__init__.py
index f228dcda48..2c18df72cf 100644
--- a/src/cfnlint/data/schemas/providers/eu_west_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/eu_west_1/__init__.py
@@ -1632,6 +1632,7 @@
     "aws-ecr-pullthroughcacherule.json",
     "aws-ecr-registrypolicy.json",
     "aws-ecr-replicationconfiguration.json",
+    "aws-ecr-repository.json",
     "aws-ecr-repositorycreationtemplate.json",
     "aws-ecs-capacityprovider.json",
     "aws-ecs-cluster.json",
diff --git a/src/cfnlint/data/schemas/providers/eu_west_1/aws-ecr-repository.json b/src/cfnlint/data/schemas/providers/eu_west_1/aws-ecr-repository.json
deleted file mode 100644
index 062afcc632..0000000000
--- a/src/cfnlint/data/schemas/providers/eu_west_1/aws-ecr-repository.json
+++ /dev/null
@@ -1,212 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/RepositoryName",
-  "/properties/EncryptionConfiguration",
-  "/properties/EncryptionConfiguration/EncryptionType",
-  "/properties/EncryptionConfiguration/KmsKey"
- ],
- "definitions": {
-  "EmptyOnDelete": {
-   "type": "boolean"
-  },
-  "EncryptionConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "EncryptionType": {
-     "$ref": "#/definitions/EncryptionType"
-    },
-    "KmsKey": {
-     "$ref": "#/definitions/KmsKey"
-    }
-   },
-   "required": [
-    "EncryptionType"
-   ],
-   "type": "object"
-  },
-  "EncryptionType": {
-   "enum": [
-    "AES256",
-    "KMS"
-   ],
-   "type": "string"
-  },
-  "ImageScanningConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "ScanOnPush": {
-     "$ref": "#/definitions/ScanOnPush"
-    }
-   },
-   "type": "object"
-  },
-  "KmsKey": {
-   "maxLength": 2048,
-   "minLength": 1,
-   "type": "string"
-  },
-  "LifecyclePolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "LifecyclePolicyText": {
-     "$ref": "#/definitions/LifecyclePolicyText"
-    },
-    "RegistryId": {
-     "$ref": "#/definitions/RegistryId"
-    }
-   },
-   "type": "object"
-  },
-  "LifecyclePolicyText": {
-   "maxLength": 30720,
-   "minLength": 100,
-   "type": "string"
-  },
-  "RegistryId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^[0-9]{12}$",
-   "type": "string"
-  },
-  "ScanOnPush": {
-   "type": "boolean"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 127,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 255,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "ecr:CreateRepository",
-    "ecr:PutLifecyclePolicy",
-    "ecr:SetRepositoryPolicy",
-    "ecr:TagResource",
-    "kms:DescribeKey",
-    "kms:CreateGrant",
-    "kms:RetireGrant"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "ecr:DeleteRepository",
-    "kms:RetireGrant"
-   ]
-  },
-  "list": {
-   "permissions": [
-    "ecr:DescribeRepositories"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "ecr:DescribeRepositories",
-    "ecr:GetLifecyclePolicy",
-    "ecr:GetRepositoryPolicy",
-    "ecr:ListTagsForResource"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "ecr:DescribeRepositories",
-    "ecr:PutLifecyclePolicy",
-    "ecr:SetRepositoryPolicy",
-    "ecr:ListTagsForResource",
-    "ecr:TagResource",
-    "ecr:UntagResource",
-    "ecr:DeleteLifecyclePolicy",
-    "ecr:DeleteRepositoryPolicy",
-    "ecr:PutImageScanningConfiguration",
-    "ecr:PutImageTagMutability",
-    "kms:DescribeKey",
-    "kms:CreateGrant",
-    "kms:RetireGrant"
-   ]
-  }
- },
- "primaryIdentifier": [
-  "/properties/RepositoryName"
- ],
- "properties": {
-  "Arn": {
-   "type": "string"
-  },
-  "EmptyOnDelete": {
-   "$ref": "#/definitions/EmptyOnDelete"
-  },
-  "EncryptionConfiguration": {
-   "$ref": "#/definitions/EncryptionConfiguration"
-  },
-  "ImageScanningConfiguration": {
-   "$ref": "#/definitions/ImageScanningConfiguration"
-  },
-  "ImageTagMutability": {
-   "enum": [
-    "MUTABLE",
-    "IMMUTABLE"
-   ],
-   "type": "string"
-  },
-  "LifecyclePolicy": {
-   "$ref": "#/definitions/LifecyclePolicy"
-  },
-  "RepositoryName": {
-   "maxLength": 256,
-   "minLength": 2,
-   "pattern": "^(?=.{2,256}$)((?:[a-z0-9]+(?:[._-][a-z0-9]+)*/)*[a-z0-9]+(?:[._-][a-z0-9]+)*)$",
-   "type": "string"
-  },
-  "RepositoryPolicyText": {
-   "type": [
-    "object",
-    "string"
-   ]
-  },
-  "RepositoryUri": {
-   "type": "string"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 50,
-   "type": "array",
-   "uniqueItems": true
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/RepositoryUri"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-ecr.git",
- "tagging": {
-  "cloudFormationSystemTags": true,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::ECR::Repository",
- "writeOnlyProperties": [
-  "/properties/EmptyOnDelete"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/eu_west_2/__init__.py b/src/cfnlint/data/schemas/providers/eu_west_2/__init__.py
index 2074657327..28d46ead7f 100644
--- a/src/cfnlint/data/schemas/providers/eu_west_2/__init__.py
+++ b/src/cfnlint/data/schemas/providers/eu_west_2/__init__.py
@@ -1559,6 +1559,7 @@
     "aws-ecr-pullthroughcacherule.json",
     "aws-ecr-registrypolicy.json",
     "aws-ecr-replicationconfiguration.json",
+    "aws-ecr-repository.json",
     "aws-ecr-repositorycreationtemplate.json",
     "aws-ecs-capacityprovider.json",
     "aws-ecs-cluster.json",
diff --git a/src/cfnlint/data/schemas/providers/eu_west_2/aws-ecr-repository.json b/src/cfnlint/data/schemas/providers/eu_west_2/aws-ecr-repository.json
deleted file mode 100644
index 062afcc632..0000000000
--- a/src/cfnlint/data/schemas/providers/eu_west_2/aws-ecr-repository.json
+++ /dev/null
@@ -1,212 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/RepositoryName",
-  "/properties/EncryptionConfiguration",
-  "/properties/EncryptionConfiguration/EncryptionType",
-  "/properties/EncryptionConfiguration/KmsKey"
- ],
- "definitions": {
-  "EmptyOnDelete": {
-   "type": "boolean"
-  },
-  "EncryptionConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "EncryptionType": {
-     "$ref": "#/definitions/EncryptionType"
-    },
-    "KmsKey": {
-     "$ref": "#/definitions/KmsKey"
-    }
-   },
-   "required": [
-    "EncryptionType"
-   ],
-   "type": "object"
-  },
-  "EncryptionType": {
-   "enum": [
-    "AES256",
-    "KMS"
-   ],
-   "type": "string"
-  },
-  "ImageScanningConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "ScanOnPush": {
-     "$ref": "#/definitions/ScanOnPush"
-    }
-   },
-   "type": "object"
-  },
-  "KmsKey": {
-   "maxLength": 2048,
-   "minLength": 1,
-   "type": "string"
-  },
-  "LifecyclePolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "LifecyclePolicyText": {
-     "$ref": "#/definitions/LifecyclePolicyText"
-    },
-    "RegistryId": {
-     "$ref": "#/definitions/RegistryId"
-    }
-   },
-   "type": "object"
-  },
-  "LifecyclePolicyText": {
-   "maxLength": 30720,
-   "minLength": 100,
-   "type": "string"
-  },
-  "RegistryId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^[0-9]{12}$",
-   "type": "string"
-  },
-  "ScanOnPush": {
-   "type": "boolean"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 127,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 255,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "ecr:CreateRepository",
-    "ecr:PutLifecyclePolicy",
-    "ecr:SetRepositoryPolicy",
-    "ecr:TagResource",
-    "kms:DescribeKey",
-    "kms:CreateGrant",
-    "kms:RetireGrant"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "ecr:DeleteRepository",
-    "kms:RetireGrant"
-   ]
-  },
-  "list": {
-   "permissions": [
-    "ecr:DescribeRepositories"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "ecr:DescribeRepositories",
-    "ecr:GetLifecyclePolicy",
-    "ecr:GetRepositoryPolicy",
-    "ecr:ListTagsForResource"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "ecr:DescribeRepositories",
-    "ecr:PutLifecyclePolicy",
-    "ecr:SetRepositoryPolicy",
-    "ecr:ListTagsForResource",
-    "ecr:TagResource",
-    "ecr:UntagResource",
-    "ecr:DeleteLifecyclePolicy",
-    "ecr:DeleteRepositoryPolicy",
-    "ecr:PutImageScanningConfiguration",
-    "ecr:PutImageTagMutability",
-    "kms:DescribeKey",
-    "kms:CreateGrant",
-    "kms:RetireGrant"
-   ]
-  }
- },
- "primaryIdentifier": [
-  "/properties/RepositoryName"
- ],
- "properties": {
-  "Arn": {
-   "type": "string"
-  },
-  "EmptyOnDelete": {
-   "$ref": "#/definitions/EmptyOnDelete"
-  },
-  "EncryptionConfiguration": {
-   "$ref": "#/definitions/EncryptionConfiguration"
-  },
-  "ImageScanningConfiguration": {
-   "$ref": "#/definitions/ImageScanningConfiguration"
-  },
-  "ImageTagMutability": {
-   "enum": [
-    "MUTABLE",
-    "IMMUTABLE"
-   ],
-   "type": "string"
-  },
-  "LifecyclePolicy": {
-   "$ref": "#/definitions/LifecyclePolicy"
-  },
-  "RepositoryName": {
-   "maxLength": 256,
-   "minLength": 2,
-   "pattern": "^(?=.{2,256}$)((?:[a-z0-9]+(?:[._-][a-z0-9]+)*/)*[a-z0-9]+(?:[._-][a-z0-9]+)*)$",
-   "type": "string"
-  },
-  "RepositoryPolicyText": {
-   "type": [
-    "object",
-    "string"
-   ]
-  },
-  "RepositoryUri": {
-   "type": "string"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 50,
-   "type": "array",
-   "uniqueItems": true
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/RepositoryUri"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-ecr.git",
- "tagging": {
-  "cloudFormationSystemTags": true,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::ECR::Repository",
- "writeOnlyProperties": [
-  "/properties/EmptyOnDelete"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/eu_west_3/__init__.py b/src/cfnlint/data/schemas/providers/eu_west_3/__init__.py
index 38c7cad24c..4391d9a821 100644
--- a/src/cfnlint/data/schemas/providers/eu_west_3/__init__.py
+++ b/src/cfnlint/data/schemas/providers/eu_west_3/__init__.py
@@ -1235,6 +1235,7 @@
     "aws-ec2-host.json",
     "aws-ec2-instance.json",
     "aws-ec2-instanceconnectendpoint.json",
+    "aws-ec2-internetgateway.json",
     "aws-ec2-ipam.json",
     "aws-ec2-ipamallocation.json",
     "aws-ec2-ipampool.json",
@@ -1306,6 +1307,7 @@
     "aws-ecr-pullthroughcacherule.json",
     "aws-ecr-registrypolicy.json",
     "aws-ecr-replicationconfiguration.json",
+    "aws-ecr-repository.json",
     "aws-ecr-repositorycreationtemplate.json",
     "aws-ecs-capacityprovider.json",
     "aws-ecs-cluster.json",
@@ -1590,6 +1592,7 @@
     "aws-opensearchserverless-securityconfig.json",
     "aws-opensearchserverless-securitypolicy.json",
     "aws-opensearchserverless-vpcendpoint.json",
+    "aws-opensearchservice-domain.json",
     "aws-opsworks-app.json",
     "aws-opsworks-elasticloadbalancerattachment.json",
     "aws-opsworks-instance.json",
diff --git a/src/cfnlint/data/schemas/providers/eu_west_3/aws-ec2-internetgateway.json b/src/cfnlint/data/schemas/providers/eu_west_3/aws-ec2-internetgateway.json
deleted file mode 100644
index f4b93a4397..0000000000
--- a/src/cfnlint/data/schemas/providers/eu_west_3/aws-ec2-internetgateway.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
- "additionalProperties": false,
- "definitions": {
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "ec2:CreateInternetGateway",
-    "ec2:CreateTags",
-    "ec2:DescribeInternetGateways"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "ec2:DeleteInternetGateway",
-    "ec2:DescribeInternetGateways"
-   ]
-  },
-  "list": {
-   "permissions": [
-    "ec2:DescribeInternetGateways"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "ec2:DescribeInternetGateways"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "ec2:DeleteTags",
-    "ec2:CreateTags",
-    "ec2:DescribeInternetGateways"
-   ]
-  }
- },
- "primaryIdentifier": [
-  "/properties/InternetGatewayId"
- ],
- "properties": {
-  "InternetGatewayId": {
-   "type": "string"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": false
-  }
- },
- "readOnlyProperties": [
-  "/properties/InternetGatewayId"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git",
- "tagging": {
-  "cloudFormationSystemTags": true,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::EC2::InternetGateway"
-}
diff --git a/src/cfnlint/data/schemas/providers/eu_west_3/aws-ecr-repository.json b/src/cfnlint/data/schemas/providers/eu_west_3/aws-ecr-repository.json
deleted file mode 100644
index 062afcc632..0000000000
--- a/src/cfnlint/data/schemas/providers/eu_west_3/aws-ecr-repository.json
+++ /dev/null
@@ -1,212 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/RepositoryName",
-  "/properties/EncryptionConfiguration",
-  "/properties/EncryptionConfiguration/EncryptionType",
-  "/properties/EncryptionConfiguration/KmsKey"
- ],
- "definitions": {
-  "EmptyOnDelete": {
-   "type": "boolean"
-  },
-  "EncryptionConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "EncryptionType": {
-     "$ref": "#/definitions/EncryptionType"
-    },
-    "KmsKey": {
-     "$ref": "#/definitions/KmsKey"
-    }
-   },
-   "required": [
-    "EncryptionType"
-   ],
-   "type": "object"
-  },
-  "EncryptionType": {
-   "enum": [
-    "AES256",
-    "KMS"
-   ],
-   "type": "string"
-  },
-  "ImageScanningConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "ScanOnPush": {
-     "$ref": "#/definitions/ScanOnPush"
-    }
-   },
-   "type": "object"
-  },
-  "KmsKey": {
-   "maxLength": 2048,
-   "minLength": 1,
-   "type": "string"
-  },
-  "LifecyclePolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "LifecyclePolicyText": {
-     "$ref": "#/definitions/LifecyclePolicyText"
-    },
-    "RegistryId": {
-     "$ref": "#/definitions/RegistryId"
-    }
-   },
-   "type": "object"
-  },
-  "LifecyclePolicyText": {
-   "maxLength": 30720,
-   "minLength": 100,
-   "type": "string"
-  },
-  "RegistryId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^[0-9]{12}$",
-   "type": "string"
-  },
-  "ScanOnPush": {
-   "type": "boolean"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 127,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 255,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "ecr:CreateRepository",
-    "ecr:PutLifecyclePolicy",
-    "ecr:SetRepositoryPolicy",
-    "ecr:TagResource",
-    "kms:DescribeKey",
-    "kms:CreateGrant",
-    "kms:RetireGrant"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "ecr:DeleteRepository",
-    "kms:RetireGrant"
-   ]
-  },
-  "list": {
-   "permissions": [
-    "ecr:DescribeRepositories"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "ecr:DescribeRepositories",
-    "ecr:GetLifecyclePolicy",
-    "ecr:GetRepositoryPolicy",
-    "ecr:ListTagsForResource"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "ecr:DescribeRepositories",
-    "ecr:PutLifecyclePolicy",
-    "ecr:SetRepositoryPolicy",
-    "ecr:ListTagsForResource",
-    "ecr:TagResource",
-    "ecr:UntagResource",
-    "ecr:DeleteLifecyclePolicy",
-    "ecr:DeleteRepositoryPolicy",
-    "ecr:PutImageScanningConfiguration",
-    "ecr:PutImageTagMutability",
-    "kms:DescribeKey",
-    "kms:CreateGrant",
-    "kms:RetireGrant"
-   ]
-  }
- },
- "primaryIdentifier": [
-  "/properties/RepositoryName"
- ],
- "properties": {
-  "Arn": {
-   "type": "string"
-  },
-  "EmptyOnDelete": {
-   "$ref": "#/definitions/EmptyOnDelete"
-  },
-  "EncryptionConfiguration": {
-   "$ref": "#/definitions/EncryptionConfiguration"
-  },
-  "ImageScanningConfiguration": {
-   "$ref": "#/definitions/ImageScanningConfiguration"
-  },
-  "ImageTagMutability": {
-   "enum": [
-    "MUTABLE",
-    "IMMUTABLE"
-   ],
-   "type": "string"
-  },
-  "LifecyclePolicy": {
-   "$ref": "#/definitions/LifecyclePolicy"
-  },
-  "RepositoryName": {
-   "maxLength": 256,
-   "minLength": 2,
-   "pattern": "^(?=.{2,256}$)((?:[a-z0-9]+(?:[._-][a-z0-9]+)*/)*[a-z0-9]+(?:[._-][a-z0-9]+)*)$",
-   "type": "string"
-  },
-  "RepositoryPolicyText": {
-   "type": [
-    "object",
-    "string"
-   ]
-  },
-  "RepositoryUri": {
-   "type": "string"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 50,
-   "type": "array",
-   "uniqueItems": true
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/RepositoryUri"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-ecr.git",
- "tagging": {
-  "cloudFormationSystemTags": true,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::ECR::Repository",
- "writeOnlyProperties": [
-  "/properties/EmptyOnDelete"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/eu_west_3/aws-opensearchservice-domain.json b/src/cfnlint/data/schemas/providers/eu_west_3/aws-opensearchservice-domain.json
deleted file mode 100644
index c8aa358cc0..0000000000
--- a/src/cfnlint/data/schemas/providers/eu_west_3/aws-opensearchservice-domain.json
+++ /dev/null
@@ -1,538 +0,0 @@
-{
- "additionalProperties": false,
- "conditionalCreateOnlyProperties": [
-  "/properties/EncryptionAtRestOptions/Enabled",
-  "/properties/EncryptionAtRestOptions/KmsKeyId",
-  "/properties/AdvancedSecurityOptions/Enabled"
- ],
- "createOnlyProperties": [
-  "/properties/DomainName"
- ],
- "definitions": {
-  "AdvancedSecurityOptionsInput": {
-   "additionalProperties": false,
-   "properties": {
-    "AnonymousAuthDisableDate": {
-     "type": "string"
-    },
-    "AnonymousAuthEnabled": {
-     "type": "boolean"
-    },
-    "Enabled": {
-     "type": "boolean"
-    },
-    "InternalUserDatabaseEnabled": {
-     "type": "boolean"
-    },
-    "MasterUserOptions": {
-     "$ref": "#/definitions/MasterUserOptions"
-    },
-    "SAMLOptions": {
-     "$ref": "#/definitions/SAMLOptions"
-    }
-   },
-   "type": "object"
-  },
-  "ClusterConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "ColdStorageOptions": {
-     "$ref": "#/definitions/ColdStorageOptions"
-    },
-    "DedicatedMasterCount": {
-     "type": "integer"
-    },
-    "DedicatedMasterEnabled": {
-     "type": "boolean"
-    },
-    "DedicatedMasterType": {
-     "type": "string"
-    },
-    "InstanceCount": {
-     "type": "integer"
-    },
-    "InstanceType": {
-     "type": "string"
-    },
-    "MultiAZWithStandbyEnabled": {
-     "type": "boolean"
-    },
-    "WarmCount": {
-     "type": "integer"
-    },
-    "WarmEnabled": {
-     "type": "boolean"
-    },
-    "WarmType": {
-     "type": "string"
-    },
-    "ZoneAwarenessConfig": {
-     "$ref": "#/definitions/ZoneAwarenessConfig"
-    },
-    "ZoneAwarenessEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "CognitoOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "IdentityPoolId": {
-     "type": "string"
-    },
-    "RoleArn": {
-     "type": "string"
-    },
-    "UserPoolId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ColdStorageOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "DomainEndpointOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomEndpoint": {
-     "type": "string"
-    },
-    "CustomEndpointCertificateArn": {
-     "type": "string"
-    },
-    "CustomEndpointEnabled": {
-     "type": "boolean"
-    },
-    "EnforceHTTPS": {
-     "type": "boolean"
-    },
-    "TLSSecurityPolicy": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EBSOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "EBSEnabled": {
-     "type": "boolean"
-    },
-    "Iops": {
-     "type": "integer"
-    },
-    "Throughput": {
-     "type": "integer"
-    },
-    "VolumeSize": {
-     "type": "integer"
-    },
-    "VolumeType": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EncryptionAtRestOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "KmsKeyId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Idp": {
-   "additionalProperties": false,
-   "properties": {
-    "EntityId": {
-     "type": "string"
-    },
-    "MetadataContent": {
-     "maxLength": 1048576,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "MetadataContent",
-    "EntityId"
-   ],
-   "type": "object"
-  },
-  "LogPublishingOption": {
-   "additionalProperties": false,
-   "properties": {
-    "CloudWatchLogsLogGroupArn": {
-     "type": "string"
-    },
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "MasterUserOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "MasterUserARN": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "MasterUserPassword": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindow": {
-   "additionalProperties": false,
-   "properties": {
-    "WindowStartTime": {
-     "$ref": "#/definitions/WindowStartTime"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindowOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "OffPeakWindow": {
-     "$ref": "#/definitions/OffPeakWindow"
-    }
-   },
-   "type": "object"
-  },
-  "SAMLOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "Idp": {
-     "$ref": "#/definitions/Idp"
-    },
-    "MasterBackendRole": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "RolesKey": {
-     "type": "string"
-    },
-    "SessionTimeoutMinutes": {
-     "type": "integer"
-    },
-    "SubjectKey": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ServiceSoftwareOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedUpdateDate": {
-     "type": "string"
-    },
-    "Cancellable": {
-     "type": "boolean"
-    },
-    "CurrentVersion": {
-     "type": "string"
-    },
-    "Description": {
-     "type": "string"
-    },
-    "NewVersion": {
-     "type": "string"
-    },
-    "OptionalDeployment": {
-     "type": "boolean"
-    },
-    "UpdateAvailable": {
-     "type": "boolean"
-    },
-    "UpdateStatus": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SnapshotOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedSnapshotStartHour": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "SoftwareUpdateOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutoSoftwareUpdateEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 0,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "minLength": 0,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "VPCOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "SecurityGroupIds": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.GroupId",
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    },
-    "SubnetIds": {
-     "items": {
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "type": "object"
-  },
-  "WindowStartTime": {
-   "additionalProperties": false,
-   "properties": {
-    "Hours": {
-     "maximum": 23,
-     "minimum": 0,
-     "type": "integer"
-    },
-    "Minutes": {
-     "maximum": 59,
-     "minimum": 0,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "Hours",
-    "Minutes"
-   ],
-   "type": "object"
-  },
-  "ZoneAwarenessConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "AvailabilityZoneCount": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "es:CreateDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:ListTags"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "es:DeleteDomain",
-    "es:DescribeDomain"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "es:DescribeDomain",
-    "es:ListTags"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "es:UpdateDomain",
-    "es:UpgradeDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:RemoveTags",
-    "es:ListTags",
-    "es:DescribeDomainChangeProgress"
-   ],
-   "timeoutInMinutes": 2160
-  }
- },
- "primaryIdentifier": [
-  "/properties/DomainName"
- ],
- "properties": {
-  "AccessPolicies": {
-   "format": "json",
-   "type": [
-    "object",
-    "string"
-   ]
-  },
-  "AdvancedOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "AdvancedSecurityOptions": {
-   "$ref": "#/definitions/AdvancedSecurityOptionsInput"
-  },
-  "Arn": {
-   "type": "string"
-  },
-  "ClusterConfig": {
-   "$ref": "#/definitions/ClusterConfig"
-  },
-  "CognitoOptions": {
-   "$ref": "#/definitions/CognitoOptions"
-  },
-  "DomainArn": {
-   "type": "string"
-  },
-  "DomainEndpoint": {
-   "type": "string"
-  },
-  "DomainEndpointOptions": {
-   "$ref": "#/definitions/DomainEndpointOptions"
-  },
-  "DomainEndpointV2": {
-   "type": "string"
-  },
-  "DomainEndpoints": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "^.*$": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "DomainName": {
-   "type": "string"
-  },
-  "EBSOptions": {
-   "$ref": "#/definitions/EBSOptions"
-  },
-  "EncryptionAtRestOptions": {
-   "$ref": "#/definitions/EncryptionAtRestOptions"
-  },
-  "EngineVersion": {
-   "type": "string"
-  },
-  "IPAddressType": {
-   "type": "string"
-  },
-  "Id": {
-   "type": "string"
-  },
-  "LogPublishingOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "$ref": "#/definitions/LogPublishingOption"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "$ref": "#/definitions/NodeToNodeEncryptionOptions"
-  },
-  "OffPeakWindowOptions": {
-   "$ref": "#/definitions/OffPeakWindowOptions"
-  },
-  "ServiceSoftwareOptions": {
-   "$ref": "#/definitions/ServiceSoftwareOptions"
-  },
-  "SnapshotOptions": {
-   "$ref": "#/definitions/SnapshotOptions"
-  },
-  "SoftwareUpdateOptions": {
-   "$ref": "#/definitions/SoftwareUpdateOptions"
-  },
-  "Tags": {
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "VPCOptions": {
-   "$ref": "#/definitions/VPCOptions"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id",
-  "/properties/Arn",
-  "/properties/DomainArn",
-  "/properties/DomainEndpoint",
-  "/properties/DomainEndpointV2",
-  "/properties/DomainEndpoints",
-  "/properties/ServiceSoftwareOptions",
-  "/properties/AdvancedSecurityOptions/AnonymousAuthDisableDate"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git",
- "typeName": "AWS::OpenSearchService::Domain",
- "writeOnlyProperties": [
-  "/properties/AdvancedSecurityOptions/MasterUserOptions",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterUserName",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterBackendRole"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/il_central_1/__init__.py b/src/cfnlint/data/schemas/providers/il_central_1/__init__.py
index 1f071aa669..de22c0c547 100644
--- a/src/cfnlint/data/schemas/providers/il_central_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/il_central_1/__init__.py
@@ -1052,6 +1052,7 @@
     "aws-omics-sequencestore.json",
     "aws-omics-variantstore.json",
     "aws-omics-workflow.json",
+    "aws-opensearchservice-domain.json",
     "aws-opsworks-app.json",
     "aws-opsworks-elasticloadbalancerattachment.json",
     "aws-opsworks-userprofile.json",
diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-opensearchservice-domain.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-opensearchservice-domain.json
deleted file mode 100644
index c8aa358cc0..0000000000
--- a/src/cfnlint/data/schemas/providers/il_central_1/aws-opensearchservice-domain.json
+++ /dev/null
@@ -1,538 +0,0 @@
-{
- "additionalProperties": false,
- "conditionalCreateOnlyProperties": [
-  "/properties/EncryptionAtRestOptions/Enabled",
-  "/properties/EncryptionAtRestOptions/KmsKeyId",
-  "/properties/AdvancedSecurityOptions/Enabled"
- ],
- "createOnlyProperties": [
-  "/properties/DomainName"
- ],
- "definitions": {
-  "AdvancedSecurityOptionsInput": {
-   "additionalProperties": false,
-   "properties": {
-    "AnonymousAuthDisableDate": {
-     "type": "string"
-    },
-    "AnonymousAuthEnabled": {
-     "type": "boolean"
-    },
-    "Enabled": {
-     "type": "boolean"
-    },
-    "InternalUserDatabaseEnabled": {
-     "type": "boolean"
-    },
-    "MasterUserOptions": {
-     "$ref": "#/definitions/MasterUserOptions"
-    },
-    "SAMLOptions": {
-     "$ref": "#/definitions/SAMLOptions"
-    }
-   },
-   "type": "object"
-  },
-  "ClusterConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "ColdStorageOptions": {
-     "$ref": "#/definitions/ColdStorageOptions"
-    },
-    "DedicatedMasterCount": {
-     "type": "integer"
-    },
-    "DedicatedMasterEnabled": {
-     "type": "boolean"
-    },
-    "DedicatedMasterType": {
-     "type": "string"
-    },
-    "InstanceCount": {
-     "type": "integer"
-    },
-    "InstanceType": {
-     "type": "string"
-    },
-    "MultiAZWithStandbyEnabled": {
-     "type": "boolean"
-    },
-    "WarmCount": {
-     "type": "integer"
-    },
-    "WarmEnabled": {
-     "type": "boolean"
-    },
-    "WarmType": {
-     "type": "string"
-    },
-    "ZoneAwarenessConfig": {
-     "$ref": "#/definitions/ZoneAwarenessConfig"
-    },
-    "ZoneAwarenessEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "CognitoOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "IdentityPoolId": {
-     "type": "string"
-    },
-    "RoleArn": {
-     "type": "string"
-    },
-    "UserPoolId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ColdStorageOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "DomainEndpointOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomEndpoint": {
-     "type": "string"
-    },
-    "CustomEndpointCertificateArn": {
-     "type": "string"
-    },
-    "CustomEndpointEnabled": {
-     "type": "boolean"
-    },
-    "EnforceHTTPS": {
-     "type": "boolean"
-    },
-    "TLSSecurityPolicy": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EBSOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "EBSEnabled": {
-     "type": "boolean"
-    },
-    "Iops": {
-     "type": "integer"
-    },
-    "Throughput": {
-     "type": "integer"
-    },
-    "VolumeSize": {
-     "type": "integer"
-    },
-    "VolumeType": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EncryptionAtRestOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "KmsKeyId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Idp": {
-   "additionalProperties": false,
-   "properties": {
-    "EntityId": {
-     "type": "string"
-    },
-    "MetadataContent": {
-     "maxLength": 1048576,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "MetadataContent",
-    "EntityId"
-   ],
-   "type": "object"
-  },
-  "LogPublishingOption": {
-   "additionalProperties": false,
-   "properties": {
-    "CloudWatchLogsLogGroupArn": {
-     "type": "string"
-    },
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "MasterUserOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "MasterUserARN": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "MasterUserPassword": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindow": {
-   "additionalProperties": false,
-   "properties": {
-    "WindowStartTime": {
-     "$ref": "#/definitions/WindowStartTime"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindowOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "OffPeakWindow": {
-     "$ref": "#/definitions/OffPeakWindow"
-    }
-   },
-   "type": "object"
-  },
-  "SAMLOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "Idp": {
-     "$ref": "#/definitions/Idp"
-    },
-    "MasterBackendRole": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "RolesKey": {
-     "type": "string"
-    },
-    "SessionTimeoutMinutes": {
-     "type": "integer"
-    },
-    "SubjectKey": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ServiceSoftwareOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedUpdateDate": {
-     "type": "string"
-    },
-    "Cancellable": {
-     "type": "boolean"
-    },
-    "CurrentVersion": {
-     "type": "string"
-    },
-    "Description": {
-     "type": "string"
-    },
-    "NewVersion": {
-     "type": "string"
-    },
-    "OptionalDeployment": {
-     "type": "boolean"
-    },
-    "UpdateAvailable": {
-     "type": "boolean"
-    },
-    "UpdateStatus": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SnapshotOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedSnapshotStartHour": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "SoftwareUpdateOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutoSoftwareUpdateEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 0,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "minLength": 0,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "VPCOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "SecurityGroupIds": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.GroupId",
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    },
-    "SubnetIds": {
-     "items": {
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "type": "object"
-  },
-  "WindowStartTime": {
-   "additionalProperties": false,
-   "properties": {
-    "Hours": {
-     "maximum": 23,
-     "minimum": 0,
-     "type": "integer"
-    },
-    "Minutes": {
-     "maximum": 59,
-     "minimum": 0,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "Hours",
-    "Minutes"
-   ],
-   "type": "object"
-  },
-  "ZoneAwarenessConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "AvailabilityZoneCount": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "es:CreateDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:ListTags"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "es:DeleteDomain",
-    "es:DescribeDomain"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "es:DescribeDomain",
-    "es:ListTags"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "es:UpdateDomain",
-    "es:UpgradeDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:RemoveTags",
-    "es:ListTags",
-    "es:DescribeDomainChangeProgress"
-   ],
-   "timeoutInMinutes": 2160
-  }
- },
- "primaryIdentifier": [
-  "/properties/DomainName"
- ],
- "properties": {
-  "AccessPolicies": {
-   "format": "json",
-   "type": [
-    "object",
-    "string"
-   ]
-  },
-  "AdvancedOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "AdvancedSecurityOptions": {
-   "$ref": "#/definitions/AdvancedSecurityOptionsInput"
-  },
-  "Arn": {
-   "type": "string"
-  },
-  "ClusterConfig": {
-   "$ref": "#/definitions/ClusterConfig"
-  },
-  "CognitoOptions": {
-   "$ref": "#/definitions/CognitoOptions"
-  },
-  "DomainArn": {
-   "type": "string"
-  },
-  "DomainEndpoint": {
-   "type": "string"
-  },
-  "DomainEndpointOptions": {
-   "$ref": "#/definitions/DomainEndpointOptions"
-  },
-  "DomainEndpointV2": {
-   "type": "string"
-  },
-  "DomainEndpoints": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "^.*$": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "DomainName": {
-   "type": "string"
-  },
-  "EBSOptions": {
-   "$ref": "#/definitions/EBSOptions"
-  },
-  "EncryptionAtRestOptions": {
-   "$ref": "#/definitions/EncryptionAtRestOptions"
-  },
-  "EngineVersion": {
-   "type": "string"
-  },
-  "IPAddressType": {
-   "type": "string"
-  },
-  "Id": {
-   "type": "string"
-  },
-  "LogPublishingOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "$ref": "#/definitions/LogPublishingOption"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "$ref": "#/definitions/NodeToNodeEncryptionOptions"
-  },
-  "OffPeakWindowOptions": {
-   "$ref": "#/definitions/OffPeakWindowOptions"
-  },
-  "ServiceSoftwareOptions": {
-   "$ref": "#/definitions/ServiceSoftwareOptions"
-  },
-  "SnapshotOptions": {
-   "$ref": "#/definitions/SnapshotOptions"
-  },
-  "SoftwareUpdateOptions": {
-   "$ref": "#/definitions/SoftwareUpdateOptions"
-  },
-  "Tags": {
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "VPCOptions": {
-   "$ref": "#/definitions/VPCOptions"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id",
-  "/properties/Arn",
-  "/properties/DomainArn",
-  "/properties/DomainEndpoint",
-  "/properties/DomainEndpointV2",
-  "/properties/DomainEndpoints",
-  "/properties/ServiceSoftwareOptions",
-  "/properties/AdvancedSecurityOptions/AnonymousAuthDisableDate"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git",
- "typeName": "AWS::OpenSearchService::Domain",
- "writeOnlyProperties": [
-  "/properties/AdvancedSecurityOptions/MasterUserOptions",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterUserName",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterBackendRole"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/me_central_1/__init__.py b/src/cfnlint/data/schemas/providers/me_central_1/__init__.py
index f2cc782f5c..37993d1c95 100644
--- a/src/cfnlint/data/schemas/providers/me_central_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/me_central_1/__init__.py
@@ -898,6 +898,7 @@
     "aws-ecr-pullthroughcacherule.json",
     "aws-ecr-registrypolicy.json",
     "aws-ecr-replicationconfiguration.json",
+    "aws-ecr-repository.json",
     "aws-ecr-repositorycreationtemplate.json",
     "aws-ecs-capacityprovider.json",
     "aws-ecs-cluster.json",
diff --git a/src/cfnlint/data/schemas/providers/me_central_1/aws-ecr-repository.json b/src/cfnlint/data/schemas/providers/me_central_1/aws-ecr-repository.json
deleted file mode 100644
index 062afcc632..0000000000
--- a/src/cfnlint/data/schemas/providers/me_central_1/aws-ecr-repository.json
+++ /dev/null
@@ -1,212 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/RepositoryName",
-  "/properties/EncryptionConfiguration",
-  "/properties/EncryptionConfiguration/EncryptionType",
-  "/properties/EncryptionConfiguration/KmsKey"
- ],
- "definitions": {
-  "EmptyOnDelete": {
-   "type": "boolean"
-  },
-  "EncryptionConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "EncryptionType": {
-     "$ref": "#/definitions/EncryptionType"
-    },
-    "KmsKey": {
-     "$ref": "#/definitions/KmsKey"
-    }
-   },
-   "required": [
-    "EncryptionType"
-   ],
-   "type": "object"
-  },
-  "EncryptionType": {
-   "enum": [
-    "AES256",
-    "KMS"
-   ],
-   "type": "string"
-  },
-  "ImageScanningConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "ScanOnPush": {
-     "$ref": "#/definitions/ScanOnPush"
-    }
-   },
-   "type": "object"
-  },
-  "KmsKey": {
-   "maxLength": 2048,
-   "minLength": 1,
-   "type": "string"
-  },
-  "LifecyclePolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "LifecyclePolicyText": {
-     "$ref": "#/definitions/LifecyclePolicyText"
-    },
-    "RegistryId": {
-     "$ref": "#/definitions/RegistryId"
-    }
-   },
-   "type": "object"
-  },
-  "LifecyclePolicyText": {
-   "maxLength": 30720,
-   "minLength": 100,
-   "type": "string"
-  },
-  "RegistryId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^[0-9]{12}$",
-   "type": "string"
-  },
-  "ScanOnPush": {
-   "type": "boolean"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 127,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 255,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "ecr:CreateRepository",
-    "ecr:PutLifecyclePolicy",
-    "ecr:SetRepositoryPolicy",
-    "ecr:TagResource",
-    "kms:DescribeKey",
-    "kms:CreateGrant",
-    "kms:RetireGrant"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "ecr:DeleteRepository",
-    "kms:RetireGrant"
-   ]
-  },
-  "list": {
-   "permissions": [
-    "ecr:DescribeRepositories"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "ecr:DescribeRepositories",
-    "ecr:GetLifecyclePolicy",
-    "ecr:GetRepositoryPolicy",
-    "ecr:ListTagsForResource"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "ecr:DescribeRepositories",
-    "ecr:PutLifecyclePolicy",
-    "ecr:SetRepositoryPolicy",
-    "ecr:ListTagsForResource",
-    "ecr:TagResource",
-    "ecr:UntagResource",
-    "ecr:DeleteLifecyclePolicy",
-    "ecr:DeleteRepositoryPolicy",
-    "ecr:PutImageScanningConfiguration",
-    "ecr:PutImageTagMutability",
-    "kms:DescribeKey",
-    "kms:CreateGrant",
-    "kms:RetireGrant"
-   ]
-  }
- },
- "primaryIdentifier": [
-  "/properties/RepositoryName"
- ],
- "properties": {
-  "Arn": {
-   "type": "string"
-  },
-  "EmptyOnDelete": {
-   "$ref": "#/definitions/EmptyOnDelete"
-  },
-  "EncryptionConfiguration": {
-   "$ref": "#/definitions/EncryptionConfiguration"
-  },
-  "ImageScanningConfiguration": {
-   "$ref": "#/definitions/ImageScanningConfiguration"
-  },
-  "ImageTagMutability": {
-   "enum": [
-    "MUTABLE",
-    "IMMUTABLE"
-   ],
-   "type": "string"
-  },
-  "LifecyclePolicy": {
-   "$ref": "#/definitions/LifecyclePolicy"
-  },
-  "RepositoryName": {
-   "maxLength": 256,
-   "minLength": 2,
-   "pattern": "^(?=.{2,256}$)((?:[a-z0-9]+(?:[._-][a-z0-9]+)*/)*[a-z0-9]+(?:[._-][a-z0-9]+)*)$",
-   "type": "string"
-  },
-  "RepositoryPolicyText": {
-   "type": [
-    "object",
-    "string"
-   ]
-  },
-  "RepositoryUri": {
-   "type": "string"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 50,
-   "type": "array",
-   "uniqueItems": true
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/RepositoryUri"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-ecr.git",
- "tagging": {
-  "cloudFormationSystemTags": true,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::ECR::Repository",
- "writeOnlyProperties": [
-  "/properties/EmptyOnDelete"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/me_south_1/__init__.py b/src/cfnlint/data/schemas/providers/me_south_1/__init__.py
index 57b22edb37..93d3ccb177 100644
--- a/src/cfnlint/data/schemas/providers/me_south_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/me_south_1/__init__.py
@@ -1320,6 +1320,7 @@
     "aws-networkmanager-vpcattachment.json",
     "aws-oam-link.json",
     "aws-oam-sink.json",
+    "aws-opensearchservice-domain.json",
     "aws-opsworks-app.json",
     "aws-opsworks-elasticloadbalancerattachment.json",
     "aws-opsworks-instance.json",
diff --git a/src/cfnlint/data/schemas/providers/me_south_1/aws-opensearchservice-domain.json b/src/cfnlint/data/schemas/providers/me_south_1/aws-opensearchservice-domain.json
deleted file mode 100644
index c8aa358cc0..0000000000
--- a/src/cfnlint/data/schemas/providers/me_south_1/aws-opensearchservice-domain.json
+++ /dev/null
@@ -1,538 +0,0 @@
-{
- "additionalProperties": false,
- "conditionalCreateOnlyProperties": [
-  "/properties/EncryptionAtRestOptions/Enabled",
-  "/properties/EncryptionAtRestOptions/KmsKeyId",
-  "/properties/AdvancedSecurityOptions/Enabled"
- ],
- "createOnlyProperties": [
-  "/properties/DomainName"
- ],
- "definitions": {
-  "AdvancedSecurityOptionsInput": {
-   "additionalProperties": false,
-   "properties": {
-    "AnonymousAuthDisableDate": {
-     "type": "string"
-    },
-    "AnonymousAuthEnabled": {
-     "type": "boolean"
-    },
-    "Enabled": {
-     "type": "boolean"
-    },
-    "InternalUserDatabaseEnabled": {
-     "type": "boolean"
-    },
-    "MasterUserOptions": {
-     "$ref": "#/definitions/MasterUserOptions"
-    },
-    "SAMLOptions": {
-     "$ref": "#/definitions/SAMLOptions"
-    }
-   },
-   "type": "object"
-  },
-  "ClusterConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "ColdStorageOptions": {
-     "$ref": "#/definitions/ColdStorageOptions"
-    },
-    "DedicatedMasterCount": {
-     "type": "integer"
-    },
-    "DedicatedMasterEnabled": {
-     "type": "boolean"
-    },
-    "DedicatedMasterType": {
-     "type": "string"
-    },
-    "InstanceCount": {
-     "type": "integer"
-    },
-    "InstanceType": {
-     "type": "string"
-    },
-    "MultiAZWithStandbyEnabled": {
-     "type": "boolean"
-    },
-    "WarmCount": {
-     "type": "integer"
-    },
-    "WarmEnabled": {
-     "type": "boolean"
-    },
-    "WarmType": {
-     "type": "string"
-    },
-    "ZoneAwarenessConfig": {
-     "$ref": "#/definitions/ZoneAwarenessConfig"
-    },
-    "ZoneAwarenessEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "CognitoOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "IdentityPoolId": {
-     "type": "string"
-    },
-    "RoleArn": {
-     "type": "string"
-    },
-    "UserPoolId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ColdStorageOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "DomainEndpointOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomEndpoint": {
-     "type": "string"
-    },
-    "CustomEndpointCertificateArn": {
-     "type": "string"
-    },
-    "CustomEndpointEnabled": {
-     "type": "boolean"
-    },
-    "EnforceHTTPS": {
-     "type": "boolean"
-    },
-    "TLSSecurityPolicy": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EBSOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "EBSEnabled": {
-     "type": "boolean"
-    },
-    "Iops": {
-     "type": "integer"
-    },
-    "Throughput": {
-     "type": "integer"
-    },
-    "VolumeSize": {
-     "type": "integer"
-    },
-    "VolumeType": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EncryptionAtRestOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "KmsKeyId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Idp": {
-   "additionalProperties": false,
-   "properties": {
-    "EntityId": {
-     "type": "string"
-    },
-    "MetadataContent": {
-     "maxLength": 1048576,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "MetadataContent",
-    "EntityId"
-   ],
-   "type": "object"
-  },
-  "LogPublishingOption": {
-   "additionalProperties": false,
-   "properties": {
-    "CloudWatchLogsLogGroupArn": {
-     "type": "string"
-    },
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "MasterUserOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "MasterUserARN": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "MasterUserPassword": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindow": {
-   "additionalProperties": false,
-   "properties": {
-    "WindowStartTime": {
-     "$ref": "#/definitions/WindowStartTime"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindowOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "OffPeakWindow": {
-     "$ref": "#/definitions/OffPeakWindow"
-    }
-   },
-   "type": "object"
-  },
-  "SAMLOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "Idp": {
-     "$ref": "#/definitions/Idp"
-    },
-    "MasterBackendRole": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "RolesKey": {
-     "type": "string"
-    },
-    "SessionTimeoutMinutes": {
-     "type": "integer"
-    },
-    "SubjectKey": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ServiceSoftwareOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedUpdateDate": {
-     "type": "string"
-    },
-    "Cancellable": {
-     "type": "boolean"
-    },
-    "CurrentVersion": {
-     "type": "string"
-    },
-    "Description": {
-     "type": "string"
-    },
-    "NewVersion": {
-     "type": "string"
-    },
-    "OptionalDeployment": {
-     "type": "boolean"
-    },
-    "UpdateAvailable": {
-     "type": "boolean"
-    },
-    "UpdateStatus": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SnapshotOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedSnapshotStartHour": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "SoftwareUpdateOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutoSoftwareUpdateEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 0,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "minLength": 0,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "VPCOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "SecurityGroupIds": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.GroupId",
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    },
-    "SubnetIds": {
-     "items": {
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "type": "object"
-  },
-  "WindowStartTime": {
-   "additionalProperties": false,
-   "properties": {
-    "Hours": {
-     "maximum": 23,
-     "minimum": 0,
-     "type": "integer"
-    },
-    "Minutes": {
-     "maximum": 59,
-     "minimum": 0,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "Hours",
-    "Minutes"
-   ],
-   "type": "object"
-  },
-  "ZoneAwarenessConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "AvailabilityZoneCount": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "es:CreateDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:ListTags"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "es:DeleteDomain",
-    "es:DescribeDomain"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "es:DescribeDomain",
-    "es:ListTags"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "es:UpdateDomain",
-    "es:UpgradeDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:RemoveTags",
-    "es:ListTags",
-    "es:DescribeDomainChangeProgress"
-   ],
-   "timeoutInMinutes": 2160
-  }
- },
- "primaryIdentifier": [
-  "/properties/DomainName"
- ],
- "properties": {
-  "AccessPolicies": {
-   "format": "json",
-   "type": [
-    "object",
-    "string"
-   ]
-  },
-  "AdvancedOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "AdvancedSecurityOptions": {
-   "$ref": "#/definitions/AdvancedSecurityOptionsInput"
-  },
-  "Arn": {
-   "type": "string"
-  },
-  "ClusterConfig": {
-   "$ref": "#/definitions/ClusterConfig"
-  },
-  "CognitoOptions": {
-   "$ref": "#/definitions/CognitoOptions"
-  },
-  "DomainArn": {
-   "type": "string"
-  },
-  "DomainEndpoint": {
-   "type": "string"
-  },
-  "DomainEndpointOptions": {
-   "$ref": "#/definitions/DomainEndpointOptions"
-  },
-  "DomainEndpointV2": {
-   "type": "string"
-  },
-  "DomainEndpoints": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "^.*$": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "DomainName": {
-   "type": "string"
-  },
-  "EBSOptions": {
-   "$ref": "#/definitions/EBSOptions"
-  },
-  "EncryptionAtRestOptions": {
-   "$ref": "#/definitions/EncryptionAtRestOptions"
-  },
-  "EngineVersion": {
-   "type": "string"
-  },
-  "IPAddressType": {
-   "type": "string"
-  },
-  "Id": {
-   "type": "string"
-  },
-  "LogPublishingOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "$ref": "#/definitions/LogPublishingOption"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "$ref": "#/definitions/NodeToNodeEncryptionOptions"
-  },
-  "OffPeakWindowOptions": {
-   "$ref": "#/definitions/OffPeakWindowOptions"
-  },
-  "ServiceSoftwareOptions": {
-   "$ref": "#/definitions/ServiceSoftwareOptions"
-  },
-  "SnapshotOptions": {
-   "$ref": "#/definitions/SnapshotOptions"
-  },
-  "SoftwareUpdateOptions": {
-   "$ref": "#/definitions/SoftwareUpdateOptions"
-  },
-  "Tags": {
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "VPCOptions": {
-   "$ref": "#/definitions/VPCOptions"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id",
-  "/properties/Arn",
-  "/properties/DomainArn",
-  "/properties/DomainEndpoint",
-  "/properties/DomainEndpointV2",
-  "/properties/DomainEndpoints",
-  "/properties/ServiceSoftwareOptions",
-  "/properties/AdvancedSecurityOptions/AnonymousAuthDisableDate"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git",
- "typeName": "AWS::OpenSearchService::Domain",
- "writeOnlyProperties": [
-  "/properties/AdvancedSecurityOptions/MasterUserOptions",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterUserName",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterBackendRole"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/sa_east_1/__init__.py b/src/cfnlint/data/schemas/providers/sa_east_1/__init__.py
index d3d53ebbed..2bbeb5dc37 100644
--- a/src/cfnlint/data/schemas/providers/sa_east_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/sa_east_1/__init__.py
@@ -1348,6 +1348,7 @@
     "aws-ecr-pullthroughcacherule.json",
     "aws-ecr-registrypolicy.json",
     "aws-ecr-replicationconfiguration.json",
+    "aws-ecr-repository.json",
     "aws-ecr-repositorycreationtemplate.json",
     "aws-ecs-capacityprovider.json",
     "aws-ecs-cluster.json",
diff --git a/src/cfnlint/data/schemas/providers/sa_east_1/aws-ecr-repository.json b/src/cfnlint/data/schemas/providers/sa_east_1/aws-ecr-repository.json
deleted file mode 100644
index 062afcc632..0000000000
--- a/src/cfnlint/data/schemas/providers/sa_east_1/aws-ecr-repository.json
+++ /dev/null
@@ -1,212 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/RepositoryName",
-  "/properties/EncryptionConfiguration",
-  "/properties/EncryptionConfiguration/EncryptionType",
-  "/properties/EncryptionConfiguration/KmsKey"
- ],
- "definitions": {
-  "EmptyOnDelete": {
-   "type": "boolean"
-  },
-  "EncryptionConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "EncryptionType": {
-     "$ref": "#/definitions/EncryptionType"
-    },
-    "KmsKey": {
-     "$ref": "#/definitions/KmsKey"
-    }
-   },
-   "required": [
-    "EncryptionType"
-   ],
-   "type": "object"
-  },
-  "EncryptionType": {
-   "enum": [
-    "AES256",
-    "KMS"
-   ],
-   "type": "string"
-  },
-  "ImageScanningConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "ScanOnPush": {
-     "$ref": "#/definitions/ScanOnPush"
-    }
-   },
-   "type": "object"
-  },
-  "KmsKey": {
-   "maxLength": 2048,
-   "minLength": 1,
-   "type": "string"
-  },
-  "LifecyclePolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "LifecyclePolicyText": {
-     "$ref": "#/definitions/LifecyclePolicyText"
-    },
-    "RegistryId": {
-     "$ref": "#/definitions/RegistryId"
-    }
-   },
-   "type": "object"
-  },
-  "LifecyclePolicyText": {
-   "maxLength": 30720,
-   "minLength": 100,
-   "type": "string"
-  },
-  "RegistryId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^[0-9]{12}$",
-   "type": "string"
-  },
-  "ScanOnPush": {
-   "type": "boolean"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 127,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 255,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "ecr:CreateRepository",
-    "ecr:PutLifecyclePolicy",
-    "ecr:SetRepositoryPolicy",
-    "ecr:TagResource",
-    "kms:DescribeKey",
-    "kms:CreateGrant",
-    "kms:RetireGrant"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "ecr:DeleteRepository",
-    "kms:RetireGrant"
-   ]
-  },
-  "list": {
-   "permissions": [
-    "ecr:DescribeRepositories"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "ecr:DescribeRepositories",
-    "ecr:GetLifecyclePolicy",
-    "ecr:GetRepositoryPolicy",
-    "ecr:ListTagsForResource"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "ecr:DescribeRepositories",
-    "ecr:PutLifecyclePolicy",
-    "ecr:SetRepositoryPolicy",
-    "ecr:ListTagsForResource",
-    "ecr:TagResource",
-    "ecr:UntagResource",
-    "ecr:DeleteLifecyclePolicy",
-    "ecr:DeleteRepositoryPolicy",
-    "ecr:PutImageScanningConfiguration",
-    "ecr:PutImageTagMutability",
-    "kms:DescribeKey",
-    "kms:CreateGrant",
-    "kms:RetireGrant"
-   ]
-  }
- },
- "primaryIdentifier": [
-  "/properties/RepositoryName"
- ],
- "properties": {
-  "Arn": {
-   "type": "string"
-  },
-  "EmptyOnDelete": {
-   "$ref": "#/definitions/EmptyOnDelete"
-  },
-  "EncryptionConfiguration": {
-   "$ref": "#/definitions/EncryptionConfiguration"
-  },
-  "ImageScanningConfiguration": {
-   "$ref": "#/definitions/ImageScanningConfiguration"
-  },
-  "ImageTagMutability": {
-   "enum": [
-    "MUTABLE",
-    "IMMUTABLE"
-   ],
-   "type": "string"
-  },
-  "LifecyclePolicy": {
-   "$ref": "#/definitions/LifecyclePolicy"
-  },
-  "RepositoryName": {
-   "maxLength": 256,
-   "minLength": 2,
-   "pattern": "^(?=.{2,256}$)((?:[a-z0-9]+(?:[._-][a-z0-9]+)*/)*[a-z0-9]+(?:[._-][a-z0-9]+)*)$",
-   "type": "string"
-  },
-  "RepositoryPolicyText": {
-   "type": [
-    "object",
-    "string"
-   ]
-  },
-  "RepositoryUri": {
-   "type": "string"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 50,
-   "type": "array",
-   "uniqueItems": true
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/RepositoryUri"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-ecr.git",
- "tagging": {
-  "cloudFormationSystemTags": true,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::ECR::Repository",
- "writeOnlyProperties": [
-  "/properties/EmptyOnDelete"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/us_east_2/__init__.py b/src/cfnlint/data/schemas/providers/us_east_2/__init__.py
index 047688d7bc..8ccd938936 100644
--- a/src/cfnlint/data/schemas/providers/us_east_2/__init__.py
+++ b/src/cfnlint/data/schemas/providers/us_east_2/__init__.py
@@ -1920,6 +1920,7 @@
     "aws-opensearchserverless-securityconfig.json",
     "aws-opensearchserverless-securitypolicy.json",
     "aws-opensearchserverless-vpcendpoint.json",
+    "aws-opensearchservice-domain.json",
     "aws-opsworks-app.json",
     "aws-opsworks-elasticloadbalancerattachment.json",
     "aws-opsworks-instance.json",
diff --git a/src/cfnlint/data/schemas/providers/us_east_2/aws-opensearchservice-domain.json b/src/cfnlint/data/schemas/providers/us_east_2/aws-opensearchservice-domain.json
deleted file mode 100644
index c8aa358cc0..0000000000
--- a/src/cfnlint/data/schemas/providers/us_east_2/aws-opensearchservice-domain.json
+++ /dev/null
@@ -1,538 +0,0 @@
-{
- "additionalProperties": false,
- "conditionalCreateOnlyProperties": [
-  "/properties/EncryptionAtRestOptions/Enabled",
-  "/properties/EncryptionAtRestOptions/KmsKeyId",
-  "/properties/AdvancedSecurityOptions/Enabled"
- ],
- "createOnlyProperties": [
-  "/properties/DomainName"
- ],
- "definitions": {
-  "AdvancedSecurityOptionsInput": {
-   "additionalProperties": false,
-   "properties": {
-    "AnonymousAuthDisableDate": {
-     "type": "string"
-    },
-    "AnonymousAuthEnabled": {
-     "type": "boolean"
-    },
-    "Enabled": {
-     "type": "boolean"
-    },
-    "InternalUserDatabaseEnabled": {
-     "type": "boolean"
-    },
-    "MasterUserOptions": {
-     "$ref": "#/definitions/MasterUserOptions"
-    },
-    "SAMLOptions": {
-     "$ref": "#/definitions/SAMLOptions"
-    }
-   },
-   "type": "object"
-  },
-  "ClusterConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "ColdStorageOptions": {
-     "$ref": "#/definitions/ColdStorageOptions"
-    },
-    "DedicatedMasterCount": {
-     "type": "integer"
-    },
-    "DedicatedMasterEnabled": {
-     "type": "boolean"
-    },
-    "DedicatedMasterType": {
-     "type": "string"
-    },
-    "InstanceCount": {
-     "type": "integer"
-    },
-    "InstanceType": {
-     "type": "string"
-    },
-    "MultiAZWithStandbyEnabled": {
-     "type": "boolean"
-    },
-    "WarmCount": {
-     "type": "integer"
-    },
-    "WarmEnabled": {
-     "type": "boolean"
-    },
-    "WarmType": {
-     "type": "string"
-    },
-    "ZoneAwarenessConfig": {
-     "$ref": "#/definitions/ZoneAwarenessConfig"
-    },
-    "ZoneAwarenessEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "CognitoOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "IdentityPoolId": {
-     "type": "string"
-    },
-    "RoleArn": {
-     "type": "string"
-    },
-    "UserPoolId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ColdStorageOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "DomainEndpointOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomEndpoint": {
-     "type": "string"
-    },
-    "CustomEndpointCertificateArn": {
-     "type": "string"
-    },
-    "CustomEndpointEnabled": {
-     "type": "boolean"
-    },
-    "EnforceHTTPS": {
-     "type": "boolean"
-    },
-    "TLSSecurityPolicy": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EBSOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "EBSEnabled": {
-     "type": "boolean"
-    },
-    "Iops": {
-     "type": "integer"
-    },
-    "Throughput": {
-     "type": "integer"
-    },
-    "VolumeSize": {
-     "type": "integer"
-    },
-    "VolumeType": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "EncryptionAtRestOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "KmsKeyId": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Idp": {
-   "additionalProperties": false,
-   "properties": {
-    "EntityId": {
-     "type": "string"
-    },
-    "MetadataContent": {
-     "maxLength": 1048576,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "MetadataContent",
-    "EntityId"
-   ],
-   "type": "object"
-  },
-  "LogPublishingOption": {
-   "additionalProperties": false,
-   "properties": {
-    "CloudWatchLogsLogGroupArn": {
-     "type": "string"
-    },
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "MasterUserOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "MasterUserARN": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "MasterUserPassword": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindow": {
-   "additionalProperties": false,
-   "properties": {
-    "WindowStartTime": {
-     "$ref": "#/definitions/WindowStartTime"
-    }
-   },
-   "type": "object"
-  },
-  "OffPeakWindowOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "OffPeakWindow": {
-     "$ref": "#/definitions/OffPeakWindow"
-    }
-   },
-   "type": "object"
-  },
-  "SAMLOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "Idp": {
-     "$ref": "#/definitions/Idp"
-    },
-    "MasterBackendRole": {
-     "type": "string"
-    },
-    "MasterUserName": {
-     "type": "string"
-    },
-    "RolesKey": {
-     "type": "string"
-    },
-    "SessionTimeoutMinutes": {
-     "type": "integer"
-    },
-    "SubjectKey": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ServiceSoftwareOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedUpdateDate": {
-     "type": "string"
-    },
-    "Cancellable": {
-     "type": "boolean"
-    },
-    "CurrentVersion": {
-     "type": "string"
-    },
-    "Description": {
-     "type": "string"
-    },
-    "NewVersion": {
-     "type": "string"
-    },
-    "OptionalDeployment": {
-     "type": "boolean"
-    },
-    "UpdateAvailable": {
-     "type": "boolean"
-    },
-    "UpdateStatus": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SnapshotOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutomatedSnapshotStartHour": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "SoftwareUpdateOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "AutoSoftwareUpdateEnabled": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 0,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "minLength": 0,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "VPCOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "SecurityGroupIds": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.GroupId",
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    },
-    "SubnetIds": {
-     "items": {
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "type": "object"
-  },
-  "WindowStartTime": {
-   "additionalProperties": false,
-   "properties": {
-    "Hours": {
-     "maximum": 23,
-     "minimum": 0,
-     "type": "integer"
-    },
-    "Minutes": {
-     "maximum": 59,
-     "minimum": 0,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "Hours",
-    "Minutes"
-   ],
-   "type": "object"
-  },
-  "ZoneAwarenessConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "AvailabilityZoneCount": {
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "es:CreateDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:ListTags"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "es:DeleteDomain",
-    "es:DescribeDomain"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "es:DescribeDomain",
-    "es:ListTags"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "es:UpdateDomain",
-    "es:UpgradeDomain",
-    "es:DescribeDomain",
-    "es:AddTags",
-    "es:RemoveTags",
-    "es:ListTags",
-    "es:DescribeDomainChangeProgress"
-   ],
-   "timeoutInMinutes": 2160
-  }
- },
- "primaryIdentifier": [
-  "/properties/DomainName"
- ],
- "properties": {
-  "AccessPolicies": {
-   "format": "json",
-   "type": [
-    "object",
-    "string"
-   ]
-  },
-  "AdvancedOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "AdvancedSecurityOptions": {
-   "$ref": "#/definitions/AdvancedSecurityOptionsInput"
-  },
-  "Arn": {
-   "type": "string"
-  },
-  "ClusterConfig": {
-   "$ref": "#/definitions/ClusterConfig"
-  },
-  "CognitoOptions": {
-   "$ref": "#/definitions/CognitoOptions"
-  },
-  "DomainArn": {
-   "type": "string"
-  },
-  "DomainEndpoint": {
-   "type": "string"
-  },
-  "DomainEndpointOptions": {
-   "$ref": "#/definitions/DomainEndpointOptions"
-  },
-  "DomainEndpointV2": {
-   "type": "string"
-  },
-  "DomainEndpoints": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "^.*$": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "DomainName": {
-   "type": "string"
-  },
-  "EBSOptions": {
-   "$ref": "#/definitions/EBSOptions"
-  },
-  "EncryptionAtRestOptions": {
-   "$ref": "#/definitions/EncryptionAtRestOptions"
-  },
-  "EngineVersion": {
-   "type": "string"
-  },
-  "IPAddressType": {
-   "type": "string"
-  },
-  "Id": {
-   "type": "string"
-  },
-  "LogPublishingOptions": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "[a-zA-Z0-9]+": {
-     "$ref": "#/definitions/LogPublishingOption"
-    }
-   },
-   "type": "object"
-  },
-  "NodeToNodeEncryptionOptions": {
-   "$ref": "#/definitions/NodeToNodeEncryptionOptions"
-  },
-  "OffPeakWindowOptions": {
-   "$ref": "#/definitions/OffPeakWindowOptions"
-  },
-  "ServiceSoftwareOptions": {
-   "$ref": "#/definitions/ServiceSoftwareOptions"
-  },
-  "SnapshotOptions": {
-   "$ref": "#/definitions/SnapshotOptions"
-  },
-  "SoftwareUpdateOptions": {
-   "$ref": "#/definitions/SoftwareUpdateOptions"
-  },
-  "Tags": {
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "VPCOptions": {
-   "$ref": "#/definitions/VPCOptions"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id",
-  "/properties/Arn",
-  "/properties/DomainArn",
-  "/properties/DomainEndpoint",
-  "/properties/DomainEndpointV2",
-  "/properties/DomainEndpoints",
-  "/properties/ServiceSoftwareOptions",
-  "/properties/AdvancedSecurityOptions/AnonymousAuthDisableDate"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git",
- "typeName": "AWS::OpenSearchService::Domain",
- "writeOnlyProperties": [
-  "/properties/AdvancedSecurityOptions/MasterUserOptions",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterUserName",
-  "/properties/AdvancedSecurityOptions/SAMLOptions/MasterBackendRole"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/us_west_1/__init__.py b/src/cfnlint/data/schemas/providers/us_west_1/__init__.py
index cd8a7c0560..837e5e56a2 100644
--- a/src/cfnlint/data/schemas/providers/us_west_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/us_west_1/__init__.py
@@ -1268,6 +1268,7 @@
     "aws-ecr-pullthroughcacherule.json",
     "aws-ecr-registrypolicy.json",
     "aws-ecr-replicationconfiguration.json",
+    "aws-ecr-repository.json",
     "aws-ecr-repositorycreationtemplate.json",
     "aws-ecs-capacityprovider.json",
     "aws-ecs-cluster.json",
diff --git a/src/cfnlint/data/schemas/providers/us_west_1/aws-ecr-repository.json b/src/cfnlint/data/schemas/providers/us_west_1/aws-ecr-repository.json
deleted file mode 100644
index 062afcc632..0000000000
--- a/src/cfnlint/data/schemas/providers/us_west_1/aws-ecr-repository.json
+++ /dev/null
@@ -1,212 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/RepositoryName",
-  "/properties/EncryptionConfiguration",
-  "/properties/EncryptionConfiguration/EncryptionType",
-  "/properties/EncryptionConfiguration/KmsKey"
- ],
- "definitions": {
-  "EmptyOnDelete": {
-   "type": "boolean"
-  },
-  "EncryptionConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "EncryptionType": {
-     "$ref": "#/definitions/EncryptionType"
-    },
-    "KmsKey": {
-     "$ref": "#/definitions/KmsKey"
-    }
-   },
-   "required": [
-    "EncryptionType"
-   ],
-   "type": "object"
-  },
-  "EncryptionType": {
-   "enum": [
-    "AES256",
-    "KMS"
-   ],
-   "type": "string"
-  },
-  "ImageScanningConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "ScanOnPush": {
-     "$ref": "#/definitions/ScanOnPush"
-    }
-   },
-   "type": "object"
-  },
-  "KmsKey": {
-   "maxLength": 2048,
-   "minLength": 1,
-   "type": "string"
-  },
-  "LifecyclePolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "LifecyclePolicyText": {
-     "$ref": "#/definitions/LifecyclePolicyText"
-    },
-    "RegistryId": {
-     "$ref": "#/definitions/RegistryId"
-    }
-   },
-   "type": "object"
-  },
-  "LifecyclePolicyText": {
-   "maxLength": 30720,
-   "minLength": 100,
-   "type": "string"
-  },
-  "RegistryId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^[0-9]{12}$",
-   "type": "string"
-  },
-  "ScanOnPush": {
-   "type": "boolean"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 127,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 255,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  }
- },
- "handlers": {
-  "create": {
-   "permissions": [
-    "ecr:CreateRepository",
-    "ecr:PutLifecyclePolicy",
-    "ecr:SetRepositoryPolicy",
-    "ecr:TagResource",
-    "kms:DescribeKey",
-    "kms:CreateGrant",
-    "kms:RetireGrant"
-   ]
-  },
-  "delete": {
-   "permissions": [
-    "ecr:DeleteRepository",
-    "kms:RetireGrant"
-   ]
-  },
-  "list": {
-   "permissions": [
-    "ecr:DescribeRepositories"
-   ]
-  },
-  "read": {
-   "permissions": [
-    "ecr:DescribeRepositories",
-    "ecr:GetLifecyclePolicy",
-    "ecr:GetRepositoryPolicy",
-    "ecr:ListTagsForResource"
-   ]
-  },
-  "update": {
-   "permissions": [
-    "ecr:DescribeRepositories",
-    "ecr:PutLifecyclePolicy",
-    "ecr:SetRepositoryPolicy",
-    "ecr:ListTagsForResource",
-    "ecr:TagResource",
-    "ecr:UntagResource",
-    "ecr:DeleteLifecyclePolicy",
-    "ecr:DeleteRepositoryPolicy",
-    "ecr:PutImageScanningConfiguration",
-    "ecr:PutImageTagMutability",
-    "kms:DescribeKey",
-    "kms:CreateGrant",
-    "kms:RetireGrant"
-   ]
-  }
- },
- "primaryIdentifier": [
-  "/properties/RepositoryName"
- ],
- "properties": {
-  "Arn": {
-   "type": "string"
-  },
-  "EmptyOnDelete": {
-   "$ref": "#/definitions/EmptyOnDelete"
-  },
-  "EncryptionConfiguration": {
-   "$ref": "#/definitions/EncryptionConfiguration"
-  },
-  "ImageScanningConfiguration": {
-   "$ref": "#/definitions/ImageScanningConfiguration"
-  },
-  "ImageTagMutability": {
-   "enum": [
-    "MUTABLE",
-    "IMMUTABLE"
-   ],
-   "type": "string"
-  },
-  "LifecyclePolicy": {
-   "$ref": "#/definitions/LifecyclePolicy"
-  },
-  "RepositoryName": {
-   "maxLength": 256,
-   "minLength": 2,
-   "pattern": "^(?=.{2,256}$)((?:[a-z0-9]+(?:[._-][a-z0-9]+)*/)*[a-z0-9]+(?:[._-][a-z0-9]+)*)$",
-   "type": "string"
-  },
-  "RepositoryPolicyText": {
-   "type": [
-    "object",
-    "string"
-   ]
-  },
-  "RepositoryUri": {
-   "type": "string"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 50,
-   "type": "array",
-   "uniqueItems": true
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/RepositoryUri"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-ecr.git",
- "tagging": {
-  "cloudFormationSystemTags": true,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::ECR::Repository",
- "writeOnlyProperties": [
-  "/properties/EmptyOnDelete"
- ]
-}
diff --git a/test/unit/rules/resources/rds/test_db_cluster_engine_version.py b/test/unit/rules/resources/rds/test_db_cluster_engine_version.py
index 038750f19d..f1fde4a157 100644
--- a/test/unit/rules/resources/rds/test_db_cluster_engine_version.py
+++ b/test/unit/rules/resources/rds/test_db_cluster_engine_version.py
@@ -70,7 +70,8 @@ def rule():
                 ValidationError(
                     (
                         "'foo' is not one of ['5.7.44', '5.7.44-rds.20240408', "
-                        "'5.7.44-rds.20240529', '8.0.32', '8.0.33', '8.0.34', "
+                        "'5.7.44-rds.20240529', '5.7.44-rds.20240808', "
+                        "'8.0.32', '8.0.33', '8.0.34', "
                         "'8.0.35', '8.0.36', '8.0.37', '8.0.39']"
                     ),
                     rule=DbClusterEngineVersion(),
diff --git a/test/unit/rules/resources/rds/test_db_instance_engine_version.py b/test/unit/rules/resources/rds/test_db_instance_engine_version.py
index 1143e97eee..2d660d8512 100644
--- a/test/unit/rules/resources/rds/test_db_instance_engine_version.py
+++ b/test/unit/rules/resources/rds/test_db_instance_engine_version.py
@@ -79,8 +79,9 @@ def rule():
                 ValidationError(
                     (
                         "'foo' is not one of ['5.7.44', '5.7.44-rds.20240408', "
-                        "'5.7.44-rds.20240529', '8.0.32', '8.0.33', "
-                        "'8.0.34', '8.0.35', '8.0.36', '8.0.37', '8.0.39']"
+                        "'5.7.44-rds.20240529', '5.7.44-rds.20240808', "
+                        "'8.0.32', '8.0.33', '8.0.34', '8.0.35', "
+                        "'8.0.36', '8.0.37', '8.0.39']"
                     ),
                     rule=DbInstanceEngineVersion(),
                     path=deque(["EngineVersion"]),