From f2e87234a4219bfe08ff523c79cbbcd4465df172 Mon Sep 17 00:00:00 2001
From: Kevin DeJong <kddejong@amazon.com>
Date: Fri, 11 Oct 2024 17:19:23 -0700
Subject: [PATCH] Follow REFs in the schema

---
 scripts/boto/_automated_patches.py            | 12 ++++-
 .../aws_appflow_connectorprofile/boto.json    | 32 ------------
 .../all/aws_appstream_appblock/boto.json      |  2 +-
 .../aws_appstream_appblockbuilder/boto.json   |  2 +-
 .../all/aws_appstream_application/boto.json   |  2 +-
 .../all/aws_auditmanager_assessment/boto.json | 12 +----
 .../all/aws_b2bi_capability/boto.json         |  9 ----
 .../extensions/all/aws_b2bi_profile/boto.json | 10 ----
 .../all/aws_b2bi_transformer/boto.json        | 11 ----
 .../all/aws_backup_backupvault/boto.json      |  7 ---
 .../all/aws_ce_costcategory/boto.json         |  5 --
 .../aws_cleanrooms_collaboration/boto.json    | 15 ------
 .../aws_cleanrooms_configuredtable/boto.json  |  9 ----
 .../aws_cleanrooms_idmappingtable/boto.json   |  5 --
 .../boto.json                                 |  7 ---
 .../all/aws_cleanrooms_membership/boto.json   | 10 ----
 .../all/aws_cloudtrail_channel/boto.json      |  7 ---
 .../boto.json                                 |  7 +--
 .../boto.json                                 | 17 -------
 .../all/aws_connect_tasktemplate/boto.json    | 10 ----
 .../boto.json                                 | 31 ------------
 .../all/aws_datazone_datasource/boto.json     | 10 ----
 .../aws_datazone_projectmembership/boto.json  | 10 ----
 .../all/aws_datazone_userprofile/boto.json    | 11 ----
 .../all/aws_deadline_queue/boto.json          | 11 ----
 .../aws_deadline_queueenvironment/boto.json   | 10 ----
 .../all/aws_deadline_storageprofile/boto.json | 11 ----
 .../all/aws_ec2_networkinsightspath/boto.json | 15 +-----
 .../aws_emrserverless_application/boto.json   | 10 ----
 .../boto.json                                 |  7 ---
 .../boto.json                                 |  7 ---
 .../boto.json                                 |  7 ---
 .../boto.json                                 | 20 --------
 .../boto.json                                 |  7 ---
 .../all/aws_fis_experimenttemplate/boto.json  |  4 +-
 .../boto.json                                 |  8 +--
 .../all/aws_fms_notificationchannel/boto.json | 12 -----
 .../aws_gamelift_gameservergroup/boto.json    | 29 -----------
 .../all/aws_grafana_workspace/boto.json       | 18 -------
 .../aws_healthlake_fhirdatastore/boto.json    |  9 +---
 .../all/aws_iotfleetwise_campaign/boto.json   | 26 ----------
 .../all/aws_iotfleetwise_vehicle/boto.json    | 10 ----
 .../all/aws_kendra_datasource/boto.json       | 41 ++-------------
 .../extensions/all/aws_kendra_faq/boto.json   | 25 ++--------
 .../extensions/all/aws_kendra_index/boto.json | 25 +---------
 .../aws_kendraranking_executionplan/boto.json |  4 +-
 .../boto.json                                 |  5 --
 .../all/aws_lakeformation_tag/boto.json       |  8 +--
 .../all/aws_lambda_function/boto.json         |  8 ---
 .../all/aws_licensemanager_grant/boto.json    |  2 +-
 .../aws_location_geofencecollection/boto.json | 11 ----
 .../extensions/all/aws_location_map/boto.json | 11 ----
 .../all/aws_location_placeindex/boto.json     | 11 ----
 .../aws_location_routecalculator/boto.json    | 11 ----
 .../all/aws_location_tracker/boto.json        | 20 --------
 .../all/aws_lookoutvision_project/boto.json   |  7 ---
 .../all/aws_m2_application/boto.json          | 10 ----
 .../all/aws_m2_environment/boto.json          | 10 ----
 .../aws_managedblockchain_accessor/boto.json  | 20 --------
 .../boto.json                                 | 47 -----------------
 .../all/aws_medialive_cluster/boto.json       |  9 ----
 .../boto.json                                 | 21 --------
 .../all/aws_mediapackagev2_channel/boto.json  | 10 ----
 .../boto.json                                 | 10 ----
 .../all/aws_mediatailor_channel/boto.json     | 18 -------
 .../all/aws_mwaa_environment/boto.json        | 48 ------------------
 .../aws_networkfirewall_firewall/boto.json    |  7 ---
 .../all/aws_omics_annotationstore/boto.json   | 11 ----
 .../all/aws_omics_workflow/boto.json          | 18 -------
 .../boto.json                                 |  9 ----
 .../boto.json                                 | 19 -------
 .../boto.json                                 |  9 ----
 .../boto.json                                 |  9 ----
 .../boto.json                                 | 10 ----
 .../boto.json                                 | 27 ----------
 .../all/aws_panorama_package/boto.json        |  7 ---
 .../all/aws_panorama_packageversion/boto.json | 22 --------
 .../all/aws_paymentcryptography_key/boto.json | 10 ----
 .../extensions/all/aws_pipes_pipe/boto.json   |  8 ---
 .../aws_proton_environmenttemplate/boto.json  |  9 ----
 .../all/aws_proton_servicetemplate/boto.json  |  9 ----
 .../all/aws_qbusiness_application/boto.json   | 11 ----
 .../all/aws_qbusiness_index/boto.json         | 10 ----
 .../all/aws_qbusiness_plugin/boto.json        | 13 -----
 .../all/aws_qbusiness_retriever/boto.json     | 10 ----
 .../all/aws_qbusiness_webexperience/boto.json | 10 ----
 .../all/aws_quicksight_dataset/boto.json      | 10 ----
 .../all/aws_quicksight_datasource/boto.json   | 37 --------------
 .../all/aws_quicksight_folder/boto.json       | 18 -------
 .../all/aws_rekognition_collection/boto.json  |  7 ---
 .../all/aws_rekognition_project/boto.json     |  7 ---
 .../boto.json                                 |  7 ---
 .../boto.json                                 |  7 ---
 .../boto.json                                 |  7 ---
 .../all/aws_sagemaker_image/boto.json         |  7 ---
 .../all/aws_sagemaker_imageversion/boto.json  | 44 ----------------
 .../boto.json                                 | 17 -------
 .../boto.json                                 |  5 --
 .../boto.json                                 |  7 ---
 .../boto.json                                 |  7 ---
 .../all/aws_sagemaker_modelpackage/boto.json  | 44 +---------------
 .../aws_sagemaker_modelpackagegroup/boto.json | 12 -----
 .../boto.json                                 |  7 ---
 .../boto.json                                 |  7 ---
 .../all/aws_sagemaker_project/boto.json       | 12 -----
 .../all/aws_securityhub_insight/boto.json     |  2 +-
 .../all/aws_signer_signingprofile/boto.json   |  7 ---
 .../extensions/all/aws_wafv2_ipset/boto.json  | 28 -----------
 .../all/aws_wafv2_rulegroup/boto.json         | 20 --------
 .../extensions/all/aws_wafv2_webacl/boto.json | 20 --------
 .../all/aws_wisdom_assistant/boto.json        |  7 ---
 .../aws_wisdom_assistantassociation/boto.json |  9 ----
 .../all/aws_wisdom_knowledgebase/boto.json    |  9 ----
 .../boto.json                                 | 14 ------
 .../all/aws_workspacesweb_portal/boto.json    | 19 -------
 .../aws_workspacesweb_usersettings/boto.json  | 50 -------------------
 .../aws-route53resolver-resolverrule.json     |  1 +
 .../cn_north_1/aws-iam-instanceprofile.json   |  2 +
 .../us_east_1/aws-appstream-appblock.json     |  4 ++
 .../aws-appstream-appblockbuilder.json        |  3 ++
 .../us_east_1/aws-appstream-application.json  |  1 +
 .../aws-auditmanager-assessment.json          |  1 +
 .../aws-comprehend-documentclassifier.json    |  1 +
 .../aws-ec2-networkinsightspath.json          |  1 +
 .../us_east_1/aws-fis-experimenttemplate.json |  2 +
 .../aws-fis-targetaccountconfiguration.json   |  4 ++
 .../aws-healthlake-fhirdatastore.json         |  1 +
 .../us_east_1/aws-kendra-datasource.json      |  3 ++
 .../providers/us_east_1/aws-kendra-faq.json   |  3 ++
 .../providers/us_east_1/aws-kendra-index.json |  2 +
 .../aws-kendraranking-executionplan.json      |  2 +
 .../us_east_1/aws-licensemanager-grant.json   |  1 +
 .../us_east_1/aws-sagemaker-modelpackage.json |  1 +
 .../us_east_1/aws-securityhub-insight.json    |  1 +
 .../aws-route53resolver-resolverrule.json     |  1 +
 135 files changed, 72 insertions(+), 1521 deletions(-)
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_appflow_connectorprofile/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_b2bi_capability/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_b2bi_profile/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_b2bi_transformer/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_backup_backupvault/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_cleanrooms_collaboration/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_cleanrooms_configuredtable/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_cleanrooms_idnamespaceassociation/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_cleanrooms_membership/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_cloudtrail_channel/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_connect_integrationassociation/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_connect_tasktemplate/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_customerprofiles_calculatedattributedefinition/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_datazone_datasource/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_datazone_projectmembership/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_datazone_userprofile/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_deadline_queue/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_deadline_queueenvironment/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_deadline_storageprofile/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_emrserverless_application/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_entityresolution_idmappingworkflow/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_entityresolution_idnamespace/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_entityresolution_matchingworkflow/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_entityresolution_policystatement/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_entityresolution_schemamapping/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_fms_notificationchannel/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_gamelift_gameservergroup/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_grafana_workspace/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_iotfleetwise_campaign/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_iotfleetwise_vehicle/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_location_geofencecollection/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_location_map/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_location_placeindex/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_location_routecalculator/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_location_tracker/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_lookoutvision_project/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_m2_application/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_m2_environment/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_managedblockchain_accessor/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_medialive_cloudwatchalarmtemplate/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_medialive_cluster/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_medialive_eventbridgeruletemplate/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_mediapackagev2_channel/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_mediapackagev2_originendpoint/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_mediatailor_channel/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_mwaa_environment/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_networkfirewall_firewall/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_omics_annotationstore/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_omics_workflow/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_opensearchserverless_accesspolicy/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_opensearchserverless_collection/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_opensearchserverless_lifecyclepolicy/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_opensearchserverless_securityconfig/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_opensearchserverless_securitypolicy/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_panorama_applicationinstance/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_panorama_package/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_panorama_packageversion/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_paymentcryptography_key/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_proton_environmenttemplate/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_proton_servicetemplate/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_qbusiness_application/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_qbusiness_index/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_qbusiness_plugin/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_qbusiness_retriever/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_qbusiness_webexperience/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_quicksight_dataset/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_quicksight_datasource/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_quicksight_folder/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_rekognition_collection/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_rekognition_project/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_robomaker_robotapplicationversion/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_robomaker_simulationapplicationversion/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_dataqualityjobdefinition/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_image/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_imageversion/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_inferencecomponent/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_modelbiasjobdefinition/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_modelexplainabilityjobdefinition/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_modelpackagegroup/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_modelqualityjobdefinition/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_monitoringschedule/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_project/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_signer_signingprofile/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_wafv2_ipset/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_wafv2_rulegroup/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_wafv2_webacl/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_wisdom_assistantassociation/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_workspacesweb_identityprovider/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_workspacesweb_portal/boto.json
 delete mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_workspacesweb_usersettings/boto.json

diff --git a/scripts/boto/_automated_patches.py b/scripts/boto/_automated_patches.py
index e3eecad925..d2ca8d6063 100644
--- a/scripts/boto/_automated_patches.py
+++ b/scripts/boto/_automated_patches.py
@@ -113,6 +113,15 @@ def _per_resource_patch(
                     continue
                 if p_name.lower() == member.lower():
 
+                    path = f"/properties/{p_name}"
+
+                    if "$ref" in p_data:
+                        pointer = p_data["$ref"].split("/")
+                        p_data = schema_data.get(pointer[1], {}).get(pointer[2], {})
+                        if not p_data:
+                            continue
+                        path = f"/{'/'.join(pointer[1:])}"
+
                     # skip if we already have an enum or pattern
                     if any([p_data.get(field) for field in _fields]):
                         continue
@@ -125,7 +134,7 @@ def _per_resource_patch(
                     if not any([member_shape.get(field) for field in _fields]):
                         continue
 
-                    results[f"/properties/{p_name}"] = Patch(
+                    results[path] = Patch(
                         source=source,
                         shape=member_shape_name,
                     )
@@ -177,7 +186,6 @@ def each_boto_service(boto_path: Path, schema_path: Path) -> AllPatches:
     boto_path = boto_path / "botocore-master" / "botocore" / "data"
 
     for service_dir in boto_path.iterdir():
-        print(service_dir)
         if not service_dir.is_dir():
             continue
 
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_appflow_connectorprofile/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_appflow_connectorprofile/boto.json
deleted file mode 100644
index 4157546819..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_appflow_connectorprofile/boto.json
+++ /dev/null
@@ -1,32 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/ConnectorType/enum",
-  "value": [
-   "Amplitude",
-   "CustomConnector",
-   "CustomerProfiles",
-   "Datadog",
-   "Dynatrace",
-   "EventBridge",
-   "Googleanalytics",
-   "Honeycode",
-   "Infornexus",
-   "LookoutMetrics",
-   "Marketo",
-   "Pardot",
-   "Redshift",
-   "S3",
-   "SAPOData",
-   "Salesforce",
-   "Servicenow",
-   "Singular",
-   "Slack",
-   "Snowflake",
-   "Trendmicro",
-   "Upsolver",
-   "Veeva",
-   "Zendesk"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_appstream_appblock/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_appstream_appblock/boto.json
index 13e1f98258..33fe5fa1c8 100644
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_appstream_appblock/boto.json
+++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_appstream_appblock/boto.json
@@ -6,7 +6,7 @@
  },
  {
   "op": "add",
-  "path": "/properties/PackagingType/enum",
+  "path": "/definitions/PackagingType/enum",
   "value": [
    "APPSTREAM2",
    "CUSTOM"
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_appstream_appblockbuilder/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_appstream_appblockbuilder/boto.json
index bee905e564..dc8aa7c645 100644
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_appstream_appblockbuilder/boto.json
+++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_appstream_appblockbuilder/boto.json
@@ -6,7 +6,7 @@
  },
  {
   "op": "add",
-  "path": "/properties/Platform/enum",
+  "path": "/definitions/PlatformType/enum",
   "value": [
    "WINDOWS_SERVER_2019"
   ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_appstream_application/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_appstream_application/boto.json
index 05a903ed0f..78c9339f55 100644
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_appstream_application/boto.json
+++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_appstream_application/boto.json
@@ -6,7 +6,7 @@
  },
  {
   "op": "add",
-  "path": "/properties/AppBlockArn/pattern",
+  "path": "/definitions/Arn/pattern",
   "value": "^arn:aws(?:\\-cn|\\-iso\\-b|\\-iso|\\-us\\-gov)?:[A-Za-z0-9][A-Za-z0-9_/.-]{0,62}:[A-Za-z0-9_/.-]{0,63}:[A-Za-z0-9_/.-]{0,63}:[A-Za-z0-9][A-Za-z0-9:_/+=,@.\\\\-]{0,1023}$"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_auditmanager_assessment/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_auditmanager_assessment/boto.json
index 93e7a16bd6..986c97732c 100644
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_auditmanager_assessment/boto.json
+++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_auditmanager_assessment/boto.json
@@ -1,17 +1,7 @@
 [
  {
   "op": "add",
-  "path": "/properties/Name/pattern",
-  "value": "^[^\\\\]*$"
- },
- {
-  "op": "add",
-  "path": "/properties/Description/pattern",
+  "path": "/definitions/AssessmentDescription/pattern",
   "value": "^[\\w\\W\\s\\S]*$"
- },
- {
-  "op": "add",
-  "path": "/properties/FrameworkId/pattern",
-  "value": "^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_b2bi_capability/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_b2bi_capability/boto.json
deleted file mode 100644
index b1e9134e8d..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_b2bi_capability/boto.json
+++ /dev/null
@@ -1,9 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/Type/enum",
-  "value": [
-   "edi"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_b2bi_profile/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_b2bi_profile/boto.json
deleted file mode 100644
index 70f6b6a9ce..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_b2bi_profile/boto.json
+++ /dev/null
@@ -1,10 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/Logging/enum",
-  "value": [
-   "DISABLED",
-   "ENABLED"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_b2bi_transformer/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_b2bi_transformer/boto.json
deleted file mode 100644
index a6dace4450..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_b2bi_transformer/boto.json
+++ /dev/null
@@ -1,11 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/FileFormat/enum",
-  "value": [
-   "JSON",
-   "NOT_USED",
-   "XML"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_backup_backupvault/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_backup_backupvault/boto.json
deleted file mode 100644
index 4dff994bef..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_backup_backupvault/boto.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/BackupVaultName/pattern",
-  "value": "^[a-zA-Z0-9\\-\\_]{2,50}$"
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ce_costcategory/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ce_costcategory/boto.json
index 09c40890fe..58684b8917 100644
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_ce_costcategory/boto.json
+++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_ce_costcategory/boto.json
@@ -4,11 +4,6 @@
   "path": "/properties/Name/pattern",
   "value": "^(?! )[\\p{L}\\p{N}\\p{Z}-_]*(?<! )$"
  },
- {
-  "op": "add",
-  "path": "/properties/EffectiveStart/pattern",
-  "value": "^\\d{4}-\\d\\d-\\d\\dT\\d\\d:\\d\\d:\\d\\d(([+-]\\d\\d:\\d\\d)|Z)$"
- },
  {
   "op": "add",
   "path": "/properties/DefaultValue/pattern",
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_cleanrooms_collaboration/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_cleanrooms_collaboration/boto.json
deleted file mode 100644
index 3216e6c1bf..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_cleanrooms_collaboration/boto.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/CreatorDisplayName/pattern",
-  "value": "(?!\\s*$)[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDBFF-\\uDC00\\uDFFF\\t]*"
- },
- {
-  "op": "add",
-  "path": "/properties/QueryLogStatus/enum",
-  "value": [
-   "DISABLED",
-   "ENABLED"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_cleanrooms_configuredtable/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_cleanrooms_configuredtable/boto.json
deleted file mode 100644
index fac84f34f6..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_cleanrooms_configuredtable/boto.json
+++ /dev/null
@@ -1,9 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/AnalysisMethod/enum",
-  "value": [
-   "DIRECT_QUERY"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_cleanrooms_idmappingtable/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_cleanrooms_idmappingtable/boto.json
index e87b2a1d67..10e9a8e2e2 100644
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_cleanrooms_idmappingtable/boto.json
+++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_cleanrooms_idmappingtable/boto.json
@@ -1,9 +1,4 @@
 [
- {
-  "op": "add",
-  "path": "/properties/MembershipIdentifier/pattern",
-  "value": "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}"
- },
  {
   "op": "add",
   "path": "/properties/KmsKeyArn/pattern",
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_cleanrooms_idnamespaceassociation/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_cleanrooms_idnamespaceassociation/boto.json
deleted file mode 100644
index 4e10b8dffa..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_cleanrooms_idnamespaceassociation/boto.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/MembershipIdentifier/pattern",
-  "value": "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}"
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_cleanrooms_membership/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_cleanrooms_membership/boto.json
deleted file mode 100644
index e3c8b5acd7..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_cleanrooms_membership/boto.json
+++ /dev/null
@@ -1,10 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/QueryLogStatus/enum",
-  "value": [
-   "DISABLED",
-   "ENABLED"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_cloudtrail_channel/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_cloudtrail_channel/boto.json
deleted file mode 100644
index da189800c4..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_cloudtrail_channel/boto.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/Name/pattern",
-  "value": "^[a-zA-Z0-9._\\-]+$"
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_comprehend_documentclassifier/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_comprehend_documentclassifier/boto.json
index fc47251dc2..daa6fb486d 100644
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_comprehend_documentclassifier/boto.json
+++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_comprehend_documentclassifier/boto.json
@@ -1,12 +1,7 @@
 [
  {
   "op": "add",
-  "path": "/properties/VolumeKmsKeyId/pattern",
-  "value": "^\\p{ASCII}+$"
- },
- {
-  "op": "add",
-  "path": "/properties/ModelKmsKeyId/pattern",
+  "path": "/definitions/KmsKeyId/pattern",
   "value": "^\\p{ASCII}+$"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_connect_integrationassociation/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_connect_integrationassociation/boto.json
deleted file mode 100644
index 8f22f93790..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_connect_integrationassociation/boto.json
+++ /dev/null
@@ -1,17 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/IntegrationType/enum",
-  "value": [
-   "APPLICATION",
-   "CASES_DOMAIN",
-   "EVENT",
-   "FILE_SCANNER",
-   "PINPOINT_APP",
-   "VOICE_ID",
-   "WISDOM_ASSISTANT",
-   "WISDOM_KNOWLEDGE_BASE",
-   "WISDOM_QUICK_RESPONSES"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_connect_tasktemplate/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_connect_tasktemplate/boto.json
deleted file mode 100644
index ccfebd586f..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_connect_tasktemplate/boto.json
+++ /dev/null
@@ -1,10 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/Status/enum",
-  "value": [
-   "ACTIVE",
-   "INACTIVE"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_customerprofiles_calculatedattributedefinition/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_customerprofiles_calculatedattributedefinition/boto.json
deleted file mode 100644
index 76fd43637b..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_customerprofiles_calculatedattributedefinition/boto.json
+++ /dev/null
@@ -1,31 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/DomainName/pattern",
-  "value": "^[a-zA-Z0-9_-]+$"
- },
- {
-  "op": "add",
-  "path": "/properties/CalculatedAttributeName/pattern",
-  "value": "^[a-zA-Z_][a-zA-Z_0-9-]*$"
- },
- {
-  "op": "add",
-  "path": "/properties/DisplayName/pattern",
-  "value": "^[a-zA-Z_][a-zA-Z_0-9-\\s]*$"
- },
- {
-  "op": "add",
-  "path": "/properties/Statistic/enum",
-  "value": [
-   "AVERAGE",
-   "COUNT",
-   "FIRST_OCCURRENCE",
-   "LAST_OCCURRENCE",
-   "MAXIMUM",
-   "MAX_OCCURRENCE",
-   "MINIMUM",
-   "SUM"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_datazone_datasource/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_datazone_datasource/boto.json
deleted file mode 100644
index 74870cb4ab..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_datazone_datasource/boto.json
+++ /dev/null
@@ -1,10 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/EnableSetting/enum",
-  "value": [
-   "DISABLED",
-   "ENABLED"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_datazone_projectmembership/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_datazone_projectmembership/boto.json
deleted file mode 100644
index 4c6dade78e..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_datazone_projectmembership/boto.json
+++ /dev/null
@@ -1,10 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/Designation/enum",
-  "value": [
-   "PROJECT_CONTRIBUTOR",
-   "PROJECT_OWNER"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_datazone_userprofile/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_datazone_userprofile/boto.json
deleted file mode 100644
index 77474871b7..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_datazone_userprofile/boto.json
+++ /dev/null
@@ -1,11 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/UserType/enum",
-  "value": [
-   "IAM_ROLE",
-   "IAM_USER",
-   "SSO_USER"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_deadline_queue/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_deadline_queue/boto.json
deleted file mode 100644
index 981831a460..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_deadline_queue/boto.json
+++ /dev/null
@@ -1,11 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/DefaultBudgetAction/enum",
-  "value": [
-   "NONE",
-   "STOP_SCHEDULING_AND_CANCEL_TASKS",
-   "STOP_SCHEDULING_AND_COMPLETE_TASKS"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_deadline_queueenvironment/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_deadline_queueenvironment/boto.json
deleted file mode 100644
index 8e621c8e45..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_deadline_queueenvironment/boto.json
+++ /dev/null
@@ -1,10 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/TemplateType/enum",
-  "value": [
-   "JSON",
-   "YAML"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_deadline_storageprofile/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_deadline_storageprofile/boto.json
deleted file mode 100644
index b5e667cff8..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_deadline_storageprofile/boto.json
+++ /dev/null
@@ -1,11 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/OsFamily/enum",
-  "value": [
-   "LINUX",
-   "MACOS",
-   "WINDOWS"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_networkinsightspath/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_networkinsightspath/boto.json
index cd53a35908..ebad055405 100644
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_networkinsightspath/boto.json
+++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_ec2_networkinsightspath/boto.json
@@ -1,20 +1,7 @@
 [
  {
   "op": "add",
-  "path": "/properties/SourceIp/pattern",
+  "path": "/definitions/IpAddress/pattern",
   "value": "^([0-9]{1,3}.){3}[0-9]{1,3}$"
- },
- {
-  "op": "add",
-  "path": "/properties/DestinationIp/pattern",
-  "value": "^([0-9]{1,3}.){3}[0-9]{1,3}$"
- },
- {
-  "op": "add",
-  "path": "/properties/Protocol/enum",
-  "value": [
-   "tcp",
-   "udp"
-  ]
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_emrserverless_application/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_emrserverless_application/boto.json
deleted file mode 100644
index 8b0ac527ab..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_emrserverless_application/boto.json
+++ /dev/null
@@ -1,10 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/Architecture/enum",
-  "value": [
-   "ARM64",
-   "X86_64"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_entityresolution_idmappingworkflow/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_entityresolution_idmappingworkflow/boto.json
deleted file mode 100644
index 67c5717a62..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_entityresolution_idmappingworkflow/boto.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/WorkflowName/pattern",
-  "value": "^[a-zA-Z_0-9-]*$"
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_entityresolution_idnamespace/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_entityresolution_idnamespace/boto.json
deleted file mode 100644
index 1f2fa05a54..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_entityresolution_idnamespace/boto.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/IdNamespaceName/pattern",
-  "value": "^[a-zA-Z_0-9-]*$"
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_entityresolution_matchingworkflow/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_entityresolution_matchingworkflow/boto.json
deleted file mode 100644
index 67c5717a62..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_entityresolution_matchingworkflow/boto.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/WorkflowName/pattern",
-  "value": "^[a-zA-Z_0-9-]*$"
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_entityresolution_policystatement/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_entityresolution_policystatement/boto.json
deleted file mode 100644
index 27b4fca70c..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_entityresolution_policystatement/boto.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/Arn/pattern",
-  "value": "^arn:(aws|aws-us-gov|aws-cn):entityresolution:[a-z]{2}-[a-z]{1,10}-[0-9]:[0-9]{12}:((schemamapping|matchingworkflow|idmappingworkflow|idnamespace)/[a-zA-Z_0-9-]{1,255})$"
- },
- {
-  "op": "add",
-  "path": "/properties/Effect/enum",
-  "value": [
-   "Allow",
-   "Deny"
-  ]
- },
- {
-  "op": "add",
-  "path": "/properties/StatementId/pattern",
-  "value": "^[0-9A-Za-z]+$"
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_entityresolution_schemamapping/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_entityresolution_schemamapping/boto.json
deleted file mode 100644
index ab86b4990c..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_entityresolution_schemamapping/boto.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/SchemaName/pattern",
-  "value": "^[a-zA-Z_0-9-]*$"
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_fis_experimenttemplate/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_fis_experimenttemplate/boto.json
index 13ce21d2b2..a8f579005b 100644
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_fis_experimenttemplate/boto.json
+++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_fis_experimenttemplate/boto.json
@@ -1,12 +1,12 @@
 [
  {
   "op": "add",
-  "path": "/properties/Description/pattern",
+  "path": "/definitions/ExperimentTemplateDescription/pattern",
   "value": "[\\s\\S]+"
  },
  {
   "op": "add",
-  "path": "/properties/RoleArn/pattern",
+  "path": "/definitions/RoleArn/pattern",
   "value": "[\\S]+"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_fis_targetaccountconfiguration/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_fis_targetaccountconfiguration/boto.json
index 781347ed06..d5c00a259d 100644
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_fis_targetaccountconfiguration/boto.json
+++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_fis_targetaccountconfiguration/boto.json
@@ -1,22 +1,22 @@
 [
  {
   "op": "add",
-  "path": "/properties/ExperimentTemplateId/pattern",
+  "path": "/definitions/TargetExperimentTemplateId/pattern",
   "value": "[\\S]+"
  },
  {
   "op": "add",
-  "path": "/properties/AccountId/pattern",
+  "path": "/definitions/TargetAccountId/pattern",
   "value": "[\\S]+"
  },
  {
   "op": "add",
-  "path": "/properties/RoleArn/pattern",
+  "path": "/definitions/TargetAccountRoleArn/pattern",
   "value": "[\\S]+"
  },
  {
   "op": "add",
-  "path": "/properties/Description/pattern",
+  "path": "/definitions/TargetAccountConfigurationDescription/pattern",
   "value": "[\\s\\S]*"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_fms_notificationchannel/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_fms_notificationchannel/boto.json
deleted file mode 100644
index 03ac5680bb..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_fms_notificationchannel/boto.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/SnsTopicArn/pattern",
-  "value": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$"
- },
- {
-  "op": "add",
-  "path": "/properties/SnsRoleName/pattern",
-  "value": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$"
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_gamelift_gameservergroup/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_gamelift_gameservergroup/boto.json
deleted file mode 100644
index 5d3d5a8b0f..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_gamelift_gameservergroup/boto.json
+++ /dev/null
@@ -1,29 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/GameServerGroupName/pattern",
-  "value": "[a-zA-Z0-9-\\.]+"
- },
- {
-  "op": "add",
-  "path": "/properties/RoleArn/pattern",
-  "value": "^arn:.*:role\\/[\\w+=,.@-]+"
- },
- {
-  "op": "add",
-  "path": "/properties/BalancingStrategy/enum",
-  "value": [
-   "ON_DEMAND_ONLY",
-   "SPOT_ONLY",
-   "SPOT_PREFERRED"
-  ]
- },
- {
-  "op": "add",
-  "path": "/properties/GameServerProtectionPolicy/enum",
-  "value": [
-   "FULL_PROTECTION",
-   "NO_PROTECTION"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_grafana_workspace/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_grafana_workspace/boto.json
deleted file mode 100644
index dd290386f1..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_grafana_workspace/boto.json
+++ /dev/null
@@ -1,18 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/AccountAccessType/enum",
-  "value": [
-   "CURRENT_ACCOUNT",
-   "ORGANIZATION"
-  ]
- },
- {
-  "op": "add",
-  "path": "/properties/PermissionType/enum",
-  "value": [
-   "CUSTOMER_MANAGED",
-   "SERVICE_MANAGED"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_healthlake_fhirdatastore/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_healthlake_fhirdatastore/boto.json
index 1693daf620..9421e54e16 100644
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_healthlake_fhirdatastore/boto.json
+++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_healthlake_fhirdatastore/boto.json
@@ -1,14 +1,7 @@
 [
  {
   "op": "add",
-  "path": "/properties/DatastoreName/pattern",
+  "path": "/definitions/DatastoreName/pattern",
   "value": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-%@]*)$"
- },
- {
-  "op": "add",
-  "path": "/properties/DatastoreTypeVersion/enum",
-  "value": [
-   "R4"
-  ]
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_iotfleetwise_campaign/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_iotfleetwise_campaign/boto.json
deleted file mode 100644
index 632233bc0c..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_iotfleetwise_campaign/boto.json
+++ /dev/null
@@ -1,26 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/DiagnosticsMode/enum",
-  "value": [
-   "OFF",
-   "SEND_ACTIVE_DTCS"
-  ]
- },
- {
-  "op": "add",
-  "path": "/properties/SpoolingMode/enum",
-  "value": [
-   "OFF",
-   "TO_DISK"
-  ]
- },
- {
-  "op": "add",
-  "path": "/properties/Compression/enum",
-  "value": [
-   "OFF",
-   "SNAPPY"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_iotfleetwise_vehicle/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_iotfleetwise_vehicle/boto.json
deleted file mode 100644
index 9ec1197a14..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_iotfleetwise_vehicle/boto.json
+++ /dev/null
@@ -1,10 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/AssociationBehavior/enum",
-  "value": [
-   "CreateIotThing",
-   "ValidateIotThingExists"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_kendra_datasource/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_kendra_datasource/boto.json
index 51d9b33fb2..88f2973233 100644
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_kendra_datasource/boto.json
+++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_kendra_datasource/boto.json
@@ -1,52 +1,17 @@
 [
  {
   "op": "add",
-  "path": "/properties/Name/pattern",
+  "path": "/definitions/Name/pattern",
   "value": "[a-zA-Z0-9][a-zA-Z0-9_-]*"
  },
  {
   "op": "add",
-  "path": "/properties/IndexId/pattern",
+  "path": "/definitions/IndexId/pattern",
   "value": "[a-zA-Z0-9][a-zA-Z0-9-]*"
  },
  {
   "op": "add",
-  "path": "/properties/Type/enum",
-  "value": [
-   "ALFRESCO",
-   "BOX",
-   "CONFLUENCE",
-   "CUSTOM",
-   "DATABASE",
-   "FSX",
-   "GITHUB",
-   "GOOGLEDRIVE",
-   "JIRA",
-   "ONEDRIVE",
-   "QUIP",
-   "S3",
-   "SALESFORCE",
-   "SERVICENOW",
-   "SHAREPOINT",
-   "SLACK",
-   "TEMPLATE",
-   "WEBCRAWLER",
-   "WORKDOCS"
-  ]
- },
- {
-  "op": "add",
-  "path": "/properties/Description/pattern",
+  "path": "/definitions/Description/pattern",
   "value": "^\\P{C}*$"
- },
- {
-  "op": "add",
-  "path": "/properties/RoleArn/pattern",
-  "value": "arn:[a-z0-9-\\.]{1,63}:[a-z0-9-\\.]{0,63}:[a-z0-9-\\.]{0,63}:[a-z0-9-\\.]{0,63}:[^/].{0,1023}"
- },
- {
-  "op": "add",
-  "path": "/properties/LanguageCode/pattern",
-  "value": "[a-zA-Z-]*"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_kendra_faq/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_kendra_faq/boto.json
index 6bf5b56079..091b17cb47 100644
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_kendra_faq/boto.json
+++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_kendra_faq/boto.json
@@ -1,36 +1,17 @@
 [
  {
   "op": "add",
-  "path": "/properties/IndexId/pattern",
+  "path": "/definitions/IndexId/pattern",
   "value": "[a-zA-Z0-9][a-zA-Z0-9-]*"
  },
  {
   "op": "add",
-  "path": "/properties/Name/pattern",
+  "path": "/definitions/FaqName/pattern",
   "value": "[a-zA-Z0-9][a-zA-Z0-9_-]*"
  },
  {
   "op": "add",
-  "path": "/properties/Description/pattern",
+  "path": "/definitions/Description/pattern",
   "value": "^\\P{C}*$"
- },
- {
-  "op": "add",
-  "path": "/properties/RoleArn/pattern",
-  "value": "arn:[a-z0-9-\\.]{1,63}:[a-z0-9-\\.]{0,63}:[a-z0-9-\\.]{0,63}:[a-z0-9-\\.]{0,63}:[^/].{0,1023}"
- },
- {
-  "op": "add",
-  "path": "/properties/FileFormat/enum",
-  "value": [
-   "CSV",
-   "CSV_WITH_HEADER",
-   "JSON"
-  ]
- },
- {
-  "op": "add",
-  "path": "/properties/LanguageCode/pattern",
-  "value": "[a-zA-Z-]*"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_kendra_index/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_kendra_index/boto.json
index 301734efff..7abc554124 100644
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_kendra_index/boto.json
+++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_kendra_index/boto.json
@@ -1,33 +1,12 @@
 [
  {
   "op": "add",
-  "path": "/properties/Name/pattern",
+  "path": "/definitions/Name/pattern",
   "value": "[a-zA-Z0-9][a-zA-Z0-9_-]*"
  },
  {
   "op": "add",
-  "path": "/properties/Edition/enum",
-  "value": [
-   "DEVELOPER_EDITION",
-   "ENTERPRISE_EDITION"
-  ]
- },
- {
-  "op": "add",
-  "path": "/properties/RoleArn/pattern",
-  "value": "arn:[a-z0-9-\\.]{1,63}:[a-z0-9-\\.]{0,63}:[a-z0-9-\\.]{0,63}:[a-z0-9-\\.]{0,63}:[^/].{0,1023}"
- },
- {
-  "op": "add",
-  "path": "/properties/Description/pattern",
+  "path": "/definitions/Description/pattern",
   "value": "^\\P{C}*$"
- },
- {
-  "op": "add",
-  "path": "/properties/UserContextPolicy/enum",
-  "value": [
-   "ATTRIBUTE_FILTER",
-   "USER_TOKEN"
-  ]
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_kendraranking_executionplan/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_kendraranking_executionplan/boto.json
index 39665a3c4a..7abc554124 100644
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_kendraranking_executionplan/boto.json
+++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_kendraranking_executionplan/boto.json
@@ -1,12 +1,12 @@
 [
  {
   "op": "add",
-  "path": "/properties/Name/pattern",
+  "path": "/definitions/Name/pattern",
   "value": "[a-zA-Z0-9][a-zA-Z0-9_-]*"
  },
  {
   "op": "add",
-  "path": "/properties/Description/pattern",
+  "path": "/definitions/Description/pattern",
   "value": "^\\P{C}*$"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_kinesisanalyticsv2_application/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_kinesisanalyticsv2_application/boto.json
index 3947bd3681..d8573e0f59 100644
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_kinesisanalyticsv2_application/boto.json
+++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_kinesisanalyticsv2_application/boto.json
@@ -16,10 +16,5 @@
    "ZEPPELIN-FLINK-2_0",
    "ZEPPELIN-FLINK-3_0"
   ]
- },
- {
-  "op": "add",
-  "path": "/properties/ServiceExecutionRole/pattern",
-  "value": "arn:.*"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_lakeformation_tag/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_lakeformation_tag/boto.json
index 3c11fc5bb6..fe51488c70 100644
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_lakeformation_tag/boto.json
+++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_lakeformation_tag/boto.json
@@ -1,7 +1 @@
-[
- {
-  "op": "add",
-  "path": "/properties/TagKey/pattern",
-  "value": "^([\\p{L}\\p{Z}\\p{N}_.:\\/=+\\-@%]*)$"
- }
-]
+[]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_lambda_function/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_lambda_function/boto.json
index 16334bf3a4..88a23237da 100644
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_lambda_function/boto.json
+++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_lambda_function/boto.json
@@ -47,13 +47,5 @@
    "ruby3.2",
    "ruby3.3"
   ]
- },
- {
-  "op": "add",
-  "path": "/properties/RecursiveLoop/enum",
-  "value": [
-   "Allow",
-   "Terminate"
-  ]
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_licensemanager_grant/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_licensemanager_grant/boto.json
index 574ff9cb1e..731447f0ba 100644
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_licensemanager_grant/boto.json
+++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_licensemanager_grant/boto.json
@@ -1,7 +1,7 @@
 [
  {
   "op": "add",
-  "path": "/properties/LicenseArn/pattern",
+  "path": "/definitions/Arn/pattern",
   "value": "^arn:aws(-(cn|us-gov|iso-b|iso-c|iso-d))?:[A-Za-z0-9][A-Za-z0-9_/.-]{0,62}:[A-Za-z0-9_/.-]{0,63}:[A-Za-z0-9_/.-]{0,63}:[A-Za-z0-9][A-Za-z0-9:_/+=,@.-]{0,1023}$"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_location_geofencecollection/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_location_geofencecollection/boto.json
deleted file mode 100644
index f90dfa1eb3..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_location_geofencecollection/boto.json
+++ /dev/null
@@ -1,11 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/PricingPlan/enum",
-  "value": [
-   "MobileAssetManagement",
-   "MobileAssetTracking",
-   "RequestBasedUsage"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_location_map/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_location_map/boto.json
deleted file mode 100644
index f90dfa1eb3..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_location_map/boto.json
+++ /dev/null
@@ -1,11 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/PricingPlan/enum",
-  "value": [
-   "MobileAssetManagement",
-   "MobileAssetTracking",
-   "RequestBasedUsage"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_location_placeindex/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_location_placeindex/boto.json
deleted file mode 100644
index f90dfa1eb3..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_location_placeindex/boto.json
+++ /dev/null
@@ -1,11 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/PricingPlan/enum",
-  "value": [
-   "MobileAssetManagement",
-   "MobileAssetTracking",
-   "RequestBasedUsage"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_location_routecalculator/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_location_routecalculator/boto.json
deleted file mode 100644
index f90dfa1eb3..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_location_routecalculator/boto.json
+++ /dev/null
@@ -1,11 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/PricingPlan/enum",
-  "value": [
-   "MobileAssetManagement",
-   "MobileAssetTracking",
-   "RequestBasedUsage"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_location_tracker/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_location_tracker/boto.json
deleted file mode 100644
index 7d770d5bb4..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_location_tracker/boto.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/PricingPlan/enum",
-  "value": [
-   "MobileAssetManagement",
-   "MobileAssetTracking",
-   "RequestBasedUsage"
-  ]
- },
- {
-  "op": "add",
-  "path": "/properties/PositionFiltering/enum",
-  "value": [
-   "AccuracyBased",
-   "DistanceBased",
-   "TimeBased"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_lookoutvision_project/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_lookoutvision_project/boto.json
deleted file mode 100644
index f5cf4d4a95..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_lookoutvision_project/boto.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/ProjectName/pattern",
-  "value": "[a-zA-Z0-9][a-zA-Z0-9_\\-]*"
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_m2_application/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_m2_application/boto.json
deleted file mode 100644
index f49040c958..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_m2_application/boto.json
+++ /dev/null
@@ -1,10 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/EngineType/enum",
-  "value": [
-   "bluage",
-   "microfocus"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_m2_environment/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_m2_environment/boto.json
deleted file mode 100644
index f49040c958..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_m2_environment/boto.json
+++ /dev/null
@@ -1,10 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/EngineType/enum",
-  "value": [
-   "bluage",
-   "microfocus"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_managedblockchain_accessor/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_managedblockchain_accessor/boto.json
deleted file mode 100644
index 0535bcf762..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_managedblockchain_accessor/boto.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/AccessorType/enum",
-  "value": [
-   "BILLING_TOKEN"
-  ]
- },
- {
-  "op": "add",
-  "path": "/properties/NetworkType/enum",
-  "value": [
-   "ETHEREUM_GOERLI",
-   "ETHEREUM_MAINNET",
-   "ETHEREUM_MAINNET_AND_GOERLI",
-   "POLYGON_MAINNET",
-   "POLYGON_MUMBAI"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_medialive_cloudwatchalarmtemplate/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_medialive_cloudwatchalarmtemplate/boto.json
deleted file mode 100644
index 6511cddd51..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_medialive_cloudwatchalarmtemplate/boto.json
+++ /dev/null
@@ -1,47 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/ComparisonOperator/enum",
-  "value": [
-   "GreaterThanOrEqualToThreshold",
-   "GreaterThanThreshold",
-   "LessThanOrEqualToThreshold",
-   "LessThanThreshold"
-  ]
- },
- {
-  "op": "add",
-  "path": "/properties/Statistic/enum",
-  "value": [
-   "Average",
-   "Maximum",
-   "Minimum",
-   "SampleCount",
-   "Sum"
-  ]
- },
- {
-  "op": "add",
-  "path": "/properties/TargetResourceType/enum",
-  "value": [
-   "CLOUDFRONT_DISTRIBUTION",
-   "MEDIACONNECT_FLOW",
-   "MEDIALIVE_CHANNEL",
-   "MEDIALIVE_INPUT_DEVICE",
-   "MEDIALIVE_MULTIPLEX",
-   "MEDIAPACKAGE_CHANNEL",
-   "MEDIAPACKAGE_ORIGIN_ENDPOINT",
-   "S3_BUCKET"
-  ]
- },
- {
-  "op": "add",
-  "path": "/properties/TreatMissingData/enum",
-  "value": [
-   "breaching",
-   "ignore",
-   "missing",
-   "notBreaching"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_medialive_cluster/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_medialive_cluster/boto.json
deleted file mode 100644
index a77b1ae1a3..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_medialive_cluster/boto.json
+++ /dev/null
@@ -1,9 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/ClusterType/enum",
-  "value": [
-   "ON_PREMISES"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_medialive_eventbridgeruletemplate/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_medialive_eventbridgeruletemplate/boto.json
deleted file mode 100644
index 65aee16e95..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_medialive_eventbridgeruletemplate/boto.json
+++ /dev/null
@@ -1,21 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/EventType/enum",
-  "value": [
-   "MEDIACONNECT_ALERT",
-   "MEDIACONNECT_FLOW_STATUS_CHANGE",
-   "MEDIACONNECT_OUTPUT_HEALTH",
-   "MEDIACONNECT_SOURCE_HEALTH",
-   "MEDIALIVE_CHANNEL_ALERT",
-   "MEDIALIVE_CHANNEL_INPUT_CHANGE",
-   "MEDIALIVE_CHANNEL_STATE_CHANGE",
-   "MEDIALIVE_MULTIPLEX_ALERT",
-   "MEDIALIVE_MULTIPLEX_STATE_CHANGE",
-   "MEDIAPACKAGE_HARVEST_JOB_NOTIFICATION",
-   "MEDIAPACKAGE_INPUT_NOTIFICATION",
-   "MEDIAPACKAGE_KEY_PROVIDER_NOTIFICATION",
-   "SIGNAL_MAP_ACTIVE_ALARM"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_mediapackagev2_channel/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_mediapackagev2_channel/boto.json
deleted file mode 100644
index aebdfaa7c7..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_mediapackagev2_channel/boto.json
+++ /dev/null
@@ -1,10 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/InputType/enum",
-  "value": [
-   "CMAF",
-   "HLS"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_mediapackagev2_originendpoint/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_mediapackagev2_originendpoint/boto.json
deleted file mode 100644
index e1d3319f13..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_mediapackagev2_originendpoint/boto.json
+++ /dev/null
@@ -1,10 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/ContainerType/enum",
-  "value": [
-   "CMAF",
-   "TS"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_mediatailor_channel/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_mediatailor_channel/boto.json
deleted file mode 100644
index a4301fe402..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_mediatailor_channel/boto.json
+++ /dev/null
@@ -1,18 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/PlaybackMode/enum",
-  "value": [
-   "LINEAR",
-   "LOOP"
-  ]
- },
- {
-  "op": "add",
-  "path": "/properties/Tier/enum",
-  "value": [
-   "BASIC",
-   "STANDARD"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_mwaa_environment/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_mwaa_environment/boto.json
deleted file mode 100644
index 2b51b4bd28..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_mwaa_environment/boto.json
+++ /dev/null
@@ -1,48 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/Name/pattern",
-  "value": "[a-zA-Z][0-9a-zA-Z-_]*"
- },
- {
-  "op": "add",
-  "path": "/properties/ExecutionRoleArn/pattern",
-  "value": "arn:aws(-[a-z]+)?:iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+"
- },
- {
-  "op": "add",
-  "path": "/properties/SourceBucketArn/pattern",
-  "value": "arn:aws(-[a-z]+)?:s3:::[a-z0-9.\\-]+"
- },
- {
-  "op": "add",
-  "path": "/properties/KmsKey/pattern",
-  "value": "(((arn:aws(-[a-z]+)?:kms:[a-z]{2}-[a-z]+-\\d:\\d+:)?key\\/)?[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}|(arn:aws(-[a-z]+)?:kms:[a-z]{2}-[a-z]+-\\d:\\d+:)?alias/.+)"
- },
- {
-  "op": "add",
-  "path": "/properties/AirflowVersion/pattern",
-  "value": "[0-9a-z.]+"
- },
- {
-  "op": "add",
-  "path": "/properties/WeeklyMaintenanceWindowStart/pattern",
-  "value": ".*(MON|TUE|WED|THU|FRI|SAT|SUN):([01]\\d|2[0-3]):(00|30).*"
- },
- {
-  "op": "add",
-  "path": "/properties/WebserverAccessMode/enum",
-  "value": [
-   "PRIVATE_ONLY",
-   "PUBLIC_ONLY"
-  ]
- },
- {
-  "op": "add",
-  "path": "/properties/EndpointManagement/enum",
-  "value": [
-   "CUSTOMER",
-   "SERVICE"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_networkfirewall_firewall/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_networkfirewall_firewall/boto.json
deleted file mode 100644
index dfedbaf1ff..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_networkfirewall_firewall/boto.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/FirewallPolicyArn/pattern",
-  "value": "^arn:aws.*"
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_omics_annotationstore/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_omics_annotationstore/boto.json
deleted file mode 100644
index aa0cf2e217..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_omics_annotationstore/boto.json
+++ /dev/null
@@ -1,11 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/StoreFormat/enum",
-  "value": [
-   "GFF",
-   "TSV",
-   "VCF"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_omics_workflow/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_omics_workflow/boto.json
deleted file mode 100644
index 00a47db2f1..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_omics_workflow/boto.json
+++ /dev/null
@@ -1,18 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/Engine/enum",
-  "value": [
-   "CWL",
-   "NEXTFLOW",
-   "WDL"
-  ]
- },
- {
-  "op": "add",
-  "path": "/properties/Accelerators/enum",
-  "value": [
-   "GPU"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_opensearchserverless_accesspolicy/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_opensearchserverless_accesspolicy/boto.json
deleted file mode 100644
index e17c914f21..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_opensearchserverless_accesspolicy/boto.json
+++ /dev/null
@@ -1,9 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/Type/enum",
-  "value": [
-   "data"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_opensearchserverless_collection/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_opensearchserverless_collection/boto.json
deleted file mode 100644
index 910cb7f1e0..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_opensearchserverless_collection/boto.json
+++ /dev/null
@@ -1,19 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/StandbyReplicas/enum",
-  "value": [
-   "DISABLED",
-   "ENABLED"
-  ]
- },
- {
-  "op": "add",
-  "path": "/properties/Type/enum",
-  "value": [
-   "SEARCH",
-   "TIMESERIES",
-   "VECTORSEARCH"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_opensearchserverless_lifecyclepolicy/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_opensearchserverless_lifecyclepolicy/boto.json
deleted file mode 100644
index 19ef150784..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_opensearchserverless_lifecyclepolicy/boto.json
+++ /dev/null
@@ -1,9 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/Type/enum",
-  "value": [
-   "retention"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_opensearchserverless_securityconfig/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_opensearchserverless_securityconfig/boto.json
deleted file mode 100644
index ae9d29f168..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_opensearchserverless_securityconfig/boto.json
+++ /dev/null
@@ -1,9 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/Type/enum",
-  "value": [
-   "saml"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_opensearchserverless_securitypolicy/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_opensearchserverless_securitypolicy/boto.json
deleted file mode 100644
index 71502949d3..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_opensearchserverless_securitypolicy/boto.json
+++ /dev/null
@@ -1,10 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/Type/enum",
-  "value": [
-   "encryption",
-   "network"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_panorama_applicationinstance/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_panorama_applicationinstance/boto.json
deleted file mode 100644
index c86ce2ba9b..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_panorama_applicationinstance/boto.json
+++ /dev/null
@@ -1,27 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/ApplicationInstanceIdToReplace/pattern",
-  "value": "^[a-zA-Z0-9\\-\\_]+$"
- },
- {
-  "op": "add",
-  "path": "/properties/DefaultRuntimeContextDevice/pattern",
-  "value": "^[a-zA-Z0-9\\-\\_]+$"
- },
- {
-  "op": "add",
-  "path": "/properties/Description/pattern",
-  "value": "^.*$"
- },
- {
-  "op": "add",
-  "path": "/properties/Name/pattern",
-  "value": "^[a-zA-Z0-9\\-\\_]+$"
- },
- {
-  "op": "add",
-  "path": "/properties/RuntimeRoleArn/pattern",
-  "value": "^arn:[a-z0-9][-.a-z0-9]{0,62}:iam::[0-9]{12}:role/.+$"
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_panorama_package/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_panorama_package/boto.json
deleted file mode 100644
index 24c63a8cf3..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_panorama_package/boto.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/PackageName/pattern",
-  "value": "^[a-zA-Z0-9\\-\\_]+$"
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_panorama_packageversion/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_panorama_packageversion/boto.json
deleted file mode 100644
index 5296a284e6..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_panorama_packageversion/boto.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/OwnerAccount/pattern",
-  "value": "^[0-9a-z\\_]+$"
- },
- {
-  "op": "add",
-  "path": "/properties/PackageId/pattern",
-  "value": "^[a-zA-Z0-9\\-\\_\\/]+$"
- },
- {
-  "op": "add",
-  "path": "/properties/PackageVersion/pattern",
-  "value": "^([0-9]+)\\.([0-9]+)$"
- },
- {
-  "op": "add",
-  "path": "/properties/PatchVersion/pattern",
-  "value": "^[a-z0-9]+$"
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_paymentcryptography_key/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_paymentcryptography_key/boto.json
deleted file mode 100644
index 42731dd485..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_paymentcryptography_key/boto.json
+++ /dev/null
@@ -1,10 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/KeyCheckValueAlgorithm/enum",
-  "value": [
-   "ANSI_X9_24",
-   "CMAC"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_pipes_pipe/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_pipes_pipe/boto.json
index 35151eb0e0..d3ad9368a5 100644
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_pipes_pipe/boto.json
+++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_pipes_pipe/boto.json
@@ -1,12 +1,4 @@
 [
- {
-  "op": "add",
-  "path": "/properties/DesiredState/enum",
-  "value": [
-   "RUNNING",
-   "STOPPED"
-  ]
- },
  {
   "op": "add",
   "path": "/properties/KmsKeyIdentifier/pattern",
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_proton_environmenttemplate/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_proton_environmenttemplate/boto.json
deleted file mode 100644
index 76bc3b45e0..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_proton_environmenttemplate/boto.json
+++ /dev/null
@@ -1,9 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/Provisioning/enum",
-  "value": [
-   "CUSTOMER_MANAGED"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_proton_servicetemplate/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_proton_servicetemplate/boto.json
deleted file mode 100644
index 3310fd53bf..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_proton_servicetemplate/boto.json
+++ /dev/null
@@ -1,9 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/PipelineProvisioning/enum",
-  "value": [
-   "CUSTOMER_MANAGED"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_qbusiness_application/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_qbusiness_application/boto.json
deleted file mode 100644
index e6f0a8b852..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_qbusiness_application/boto.json
+++ /dev/null
@@ -1,11 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/IdentityType/enum",
-  "value": [
-   "AWS_IAM_IDC",
-   "AWS_IAM_IDP_OIDC",
-   "AWS_IAM_IDP_SAML"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_qbusiness_index/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_qbusiness_index/boto.json
deleted file mode 100644
index d01c4693c1..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_qbusiness_index/boto.json
+++ /dev/null
@@ -1,10 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/Type/enum",
-  "value": [
-   "ENTERPRISE",
-   "STARTER"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_qbusiness_plugin/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_qbusiness_plugin/boto.json
deleted file mode 100644
index 1e42cdacfc..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_qbusiness_plugin/boto.json
+++ /dev/null
@@ -1,13 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/Type/enum",
-  "value": [
-   "CUSTOM",
-   "JIRA",
-   "SALESFORCE",
-   "SERVICE_NOW",
-   "ZENDESK"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_qbusiness_retriever/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_qbusiness_retriever/boto.json
deleted file mode 100644
index b4589ab82e..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_qbusiness_retriever/boto.json
+++ /dev/null
@@ -1,10 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/Type/enum",
-  "value": [
-   "KENDRA_INDEX",
-   "NATIVE_INDEX"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_qbusiness_webexperience/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_qbusiness_webexperience/boto.json
deleted file mode 100644
index b5335f6553..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_qbusiness_webexperience/boto.json
+++ /dev/null
@@ -1,10 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/SamplePromptsControlMode/enum",
-  "value": [
-   "DISABLED",
-   "ENABLED"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_quicksight_dataset/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_quicksight_dataset/boto.json
deleted file mode 100644
index 0005c8d903..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_quicksight_dataset/boto.json
+++ /dev/null
@@ -1,10 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/ImportMode/enum",
-  "value": [
-   "DIRECT_QUERY",
-   "SPICE"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_quicksight_datasource/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_quicksight_datasource/boto.json
deleted file mode 100644
index cd0e8045aa..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_quicksight_datasource/boto.json
+++ /dev/null
@@ -1,37 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/Type/enum",
-  "value": [
-   "ADOBE_ANALYTICS",
-   "AMAZON_ELASTICSEARCH",
-   "AMAZON_OPENSEARCH",
-   "ATHENA",
-   "AURORA",
-   "AURORA_POSTGRESQL",
-   "AWS_IOT_ANALYTICS",
-   "BIGQUERY",
-   "DATABRICKS",
-   "EXASOL",
-   "GITHUB",
-   "JIRA",
-   "MARIADB",
-   "MYSQL",
-   "ORACLE",
-   "POSTGRESQL",
-   "PRESTO",
-   "REDSHIFT",
-   "S3",
-   "SALESFORCE",
-   "SERVICENOW",
-   "SNOWFLAKE",
-   "SPARK",
-   "SQLSERVER",
-   "STARBURST",
-   "TERADATA",
-   "TIMESTREAM",
-   "TRINO",
-   "TWITTER"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_quicksight_folder/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_quicksight_folder/boto.json
deleted file mode 100644
index 1465a7a781..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_quicksight_folder/boto.json
+++ /dev/null
@@ -1,18 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/FolderType/enum",
-  "value": [
-   "RESTRICTED",
-   "SHARED"
-  ]
- },
- {
-  "op": "add",
-  "path": "/properties/SharingModel/enum",
-  "value": [
-   "ACCOUNT",
-   "NAMESPACE"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_rekognition_collection/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_rekognition_collection/boto.json
deleted file mode 100644
index 7be668f6ec..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_rekognition_collection/boto.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/CollectionId/pattern",
-  "value": "[a-zA-Z0-9_.\\-]+"
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_rekognition_project/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_rekognition_project/boto.json
deleted file mode 100644
index 2e362fa345..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_rekognition_project/boto.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/ProjectName/pattern",
-  "value": "[a-zA-Z0-9_.\\-]+"
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_robomaker_robotapplicationversion/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_robomaker_robotapplicationversion/boto.json
deleted file mode 100644
index 8e9bb0e48a..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_robomaker_robotapplicationversion/boto.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/Application/pattern",
-  "value": "arn:.*"
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_robomaker_simulationapplicationversion/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_robomaker_simulationapplicationversion/boto.json
deleted file mode 100644
index 8e9bb0e48a..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_robomaker_simulationapplicationversion/boto.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/Application/pattern",
-  "value": "arn:.*"
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_dataqualityjobdefinition/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_dataqualityjobdefinition/boto.json
deleted file mode 100644
index 1a4b239ce4..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_dataqualityjobdefinition/boto.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/JobDefinitionName/pattern",
-  "value": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}$"
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_image/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_image/boto.json
deleted file mode 100644
index 31c06fe5b6..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_image/boto.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/ImageName/pattern",
-  "value": "^[a-zA-Z0-9]([-.]?[a-zA-Z0-9]){0,62}$"
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_imageversion/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_imageversion/boto.json
deleted file mode 100644
index 9bcfc0315d..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_imageversion/boto.json
+++ /dev/null
@@ -1,44 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/ImageName/pattern",
-  "value": "^[a-zA-Z0-9]([-.]?[a-zA-Z0-9]){0,62}$"
- },
- {
-  "op": "add",
-  "path": "/properties/VendorGuidance/enum",
-  "value": [
-   "ARCHIVED",
-   "NOT_PROVIDED",
-   "STABLE",
-   "TO_BE_ARCHIVED"
-  ]
- },
- {
-  "op": "add",
-  "path": "/properties/JobType/enum",
-  "value": [
-   "INFERENCE",
-   "NOTEBOOK_KERNEL",
-   "TRAINING"
-  ]
- },
- {
-  "op": "add",
-  "path": "/properties/MLFramework/pattern",
-  "value": "^[a-zA-Z]+ ?\\d+\\.\\d+(\\.\\d+)?$"
- },
- {
-  "op": "add",
-  "path": "/properties/ProgrammingLang/pattern",
-  "value": "^[a-zA-Z]+ ?\\d+\\.\\d+(\\.\\d+)?$"
- },
- {
-  "op": "add",
-  "path": "/properties/Processor/enum",
-  "value": [
-   "CPU",
-   "GPU"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_inferencecomponent/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_inferencecomponent/boto.json
deleted file mode 100644
index d450f79939..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_inferencecomponent/boto.json
+++ /dev/null
@@ -1,17 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/InferenceComponentName/pattern",
-  "value": "^[a-zA-Z0-9]([\\-a-zA-Z0-9]*[a-zA-Z0-9])?$"
- },
- {
-  "op": "add",
-  "path": "/properties/EndpointName/pattern",
-  "value": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}"
- },
- {
-  "op": "add",
-  "path": "/properties/VariantName/pattern",
-  "value": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}"
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_inferenceexperiment/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_inferenceexperiment/boto.json
index 08dcecd48a..9edec531bb 100644
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_inferenceexperiment/boto.json
+++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_inferenceexperiment/boto.json
@@ -3,10 +3,5 @@
   "op": "add",
   "path": "/properties/Name/pattern",
   "value": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,119}"
- },
- {
-  "op": "add",
-  "path": "/properties/EndpointName/pattern",
-  "value": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_modelbiasjobdefinition/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_modelbiasjobdefinition/boto.json
deleted file mode 100644
index 1a4b239ce4..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_modelbiasjobdefinition/boto.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/JobDefinitionName/pattern",
-  "value": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}$"
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_modelexplainabilityjobdefinition/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_modelexplainabilityjobdefinition/boto.json
deleted file mode 100644
index 1a4b239ce4..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_modelexplainabilityjobdefinition/boto.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/JobDefinitionName/pattern",
-  "value": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}$"
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_modelpackage/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_modelpackage/boto.json
index 27e3a353b5..9c36ca7ad0 100644
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_modelpackage/boto.json
+++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_modelpackage/boto.json
@@ -1,49 +1,7 @@
 [
  {
   "op": "add",
-  "path": "/properties/ModelPackageName/pattern",
+  "path": "/definitions/ModelPackageName/pattern",
   "value": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}$"
- },
- {
-  "op": "add",
-  "path": "/properties/ModelPackageGroupName/pattern",
-  "value": "(arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:[a-z\\-]*\\/)?([a-zA-Z0-9]([a-zA-Z0-9-]){0,62})(?<!-)$"
- },
- {
-  "op": "add",
-  "path": "/properties/ModelPackageDescription/pattern",
-  "value": "[\\p{L}\\p{M}\\p{Z}\\p{S}\\p{N}\\p{P}]*"
- },
- {
-  "op": "add",
-  "path": "/properties/ModelApprovalStatus/enum",
-  "value": [
-   "Approved",
-   "PendingManualApproval",
-   "Rejected"
-  ]
- },
- {
-  "op": "add",
-  "path": "/properties/ClientToken/pattern",
-  "value": "^[a-zA-Z0-9-]+$"
- },
- {
-  "op": "add",
-  "path": "/properties/SamplePayloadUrl/pattern",
-  "value": "^(https|s3)://([^/]+)/?(.*)$"
- },
- {
-  "op": "add",
-  "path": "/properties/SkipModelValidation/enum",
-  "value": [
-   "All",
-   "None"
-  ]
- },
- {
-  "op": "add",
-  "path": "/properties/SourceUri/pattern",
-  "value": "[\\p{L}\\p{M}\\p{Z}\\p{N}\\p{P}]{0,1024}"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_modelpackagegroup/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_modelpackagegroup/boto.json
deleted file mode 100644
index fd06bf5b95..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_modelpackagegroup/boto.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/ModelPackageGroupName/pattern",
-  "value": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}$"
- },
- {
-  "op": "add",
-  "path": "/properties/ModelPackageGroupDescription/pattern",
-  "value": "[\\p{L}\\p{M}\\p{Z}\\p{S}\\p{N}\\p{P}]*"
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_modelqualityjobdefinition/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_modelqualityjobdefinition/boto.json
deleted file mode 100644
index 1a4b239ce4..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_modelqualityjobdefinition/boto.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/JobDefinitionName/pattern",
-  "value": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}$"
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_monitoringschedule/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_monitoringschedule/boto.json
deleted file mode 100644
index c2a7a5373a..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_monitoringschedule/boto.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/MonitoringScheduleName/pattern",
-  "value": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}$"
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_project/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_project/boto.json
deleted file mode 100644
index ae2c3aa56a..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_sagemaker_project/boto.json
+++ /dev/null
@@ -1,12 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/ProjectName/pattern",
-  "value": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,31}"
- },
- {
-  "op": "add",
-  "path": "/properties/ProjectDescription/pattern",
-  "value": "[\\p{L}\\p{M}\\p{Z}\\p{S}\\p{N}\\p{P}]*"
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_securityhub_insight/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_securityhub_insight/boto.json
index 0907020481..8c6fa32615 100644
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_securityhub_insight/boto.json
+++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_securityhub_insight/boto.json
@@ -6,7 +6,7 @@
  },
  {
   "op": "add",
-  "path": "/properties/GroupByAttribute/pattern",
+  "path": "/definitions/NonEmptyString/pattern",
   "value": ".*\\S.*"
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_signer_signingprofile/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_signer_signingprofile/boto.json
deleted file mode 100644
index 8dbbefe4b7..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_signer_signingprofile/boto.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/ProfileName/pattern",
-  "value": "^[a-zA-Z0-9_]{2,}"
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_wafv2_ipset/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_wafv2_ipset/boto.json
deleted file mode 100644
index 7e7068f912..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_wafv2_ipset/boto.json
+++ /dev/null
@@ -1,28 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/Name/pattern",
-  "value": "^[\\w\\-]+$"
- },
- {
-  "op": "add",
-  "path": "/properties/Scope/enum",
-  "value": [
-   "CLOUDFRONT",
-   "REGIONAL"
-  ]
- },
- {
-  "op": "add",
-  "path": "/properties/Description/pattern",
-  "value": "^[\\w+=:#@/\\-,\\.][\\w+=:#@/\\-,\\.\\s]+[\\w+=:#@/\\-,\\.]$"
- },
- {
-  "op": "add",
-  "path": "/properties/IPAddressVersion/enum",
-  "value": [
-   "IPV4",
-   "IPV6"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_wafv2_rulegroup/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_wafv2_rulegroup/boto.json
deleted file mode 100644
index 8249a0ec7f..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_wafv2_rulegroup/boto.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/Name/pattern",
-  "value": "^[\\w\\-]+$"
- },
- {
-  "op": "add",
-  "path": "/properties/Scope/enum",
-  "value": [
-   "CLOUDFRONT",
-   "REGIONAL"
-  ]
- },
- {
-  "op": "add",
-  "path": "/properties/Description/pattern",
-  "value": "^[\\w+=:#@/\\-,\\.][\\w+=:#@/\\-,\\.\\s]+[\\w+=:#@/\\-,\\.]$"
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_wafv2_webacl/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_wafv2_webacl/boto.json
deleted file mode 100644
index 8249a0ec7f..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_wafv2_webacl/boto.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/Name/pattern",
-  "value": "^[\\w\\-]+$"
- },
- {
-  "op": "add",
-  "path": "/properties/Scope/enum",
-  "value": [
-   "CLOUDFRONT",
-   "REGIONAL"
-  ]
- },
- {
-  "op": "add",
-  "path": "/properties/Description/pattern",
-  "value": "^[\\w+=:#@/\\-,\\.][\\w+=:#@/\\-,\\.\\s]+[\\w+=:#@/\\-,\\.]$"
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_wisdom_assistant/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_wisdom_assistant/boto.json
index 984aae009e..de4e56754f 100644
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_wisdom_assistant/boto.json
+++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_wisdom_assistant/boto.json
@@ -8,12 +8,5 @@
   "op": "add",
   "path": "/properties/Name/pattern",
   "value": "^[a-zA-Z0-9\\s_.,-]+"
- },
- {
-  "op": "add",
-  "path": "/properties/Type/enum",
-  "value": [
-   "AGENT"
-  ]
  }
 ]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_wisdom_assistantassociation/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_wisdom_assistantassociation/boto.json
deleted file mode 100644
index db60b0b2d4..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_wisdom_assistantassociation/boto.json
+++ /dev/null
@@ -1,9 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/AssociationType/enum",
-  "value": [
-   "KNOWLEDGE_BASE"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_wisdom_knowledgebase/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_wisdom_knowledgebase/boto.json
index c0aaec6fda..de4e56754f 100644
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_wisdom_knowledgebase/boto.json
+++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_wisdom_knowledgebase/boto.json
@@ -4,15 +4,6 @@
   "path": "/properties/Description/pattern",
   "value": "^[a-zA-Z0-9\\s_.,-]+"
  },
- {
-  "op": "add",
-  "path": "/properties/KnowledgeBaseType/enum",
-  "value": [
-   "CUSTOM",
-   "EXTERNAL",
-   "QUICK_RESPONSES"
-  ]
- },
  {
   "op": "add",
   "path": "/properties/Name/pattern",
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_workspacesweb_identityprovider/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_workspacesweb_identityprovider/boto.json
deleted file mode 100644
index f0af17b761..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_workspacesweb_identityprovider/boto.json
+++ /dev/null
@@ -1,14 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/IdentityProviderType/enum",
-  "value": [
-   "Facebook",
-   "Google",
-   "LoginWithAmazon",
-   "OIDC",
-   "SAML",
-   "SignInWithApple"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_workspacesweb_portal/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_workspacesweb_portal/boto.json
deleted file mode 100644
index d2c3766f68..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_workspacesweb_portal/boto.json
+++ /dev/null
@@ -1,19 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/AuthenticationType/enum",
-  "value": [
-   "IAM_Identity_Center",
-   "Standard"
-  ]
- },
- {
-  "op": "add",
-  "path": "/properties/InstanceType/enum",
-  "value": [
-   "standard.large",
-   "standard.regular",
-   "standard.xlarge"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_workspacesweb_usersettings/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_workspacesweb_usersettings/boto.json
deleted file mode 100644
index 5811c4e0b5..0000000000
--- a/src/cfnlint/data/schemas/patches/extensions/all/aws_workspacesweb_usersettings/boto.json
+++ /dev/null
@@ -1,50 +0,0 @@
-[
- {
-  "op": "add",
-  "path": "/properties/CopyAllowed/enum",
-  "value": [
-   "Disabled",
-   "Enabled"
-  ]
- },
- {
-  "op": "add",
-  "path": "/properties/DeepLinkAllowed/enum",
-  "value": [
-   "Disabled",
-   "Enabled"
-  ]
- },
- {
-  "op": "add",
-  "path": "/properties/DownloadAllowed/enum",
-  "value": [
-   "Disabled",
-   "Enabled"
-  ]
- },
- {
-  "op": "add",
-  "path": "/properties/PasteAllowed/enum",
-  "value": [
-   "Disabled",
-   "Enabled"
-  ]
- },
- {
-  "op": "add",
-  "path": "/properties/PrintAllowed/enum",
-  "value": [
-   "Disabled",
-   "Enabled"
-  ]
- },
- {
-  "op": "add",
-  "path": "/properties/UploadAllowed/enum",
-  "value": [
-   "Disabled",
-   "Enabled"
-  ]
- }
-]
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-route53resolver-resolverrule.json b/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-route53resolver-resolverrule.json
index 7b24325ca2..03475784a5 100644
--- a/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-route53resolver-resolverrule.json
+++ b/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-route53resolver-resolverrule.json
@@ -72,6 +72,7 @@
   "Name": {
    "maxLength": 64,
    "minLength": 0,
+   "pattern": "(?!^[0-9]+$)([a-zA-Z0-9\\-_' ']+)",
    "type": "string"
   },
   "ResolverEndpointId": {
diff --git a/src/cfnlint/data/schemas/providers/cn_north_1/aws-iam-instanceprofile.json b/src/cfnlint/data/schemas/providers/cn_north_1/aws-iam-instanceprofile.json
index b3c40cd7cd..2c6ad3a83d 100644
--- a/src/cfnlint/data/schemas/providers/cn_north_1/aws-iam-instanceprofile.json
+++ b/src/cfnlint/data/schemas/providers/cn_north_1/aws-iam-instanceprofile.json
@@ -12,9 +12,11 @@
    "type": "string"
   },
   "InstanceProfileName": {
+   "pattern": "[\\w+=,.@-]+",
    "type": "string"
   },
   "Path": {
+   "pattern": "(\\u002F)|(\\u002F[\\u0021-\\u007E]+\\u002F)",
    "type": "string"
   },
   "Roles": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-appstream-appblock.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-appstream-appblock.json
index 9e49a00edb..6ce3541ac2 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-appstream-appblock.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-appstream-appblock.json
@@ -14,6 +14,10 @@
    "type": "string"
   },
   "PackagingType": {
+   "enum": [
+    "APPSTREAM2",
+    "CUSTOM"
+   ],
    "type": "string"
   },
   "S3Location": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-appstream-appblockbuilder.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-appstream-appblockbuilder.json
index a87495b2de..762e33e51f 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-appstream-appblockbuilder.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-appstream-appblockbuilder.json
@@ -24,6 +24,9 @@
    "type": "string"
   },
   "PlatformType": {
+   "enum": [
+    "WINDOWS_SERVER_2019"
+   ],
    "type": "string"
   },
   "Tag": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-appstream-application.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-appstream-application.json
index eb0e46a30c..da43c9fd3b 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-appstream-application.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-appstream-application.json
@@ -10,6 +10,7 @@
    "type": "string"
   },
   "Arn": {
+   "pattern": "^arn:aws(?:\\-cn|\\-iso\\-b|\\-iso|\\-us\\-gov)?:[A-Za-z0-9][A-Za-z0-9_/.-]{0,62}:[A-Za-z0-9_/.-]{0,63}:[A-Za-z0-9_/.-]{0,63}:[A-Za-z0-9][A-Za-z0-9:_/+=,@.\\\\-]{0,1023}$",
    "type": "string"
   },
   "PlatformType": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-auditmanager-assessment.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-auditmanager-assessment.json
index 5e2a4c2b2d..91369b231f 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-auditmanager-assessment.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-auditmanager-assessment.json
@@ -51,6 +51,7 @@
    "type": "string"
   },
   "AssessmentDescription": {
+   "pattern": "^[\\w\\W\\s\\S]*$",
    "type": "string"
   },
   "AssessmentName": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-comprehend-documentclassifier.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-comprehend-documentclassifier.json
index 854a4d08e9..3456f08269 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-comprehend-documentclassifier.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-comprehend-documentclassifier.json
@@ -159,6 +159,7 @@
   "KmsKeyId": {
    "maxLength": 2048,
    "minLength": 1,
+   "pattern": "^\\p{ASCII}+$",
    "type": "string"
   },
   "S3Uri": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-networkinsightspath.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-networkinsightspath.json
index 69d48a7f01..d1288306d4 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-networkinsightspath.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-ec2-networkinsightspath.json
@@ -29,6 +29,7 @@
    "type": "object"
   },
   "IpAddress": {
+   "pattern": "^([0-9]{1,3}.){3}[0-9]{1,3}$",
    "type": "string"
   },
   "PathFilter": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-fis-experimenttemplate.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-fis-experimenttemplate.json
index 5a9e226aef..5b8405fdcb 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-fis-experimenttemplate.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-fis-experimenttemplate.json
@@ -78,6 +78,7 @@
   },
   "ExperimentTemplateDescription": {
    "maxLength": 512,
+   "pattern": "[\\s\\S]+",
    "type": "string"
   },
   "ExperimentTemplateExperimentOptions": {
@@ -278,6 +279,7 @@
   },
   "RoleArn": {
    "maxLength": 1224,
+   "pattern": "[\\S]+",
    "type": "string"
   },
   "StopConditionSource": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-fis-targetaccountconfiguration.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-fis-targetaccountconfiguration.json
index bcda9634e2..d5456a29fc 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-fis-targetaccountconfiguration.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-fis-targetaccountconfiguration.json
@@ -7,17 +7,21 @@
  "definitions": {
   "TargetAccountConfigurationDescription": {
    "maxLength": 512,
+   "pattern": "[\\s\\S]*",
    "type": "string"
   },
   "TargetAccountId": {
    "maxLength": 512,
+   "pattern": "[\\S]+",
    "type": "string"
   },
   "TargetAccountRoleArn": {
    "maxLength": 1224,
+   "pattern": "[\\S]+",
    "type": "string"
   },
   "TargetExperimentTemplateId": {
+   "pattern": "[\\S]+",
    "type": "string"
   }
  },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-healthlake-fhirdatastore.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-healthlake-fhirdatastore.json
index e08265e20c..d78146b57f 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-healthlake-fhirdatastore.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-healthlake-fhirdatastore.json
@@ -40,6 +40,7 @@
   "DatastoreName": {
    "maxLength": 256,
    "minLength": 1,
+   "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-%@]*)$",
    "type": "string"
   },
   "DatastoreStatus": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-kendra-datasource.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-kendra-datasource.json
index b42810d791..c20fac3087 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-kendra-datasource.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-kendra-datasource.json
@@ -626,6 +626,7 @@
   "Description": {
    "maxLength": 1000,
    "minLength": 1,
+   "pattern": "^\\P{C}*$",
    "type": "string"
   },
   "DisableLocalGroups": {
@@ -792,6 +793,7 @@
   "IndexId": {
    "maxLength": 36,
    "minLength": 36,
+   "pattern": "[a-zA-Z0-9][a-zA-Z0-9-]*",
    "type": "string"
   },
   "InlineConfigurations": {
@@ -839,6 +841,7 @@
   "Name": {
    "maxLength": 1000,
    "minLength": 1,
+   "pattern": "[a-zA-Z0-9][a-zA-Z0-9_-]*",
    "type": "string"
   },
   "OneDriveConfiguration": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-kendra-faq.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-kendra-faq.json
index c04deb71eb..01b70e6837 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-kendra-faq.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-kendra-faq.json
@@ -12,11 +12,13 @@
   "Description": {
    "maxLength": 1000,
    "minLength": 1,
+   "pattern": "^\\P{C}*$",
    "type": "string"
   },
   "FaqName": {
    "maxLength": 100,
    "minLength": 1,
+   "pattern": "[a-zA-Z0-9][a-zA-Z0-9_-]*",
    "type": "string"
   },
   "FileFormat": {
@@ -35,6 +37,7 @@
   "IndexId": {
    "maxLength": 36,
    "minLength": 36,
+   "pattern": "[a-zA-Z0-9][a-zA-Z0-9-]*",
    "type": "string"
   },
   "LanguageCode": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-kendra-index.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-kendra-index.json
index 8dc90de4c9..3f7ed0261a 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-kendra-index.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-kendra-index.json
@@ -32,6 +32,7 @@
   },
   "Description": {
    "maxLength": 1000,
+   "pattern": "^\\P{C}*$",
    "type": "string"
   },
   "DocumentAttributeValueType": {
@@ -174,6 +175,7 @@
   "Name": {
    "maxLength": 1000,
    "minLength": 1,
+   "pattern": "[a-zA-Z0-9][a-zA-Z0-9_-]*",
    "type": "string"
   },
   "Order": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-kendraranking-executionplan.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-kendraranking-executionplan.json
index 8c40462454..901edfc7f2 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-kendraranking-executionplan.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-kendraranking-executionplan.json
@@ -19,6 +19,7 @@
   },
   "Description": {
    "maxLength": 1000,
+   "pattern": "^\\P{C}*$",
    "type": "string"
   },
   "Id": {
@@ -29,6 +30,7 @@
   "Name": {
    "maxLength": 1000,
    "minLength": 1,
+   "pattern": "[a-zA-Z0-9][a-zA-Z0-9_-]*",
    "type": "string"
   },
   "RescoreCapacityUnits": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-licensemanager-grant.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-licensemanager-grant.json
index 6668ef884b..64998e64cf 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-licensemanager-grant.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-licensemanager-grant.json
@@ -3,6 +3,7 @@
  "definitions": {
   "Arn": {
    "maxLength": 2048,
+   "pattern": "^arn:aws(-(cn|us-gov|iso-b|iso-c|iso-d))?:[A-Za-z0-9][A-Za-z0-9_/.-]{0,62}:[A-Za-z0-9_/.-]{0,63}:[A-Za-z0-9_/.-]{0,63}:[A-Za-z0-9][A-Za-z0-9:_/+=,@.-]{0,1023}$",
    "type": "string"
   }
  },
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-modelpackage.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-modelpackage.json
index 93587f3902..cfbed3f62e 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-modelpackage.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-sagemaker-modelpackage.json
@@ -547,6 +547,7 @@
    "type": "string"
   },
   "ModelPackageName": {
+   "pattern": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}$",
    "type": "string"
   },
   "ModelPackageStatus": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-securityhub-insight.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-securityhub-insight.json
index e02a1dbc62..00e82c46e1 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-securityhub-insight.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-securityhub-insight.json
@@ -1043,6 +1043,7 @@
   },
   "NonEmptyString": {
    "minLength": 1,
+   "pattern": ".*\\S.*",
    "type": "string"
   },
   "NumberFilter": {
diff --git a/src/cfnlint/data/schemas/providers/us_west_1/aws-route53resolver-resolverrule.json b/src/cfnlint/data/schemas/providers/us_west_1/aws-route53resolver-resolverrule.json
index 7b24325ca2..03475784a5 100644
--- a/src/cfnlint/data/schemas/providers/us_west_1/aws-route53resolver-resolverrule.json
+++ b/src/cfnlint/data/schemas/providers/us_west_1/aws-route53resolver-resolverrule.json
@@ -72,6 +72,7 @@
   "Name": {
    "maxLength": 64,
    "minLength": 0,
+   "pattern": "(?!^[0-9]+$)([a-zA-Z0-9\\-_' ']+)",
    "type": "string"
   },
   "ResolverEndpointId": {