From e18c215a2b2d48ed678e58df30cc0bcb84c7f910 Mon Sep 17 00:00:00 2001
From: kddejong <36457093+kddejong@users.noreply.github.com>
Date: Tue, 28 Jan 2025 20:33:34 +0000
Subject: [PATCH] Update CloudFormation schemas to 2025-01-28

---
 ...5a0d14c62111ff864923fc7b7960dda6.meta.json |    2 +-
 ...2b6653d7edfe98a64577daae0b481c38.meta.json |    2 +-
 ...5e4752bbc10d9552de8df8f81348c42b.meta.json |    2 +-
 ...63a1bf4413531ad420ff60a5a0d7965d.meta.json |    2 +-
 ...4cfc32461d10e077e7e5de1fc25d8b8f.meta.json |    2 +-
 ...d3fe2e7838c23f6acd054944cb2b1618.meta.json |    2 +-
 ...7e9907e4a512c10ddae70b98b4dada43.meta.json |    2 +-
 ...3fbf0a0fb76625ba46dbe42abd34333c.meta.json |    2 +-
 ...376aa3fe15197e3bb0e9290ff8719b4e.meta.json |    2 +-
 ...f60a7b5acfc406ebb10d5748cbb8ed41.meta.json |    2 +-
 ...aa3b299156f53fa9d1fd8eeabec5a268.meta.json |    2 +-
 ...f35136af536e92a84ccbaf062c315066.meta.json |    2 +-
 ...04470222e5e4c690bacef5312891581d.meta.json |    2 +-
 ...646b563d773e34b020d0ddeab2fe195b.meta.json |    2 +-
 ...548d44cc32e246ec9d7742088a2c17f8.meta.json |    2 +-
 ...98ac34d4109512e0e0947ef752dcb9c9.meta.json |    2 +-
 ...7e4a4542365d35fd75466abcf306eeca.meta.json |    2 +-
 ...69b7533eabab32ecfc0a00cb19e55a5f.meta.json |    2 +-
 ...c83164555533634faab47e36a5074fe6.meta.json |    2 +-
 ...e783fe32b6bb6b13774c32fcca1d303a.meta.json |    2 +-
 ...05f2567698dfdfa979bf0ccdb68cb856.meta.json |    2 +-
 ...92030ae5c03d7451980a15735e557edb.meta.json |    2 +-
 ...6bb7f975b606f8db57532faddfcdd8c8.meta.json |    2 +-
 ...73ff097c685cda0a63c08a6416dc58ed.meta.json |    2 +-
 ...25c8d66a1f84939600616bab42579541.meta.json |    2 +-
 ...972142778e1ff452383ede2ad4bac3d7.meta.json |    2 +-
 ...26b315ef6f38515840537c02de23abe2.meta.json |    2 +-
 ...cf908a34e6b4c3fb3e97e2b584f651ca.meta.json |    2 +-
 ...318c41c71c21b0a17d4f68d82c5aee21.meta.json |    2 +-
 ...6cd7e4ced378cacdb93f76ed227b5c5d.meta.json |    2 +-
 ...b9e2e4d5e38136a5be83b6a55e7a82a1.meta.json |    2 +-
 ...41c64a9c91b2fa5b4928c0d9b2f780b0.meta.json |    2 +-
 ...b2d398fe33547eed780b9b70f10eb4a2.meta.json |    2 +-
 ...e50a1638ffe0a5dba0d8805c190a05f8.meta.json |    2 +-
 ...3b69878d351cffd417dc9a457df808af.meta.json |    2 +-
 .../all/aws_cloudfront_vpcorigin/__init__.py  |    0
 .../all/aws_cloudfront_vpcorigin/boto.json    |   11 +
 .../all/aws_datazone_datasource/boto.json     |    5 +
 .../schemas/providers/af_south_1/__init__.py  |    2 +
 .../aws-ec2-capacityreservation.json          |  250 ----
 .../providers/af_south_1/aws-fms-policy.json  |  416 ------
 .../schemas/providers/ap_east_1/__init__.py   |    2 +
 .../providers/ap_east_1/aws-fms-policy.json   |  416 ------
 .../ap_east_1/aws-resiliencehub-app.json      |  222 ---
 .../providers/ap_northeast_1/__init__.py      |    5 +
 .../aws-datazone-datasource.json              |  552 -------
 .../ap_northeast_1/aws-sagemaker-domain.json  |  905 ------------
 .../aws-sagemaker-userprofile.json            |  662 ---------
 .../providers/ap_northeast_2/__init__.py      |    2 +
 .../aws-ec2-capacityreservation.json          |  250 ----
 .../ap_northeast_2/aws-fms-policy.json        |  416 ------
 .../providers/ap_northeast_3/__init__.py      |    3 +
 .../aws-acmpca-certificateauthority.json      |  424 ------
 .../ap_northeast_3/aws-ec2-vpnconnection.json |  384 -----
 .../ap_northeast_3/aws-fms-policy.json        |  416 ------
 .../schemas/providers/ap_south_1/__init__.py  |    1 -
 .../aws-iotfleetwise-statetemplate.json       |  128 ++
 .../schemas/providers/ap_south_2/__init__.py  |    1 +
 .../providers/ap_south_2/aws-fms-policy.json  |  416 ------
 .../providers/ap_southeast_1/__init__.py      |    6 +
 .../aws-datazone-datasource.json              |  552 -------
 .../ap_southeast_1/aws-panorama-package.json  |  124 --
 .../aws-panorama-packageversion.json          |  124 --
 .../providers/ap_southeast_2/__init__.py      |    2 +-
 .../aws-datazone-datasource.json              |  552 -------
 .../aws-iotsitewise-gateway.json              |  164 +++
 .../providers/ap_southeast_3/__init__.py      |    3 +
 .../aws-cloudwatch-metricstream.json          |  228 ---
 .../aws-ec2-capacityreservation.json          |  250 ----
 .../ap_southeast_3/aws-fms-policy.json        |  416 ------
 .../providers/ap_southeast_4/__init__.py      |    3 +
 .../aws-ec2-capacityreservation.json          |  250 ----
 .../ap_southeast_4/aws-ec2-vpnconnection.json |  384 -----
 .../ap_southeast_4/aws-fms-policy.json        |  416 ------
 .../providers/ap_southeast_5/__init__.py      |    1 +
 .../aws-ec2-capacityreservation.json          |  250 ----
 .../providers/ap_southeast_7/__init__.py      |    1 +
 .../aws-ec2-capacityreservation.json          |  250 ----
 .../providers/ca_central_1/__init__.py        |    5 +
 .../ca_central_1/aws-datazone-datasource.json |  552 -------
 .../ca_central_1/aws-fms-policy.json          |  416 ------
 .../ca_central_1/aws-panorama-package.json    |  124 --
 .../aws-panorama-packageversion.json          |  124 --
 .../schemas/providers/ca_west_1/__init__.py   |    3 +
 .../aws-cloudwatch-metricstream.json          |  228 ---
 .../aws-ec2-capacityreservation.json          |  250 ----
 .../providers/ca_west_1/aws-fms-policy.json   |  416 ------
 .../providers/cn_northwest_1/__init__.py      |    1 +
 .../aws-cloudwatch-metricstream.json          |  228 ---
 .../providers/eu_central_1/__init__.py        |    5 +-
 .../eu_central_1/aws-batch-jobdefinition.json | 1268 +++++++++++++++++
 .../eu_central_1/aws-datazone-datasource.json |  552 -------
 .../eu_central_1/aws-ecs-service.json         |  646 +++++++++
 .../eu_central_1/aws-sagemaker-pipeline.json  |  137 ++
 .../providers/eu_central_2/__init__.py        |    2 +
 .../aws-bedrock-promptversion.json            |  244 ----
 .../aws-ec2-capacityreservation.json          |  250 ----
 .../schemas/providers/eu_north_1/__init__.py  |    6 +
 .../eu_north_1/aws-datazone-datasource.json   |  552 -------
 .../eu_north_1/aws-ec2-vpnconnection.json     |  384 -----
 .../providers/eu_north_1/aws-fms-policy.json  |  416 ------
 .../eu_north_1/aws-sagemaker-domain.json      |  905 ------------
 .../eu_north_1/aws-sagemaker-userprofile.json |  662 ---------
 .../aws-timestream-influxdbinstance.json      |  233 ---
 .../schemas/providers/eu_south_1/__init__.py  |    2 +
 .../aws-cloudwatch-metricstream.json          |  228 ---
 .../aws-ec2-capacityreservation.json          |  250 ----
 .../schemas/providers/eu_south_2/__init__.py  |    5 +
 .../eu_south_2/aws-ec2-clientvpnendpoint.json |  240 ----
 .../eu_south_2/aws-ec2-vpnconnection.json     |  384 -----
 .../providers/eu_south_2/aws-fms-policy.json  |  416 ------
 .../eu_south_2/aws-sagemaker-domain.json      |  905 ------------
 .../eu_south_2/aws-sagemaker-userprofile.json |  662 ---------
 .../schemas/providers/eu_west_1/__init__.py   |    2 +-
 .../eu_west_1/aws-datazone-datasource.json    |  552 -------
 .../aws-panorama-applicationinstance.json     |    8 +-
 .../schemas/providers/eu_west_2/__init__.py   |    3 +-
 .../eu_west_2/aws-ec2-vpnconnection.json      |  384 -----
 .../providers/eu_west_2/aws-fms-policy.json   |  416 ------
 .../aws-gamelift-gamesessionqueue.json        |  194 +++
 .../schemas/providers/eu_west_3/__init__.py   |    2 +
 .../eu_west_3/aws-ec2-vpnconnection.json      |  384 -----
 .../providers/eu_west_3/aws-fms-policy.json   |  416 ------
 .../providers/il_central_1/__init__.py        |    4 +
 .../aws-cloudwatch-metricstream.json          |  228 ---
 .../aws-ec2-capacityreservation.json          |  250 ----
 .../il_central_1/aws-fms-policy.json          |  416 ------
 .../aws-ses-configurationset.json             |  138 --
 .../providers/me_central_1/__init__.py        |    3 +
 .../me_central_1/aws-fms-policy.json          |  416 ------
 .../me_central_1/aws-sagemaker-domain.json    |  905 ------------
 .../aws-sagemaker-userprofile.json            |  662 ---------
 .../schemas/providers/me_south_1/__init__.py  |    3 +
 .../aws-ec2-capacityreservation.json          |  250 ----
 .../providers/me_south_1/aws-fms-policy.json  |  416 ------
 .../me_south_1/aws-resiliencehub-app.json     |  222 ---
 .../schemas/providers/sa_east_1/__init__.py   |    1 +
 .../sa_east_1/aws-datazone-datasource.json    |  552 -------
 .../schemas/providers/us_east_1/__init__.py   |    1 +
 .../aws-cloudfront-vpcorigin.json             |    5 +
 .../us_east_1/aws-datazone-datasource.json    |   19 +-
 .../aws-iotfleetwise-statetemplate.json       |    7 +
 .../aws-panorama-applicationinstance.json     |    8 +-
 .../us_east_1/aws-panorama-package.json       |    8 +-
 .../aws-panorama-packageversion.json          |    1 -
 .../schemas/providers/us_east_2/__init__.py   |    4 +-
 .../providers/us_east_2/aws-aps-scraper.json  |  199 +++
 .../us_east_2/aws-datazone-datasource.json    |  552 -------
 .../us_east_2/aws-ec2-vpnconnection.json      |  384 -----
 .../providers/us_east_2/aws-fms-policy.json   |  416 ------
 .../providers/us_gov_east_1/__init__.py       |    7 +
 .../aws-bedrock-knowledgebase.json            |  974 -------------
 .../aws-cloudwatch-metricstream.json          |  228 ---
 .../aws-ec2-capacityreservation.json          |  250 ----
 .../us_gov_east_1/aws-resiliencehub-app.json  |  222 ---
 .../us_gov_east_1/aws-sagemaker-domain.json   |  881 ------------
 .../aws-sagemaker-userprofile.json            |  638 ---------
 .../aws-ses-configurationset.json             |  138 --
 .../providers/us_gov_west_1/__init__.py       |    7 +
 .../aws-bedrock-knowledgebase.json            |  974 -------------
 .../aws-cloudwatch-metricstream.json          |  228 ---
 .../aws-ec2-capacityreservation.json          |  250 ----
 .../us_gov_west_1/aws-resiliencehub-app.json  |  222 ---
 .../us_gov_west_1/aws-sagemaker-domain.json   |  881 ------------
 .../aws-sagemaker-userprofile.json            |  638 ---------
 .../aws-ses-configurationset.json             |  138 --
 .../schemas/providers/us_west_1/__init__.py   |    3 +
 .../aws-cloudformation-typeactivation.json    |  110 --
 .../us_west_1/aws-ec2-vpnconnection.json      |  384 -----
 .../providers/us_west_1/aws-fms-policy.json   |  416 ------
 .../schemas/providers/us_west_2/__init__.py   |    7 +-
 .../us_west_2/aws-cloudfront-vpcorigin.json   |  108 --
 .../us_west_2/aws-datazone-datasource.json    |  552 -------
 .../aws-panorama-applicationinstance.json     |    8 +-
 .../us_west_2/aws-qbusiness-datasource.json   |  418 ++++++
 .../us_west_2/aws-qbusiness-index.json        |  208 +++
 .../us_west_2/aws-qbusiness-retriever.json    |  188 +++
 .../aws-qbusiness-webexperience.json          |  288 ++++
 178 files changed, 4027 insertions(+), 35406 deletions(-)
 create mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_cloudfront_vpcorigin/__init__.py
 create mode 100644 src/cfnlint/data/schemas/patches/extensions/all/aws_cloudfront_vpcorigin/boto.json
 delete mode 100644 src/cfnlint/data/schemas/providers/af_south_1/aws-ec2-capacityreservation.json
 delete mode 100644 src/cfnlint/data/schemas/providers/af_south_1/aws-fms-policy.json
 delete mode 100644 src/cfnlint/data/schemas/providers/ap_east_1/aws-fms-policy.json
 delete mode 100644 src/cfnlint/data/schemas/providers/ap_east_1/aws-resiliencehub-app.json
 delete mode 100644 src/cfnlint/data/schemas/providers/ap_northeast_1/aws-datazone-datasource.json
 delete mode 100644 src/cfnlint/data/schemas/providers/ap_northeast_1/aws-sagemaker-domain.json
 delete mode 100644 src/cfnlint/data/schemas/providers/ap_northeast_1/aws-sagemaker-userprofile.json
 delete mode 100644 src/cfnlint/data/schemas/providers/ap_northeast_2/aws-ec2-capacityreservation.json
 delete mode 100644 src/cfnlint/data/schemas/providers/ap_northeast_2/aws-fms-policy.json
 delete mode 100644 src/cfnlint/data/schemas/providers/ap_northeast_3/aws-acmpca-certificateauthority.json
 delete mode 100644 src/cfnlint/data/schemas/providers/ap_northeast_3/aws-ec2-vpnconnection.json
 delete mode 100644 src/cfnlint/data/schemas/providers/ap_northeast_3/aws-fms-policy.json
 create mode 100644 src/cfnlint/data/schemas/providers/ap_south_1/aws-iotfleetwise-statetemplate.json
 delete mode 100644 src/cfnlint/data/schemas/providers/ap_south_2/aws-fms-policy.json
 delete mode 100644 src/cfnlint/data/schemas/providers/ap_southeast_1/aws-datazone-datasource.json
 delete mode 100644 src/cfnlint/data/schemas/providers/ap_southeast_1/aws-panorama-package.json
 delete mode 100644 src/cfnlint/data/schemas/providers/ap_southeast_1/aws-panorama-packageversion.json
 delete mode 100644 src/cfnlint/data/schemas/providers/ap_southeast_2/aws-datazone-datasource.json
 create mode 100644 src/cfnlint/data/schemas/providers/ap_southeast_2/aws-iotsitewise-gateway.json
 delete mode 100644 src/cfnlint/data/schemas/providers/ap_southeast_3/aws-cloudwatch-metricstream.json
 delete mode 100644 src/cfnlint/data/schemas/providers/ap_southeast_3/aws-ec2-capacityreservation.json
 delete mode 100644 src/cfnlint/data/schemas/providers/ap_southeast_3/aws-fms-policy.json
 delete mode 100644 src/cfnlint/data/schemas/providers/ap_southeast_4/aws-ec2-capacityreservation.json
 delete mode 100644 src/cfnlint/data/schemas/providers/ap_southeast_4/aws-ec2-vpnconnection.json
 delete mode 100644 src/cfnlint/data/schemas/providers/ap_southeast_4/aws-fms-policy.json
 delete mode 100644 src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ec2-capacityreservation.json
 delete mode 100644 src/cfnlint/data/schemas/providers/ap_southeast_7/aws-ec2-capacityreservation.json
 delete mode 100644 src/cfnlint/data/schemas/providers/ca_central_1/aws-datazone-datasource.json
 delete mode 100644 src/cfnlint/data/schemas/providers/ca_central_1/aws-fms-policy.json
 delete mode 100644 src/cfnlint/data/schemas/providers/ca_central_1/aws-panorama-package.json
 delete mode 100644 src/cfnlint/data/schemas/providers/ca_central_1/aws-panorama-packageversion.json
 delete mode 100644 src/cfnlint/data/schemas/providers/ca_west_1/aws-cloudwatch-metricstream.json
 delete mode 100644 src/cfnlint/data/schemas/providers/ca_west_1/aws-ec2-capacityreservation.json
 delete mode 100644 src/cfnlint/data/schemas/providers/ca_west_1/aws-fms-policy.json
 delete mode 100644 src/cfnlint/data/schemas/providers/cn_northwest_1/aws-cloudwatch-metricstream.json
 create mode 100644 src/cfnlint/data/schemas/providers/eu_central_1/aws-batch-jobdefinition.json
 delete mode 100644 src/cfnlint/data/schemas/providers/eu_central_1/aws-datazone-datasource.json
 create mode 100644 src/cfnlint/data/schemas/providers/eu_central_1/aws-ecs-service.json
 create mode 100644 src/cfnlint/data/schemas/providers/eu_central_1/aws-sagemaker-pipeline.json
 delete mode 100644 src/cfnlint/data/schemas/providers/eu_central_2/aws-bedrock-promptversion.json
 delete mode 100644 src/cfnlint/data/schemas/providers/eu_central_2/aws-ec2-capacityreservation.json
 delete mode 100644 src/cfnlint/data/schemas/providers/eu_north_1/aws-datazone-datasource.json
 delete mode 100644 src/cfnlint/data/schemas/providers/eu_north_1/aws-ec2-vpnconnection.json
 delete mode 100644 src/cfnlint/data/schemas/providers/eu_north_1/aws-fms-policy.json
 delete mode 100644 src/cfnlint/data/schemas/providers/eu_north_1/aws-sagemaker-domain.json
 delete mode 100644 src/cfnlint/data/schemas/providers/eu_north_1/aws-sagemaker-userprofile.json
 delete mode 100644 src/cfnlint/data/schemas/providers/eu_north_1/aws-timestream-influxdbinstance.json
 delete mode 100644 src/cfnlint/data/schemas/providers/eu_south_1/aws-cloudwatch-metricstream.json
 delete mode 100644 src/cfnlint/data/schemas/providers/eu_south_1/aws-ec2-capacityreservation.json
 delete mode 100644 src/cfnlint/data/schemas/providers/eu_south_2/aws-ec2-clientvpnendpoint.json
 delete mode 100644 src/cfnlint/data/schemas/providers/eu_south_2/aws-ec2-vpnconnection.json
 delete mode 100644 src/cfnlint/data/schemas/providers/eu_south_2/aws-fms-policy.json
 delete mode 100644 src/cfnlint/data/schemas/providers/eu_south_2/aws-sagemaker-domain.json
 delete mode 100644 src/cfnlint/data/schemas/providers/eu_south_2/aws-sagemaker-userprofile.json
 delete mode 100644 src/cfnlint/data/schemas/providers/eu_west_1/aws-datazone-datasource.json
 rename src/cfnlint/data/schemas/providers/{ca_central_1 => eu_west_1}/aws-panorama-applicationinstance.json (97%)
 delete mode 100644 src/cfnlint/data/schemas/providers/eu_west_2/aws-ec2-vpnconnection.json
 delete mode 100644 src/cfnlint/data/schemas/providers/eu_west_2/aws-fms-policy.json
 create mode 100644 src/cfnlint/data/schemas/providers/eu_west_2/aws-gamelift-gamesessionqueue.json
 delete mode 100644 src/cfnlint/data/schemas/providers/eu_west_3/aws-ec2-vpnconnection.json
 delete mode 100644 src/cfnlint/data/schemas/providers/eu_west_3/aws-fms-policy.json
 delete mode 100644 src/cfnlint/data/schemas/providers/il_central_1/aws-cloudwatch-metricstream.json
 delete mode 100644 src/cfnlint/data/schemas/providers/il_central_1/aws-ec2-capacityreservation.json
 delete mode 100644 src/cfnlint/data/schemas/providers/il_central_1/aws-fms-policy.json
 delete mode 100644 src/cfnlint/data/schemas/providers/il_central_1/aws-ses-configurationset.json
 delete mode 100644 src/cfnlint/data/schemas/providers/me_central_1/aws-fms-policy.json
 delete mode 100644 src/cfnlint/data/schemas/providers/me_central_1/aws-sagemaker-domain.json
 delete mode 100644 src/cfnlint/data/schemas/providers/me_central_1/aws-sagemaker-userprofile.json
 delete mode 100644 src/cfnlint/data/schemas/providers/me_south_1/aws-ec2-capacityreservation.json
 delete mode 100644 src/cfnlint/data/schemas/providers/me_south_1/aws-fms-policy.json
 delete mode 100644 src/cfnlint/data/schemas/providers/me_south_1/aws-resiliencehub-app.json
 delete mode 100644 src/cfnlint/data/schemas/providers/sa_east_1/aws-datazone-datasource.json
 rename src/cfnlint/data/schemas/providers/{eu_central_1 => us_east_1}/aws-cloudfront-vpcorigin.json (95%)
 create mode 100644 src/cfnlint/data/schemas/providers/us_east_2/aws-aps-scraper.json
 delete mode 100644 src/cfnlint/data/schemas/providers/us_east_2/aws-datazone-datasource.json
 delete mode 100644 src/cfnlint/data/schemas/providers/us_east_2/aws-ec2-vpnconnection.json
 delete mode 100644 src/cfnlint/data/schemas/providers/us_east_2/aws-fms-policy.json
 delete mode 100644 src/cfnlint/data/schemas/providers/us_gov_east_1/aws-bedrock-knowledgebase.json
 delete mode 100644 src/cfnlint/data/schemas/providers/us_gov_east_1/aws-cloudwatch-metricstream.json
 delete mode 100644 src/cfnlint/data/schemas/providers/us_gov_east_1/aws-ec2-capacityreservation.json
 delete mode 100644 src/cfnlint/data/schemas/providers/us_gov_east_1/aws-resiliencehub-app.json
 delete mode 100644 src/cfnlint/data/schemas/providers/us_gov_east_1/aws-sagemaker-domain.json
 delete mode 100644 src/cfnlint/data/schemas/providers/us_gov_east_1/aws-sagemaker-userprofile.json
 delete mode 100644 src/cfnlint/data/schemas/providers/us_gov_east_1/aws-ses-configurationset.json
 delete mode 100644 src/cfnlint/data/schemas/providers/us_gov_west_1/aws-bedrock-knowledgebase.json
 delete mode 100644 src/cfnlint/data/schemas/providers/us_gov_west_1/aws-cloudwatch-metricstream.json
 delete mode 100644 src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ec2-capacityreservation.json
 delete mode 100644 src/cfnlint/data/schemas/providers/us_gov_west_1/aws-resiliencehub-app.json
 delete mode 100644 src/cfnlint/data/schemas/providers/us_gov_west_1/aws-sagemaker-domain.json
 delete mode 100644 src/cfnlint/data/schemas/providers/us_gov_west_1/aws-sagemaker-userprofile.json
 delete mode 100644 src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ses-configurationset.json
 delete mode 100644 src/cfnlint/data/schemas/providers/us_west_1/aws-cloudformation-typeactivation.json
 delete mode 100644 src/cfnlint/data/schemas/providers/us_west_1/aws-ec2-vpnconnection.json
 delete mode 100644 src/cfnlint/data/schemas/providers/us_west_1/aws-fms-policy.json
 delete mode 100644 src/cfnlint/data/schemas/providers/us_west_2/aws-cloudfront-vpcorigin.json
 delete mode 100644 src/cfnlint/data/schemas/providers/us_west_2/aws-datazone-datasource.json
 rename src/cfnlint/data/schemas/providers/{ap_southeast_1 => us_west_2}/aws-panorama-applicationinstance.json (97%)
 create mode 100644 src/cfnlint/data/schemas/providers/us_west_2/aws-qbusiness-datasource.json
 create mode 100644 src/cfnlint/data/schemas/providers/us_west_2/aws-qbusiness-index.json
 create mode 100644 src/cfnlint/data/schemas/providers/us_west_2/aws-qbusiness-retriever.json
 create mode 100644 src/cfnlint/data/schemas/providers/us_west_2/aws-qbusiness-webexperience.json

diff --git a/src/cfnlint/data/DownloadsMetadata/123ba181485ae293d5bd09722af0c19d5a0d14c62111ff864923fc7b7960dda6.meta.json b/src/cfnlint/data/DownloadsMetadata/123ba181485ae293d5bd09722af0c19d5a0d14c62111ff864923fc7b7960dda6.meta.json
index 564551a34a..c193358c63 100644
--- a/src/cfnlint/data/DownloadsMetadata/123ba181485ae293d5bd09722af0c19d5a0d14c62111ff864923fc7b7960dda6.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/123ba181485ae293d5bd09722af0c19d5a0d14c62111ff864923fc7b7960dda6.meta.json
@@ -1 +1 @@
-{"etag": "\"a78902d4f6318ba6a26726a7f5f37d0d\"", "url": "https://schema.cloudformation.eu-south-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"a3a9398e6ce8f669d4c17a7d07048e68\"", "url": "https://schema.cloudformation.eu-south-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/164e1bfc2823fbd49d8d0e7163ebf32b2b6653d7edfe98a64577daae0b481c38.meta.json b/src/cfnlint/data/DownloadsMetadata/164e1bfc2823fbd49d8d0e7163ebf32b2b6653d7edfe98a64577daae0b481c38.meta.json
index 8427fc99eb..9e3e72c40d 100644
--- a/src/cfnlint/data/DownloadsMetadata/164e1bfc2823fbd49d8d0e7163ebf32b2b6653d7edfe98a64577daae0b481c38.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/164e1bfc2823fbd49d8d0e7163ebf32b2b6653d7edfe98a64577daae0b481c38.meta.json
@@ -1 +1 @@
-{"etag": "\"65bfad718b9729df1bff70541d6644e0\"", "url": "https://schema.cloudformation.cn-north-1.amazonaws.com.cn/CloudformationSchema.zip"}
+{"etag": "\"321f68024851571ff393957d835967ce\"", "url": "https://schema.cloudformation.cn-north-1.amazonaws.com.cn/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/18624fcc4a1c571691d10b2508e6be565e4752bbc10d9552de8df8f81348c42b.meta.json b/src/cfnlint/data/DownloadsMetadata/18624fcc4a1c571691d10b2508e6be565e4752bbc10d9552de8df8f81348c42b.meta.json
index 0dfc12c63a..76eeb3fef4 100644
--- a/src/cfnlint/data/DownloadsMetadata/18624fcc4a1c571691d10b2508e6be565e4752bbc10d9552de8df8f81348c42b.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/18624fcc4a1c571691d10b2508e6be565e4752bbc10d9552de8df8f81348c42b.meta.json
@@ -1 +1 @@
-{"etag": "\"6ae70b5a7b8d3fea44d9d81d52ba925b\"", "url": "https://schema.cloudformation.us-gov-east-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"c1a5990051e29d25b58e96b5949d8538\"", "url": "https://schema.cloudformation.us-gov-east-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/227d6e59c86482f7153466759080e65963a1bf4413531ad420ff60a5a0d7965d.meta.json b/src/cfnlint/data/DownloadsMetadata/227d6e59c86482f7153466759080e65963a1bf4413531ad420ff60a5a0d7965d.meta.json
index 68c39ddaf3..c628801b3f 100644
--- a/src/cfnlint/data/DownloadsMetadata/227d6e59c86482f7153466759080e65963a1bf4413531ad420ff60a5a0d7965d.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/227d6e59c86482f7153466759080e65963a1bf4413531ad420ff60a5a0d7965d.meta.json
@@ -1 +1 @@
-{"etag": "\"3edfd7a328d7e5f86474f11a164c24bc\"", "url": "https://schema.cloudformation.me-south-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"1055d4d4dede761ac21100fd3cec443e\"", "url": "https://schema.cloudformation.me-south-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/23be708e675cb6098b08969e4dbbc3f54cfc32461d10e077e7e5de1fc25d8b8f.meta.json b/src/cfnlint/data/DownloadsMetadata/23be708e675cb6098b08969e4dbbc3f54cfc32461d10e077e7e5de1fc25d8b8f.meta.json
index afae00f202..b49821386a 100644
--- a/src/cfnlint/data/DownloadsMetadata/23be708e675cb6098b08969e4dbbc3f54cfc32461d10e077e7e5de1fc25d8b8f.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/23be708e675cb6098b08969e4dbbc3f54cfc32461d10e077e7e5de1fc25d8b8f.meta.json
@@ -1 +1 @@
-{"etag": "\"81ce62b182871cc89105ff272aab2bff\"", "url": "https://schema.cloudformation.us-gov-west-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"4ce139fdd6319e4e94d11f783ad5fd71\"", "url": "https://schema.cloudformation.us-gov-west-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/26cf4521b683d3267844178a6bcd1d0ad3fe2e7838c23f6acd054944cb2b1618.meta.json b/src/cfnlint/data/DownloadsMetadata/26cf4521b683d3267844178a6bcd1d0ad3fe2e7838c23f6acd054944cb2b1618.meta.json
index fd955f1713..712168727c 100644
--- a/src/cfnlint/data/DownloadsMetadata/26cf4521b683d3267844178a6bcd1d0ad3fe2e7838c23f6acd054944cb2b1618.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/26cf4521b683d3267844178a6bcd1d0ad3fe2e7838c23f6acd054944cb2b1618.meta.json
@@ -1 +1 @@
-{"etag": "\"8a2f65d0cdc5c22d74c9f97432228e93\"", "url": "https://schema.cloudformation.me-central-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"5d4bac111c8c3e3a2af52f17e8c1bf4b\"", "url": "https://schema.cloudformation.me-central-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/276cecfeb1ec5e608e2aaa06925a2da57e9907e4a512c10ddae70b98b4dada43.meta.json b/src/cfnlint/data/DownloadsMetadata/276cecfeb1ec5e608e2aaa06925a2da57e9907e4a512c10ddae70b98b4dada43.meta.json
index 1e238a8929..5a9c14da03 100644
--- a/src/cfnlint/data/DownloadsMetadata/276cecfeb1ec5e608e2aaa06925a2da57e9907e4a512c10ddae70b98b4dada43.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/276cecfeb1ec5e608e2aaa06925a2da57e9907e4a512c10ddae70b98b4dada43.meta.json
@@ -1 +1 @@
-{"etag": "\"bb943e28b8a252ec43bbf024cdb62a95\"", "url": "https://schema.cloudformation.eu-west-2.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"73a8fc5d3735a29bde371a02d798e422\"", "url": "https://schema.cloudformation.eu-west-2.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/371e40c90b2e47c99f6e275e060ee83a3fbf0a0fb76625ba46dbe42abd34333c.meta.json b/src/cfnlint/data/DownloadsMetadata/371e40c90b2e47c99f6e275e060ee83a3fbf0a0fb76625ba46dbe42abd34333c.meta.json
index 4ee79878ad..61054ef60d 100644
--- a/src/cfnlint/data/DownloadsMetadata/371e40c90b2e47c99f6e275e060ee83a3fbf0a0fb76625ba46dbe42abd34333c.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/371e40c90b2e47c99f6e275e060ee83a3fbf0a0fb76625ba46dbe42abd34333c.meta.json
@@ -1 +1 @@
-{"etag": "\"60ec4b5d1344b16826360dc7a88a65e7\"", "url": "https://schema.cloudformation.cn-northwest-1.amazonaws.com.cn/CloudformationSchema.zip"}
+{"etag": "\"0664dfcd563c561875d2809b7272c180\"", "url": "https://schema.cloudformation.cn-northwest-1.amazonaws.com.cn/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/42155835f382d82337be3d2bf832bada376aa3fe15197e3bb0e9290ff8719b4e.meta.json b/src/cfnlint/data/DownloadsMetadata/42155835f382d82337be3d2bf832bada376aa3fe15197e3bb0e9290ff8719b4e.meta.json
index 11cca7edc4..006bf03db3 100644
--- a/src/cfnlint/data/DownloadsMetadata/42155835f382d82337be3d2bf832bada376aa3fe15197e3bb0e9290ff8719b4e.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/42155835f382d82337be3d2bf832bada376aa3fe15197e3bb0e9290ff8719b4e.meta.json
@@ -1 +1 @@
-{"etag": "\"0ad59ac5c55df423d7cb3d2d81141bd3\"", "url": "https://schema.cloudformation.af-south-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"9fa186806893b7c0d00585be1d3727c4\"", "url": "https://schema.cloudformation.af-south-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/42e9df95722b6524cd001503b6750b86f60a7b5acfc406ebb10d5748cbb8ed41.meta.json b/src/cfnlint/data/DownloadsMetadata/42e9df95722b6524cd001503b6750b86f60a7b5acfc406ebb10d5748cbb8ed41.meta.json
index 57e0d6b8ca..ac0b3c35cb 100644
--- a/src/cfnlint/data/DownloadsMetadata/42e9df95722b6524cd001503b6750b86f60a7b5acfc406ebb10d5748cbb8ed41.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/42e9df95722b6524cd001503b6750b86f60a7b5acfc406ebb10d5748cbb8ed41.meta.json
@@ -1 +1 @@
-{"etag": "\"6635ec7db859be42e9521821d879a6af\"", "url": "https://schema.cloudformation.us-west-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"9eb66b023ff7014e3c7fb055b0653540\"", "url": "https://schema.cloudformation.us-west-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/49ed0265aaab90ce485c07e02ea671e5aa3b299156f53fa9d1fd8eeabec5a268.meta.json b/src/cfnlint/data/DownloadsMetadata/49ed0265aaab90ce485c07e02ea671e5aa3b299156f53fa9d1fd8eeabec5a268.meta.json
index 6534b86e19..d60d94cb0b 100644
--- a/src/cfnlint/data/DownloadsMetadata/49ed0265aaab90ce485c07e02ea671e5aa3b299156f53fa9d1fd8eeabec5a268.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/49ed0265aaab90ce485c07e02ea671e5aa3b299156f53fa9d1fd8eeabec5a268.meta.json
@@ -1 +1 @@
-{"etag": "\"00f138f2dcc83b1b0e96bab36f5fd4be\"", "url": "https://schema.cloudformation.ap-southeast-5.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"f713139ba5a8684e061854a1985b9fde\"", "url": "https://schema.cloudformation.ap-southeast-5.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/4fbb29b69678acdd32c5758ed43ead9bf35136af536e92a84ccbaf062c315066.meta.json b/src/cfnlint/data/DownloadsMetadata/4fbb29b69678acdd32c5758ed43ead9bf35136af536e92a84ccbaf062c315066.meta.json
index ce3664a77a..87b176eb26 100644
--- a/src/cfnlint/data/DownloadsMetadata/4fbb29b69678acdd32c5758ed43ead9bf35136af536e92a84ccbaf062c315066.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/4fbb29b69678acdd32c5758ed43ead9bf35136af536e92a84ccbaf062c315066.meta.json
@@ -1 +1 @@
-{"etag": "\"b890509d18613092b5dc1e89d8213397\"", "url": "https://schema.cloudformation.eu-central-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"b75b8272bdbba6cb92d5283fd7d89f70\"", "url": "https://schema.cloudformation.eu-central-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/56584c7d00e444de640bef01fc2c630804470222e5e4c690bacef5312891581d.meta.json b/src/cfnlint/data/DownloadsMetadata/56584c7d00e444de640bef01fc2c630804470222e5e4c690bacef5312891581d.meta.json
index 7e3f0a504c..0642eeb633 100644
--- a/src/cfnlint/data/DownloadsMetadata/56584c7d00e444de640bef01fc2c630804470222e5e4c690bacef5312891581d.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/56584c7d00e444de640bef01fc2c630804470222e5e4c690bacef5312891581d.meta.json
@@ -1 +1 @@
-{"etag": "\"33e7d5b70865f53dbe58580029442db5\"", "url": "https://schema.cloudformation.ap-south-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"2f2e3e96e2167d81b1b075ed9d8b8bbc\"", "url": "https://schema.cloudformation.ap-south-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/583721567eccd1d5855daa623819df1a646b563d773e34b020d0ddeab2fe195b.meta.json b/src/cfnlint/data/DownloadsMetadata/583721567eccd1d5855daa623819df1a646b563d773e34b020d0ddeab2fe195b.meta.json
index 5949703162..310f2041b1 100644
--- a/src/cfnlint/data/DownloadsMetadata/583721567eccd1d5855daa623819df1a646b563d773e34b020d0ddeab2fe195b.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/583721567eccd1d5855daa623819df1a646b563d773e34b020d0ddeab2fe195b.meta.json
@@ -1 +1 @@
-{"etag": "\"24bfee63d9179f6a3870f4f488f23826\"", "url": "https://schema.cloudformation.ap-southeast-4.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"b42688ae1987649ccd87097383da71a9\"", "url": "https://schema.cloudformation.ap-southeast-4.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/6316ae24f21cb620947aa250bebbee69548d44cc32e246ec9d7742088a2c17f8.meta.json b/src/cfnlint/data/DownloadsMetadata/6316ae24f21cb620947aa250bebbee69548d44cc32e246ec9d7742088a2c17f8.meta.json
index 19ab4265e7..a1cef0b33a 100644
--- a/src/cfnlint/data/DownloadsMetadata/6316ae24f21cb620947aa250bebbee69548d44cc32e246ec9d7742088a2c17f8.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/6316ae24f21cb620947aa250bebbee69548d44cc32e246ec9d7742088a2c17f8.meta.json
@@ -1 +1 @@
-{"etag": "\"5998264541b9324d9059c9f42cb88aea\"", "url": "https://schema.cloudformation.us-east-2.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"777a5f989b38ba03f6fd1f57d72c0979\"", "url": "https://schema.cloudformation.us-east-2.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/81e1cc73ff2daf7d1e1eca393c2d1fdd98ac34d4109512e0e0947ef752dcb9c9.meta.json b/src/cfnlint/data/DownloadsMetadata/81e1cc73ff2daf7d1e1eca393c2d1fdd98ac34d4109512e0e0947ef752dcb9c9.meta.json
index 0edef82d1c..6ad9e3d19e 100644
--- a/src/cfnlint/data/DownloadsMetadata/81e1cc73ff2daf7d1e1eca393c2d1fdd98ac34d4109512e0e0947ef752dcb9c9.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/81e1cc73ff2daf7d1e1eca393c2d1fdd98ac34d4109512e0e0947ef752dcb9c9.meta.json
@@ -1 +1 @@
-{"etag": "\"9021383ae708e6905a3ffa9575458380\"", "url": "https://schema.cloudformation.ap-southeast-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"cdc9a2225bca18c832bd09fdfb39967f\"", "url": "https://schema.cloudformation.ap-southeast-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/8adeabf0a09b37a8ed924aea799005947e4a4542365d35fd75466abcf306eeca.meta.json b/src/cfnlint/data/DownloadsMetadata/8adeabf0a09b37a8ed924aea799005947e4a4542365d35fd75466abcf306eeca.meta.json
index a77cfa41cf..b62369bdbd 100644
--- a/src/cfnlint/data/DownloadsMetadata/8adeabf0a09b37a8ed924aea799005947e4a4542365d35fd75466abcf306eeca.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/8adeabf0a09b37a8ed924aea799005947e4a4542365d35fd75466abcf306eeca.meta.json
@@ -1 +1 @@
-{"etag": "\"3616478e651473361276960d39f100a9\"", "url": "https://schema.cloudformation.ap-northeast-2.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"bc57519897d5257552a6febdd43a7d6e\"", "url": "https://schema.cloudformation.ap-northeast-2.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/8b8b0cee4df1ef0947a8289e8ec0c67869b7533eabab32ecfc0a00cb19e55a5f.meta.json b/src/cfnlint/data/DownloadsMetadata/8b8b0cee4df1ef0947a8289e8ec0c67869b7533eabab32ecfc0a00cb19e55a5f.meta.json
index 6d60ba9277..ab1a1b7ead 100644
--- a/src/cfnlint/data/DownloadsMetadata/8b8b0cee4df1ef0947a8289e8ec0c67869b7533eabab32ecfc0a00cb19e55a5f.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/8b8b0cee4df1ef0947a8289e8ec0c67869b7533eabab32ecfc0a00cb19e55a5f.meta.json
@@ -1 +1 @@
-{"etag": "\"c9a7fcad53580df257c136716fd19849\"", "url": "https://schema.cloudformation.ap-southeast-3.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"460c2aaca55ec71316e224130c460f03\"", "url": "https://schema.cloudformation.ap-southeast-3.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/938898214b52d71b96c5ccc34de3b5bdc83164555533634faab47e36a5074fe6.meta.json b/src/cfnlint/data/DownloadsMetadata/938898214b52d71b96c5ccc34de3b5bdc83164555533634faab47e36a5074fe6.meta.json
index 261a1070fe..b9ca0cf5bb 100644
--- a/src/cfnlint/data/DownloadsMetadata/938898214b52d71b96c5ccc34de3b5bdc83164555533634faab47e36a5074fe6.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/938898214b52d71b96c5ccc34de3b5bdc83164555533634faab47e36a5074fe6.meta.json
@@ -1 +1 @@
-{"etag": "\"60af42a28de5325f83e3cdd0f35d8d0f\"", "url": "https://schema.cloudformation.ap-southeast-7.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"32b678372d3b55280c29fabbf451cd0f\"", "url": "https://schema.cloudformation.ap-southeast-7.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/b1f069477cd577cde04dfe1b323c0bb0e783fe32b6bb6b13774c32fcca1d303a.meta.json b/src/cfnlint/data/DownloadsMetadata/b1f069477cd577cde04dfe1b323c0bb0e783fe32b6bb6b13774c32fcca1d303a.meta.json
index a0c1f5f776..0e3732adcd 100644
--- a/src/cfnlint/data/DownloadsMetadata/b1f069477cd577cde04dfe1b323c0bb0e783fe32b6bb6b13774c32fcca1d303a.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/b1f069477cd577cde04dfe1b323c0bb0e783fe32b6bb6b13774c32fcca1d303a.meta.json
@@ -1 +1 @@
-{"etag": "\"4e157d358f2be3bc62f3c3eae11992c4\"", "url": "https://schema.cloudformation.ap-east-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"dcf952a4de81b7189c5f374f1686e517\"", "url": "https://schema.cloudformation.ap-east-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/c7ada205073390b33b7593ef8f304b9705f2567698dfdfa979bf0ccdb68cb856.meta.json b/src/cfnlint/data/DownloadsMetadata/c7ada205073390b33b7593ef8f304b9705f2567698dfdfa979bf0ccdb68cb856.meta.json
index c17a433625..9f09e4d407 100644
--- a/src/cfnlint/data/DownloadsMetadata/c7ada205073390b33b7593ef8f304b9705f2567698dfdfa979bf0ccdb68cb856.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/c7ada205073390b33b7593ef8f304b9705f2567698dfdfa979bf0ccdb68cb856.meta.json
@@ -1 +1 @@
-{"etag": "\"59d24f03a71f1e54b61a5d7457773815\"", "url": "https://schema.cloudformation.sa-east-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"2646897f563a35ff4b60f2b1aaea42cb\"", "url": "https://schema.cloudformation.sa-east-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/d24ce9a45a014b1ff04d479422ea956e92030ae5c03d7451980a15735e557edb.meta.json b/src/cfnlint/data/DownloadsMetadata/d24ce9a45a014b1ff04d479422ea956e92030ae5c03d7451980a15735e557edb.meta.json
index cc9b422a9d..e6906682cf 100644
--- a/src/cfnlint/data/DownloadsMetadata/d24ce9a45a014b1ff04d479422ea956e92030ae5c03d7451980a15735e557edb.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/d24ce9a45a014b1ff04d479422ea956e92030ae5c03d7451980a15735e557edb.meta.json
@@ -1 +1 @@
-{"etag": "\"e4943d0977db2b30779bab1dea391fc8\"", "url": "https://schema.cloudformation.ap-southeast-2.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"219d9be297783d37a0a3d071857f5c56\"", "url": "https://schema.cloudformation.ap-southeast-2.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/d85e2e061cacfcffe4902adb1074a04e6bb7f975b606f8db57532faddfcdd8c8.meta.json b/src/cfnlint/data/DownloadsMetadata/d85e2e061cacfcffe4902adb1074a04e6bb7f975b606f8db57532faddfcdd8c8.meta.json
index 0069de1bd7..7d300f86d7 100644
--- a/src/cfnlint/data/DownloadsMetadata/d85e2e061cacfcffe4902adb1074a04e6bb7f975b606f8db57532faddfcdd8c8.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/d85e2e061cacfcffe4902adb1074a04e6bb7f975b606f8db57532faddfcdd8c8.meta.json
@@ -1 +1 @@
-{"etag": "\"d1be185d49bd439d09e4ef489e6904e4\"", "url": "https://schema.cloudformation.ca-west-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"6e0ebfdab322d131ba96bb3bd253a258\"", "url": "https://schema.cloudformation.ca-west-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/d8e41d35f4f8922b66525dea2c66d72a73ff097c685cda0a63c08a6416dc58ed.meta.json b/src/cfnlint/data/DownloadsMetadata/d8e41d35f4f8922b66525dea2c66d72a73ff097c685cda0a63c08a6416dc58ed.meta.json
index e58fb258a1..b1d14a7c9e 100644
--- a/src/cfnlint/data/DownloadsMetadata/d8e41d35f4f8922b66525dea2c66d72a73ff097c685cda0a63c08a6416dc58ed.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/d8e41d35f4f8922b66525dea2c66d72a73ff097c685cda0a63c08a6416dc58ed.meta.json
@@ -1 +1 @@
-{"etag": "\"72a65a60e630a2fb5d3e06eb72eee341\"", "url": "https://schema.cloudformation.eu-central-2.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"baa34d71144155ed76b6304ac02ffe9c\"", "url": "https://schema.cloudformation.eu-central-2.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/dd98171253ebc36f5b78e247f3132b5f25c8d66a1f84939600616bab42579541.meta.json b/src/cfnlint/data/DownloadsMetadata/dd98171253ebc36f5b78e247f3132b5f25c8d66a1f84939600616bab42579541.meta.json
index 83e5e4ae7b..9fdd71a9f3 100644
--- a/src/cfnlint/data/DownloadsMetadata/dd98171253ebc36f5b78e247f3132b5f25c8d66a1f84939600616bab42579541.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/dd98171253ebc36f5b78e247f3132b5f25c8d66a1f84939600616bab42579541.meta.json
@@ -1 +1 @@
-{"etag": "\"fc21ccf5e0d67cda647694c0088891ca\"", "url": "https://schema.cloudformation.eu-north-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"bddaaa4fe147f3df67b6ecf344676291\"", "url": "https://schema.cloudformation.eu-north-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/df4945435575c690a2651bb31e7a9b48972142778e1ff452383ede2ad4bac3d7.meta.json b/src/cfnlint/data/DownloadsMetadata/df4945435575c690a2651bb31e7a9b48972142778e1ff452383ede2ad4bac3d7.meta.json
index ea9840afaf..2646fa8e0f 100644
--- a/src/cfnlint/data/DownloadsMetadata/df4945435575c690a2651bb31e7a9b48972142778e1ff452383ede2ad4bac3d7.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/df4945435575c690a2651bb31e7a9b48972142778e1ff452383ede2ad4bac3d7.meta.json
@@ -1 +1 @@
-{"etag": "\"1f0ce22492f8353c6d1421b516777e96\"", "url": "https://schema.cloudformation.eu-south-2.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"248305a5aa8d9ad03a566b0e908e7f03\"", "url": "https://schema.cloudformation.eu-south-2.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/e5301e07e25fa2c35d2c7e1f9dcf720826b315ef6f38515840537c02de23abe2.meta.json b/src/cfnlint/data/DownloadsMetadata/e5301e07e25fa2c35d2c7e1f9dcf720826b315ef6f38515840537c02de23abe2.meta.json
index 9ab3c8c0d3..7227a3fe38 100644
--- a/src/cfnlint/data/DownloadsMetadata/e5301e07e25fa2c35d2c7e1f9dcf720826b315ef6f38515840537c02de23abe2.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/e5301e07e25fa2c35d2c7e1f9dcf720826b315ef6f38515840537c02de23abe2.meta.json
@@ -1 +1 @@
-{"etag": "\"d974dbc7161571cd8ad6b1d7049bb501\"", "url": "https://schema.cloudformation.ca-central-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"76e6f4be1f9b382d468708b74a87faaf\"", "url": "https://schema.cloudformation.ca-central-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/e8b3dacc1675b478e8c7392b51f41467cf908a34e6b4c3fb3e97e2b584f651ca.meta.json b/src/cfnlint/data/DownloadsMetadata/e8b3dacc1675b478e8c7392b51f41467cf908a34e6b4c3fb3e97e2b584f651ca.meta.json
index c2a4003b61..d7a06432a9 100644
--- a/src/cfnlint/data/DownloadsMetadata/e8b3dacc1675b478e8c7392b51f41467cf908a34e6b4c3fb3e97e2b584f651ca.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/e8b3dacc1675b478e8c7392b51f41467cf908a34e6b4c3fb3e97e2b584f651ca.meta.json
@@ -1 +1 @@
-{"etag": "\"620911ee4350a1a0ea55e34f16d1037c\"", "url": "https://schema.cloudformation.eu-west-3.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"065b4e8e1d6be63e290f3f863243e08a\"", "url": "https://schema.cloudformation.eu-west-3.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/ea0f7b8f144feb225afe73a24dfdf993318c41c71c21b0a17d4f68d82c5aee21.meta.json b/src/cfnlint/data/DownloadsMetadata/ea0f7b8f144feb225afe73a24dfdf993318c41c71c21b0a17d4f68d82c5aee21.meta.json
index 2722487cf8..5ddd42e87a 100644
--- a/src/cfnlint/data/DownloadsMetadata/ea0f7b8f144feb225afe73a24dfdf993318c41c71c21b0a17d4f68d82c5aee21.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/ea0f7b8f144feb225afe73a24dfdf993318c41c71c21b0a17d4f68d82c5aee21.meta.json
@@ -1 +1 @@
-{"etag": "\"ec73f9cb2d7865df9339a6b3b1e1a34b\"", "url": "https://schema.cloudformation.ap-northeast-3.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"d0476993846096eaec9ffc965a8b0259\"", "url": "https://schema.cloudformation.ap-northeast-3.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/f1896c9151984eec294af1eddf64260f6cd7e4ced378cacdb93f76ed227b5c5d.meta.json b/src/cfnlint/data/DownloadsMetadata/f1896c9151984eec294af1eddf64260f6cd7e4ced378cacdb93f76ed227b5c5d.meta.json
index 12574593ad..e4d08eb0e5 100644
--- a/src/cfnlint/data/DownloadsMetadata/f1896c9151984eec294af1eddf64260f6cd7e4ced378cacdb93f76ed227b5c5d.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/f1896c9151984eec294af1eddf64260f6cd7e4ced378cacdb93f76ed227b5c5d.meta.json
@@ -1 +1 @@
-{"etag": "\"cc3fda557c18e48182c17321df82c3fa\"", "url": "https://schema.cloudformation.us-west-2.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"67047cecaea9ef8bbac598e5003262f9\"", "url": "https://schema.cloudformation.us-west-2.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/f49718b210ea89ff182ae51cb7004366b9e2e4d5e38136a5be83b6a55e7a82a1.meta.json b/src/cfnlint/data/DownloadsMetadata/f49718b210ea89ff182ae51cb7004366b9e2e4d5e38136a5be83b6a55e7a82a1.meta.json
index a7940bba58..4007ff2553 100644
--- a/src/cfnlint/data/DownloadsMetadata/f49718b210ea89ff182ae51cb7004366b9e2e4d5e38136a5be83b6a55e7a82a1.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/f49718b210ea89ff182ae51cb7004366b9e2e4d5e38136a5be83b6a55e7a82a1.meta.json
@@ -1 +1 @@
-{"etag": "\"2eb4ee74a05a6ed80263545b96676444\"", "url": "https://schema.cloudformation.ap-south-2.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"2596c756d39edfe6a1694ba6858bcffb\"", "url": "https://schema.cloudformation.ap-south-2.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/f54eee6f8ad9619f41835b700369cdbb41c64a9c91b2fa5b4928c0d9b2f780b0.meta.json b/src/cfnlint/data/DownloadsMetadata/f54eee6f8ad9619f41835b700369cdbb41c64a9c91b2fa5b4928c0d9b2f780b0.meta.json
index 42be8a890e..f8dc5b6f69 100644
--- a/src/cfnlint/data/DownloadsMetadata/f54eee6f8ad9619f41835b700369cdbb41c64a9c91b2fa5b4928c0d9b2f780b0.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/f54eee6f8ad9619f41835b700369cdbb41c64a9c91b2fa5b4928c0d9b2f780b0.meta.json
@@ -1 +1 @@
-{"etag": "\"6fedf0cd53979a8bd5a1ec71e5fc2516\"", "url": "https://schema.cloudformation.us-east-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"7997d26b2dd7ce4e83de8dd936ee7aea\"", "url": "https://schema.cloudformation.us-east-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/f6f35a459759d6c132fa2fe798cefbd5b2d398fe33547eed780b9b70f10eb4a2.meta.json b/src/cfnlint/data/DownloadsMetadata/f6f35a459759d6c132fa2fe798cefbd5b2d398fe33547eed780b9b70f10eb4a2.meta.json
index 3773cd4fd7..f7b0667233 100644
--- a/src/cfnlint/data/DownloadsMetadata/f6f35a459759d6c132fa2fe798cefbd5b2d398fe33547eed780b9b70f10eb4a2.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/f6f35a459759d6c132fa2fe798cefbd5b2d398fe33547eed780b9b70f10eb4a2.meta.json
@@ -1 +1 @@
-{"etag": "\"656361e5cc5810ff981609ad6521765f\"", "url": "https://schema.cloudformation.il-central-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"11ba6e6fa375957780c3f51d27a503bb\"", "url": "https://schema.cloudformation.il-central-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/fa657351d8e89c40ba6b82c4b1f5e1b5e50a1638ffe0a5dba0d8805c190a05f8.meta.json b/src/cfnlint/data/DownloadsMetadata/fa657351d8e89c40ba6b82c4b1f5e1b5e50a1638ffe0a5dba0d8805c190a05f8.meta.json
index c196c29ca7..e8f069e262 100644
--- a/src/cfnlint/data/DownloadsMetadata/fa657351d8e89c40ba6b82c4b1f5e1b5e50a1638ffe0a5dba0d8805c190a05f8.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/fa657351d8e89c40ba6b82c4b1f5e1b5e50a1638ffe0a5dba0d8805c190a05f8.meta.json
@@ -1 +1 @@
-{"etag": "\"54bc2a52c4ae8c92fafa977d9ab3acd6\"", "url": "https://schema.cloudformation.eu-west-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"f9770984cbda5be9cd9e446c42bf41c6\"", "url": "https://schema.cloudformation.eu-west-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/DownloadsMetadata/ff02b7d808c1c00053f09aa43a50addf3b69878d351cffd417dc9a457df808af.meta.json b/src/cfnlint/data/DownloadsMetadata/ff02b7d808c1c00053f09aa43a50addf3b69878d351cffd417dc9a457df808af.meta.json
index 3b5450317b..7a2e5f48c2 100644
--- a/src/cfnlint/data/DownloadsMetadata/ff02b7d808c1c00053f09aa43a50addf3b69878d351cffd417dc9a457df808af.meta.json
+++ b/src/cfnlint/data/DownloadsMetadata/ff02b7d808c1c00053f09aa43a50addf3b69878d351cffd417dc9a457df808af.meta.json
@@ -1 +1 @@
-{"etag": "\"26b8d2d8ba26b39c90e11dd9b577a4e7\"", "url": "https://schema.cloudformation.ap-northeast-1.amazonaws.com/CloudformationSchema.zip"}
+{"etag": "\"97779b081c02cf22f3d96823284e46a6\"", "url": "https://schema.cloudformation.ap-northeast-1.amazonaws.com/CloudformationSchema.zip"}
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_cloudfront_vpcorigin/__init__.py b/src/cfnlint/data/schemas/patches/extensions/all/aws_cloudfront_vpcorigin/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/cfnlint/data/schemas/patches/extensions/all/aws_cloudfront_vpcorigin/boto.json b/src/cfnlint/data/schemas/patches/extensions/all/aws_cloudfront_vpcorigin/boto.json
new file mode 100644
index 0000000000..c3d2b183ef
--- /dev/null
+++ b/src/cfnlint/data/schemas/patches/extensions/all/aws_cloudfront_vpcorigin/boto.json
@@ -0,0 +1,11 @@
+[
+ {
+  "op": "add",
+  "path": "/definitions/VpcOriginEndpointConfig/properties/OriginProtocolPolicy/enum",
+  "value": [
+   "http-only",
+   "https-only",
+   "match-viewer"
+  ]
+ }
+]
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
index 6b96e496d4..71bf3d2f63 100644
--- 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
@@ -4,6 +4,11 @@
   "path": "/definitions/TypeRevision/pattern",
   "value": "^[a-zA-Z0-9_-]+$"
  },
+ {
+  "op": "add",
+  "path": "/properties/ConnectionIdentifier/pattern",
+  "value": "^[a-zA-Z0-9_-]{1,36}$"
+ },
  {
   "op": "add",
   "path": "/properties/EnvironmentIdentifier/pattern",
diff --git a/src/cfnlint/data/schemas/providers/af_south_1/__init__.py b/src/cfnlint/data/schemas/providers/af_south_1/__init__.py
index 4c0e58d105..fc7997c1b8 100644
--- a/src/cfnlint/data/schemas/providers/af_south_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/af_south_1/__init__.py
@@ -1141,6 +1141,7 @@
     "aws-docdb-eventsubscription.json",
     "aws-dynamodb-globaltable.json",
     "aws-dynamodb-table.json",
+    "aws-ec2-capacityreservation.json",
     "aws-ec2-capacityreservationfleet.json",
     "aws-ec2-clientvpnroute.json",
     "aws-ec2-clientvpntargetnetworkassociation.json",
@@ -1293,6 +1294,7 @@
     "aws-fis-experimenttemplate.json",
     "aws-fis-targetaccountconfiguration.json",
     "aws-fms-notificationchannel.json",
+    "aws-fms-policy.json",
     "aws-fms-resourceset.json",
     "aws-fsx-datarepositoryassociation.json",
     "aws-fsx-filesystem.json",
diff --git a/src/cfnlint/data/schemas/providers/af_south_1/aws-ec2-capacityreservation.json b/src/cfnlint/data/schemas/providers/af_south_1/aws-ec2-capacityreservation.json
deleted file mode 100644
index 5a10969ce5..0000000000
--- a/src/cfnlint/data/schemas/providers/af_south_1/aws-ec2-capacityreservation.json
+++ /dev/null
@@ -1,250 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/Tenancy",
-  "/properties/InstancePlatform",
-  "/properties/InstanceType",
-  "/properties/AvailabilityZone",
-  "/properties/TagSpecifications",
-  "/properties/OutPostArn",
-  "/properties/EphemeralStorage",
-  "/properties/EbsOptimized",
-  "/properties/PlacementGroupArn"
- ],
- "definitions": {
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "type": "string"
-    },
-    "Value": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "TagSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "ResourceType": {
-     "enum": [
-      "capacity-reservation",
-      "capacity-reservation-fleet",
-      "carrier-gateway",
-      "client-vpn-endpoint",
-      "coip-pool",
-      "customer-gateway",
-      "declarative-policies-report",
-      "dedicated-host",
-      "dhcp-options",
-      "egress-only-internet-gateway",
-      "elastic-gpu",
-      "elastic-ip",
-      "export-image-task",
-      "export-instance-task",
-      "fleet",
-      "fpga-image",
-      "host-reservation",
-      "image",
-      "import-image-task",
-      "import-snapshot-task",
-      "instance",
-      "instance-connect-endpoint",
-      "instance-event-window",
-      "internet-gateway",
-      "ipam",
-      "ipam-external-resource-verification-token",
-      "ipam-pool",
-      "ipam-resource-discovery",
-      "ipam-resource-discovery-association",
-      "ipam-scope",
-      "ipv4pool-ec2",
-      "ipv6pool-ec2",
-      "key-pair",
-      "launch-template",
-      "local-gateway",
-      "local-gateway-route-table",
-      "local-gateway-route-table-virtual-interface-group-association",
-      "local-gateway-route-table-vpc-association",
-      "local-gateway-virtual-interface",
-      "local-gateway-virtual-interface-group",
-      "natgateway",
-      "network-acl",
-      "network-insights-access-scope",
-      "network-insights-access-scope-analysis",
-      "network-insights-analysis",
-      "network-insights-path",
-      "network-interface",
-      "placement-group",
-      "prefix-list",
-      "replace-root-volume-task",
-      "reserved-instances",
-      "route-table",
-      "security-group",
-      "security-group-rule",
-      "snapshot",
-      "spot-fleet-request",
-      "spot-instances-request",
-      "subnet",
-      "subnet-cidr-reservation",
-      "traffic-mirror-filter",
-      "traffic-mirror-filter-rule",
-      "traffic-mirror-session",
-      "traffic-mirror-target",
-      "transit-gateway",
-      "transit-gateway-attachment",
-      "transit-gateway-connect-peer",
-      "transit-gateway-multicast-domain",
-      "transit-gateway-policy-table",
-      "transit-gateway-route-table",
-      "transit-gateway-route-table-announcement",
-      "verified-access-endpoint",
-      "verified-access-endpoint-target",
-      "verified-access-group",
-      "verified-access-instance",
-      "verified-access-policy",
-      "verified-access-trust-provider",
-      "volume",
-      "vpc",
-      "vpc-block-public-access-exclusion",
-      "vpc-endpoint",
-      "vpc-endpoint-connection",
-      "vpc-endpoint-connection-device-type",
-      "vpc-endpoint-service",
-      "vpc-endpoint-service-permission",
-      "vpc-flow-log",
-      "vpc-peering-connection",
-      "vpn-connection",
-      "vpn-connection-device-type",
-      "vpn-gateway"
-     ],
-     "type": "string"
-    },
-    "Tags": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Tag"
-     },
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "AvailabilityZone": {
-   "type": "string"
-  },
-  "AvailableInstanceCount": {
-   "type": "integer"
-  },
-  "EbsOptimized": {
-   "type": "boolean"
-  },
-  "EndDate": {
-   "type": "string"
-  },
-  "EndDateType": {
-   "enum": [
-    "limited",
-    "unlimited"
-   ],
-   "type": "string"
-  },
-  "EphemeralStorage": {
-   "type": "boolean"
-  },
-  "Id": {
-   "type": "string"
-  },
-  "InstanceCount": {
-   "type": "integer"
-  },
-  "InstanceMatchCriteria": {
-   "enum": [
-    "open",
-    "targeted"
-   ],
-   "type": "string"
-  },
-  "InstancePlatform": {
-   "enum": [
-    "Linux with SQL Server Enterprise",
-    "Linux with SQL Server Standard",
-    "Linux with SQL Server Web",
-    "Linux/UNIX",
-    "RHEL with HA",
-    "RHEL with HA and SQL Server Enterprise",
-    "RHEL with HA and SQL Server Standard",
-    "RHEL with SQL Server Enterprise",
-    "RHEL with SQL Server Standard",
-    "RHEL with SQL Server Web",
-    "Red Hat Enterprise Linux",
-    "SUSE Linux",
-    "Ubuntu Pro",
-    "Windows",
-    "Windows with SQL Server",
-    "Windows with SQL Server Enterprise",
-    "Windows with SQL Server Standard",
-    "Windows with SQL Server Web"
-   ],
-   "type": "string"
-  },
-  "InstanceType": {
-   "type": "string"
-  },
-  "OutPostArn": {
-   "pattern": "^arn:aws([a-z-]+)?:outposts:[a-z\\d-]+:\\d{12}:outpost/op-[a-f0-9]{17}$",
-   "type": "string"
-  },
-  "PlacementGroupArn": {
-   "pattern": "^arn:aws([a-z-]+)?:ec2:[a-z\\d-]+:\\d{12}:placement-group/^.{1,255}$",
-   "type": "string"
-  },
-  "TagSpecifications": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/TagSpecification"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "Tenancy": {
-   "enum": [
-    "dedicated",
-    "default"
-   ],
-   "type": "string"
-  },
-  "TotalInstanceCount": {
-   "type": "integer"
-  },
-  "UnusedReservationBillingOwnerId": {
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id",
-  "/properties/AvailableInstanceCount",
-  "/properties/TotalInstanceCount"
- ],
- "required": [
-  "InstanceCount",
-  "AvailabilityZone",
-  "InstancePlatform",
-  "InstanceType"
- ],
- "typeName": "AWS::EC2::CapacityReservation",
- "writeOnlyProperties": [
-  "/properties/UnusedReservationBillingOwnerId"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/af_south_1/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/af_south_1/aws-fms-policy.json
deleted file mode 100644
index 8422693828..0000000000
--- a/src/cfnlint/data/schemas/providers/af_south_1/aws-fms-policy.json
+++ /dev/null
@@ -1,416 +0,0 @@
-{
- "additionalProperties": false,
- "definitions": {
-  "AccountId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^([0-9]*)$",
-   "type": "string"
-  },
-  "Base62Id": {
-   "maxLength": 22,
-   "minLength": 22,
-   "pattern": "^[a-z0-9A-Z]{22}$",
-   "type": "string"
-  },
-  "FirewallDeploymentModel": {
-   "enum": [
-    "DISTRIBUTED",
-    "CENTRALIZED"
-   ],
-   "type": "string"
-  },
-  "IEMap": {
-   "additionalProperties": false,
-   "properties": {
-    "ACCOUNT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/AccountId"
-     },
-     "type": "array"
-    },
-    "ORGUNIT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/OrganizationalUnitId"
-     },
-     "type": "array"
-    }
-   },
-   "type": "object"
-  },
-  "ManagedServiceData": {
-   "maxLength": 30000,
-   "minLength": 1,
-   "type": "string"
-  },
-  "NetworkAclCommonPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "NetworkAclEntrySet": {
-     "$ref": "#/definitions/NetworkAclEntrySet"
-    }
-   },
-   "required": [
-    "NetworkAclEntrySet"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntry": {
-   "additionalProperties": false,
-   "properties": {
-    "CidrBlock": {
-     "pattern": "^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(\\/([0-9]|[1-2][0-9]|3[0-2]))$",
-     "type": "string"
-    },
-    "Egress": {
-     "type": "boolean"
-    },
-    "IcmpTypeCode": {
-     "additionalProperties": false,
-     "properties": {
-      "Code": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "Type": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "Code",
-      "Type"
-     ],
-     "type": "object"
-    },
-    "Ipv6CidrBlock": {
-     "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))(/(1[0-2]|[0-9]))?$",
-     "type": "string"
-    },
-    "PortRange": {
-     "additionalProperties": false,
-     "properties": {
-      "From": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "To": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "From",
-      "To"
-     ],
-     "type": "object"
-    },
-    "Protocol": {
-     "pattern": "^(tcp|udp|icmp|-1|([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))$",
-     "type": "string"
-    },
-    "RuleAction": {
-     "enum": [
-      "allow",
-      "deny"
-     ],
-     "type": "string"
-    }
-   },
-   "required": [
-    "Egress",
-    "Protocol",
-    "RuleAction"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntryList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/NetworkAclEntry"
-   },
-   "type": "array"
-  },
-  "NetworkAclEntrySet": {
-   "additionalProperties": false,
-   "anyOf": [
-    {
-     "required": [
-      "FirstEntries"
-     ]
-    },
-    {
-     "required": [
-      "LastEntries"
-     ]
-    }
-   ],
-   "properties": {
-    "FirstEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    },
-    "ForceRemediateForFirstEntries": {
-     "type": "boolean"
-    },
-    "ForceRemediateForLastEntries": {
-     "type": "boolean"
-    },
-    "LastEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    }
-   },
-   "required": [
-    "ForceRemediateForFirstEntries",
-    "ForceRemediateForLastEntries"
-   ],
-   "type": "object"
-  },
-  "NetworkFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  },
-  "OrganizationalUnitId": {
-   "maxLength": 68,
-   "minLength": 16,
-   "pattern": "^(ou-[0-9a-z]{4,32}-[a-z0-9]{8,32})$",
-   "type": "string"
-  },
-  "PolicyOption": {
-   "additionalProperties": false,
-   "oneOf": [
-    {
-     "required": [
-      "NetworkFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "ThirdPartyFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "NetworkAclCommonPolicy"
-     ]
-    }
-   ],
-   "properties": {
-    "NetworkAclCommonPolicy": {
-     "$ref": "#/definitions/NetworkAclCommonPolicy"
-    },
-    "NetworkFirewallPolicy": {
-     "$ref": "#/definitions/NetworkFirewallPolicy"
-    },
-    "ThirdPartyFirewallPolicy": {
-     "$ref": "#/definitions/ThirdPartyFirewallPolicy"
-    }
-   },
-   "type": "object"
-  },
-  "PolicyTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "PolicyType": {
-   "enum": [
-    "WAF",
-    "WAFV2",
-    "SHIELD_ADVANCED",
-    "SECURITY_GROUPS_COMMON",
-    "SECURITY_GROUPS_CONTENT_AUDIT",
-    "SECURITY_GROUPS_USAGE_AUDIT",
-    "NETWORK_FIREWALL",
-    "THIRD_PARTY_FIREWALL",
-    "DNS_FIREWALL",
-    "IMPORT_NETWORK_FIREWALL",
-    "NETWORK_ACL_COMMON"
-   ],
-   "type": "string"
-  },
-  "ResourceArn": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "ResourceTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key"
-   ],
-   "type": "object"
-  },
-  "ResourceType": {
-   "maxLength": 128,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "SecurityServicePolicyData": {
-   "additionalProperties": false,
-   "properties": {
-    "ManagedServiceData": {
-     "$ref": "#/definitions/ManagedServiceData"
-    },
-    "PolicyOption": {
-     "$ref": "#/definitions/PolicyOption"
-    },
-    "Type": {
-     "$ref": "#/definitions/PolicyType"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "ThirdPartyFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "Arn": {
-   "$ref": "#/definitions/ResourceArn"
-  },
-  "DeleteAllPolicyResources": {
-   "type": "boolean"
-  },
-  "ExcludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "ExcludeResourceTags": {
-   "type": "boolean"
-  },
-  "Id": {
-   "maxLength": 36,
-   "minLength": 36,
-   "pattern": "^[a-z0-9A-Z-]{36}$",
-   "type": "string"
-  },
-  "IncludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "PolicyDescription": {
-   "maxLength": 256,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "PolicyName": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "RemediationEnabled": {
-   "type": "boolean"
-  },
-  "ResourceSetIds": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/Base62Id"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "ResourceTags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceTag"
-   },
-   "maxItems": 8,
-   "type": "array"
-  },
-  "ResourceType": {
-   "$ref": "#/definitions/ResourceType"
-  },
-  "ResourceTypeList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceType"
-   },
-   "type": "array"
-  },
-  "ResourcesCleanUp": {
-   "type": "boolean"
-  },
-  "SecurityServicePolicyData": {
-   "$ref": "#/definitions/SecurityServicePolicyData"
-  },
-  "Tags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/PolicyTag"
-   },
-   "type": "array"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/Id"
- ],
- "required": [
-  "ExcludeResourceTags",
-  "PolicyName",
-  "RemediationEnabled",
-  "SecurityServicePolicyData"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-fms.git",
- "typeName": "AWS::FMS::Policy",
- "writeOnlyProperties": [
-  "/properties/DeleteAllPolicyResources"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_east_1/__init__.py b/src/cfnlint/data/schemas/providers/ap_east_1/__init__.py
index a54a32edac..88d89346b5 100644
--- a/src/cfnlint/data/schemas/providers/ap_east_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/ap_east_1/__init__.py
@@ -1243,6 +1243,7 @@
     "aws-fis-experimenttemplate.json",
     "aws-fis-targetaccountconfiguration.json",
     "aws-fms-notificationchannel.json",
+    "aws-fms-policy.json",
     "aws-fms-resourceset.json",
     "aws-fsx-datarepositoryassociation.json",
     "aws-fsx-filesystem.json",
@@ -1478,6 +1479,7 @@
     "aws-redshift-scheduledaction.json",
     "aws-redshiftserverless-namespace.json",
     "aws-redshiftserverless-workgroup.json",
+    "aws-resiliencehub-app.json",
     "aws-resiliencehub-resiliencypolicy.json",
     "aws-resourceexplorer2-defaultviewassociation.json",
     "aws-resourceexplorer2-index.json",
diff --git a/src/cfnlint/data/schemas/providers/ap_east_1/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/ap_east_1/aws-fms-policy.json
deleted file mode 100644
index 8422693828..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_east_1/aws-fms-policy.json
+++ /dev/null
@@ -1,416 +0,0 @@
-{
- "additionalProperties": false,
- "definitions": {
-  "AccountId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^([0-9]*)$",
-   "type": "string"
-  },
-  "Base62Id": {
-   "maxLength": 22,
-   "minLength": 22,
-   "pattern": "^[a-z0-9A-Z]{22}$",
-   "type": "string"
-  },
-  "FirewallDeploymentModel": {
-   "enum": [
-    "DISTRIBUTED",
-    "CENTRALIZED"
-   ],
-   "type": "string"
-  },
-  "IEMap": {
-   "additionalProperties": false,
-   "properties": {
-    "ACCOUNT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/AccountId"
-     },
-     "type": "array"
-    },
-    "ORGUNIT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/OrganizationalUnitId"
-     },
-     "type": "array"
-    }
-   },
-   "type": "object"
-  },
-  "ManagedServiceData": {
-   "maxLength": 30000,
-   "minLength": 1,
-   "type": "string"
-  },
-  "NetworkAclCommonPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "NetworkAclEntrySet": {
-     "$ref": "#/definitions/NetworkAclEntrySet"
-    }
-   },
-   "required": [
-    "NetworkAclEntrySet"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntry": {
-   "additionalProperties": false,
-   "properties": {
-    "CidrBlock": {
-     "pattern": "^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(\\/([0-9]|[1-2][0-9]|3[0-2]))$",
-     "type": "string"
-    },
-    "Egress": {
-     "type": "boolean"
-    },
-    "IcmpTypeCode": {
-     "additionalProperties": false,
-     "properties": {
-      "Code": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "Type": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "Code",
-      "Type"
-     ],
-     "type": "object"
-    },
-    "Ipv6CidrBlock": {
-     "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))(/(1[0-2]|[0-9]))?$",
-     "type": "string"
-    },
-    "PortRange": {
-     "additionalProperties": false,
-     "properties": {
-      "From": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "To": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "From",
-      "To"
-     ],
-     "type": "object"
-    },
-    "Protocol": {
-     "pattern": "^(tcp|udp|icmp|-1|([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))$",
-     "type": "string"
-    },
-    "RuleAction": {
-     "enum": [
-      "allow",
-      "deny"
-     ],
-     "type": "string"
-    }
-   },
-   "required": [
-    "Egress",
-    "Protocol",
-    "RuleAction"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntryList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/NetworkAclEntry"
-   },
-   "type": "array"
-  },
-  "NetworkAclEntrySet": {
-   "additionalProperties": false,
-   "anyOf": [
-    {
-     "required": [
-      "FirstEntries"
-     ]
-    },
-    {
-     "required": [
-      "LastEntries"
-     ]
-    }
-   ],
-   "properties": {
-    "FirstEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    },
-    "ForceRemediateForFirstEntries": {
-     "type": "boolean"
-    },
-    "ForceRemediateForLastEntries": {
-     "type": "boolean"
-    },
-    "LastEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    }
-   },
-   "required": [
-    "ForceRemediateForFirstEntries",
-    "ForceRemediateForLastEntries"
-   ],
-   "type": "object"
-  },
-  "NetworkFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  },
-  "OrganizationalUnitId": {
-   "maxLength": 68,
-   "minLength": 16,
-   "pattern": "^(ou-[0-9a-z]{4,32}-[a-z0-9]{8,32})$",
-   "type": "string"
-  },
-  "PolicyOption": {
-   "additionalProperties": false,
-   "oneOf": [
-    {
-     "required": [
-      "NetworkFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "ThirdPartyFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "NetworkAclCommonPolicy"
-     ]
-    }
-   ],
-   "properties": {
-    "NetworkAclCommonPolicy": {
-     "$ref": "#/definitions/NetworkAclCommonPolicy"
-    },
-    "NetworkFirewallPolicy": {
-     "$ref": "#/definitions/NetworkFirewallPolicy"
-    },
-    "ThirdPartyFirewallPolicy": {
-     "$ref": "#/definitions/ThirdPartyFirewallPolicy"
-    }
-   },
-   "type": "object"
-  },
-  "PolicyTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "PolicyType": {
-   "enum": [
-    "WAF",
-    "WAFV2",
-    "SHIELD_ADVANCED",
-    "SECURITY_GROUPS_COMMON",
-    "SECURITY_GROUPS_CONTENT_AUDIT",
-    "SECURITY_GROUPS_USAGE_AUDIT",
-    "NETWORK_FIREWALL",
-    "THIRD_PARTY_FIREWALL",
-    "DNS_FIREWALL",
-    "IMPORT_NETWORK_FIREWALL",
-    "NETWORK_ACL_COMMON"
-   ],
-   "type": "string"
-  },
-  "ResourceArn": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "ResourceTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key"
-   ],
-   "type": "object"
-  },
-  "ResourceType": {
-   "maxLength": 128,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "SecurityServicePolicyData": {
-   "additionalProperties": false,
-   "properties": {
-    "ManagedServiceData": {
-     "$ref": "#/definitions/ManagedServiceData"
-    },
-    "PolicyOption": {
-     "$ref": "#/definitions/PolicyOption"
-    },
-    "Type": {
-     "$ref": "#/definitions/PolicyType"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "ThirdPartyFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "Arn": {
-   "$ref": "#/definitions/ResourceArn"
-  },
-  "DeleteAllPolicyResources": {
-   "type": "boolean"
-  },
-  "ExcludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "ExcludeResourceTags": {
-   "type": "boolean"
-  },
-  "Id": {
-   "maxLength": 36,
-   "minLength": 36,
-   "pattern": "^[a-z0-9A-Z-]{36}$",
-   "type": "string"
-  },
-  "IncludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "PolicyDescription": {
-   "maxLength": 256,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "PolicyName": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "RemediationEnabled": {
-   "type": "boolean"
-  },
-  "ResourceSetIds": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/Base62Id"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "ResourceTags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceTag"
-   },
-   "maxItems": 8,
-   "type": "array"
-  },
-  "ResourceType": {
-   "$ref": "#/definitions/ResourceType"
-  },
-  "ResourceTypeList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceType"
-   },
-   "type": "array"
-  },
-  "ResourcesCleanUp": {
-   "type": "boolean"
-  },
-  "SecurityServicePolicyData": {
-   "$ref": "#/definitions/SecurityServicePolicyData"
-  },
-  "Tags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/PolicyTag"
-   },
-   "type": "array"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/Id"
- ],
- "required": [
-  "ExcludeResourceTags",
-  "PolicyName",
-  "RemediationEnabled",
-  "SecurityServicePolicyData"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-fms.git",
- "typeName": "AWS::FMS::Policy",
- "writeOnlyProperties": [
-  "/properties/DeleteAllPolicyResources"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_east_1/aws-resiliencehub-app.json b/src/cfnlint/data/schemas/providers/ap_east_1/aws-resiliencehub-app.json
deleted file mode 100644
index 40b055a88b..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_east_1/aws-resiliencehub-app.json
+++ /dev/null
@@ -1,222 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/Name"
- ],
- "definitions": {
-  "EventSubscription": {
-   "additionalProperties": false,
-   "properties": {
-    "EventType": {
-     "enum": [
-      "ScheduledAssessmentFailure",
-      "DriftDetected"
-     ],
-     "type": "string"
-    },
-    "Name": {
-     "maxLength": 256,
-     "type": "string"
-    },
-    "SnsTopicArn": {
-     "pattern": "^arn:(aws|aws-cn|aws-iso|aws-iso-[a-z]{1}|aws-us-gov):[A-Za-z0-9][A-Za-z0-9_/.-]{0,62}:([a-z]{2}-((iso[a-z]{0,1}-)|(gov-)){0,1}[a-z]+-[0-9]):[0-9]{12}:[A-Za-z0-9/][A-Za-z0-9:_/+.-]{0,1023}$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Name",
-    "EventType"
-   ],
-   "type": "object"
-  },
-  "IamRoleArn": {
-   "pattern": "arn:(aws|aws-cn|aws-iso|aws-iso-[a-z]{1}|aws-us-gov):iam::[0-9]{12}:role\\/(([\\u0021-\\u007E]+\\u002F){1,511})?[A-Za-z0-9+=,.@_/-]{1,64}$",
-   "type": "string"
-  },
-  "PermissionModel": {
-   "additionalProperties": false,
-   "properties": {
-    "CrossAccountRoleArns": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/IamRoleArn"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "InvokerRoleName": {
-     "pattern": "((\\u002F[\\u0021-\\u007E]+\\u002F){1,511})?[A-Za-z0-9+=,.@_/-]{1,64}",
-     "type": "string"
-    },
-    "Type": {
-     "enum": [
-      "LegacyIAMUser",
-      "RoleBased"
-     ],
-     "type": "string"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "PhysicalResourceId": {
-   "additionalProperties": false,
-   "properties": {
-    "AwsAccountId": {
-     "pattern": "^[0-9]{12}$",
-     "type": "string"
-    },
-    "AwsRegion": {
-     "pattern": "^[a-z]{2}-((iso[a-z]{0,1}-)|(gov-)){0,1}[a-z]+-[0-9]$",
-     "type": "string"
-    },
-    "Identifier": {
-     "maxLength": 255,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Type": {
-     "pattern": "Arn|Native",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Identifier",
-    "Type"
-   ],
-   "type": "object"
-  },
-  "ResourceMapping": {
-   "additionalProperties": false,
-   "properties": {
-    "EksSourceName": {
-     "type": "string"
-    },
-    "LogicalStackName": {
-     "type": "string"
-    },
-    "MappingType": {
-     "pattern": "CfnStack|Resource|Terraform|EKS",
-     "type": "string"
-    },
-    "PhysicalResourceId": {
-     "$ref": "#/definitions/PhysicalResourceId"
-    },
-    "ResourceName": {
-     "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$",
-     "type": "string"
-    },
-    "TerraformSourceName": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "MappingType",
-    "PhysicalResourceId"
-   ],
-   "type": "object"
-  },
-  "TagMap": {
-   "additionalProperties": false,
-   "patternProperties": {
-    ".{1,128}": {
-     "$ref": "#/definitions/TagValue"
-    }
-   },
-   "type": "object"
-  },
-  "TagValue": {
-   "maxLength": 256,
-   "type": "string"
-  }
- },
- "primaryIdentifier": [
-  "/properties/AppArn"
- ],
- "properties": {
-  "AppArn": {
-   "pattern": "^arn:(aws|aws-cn|aws-iso|aws-iso-[a-z]{1}|aws-us-gov):[A-Za-z0-9][A-Za-z0-9_/.-]{0,62}:([a-z]{2}-((iso[a-z]{0,1}-)|(gov-)){0,1}[a-z]+-[0-9]):[0-9]{12}:[A-Za-z0-9][A-Za-z0-9:_/+=,@.-]{0,1023}$",
-   "type": "string"
-  },
-  "AppAssessmentSchedule": {
-   "enum": [
-    "Disabled",
-    "Daily"
-   ],
-   "type": "string"
-  },
-  "AppTemplateBody": {
-   "maxLength": 409600,
-   "minLength": 0,
-   "pattern": "^[\\w\\s:,-\\.'\\/{}\\[\\]:\"]+$",
-   "type": "string"
-  },
-  "Description": {
-   "maxLength": 500,
-   "minLength": 0,
-   "type": "string"
-  },
-  "DriftStatus": {
-   "enum": [
-    "NotChecked",
-    "NotDetected",
-    "Detected"
-   ],
-   "type": "string"
-  },
-  "EventSubscriptions": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/EventSubscription"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "Name": {
-   "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$",
-   "type": "string"
-  },
-  "PermissionModel": {
-   "$ref": "#/definitions/PermissionModel"
-  },
-  "RegulatoryPolicyArn": {
-   "pattern": "^arn:(aws|aws-cn|aws-iso|aws-iso-[a-z]{1}|aws-us-gov):[A-Za-z0-9][A-Za-z0-9_/.-]{0,62}:([a-z]{2}-((iso[a-z]{0,1}-)|(gov-)){0,1}[a-z]+-[0-9]):[0-9]{12}:[A-Za-z0-9][A-Za-z0-9:_/+=,@.-]{0,1023}$",
-   "type": "string"
-  },
-  "ResiliencyPolicyArn": {
-   "pattern": "^arn:(aws|aws-cn|aws-iso|aws-iso-[a-z]{1}|aws-us-gov):[A-Za-z0-9][A-Za-z0-9_/.-]{0,62}:([a-z]{2}-((iso[a-z]{0,1}-)|(gov-)){0,1}[a-z]+-[0-9]):[0-9]{12}:[A-Za-z0-9][A-Za-z0-9:_/+=,@.-]{0,1023}$",
-   "type": "string"
-  },
-  "ResourceMappings": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/ResourceMapping"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "Tags": {
-   "$ref": "#/definitions/TagMap"
-  }
- },
- "readOnlyProperties": [
-  "/properties/AppArn",
-  "/properties/DriftStatus"
- ],
- "required": [
-  "Name",
-  "AppTemplateBody",
-  "ResourceMappings"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-resiliencehub",
- "tagging": {
-  "cloudFormationSystemTags": true,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::ResilienceHub::App"
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_1/__init__.py b/src/cfnlint/data/schemas/providers/ap_northeast_1/__init__.py
index 5675a18ff1..84890a8cdc 100644
--- a/src/cfnlint/data/schemas/providers/ap_northeast_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/ap_northeast_1/__init__.py
@@ -206,6 +206,7 @@
     "AWS::CloudFront::RealtimeLogConfig",
     "AWS::CloudFront::ResponseHeadersPolicy",
     "AWS::CloudFront::StreamingDistribution",
+    "AWS::CloudFront::VpcOrigin",
     "AWS::CloudTrail::Channel",
     "AWS::CloudTrail::Dashboard",
     "AWS::CloudTrail::EventDataStore",
@@ -1507,6 +1508,7 @@
     "aws-cloudfront-realtimelogconfig.json",
     "aws-cloudfront-responseheaderspolicy.json",
     "aws-cloudfront-streamingdistribution.json",
+    "aws-cloudfront-vpcorigin.json",
     "aws-cloudtrail-channel.json",
     "aws-cloudtrail-dashboard.json",
     "aws-cloudtrail-eventdatastore.json",
@@ -1623,6 +1625,7 @@
     "aws-datasync-locationsmb.json",
     "aws-datasync-storagesystem.json",
     "aws-datasync-task.json",
+    "aws-datazone-datasource.json",
     "aws-datazone-domain.json",
     "aws-datazone-environment.json",
     "aws-datazone-environmentactions.json",
@@ -2375,6 +2378,7 @@
     "aws-sagemaker-dataqualityjobdefinition.json",
     "aws-sagemaker-device.json",
     "aws-sagemaker-devicefleet.json",
+    "aws-sagemaker-domain.json",
     "aws-sagemaker-endpointconfig.json",
     "aws-sagemaker-featuregroup.json",
     "aws-sagemaker-image.json",
@@ -2397,6 +2401,7 @@
     "aws-sagemaker-project.json",
     "aws-sagemaker-space.json",
     "aws-sagemaker-studiolifecycleconfig.json",
+    "aws-sagemaker-userprofile.json",
     "aws-sagemaker-workteam.json",
     "aws-scheduler-schedule.json",
     "aws-scheduler-schedulegroup.json",
diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-datazone-datasource.json b/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-datazone-datasource.json
deleted file mode 100644
index 1f1745b36e..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-datazone-datasource.json
+++ /dev/null
@@ -1,552 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/ConnectionIdentifier",
-  "/properties/EnvironmentIdentifier",
-  "/properties/DomainIdentifier",
-  "/properties/ProjectIdentifier",
-  "/properties/Type"
- ],
- "definitions": {
-  "AccountId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^\\d{12}$",
-   "type": "string"
-  },
-  "DataAccessRole": {
-   "pattern": "^arn:aws[^:]*:iam::\\d{12}:(role|role/service-role)/[\\w+=,.@-]{1,128}$",
-   "type": "string"
-  },
-  "DataSourceConfigurationInput": {
-   "oneOf": [
-    {
-     "additionalProperties": false,
-     "properties": {
-      "GlueRunConfiguration": {
-       "$ref": "#/definitions/GlueRunConfigurationInput"
-      }
-     },
-     "title": "GlueRunConfiguration",
-     "type": "object"
-    },
-    {
-     "additionalProperties": false,
-     "properties": {
-      "RedshiftRunConfiguration": {
-       "$ref": "#/definitions/RedshiftRunConfigurationInput"
-      }
-     },
-     "title": "RedshiftRunConfiguration",
-     "type": "object"
-    },
-    {
-     "additionalProperties": false,
-     "properties": {
-      "SageMakerRunConfiguration": {
-       "$ref": "#/definitions/SageMakerRunConfigurationInput"
-      }
-     },
-     "title": "SageMakerRunConfiguration",
-     "type": "object"
-    }
-   ]
-  },
-  "DataSourceStatus": {
-   "enum": [
-    "CREATING",
-    "FAILED_CREATION",
-    "READY",
-    "UPDATING",
-    "FAILED_UPDATE",
-    "RUNNING",
-    "DELETING",
-    "FAILED_DELETION"
-   ],
-   "type": "string"
-  },
-  "EnableSetting": {
-   "enum": [
-    "ENABLED",
-    "DISABLED"
-   ],
-   "type": "string"
-  },
-  "FilterExpression": {
-   "additionalProperties": false,
-   "properties": {
-    "Expression": {
-     "maxLength": 2048,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Type": {
-     "$ref": "#/definitions/FilterExpressionType"
-    }
-   },
-   "required": [
-    "Expression",
-    "Type"
-   ],
-   "type": "object"
-  },
-  "FilterExpressionType": {
-   "enum": [
-    "INCLUDE",
-    "EXCLUDE"
-   ],
-   "type": "string"
-  },
-  "FormInput": {
-   "additionalProperties": false,
-   "properties": {
-    "Content": {
-     "maxLength": 75000,
-     "type": "string"
-    },
-    "FormName": {
-     "$ref": "#/definitions/FormName"
-    },
-    "TypeIdentifier": {
-     "maxLength": 385,
-     "minLength": 1,
-     "pattern": "^(?!\\.)[\\w\\.]*\\w$",
-     "type": "string"
-    },
-    "TypeRevision": {
-     "$ref": "#/definitions/TypeRevision"
-    }
-   },
-   "required": [
-    "FormName"
-   ],
-   "type": "object"
-  },
-  "FormName": {
-   "maxLength": 128,
-   "minLength": 1,
-   "pattern": "^(?![0-9_])\\w+$|^_\\w*[a-zA-Z0-9]\\w*$",
-   "type": "string"
-  },
-  "GlueRunConfigurationInput": {
-   "additionalProperties": false,
-   "properties": {
-    "AutoImportDataQualityResult": {
-     "type": "boolean"
-    },
-    "CatalogName": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "DataAccessRole": {
-     "$ref": "#/definitions/DataAccessRole"
-    },
-    "RelationalFilterConfigurations": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/RelationalFilterConfiguration"
-     },
-     "type": "array"
-    }
-   },
-   "required": [
-    "RelationalFilterConfigurations"
-   ],
-   "type": "object"
-  },
-  "RecommendationConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "EnableBusinessNameGeneration": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "RedshiftClusterStorage": {
-   "additionalProperties": false,
-   "properties": {
-    "ClusterName": {
-     "maxLength": 63,
-     "minLength": 1,
-     "pattern": "^[0-9a-z].[a-z0-9\\-]*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "ClusterName"
-   ],
-   "type": "object"
-  },
-  "RedshiftCredentialConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "SecretManagerArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws[^:]*:secretsmanager:[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]:\\d{12}:secret:.*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "SecretManagerArn"
-   ],
-   "type": "object"
-  },
-  "RedshiftRunConfigurationInput": {
-   "additionalProperties": false,
-   "properties": {
-    "DataAccessRole": {
-     "$ref": "#/definitions/DataAccessRole"
-    },
-    "RedshiftCredentialConfiguration": {
-     "$ref": "#/definitions/RedshiftCredentialConfiguration"
-    },
-    "RedshiftStorage": {
-     "$ref": "#/definitions/RedshiftStorage"
-    },
-    "RelationalFilterConfigurations": {
-     "$ref": "#/definitions/RelationalFilterConfigurations"
-    }
-   },
-   "required": [
-    "RelationalFilterConfigurations"
-   ],
-   "type": "object"
-  },
-  "RedshiftServerlessStorage": {
-   "additionalProperties": false,
-   "properties": {
-    "WorkgroupName": {
-     "maxLength": 64,
-     "minLength": 3,
-     "pattern": "^[a-z0-9-]+$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "WorkgroupName"
-   ],
-   "type": "object"
-  },
-  "RedshiftStorage": {
-   "oneOf": [
-    {
-     "additionalProperties": false,
-     "properties": {
-      "RedshiftClusterSource": {
-       "$ref": "#/definitions/RedshiftClusterStorage"
-      }
-     },
-     "required": [
-      "RedshiftClusterSource"
-     ],
-     "title": "RedshiftClusterSource",
-     "type": "object"
-    },
-    {
-     "additionalProperties": false,
-     "properties": {
-      "RedshiftServerlessSource": {
-       "$ref": "#/definitions/RedshiftServerlessStorage"
-      }
-     },
-     "required": [
-      "RedshiftServerlessSource"
-     ],
-     "title": "RedshiftServerlessSource",
-     "type": "object"
-    }
-   ]
-  },
-  "Region": {
-   "maxLength": 16,
-   "minLength": 4,
-   "pattern": "[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]",
-   "type": "string"
-  },
-  "RelationalFilterConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "DatabaseName": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "FilterExpressions": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/FilterExpression"
-     },
-     "type": "array"
-    },
-    "SchemaName": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "DatabaseName"
-   ],
-   "type": "object"
-  },
-  "RelationalFilterConfigurations": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/RelationalFilterConfiguration"
-   },
-   "type": "array"
-  },
-  "SageMakerRunConfigurationInput": {
-   "additionalProperties": false,
-   "properties": {
-    "TrackingAssets": {
-     "$ref": "#/definitions/TrackingAssets"
-    }
-   },
-   "required": [
-    "TrackingAssets"
-   ],
-   "type": "object"
-  },
-  "ScheduleConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "Schedule": {
-     "maxLength": 256,
-     "minLength": 1,
-     "pattern": "cron\\((\\b[0-5]?[0-9]\\b) (\\b2[0-3]\\b|\\b[0-1]?[0-9]\\b) (.*){1,5} (.*){1,5} (.*){1,5} (.*){1,5}\\)",
-     "type": "string"
-    },
-    "Timezone": {
-     "$ref": "#/definitions/Timezone"
-    }
-   },
-   "type": "object"
-  },
-  "Timezone": {
-   "enum": [
-    "AFRICA_JOHANNESBURG",
-    "AMERICA_MONTREAL",
-    "AMERICA_SAO_PAULO",
-    "ASIA_BAHRAIN",
-    "ASIA_BANGKOK",
-    "ASIA_CALCUTTA",
-    "ASIA_DUBAI",
-    "ASIA_HONG_KONG",
-    "ASIA_JAKARTA",
-    "ASIA_KUALA_LUMPUR",
-    "ASIA_SEOUL",
-    "ASIA_SHANGHAI",
-    "ASIA_SINGAPORE",
-    "ASIA_TAIPEI",
-    "ASIA_TOKYO",
-    "AUSTRALIA_MELBOURNE",
-    "AUSTRALIA_SYDNEY",
-    "CANADA_CENTRAL",
-    "CET",
-    "CST6CDT",
-    "ETC_GMT",
-    "ETC_GMT0",
-    "ETC_GMT_ADD_0",
-    "ETC_GMT_ADD_1",
-    "ETC_GMT_ADD_10",
-    "ETC_GMT_ADD_11",
-    "ETC_GMT_ADD_12",
-    "ETC_GMT_ADD_2",
-    "ETC_GMT_ADD_3",
-    "ETC_GMT_ADD_4",
-    "ETC_GMT_ADD_5",
-    "ETC_GMT_ADD_6",
-    "ETC_GMT_ADD_7",
-    "ETC_GMT_ADD_8",
-    "ETC_GMT_ADD_9",
-    "ETC_GMT_NEG_0",
-    "ETC_GMT_NEG_1",
-    "ETC_GMT_NEG_10",
-    "ETC_GMT_NEG_11",
-    "ETC_GMT_NEG_12",
-    "ETC_GMT_NEG_13",
-    "ETC_GMT_NEG_14",
-    "ETC_GMT_NEG_2",
-    "ETC_GMT_NEG_3",
-    "ETC_GMT_NEG_4",
-    "ETC_GMT_NEG_5",
-    "ETC_GMT_NEG_6",
-    "ETC_GMT_NEG_7",
-    "ETC_GMT_NEG_8",
-    "ETC_GMT_NEG_9",
-    "EUROPE_DUBLIN",
-    "EUROPE_LONDON",
-    "EUROPE_PARIS",
-    "EUROPE_STOCKHOLM",
-    "EUROPE_ZURICH",
-    "ISRAEL",
-    "MEXICO_GENERAL",
-    "MST7MDT",
-    "PACIFIC_AUCKLAND",
-    "US_CENTRAL",
-    "US_EASTERN",
-    "US_MOUNTAIN",
-    "US_PACIFIC",
-    "UTC"
-   ],
-   "type": "string"
-  },
-  "TrackingAssets": {
-   "additionalProperties": false,
-   "maxProperties": 1,
-   "patternProperties": {
-    "^.{1,64}$": {
-     "items": {
-      "pattern": "^arn:aws[^:]*:sagemaker:[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]:\\d{12}:[\\w+=,.@-]{1,128}/[\\w+=,.@-]{1,256}$",
-      "type": "string"
-     },
-     "maxItems": 500,
-     "minItems": 0,
-     "type": "array"
-    }
-   },
-   "type": "object"
-  },
-  "TypeRevision": {
-   "maxLength": 64,
-   "minLength": 1,
-   "pattern": "^[a-zA-Z0-9_-]+$",
-   "type": "string"
-  }
- },
- "primaryIdentifier": [
-  "/properties/DomainId",
-  "/properties/Id"
- ],
- "properties": {
-  "AssetFormsInput": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/FormInput"
-   },
-   "maxItems": 10,
-   "minItems": 0,
-   "type": "array"
-  },
-  "Configuration": {
-   "$ref": "#/definitions/DataSourceConfigurationInput"
-  },
-  "ConnectionId": {
-   "type": "string"
-  },
-  "ConnectionIdentifier": {
-   "type": "string"
-  },
-  "CreatedAt": {
-   "format": "date-time",
-   "type": "string"
-  },
-  "Description": {
-   "maxLength": 2048,
-   "type": "string"
-  },
-  "DomainId": {
-   "pattern": "^dzd[-_][a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "DomainIdentifier": {
-   "pattern": "^dzd[-_][a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "EnableSetting": {
-   "$ref": "#/definitions/EnableSetting"
-  },
-  "EnvironmentId": {
-   "type": "string"
-  },
-  "EnvironmentIdentifier": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "Id": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "LastRunAssetCount": {
-   "type": "number"
-  },
-  "LastRunAt": {
-   "type": "string"
-  },
-  "LastRunStatus": {
-   "type": "string"
-  },
-  "Name": {
-   "maxLength": 256,
-   "minLength": 1,
-   "type": "string"
-  },
-  "ProjectId": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "ProjectIdentifier": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "PublishOnImport": {
-   "type": "boolean"
-  },
-  "Recommendation": {
-   "$ref": "#/definitions/RecommendationConfiguration"
-  },
-  "Schedule": {
-   "$ref": "#/definitions/ScheduleConfiguration"
-  },
-  "Status": {
-   "$ref": "#/definitions/DataSourceStatus"
-  },
-  "Type": {
-   "maxLength": 256,
-   "minLength": 1,
-   "type": "string"
-  },
-  "UpdatedAt": {
-   "format": "date-time",
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/ConnectionId",
-  "/properties/CreatedAt",
-  "/properties/DomainId",
-  "/properties/EnvironmentId",
-  "/properties/Id",
-  "/properties/LastRunAssetCount",
-  "/properties/LastRunAt",
-  "/properties/LastRunStatus",
-  "/properties/ProjectId",
-  "/properties/Status",
-  "/properties/UpdatedAt"
- ],
- "required": [
-  "Name",
-  "DomainIdentifier",
-  "ProjectIdentifier",
-  "Type"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-datazone",
- "tagging": {
-  "cloudFormationSystemTags": false,
-  "tagOnCreate": false,
-  "tagUpdatable": false,
-  "taggable": false
- },
- "typeName": "AWS::DataZone::DataSource",
- "writeOnlyProperties": [
-  "/properties/AssetFormsInput",
-  "/properties/ConnectionIdentifier",
-  "/properties/EnvironmentIdentifier",
-  "/properties/DomainIdentifier",
-  "/properties/Configuration",
-  "/properties/ProjectIdentifier"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-sagemaker-domain.json b/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-sagemaker-domain.json
deleted file mode 100644
index 69e42e460e..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-sagemaker-domain.json
+++ /dev/null
@@ -1,905 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/AuthMode",
-  "/properties/DomainName",
-  "/properties/DomainSettings/RStudioServerProDomainSettings/DefaultResourceSpec",
-  "/properties/KmsKeyId",
-  "/properties/VpcId",
-  "/properties/Tags"
- ],
- "definitions": {
-  "AppLifecycleManagement": {
-   "additionalProperties": false,
-   "properties": {
-    "IdleSettings": {
-     "$ref": "#/definitions/IdleSettings"
-    }
-   },
-   "type": "object"
-  },
-  "AppType": {
-   "enum": [
-    "JupyterServer",
-    "TensorBoard",
-    "RStudioServerPro",
-    "JupyterLab",
-    "CodeEditor",
-    "DetailedProfiler",
-    "Canvas"
-   ],
-   "type": "string"
-  },
-  "CodeEditorAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "AppLifecycleManagement": {
-     "$ref": "#/definitions/AppLifecycleManagement"
-    },
-    "CustomImages": {
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 200,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "CodeRepository": {
-   "additionalProperties": false,
-   "properties": {
-    "RepositoryUrl": {
-     "maxLength": 256,
-     "pattern": "^https://([.\\-_a-zA-Z0-9]+/?){3,1016}$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "RepositoryUrl"
-   ],
-   "type": "object"
-  },
-  "CustomFileSystemConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "EFSFileSystemConfig": {
-     "$ref": "#/definitions/EFSFileSystemConfig"
-    },
-    "FSxLustreFileSystemConfig": {
-     "$ref": "#/definitions/FSxLustreFileSystemConfig"
-    }
-   },
-   "type": "object"
-  },
-  "CustomImage": {
-   "additionalProperties": false,
-   "properties": {
-    "AppImageConfigName": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}",
-     "type": "string"
-    },
-    "ImageName": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9]([-.]?[a-zA-Z0-9]){0,62}$",
-     "type": "string"
-    },
-    "ImageVersionNumber": {
-     "minimum": 0,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "AppImageConfigName",
-    "ImageName"
-   ],
-   "type": "object"
-  },
-  "CustomPosixUserConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "Gid": {
-     "maximum": 4000000,
-     "minimum": 1001,
-     "type": "integer"
-    },
-    "Uid": {
-     "maximum": 4000000,
-     "minimum": 10000,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "Uid",
-    "Gid"
-   ],
-   "type": "object"
-  },
-  "DefaultEbsStorageSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultEbsVolumeSizeInGb": {
-     "$ref": "#/definitions/SpaceEbsVolumeSizeInGb"
-    },
-    "MaximumEbsVolumeSizeInGb": {
-     "$ref": "#/definitions/SpaceEbsVolumeSizeInGb"
-    }
-   },
-   "required": [
-    "DefaultEbsVolumeSizeInGb",
-    "MaximumEbsVolumeSizeInGb"
-   ],
-   "type": "object"
-  },
-  "DefaultSpaceSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomFileSystemConfigs": {
-     "items": {
-      "$ref": "#/definitions/CustomFileSystemConfig"
-     },
-     "maxItems": 2,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "CustomPosixUserConfig": {
-     "$ref": "#/definitions/CustomPosixUserConfig"
-    },
-    "ExecutionRole": {
-     "maxLength": 2048,
-     "minLength": 20,
-     "pattern": "^arn:aws[a-z\\-]*:iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+$",
-     "type": "string"
-    },
-    "JupyterLabAppSettings": {
-     "$ref": "#/definitions/JupyterLabAppSettings"
-    },
-    "JupyterServerAppSettings": {
-     "$ref": "#/definitions/JupyterServerAppSettings"
-    },
-    "KernelGatewayAppSettings": {
-     "$ref": "#/definitions/KernelGatewayAppSettings"
-    },
-    "SecurityGroups": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "insertionOrder": false,
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.Id",
-      "maxLength": 32,
-      "pattern": "[-0-9a-zA-Z]+",
-      "type": "string"
-     },
-     "maxItems": 5,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "SpaceStorageSettings": {
-     "$ref": "#/definitions/DefaultSpaceStorageSettings"
-    }
-   },
-   "required": [
-    "ExecutionRole"
-   ],
-   "type": "object"
-  },
-  "DefaultSpaceStorageSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultEbsStorageSettings": {
-     "$ref": "#/definitions/DefaultEbsStorageSettings"
-    }
-   },
-   "type": "object"
-  },
-  "DockerSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "EnableDockerAccess": {
-     "enum": [
-      "ENABLED",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "VpcOnlyTrustedAccounts": {
-     "insertionOrder": false,
-     "items": {
-      "maxLength": 12,
-      "minLength": 12,
-      "pattern": "^\\d+$",
-      "type": "string"
-     },
-     "maxItems": 20,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "DomainSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DockerSettings": {
-     "$ref": "#/definitions/DockerSettings"
-    },
-    "ExecutionRoleIdentityConfig": {
-     "enum": [
-      "USER_PROFILE_NAME",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "RStudioServerProDomainSettings": {
-     "$ref": "#/definitions/RStudioServerProDomainSettings"
-    },
-    "SecurityGroupIds": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "insertionOrder": false,
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.Id",
-      "maxLength": 32,
-      "pattern": "[-0-9a-zA-Z]+",
-      "type": "string"
-     },
-     "maxItems": 3,
-     "minItems": 1,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "EFSFileSystemConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "FileSystemId": {
-     "maxLength": 21,
-     "minLength": 11,
-     "pattern": "^(fs-[0-9a-f]{8,})$",
-     "type": "string"
-    },
-    "FileSystemPath": {
-     "maxLength": 256,
-     "minLength": 1,
-     "pattern": "^\\/\\S*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "FileSystemId"
-   ],
-   "type": "object"
-  },
-  "FSxLustreFileSystemConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "FileSystemId": {
-     "maxLength": 21,
-     "minLength": 11,
-     "pattern": "^(fs-[0-9a-f]{8,})$",
-     "type": "string"
-    },
-    "FileSystemPath": {
-     "maxLength": 256,
-     "minLength": 1,
-     "pattern": "^\\/\\S*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "FileSystemId"
-   ],
-   "type": "object"
-  },
-  "IdleSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "IdleTimeoutInMinutes": {
-     "$ref": "#/definitions/IdleTimeoutInMinutes"
-    },
-    "LifecycleManagement": {
-     "$ref": "#/definitions/LifecycleManagement"
-    },
-    "MaxIdleTimeoutInMinutes": {
-     "$ref": "#/definitions/MaxIdleTimeoutInMinutes"
-    },
-    "MinIdleTimeoutInMinutes": {
-     "$ref": "#/definitions/MinIdleTimeoutInMinutes"
-    }
-   },
-   "type": "object"
-  },
-  "IdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "JupyterLabAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "AppLifecycleManagement": {
-     "$ref": "#/definitions/AppLifecycleManagement"
-    },
-    "CodeRepositories": {
-     "items": {
-      "$ref": "#/definitions/CodeRepository"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "CustomImages": {
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 200,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "JupyterServerAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "KernelGatewayAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomImages": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 200,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "LifecycleManagement": {
-   "enum": [
-    "ENABLED",
-    "DISABLED"
-   ],
-   "type": "string"
-  },
-  "MaxIdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "MinIdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "MlTools": {
-   "enum": [
-    "DataWrangler",
-    "FeatureStore",
-    "EmrClusters",
-    "AutoMl",
-    "Experiments",
-    "Training",
-    "ModelEvaluation",
-    "Pipelines",
-    "Models",
-    "JumpStart",
-    "InferenceRecommender",
-    "Endpoints",
-    "Projects",
-    "InferenceOptimization",
-    "HyperPodClusters",
-    "Comet",
-    "DeepchecksLLMEvaluation",
-    "Fiddler",
-    "LakeraGuard"
-   ],
-   "type": "string"
-  },
-  "RSessionAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomImages": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 200,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    }
-   },
-   "type": "object"
-  },
-  "RStudioServerProAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "AccessStatus": {
-     "enum": [
-      "ENABLED",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "UserGroup": {
-     "enum": [
-      "R_STUDIO_ADMIN",
-      "R_STUDIO_USER"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "RStudioServerProDomainSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "DomainExecutionRoleArn": {
-     "maxLength": 2048,
-     "minLength": 20,
-     "pattern": "^arn:aws[a-z\\-]*:iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+$",
-     "type": "string"
-    },
-    "RStudioConnectUrl": {
-     "pattern": "^(https:|http:|www\\.)\\S*",
-     "type": "string"
-    },
-    "RStudioPackageManagerUrl": {
-     "pattern": "^(https:|http:|www\\.)\\S*",
-     "type": "string"
-    }
-   },
-   "required": [
-    "DomainExecutionRoleArn"
-   ],
-   "type": "object"
-  },
-  "ResourceSpec": {
-   "additionalProperties": false,
-   "properties": {
-    "InstanceType": {
-     "enum": [
-      "system",
-      "ml.t3.micro",
-      "ml.t3.small",
-      "ml.t3.medium",
-      "ml.t3.large",
-      "ml.t3.xlarge",
-      "ml.t3.2xlarge",
-      "ml.m5.large",
-      "ml.m5.xlarge",
-      "ml.m5.2xlarge",
-      "ml.m5.4xlarge",
-      "ml.m5.8xlarge",
-      "ml.m5.12xlarge",
-      "ml.m5.16xlarge",
-      "ml.m5.24xlarge",
-      "ml.c5.large",
-      "ml.c5.xlarge",
-      "ml.c5.2xlarge",
-      "ml.c5.4xlarge",
-      "ml.c5.9xlarge",
-      "ml.c5.12xlarge",
-      "ml.c5.18xlarge",
-      "ml.c5.24xlarge",
-      "ml.p3.2xlarge",
-      "ml.p3.8xlarge",
-      "ml.p3.16xlarge",
-      "ml.g4dn.xlarge",
-      "ml.g4dn.2xlarge",
-      "ml.g4dn.4xlarge",
-      "ml.g4dn.8xlarge",
-      "ml.g4dn.12xlarge",
-      "ml.g4dn.16xlarge",
-      "ml.r5.large",
-      "ml.r5.xlarge",
-      "ml.r5.2xlarge",
-      "ml.r5.4xlarge",
-      "ml.r5.8xlarge",
-      "ml.r5.12xlarge",
-      "ml.r5.16xlarge",
-      "ml.r5.24xlarge",
-      "ml.p3dn.24xlarge",
-      "ml.m5d.large",
-      "ml.m5d.xlarge",
-      "ml.m5d.2xlarge",
-      "ml.m5d.4xlarge",
-      "ml.m5d.8xlarge",
-      "ml.m5d.12xlarge",
-      "ml.m5d.16xlarge",
-      "ml.m5d.24xlarge",
-      "ml.g5.xlarge",
-      "ml.g5.2xlarge",
-      "ml.g5.4xlarge",
-      "ml.g5.8xlarge",
-      "ml.g5.12xlarge",
-      "ml.g5.16xlarge",
-      "ml.g5.24xlarge",
-      "ml.g5.48xlarge",
-      "ml.p4d.24xlarge",
-      "ml.p4de.24xlarge",
-      "ml.geospatial.interactive",
-      "ml.trn1.2xlarge",
-      "ml.trn1.32xlarge",
-      "ml.trn1n.32xlarge"
-     ],
-     "type": "string"
-    },
-    "LifecycleConfigArn": {
-     "maxLength": 256,
-     "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:studio-lifecycle-config/.*",
-     "type": "string"
-    },
-    "SageMakerImageArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws(-[\\w]+)*:sagemaker:.+:[0-9]{12}:image/[a-z0-9]([-.]?[a-z0-9])*$",
-     "type": "string"
-    },
-    "SageMakerImageVersionArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws(-[\\w]+)*:sagemaker:.+:[0-9]{12}:image-version/[a-z0-9]([-.]?[a-z0-9])*/[0-9]+$",
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SharingSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "NotebookOutputOption": {
-     "enum": [
-      "Allowed",
-      "Disabled"
-     ],
-     "type": "string"
-    },
-    "S3KmsKeyId": {
-     "maxLength": 2048,
-     "pattern": ".*",
-     "type": "string"
-    },
-    "S3OutputPath": {
-     "maxLength": 1024,
-     "pattern": "^(https|s3)://([^/]+)/?(.*)$",
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SpaceEbsVolumeSizeInGb": {
-   "maximum": 16384,
-   "minimum": 5,
-   "type": "integer"
-  },
-  "StudioLifecycleConfigArn": {
-   "maxLength": 256,
-   "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:studio-lifecycle-config/.*",
-   "type": "string"
-  },
-  "StudioWebPortalSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "HiddenAppTypes": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/AppType"
-     },
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "HiddenMlTools": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/MlTools"
-     },
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$",
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "UserSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CodeEditorAppSettings": {
-     "$ref": "#/definitions/CodeEditorAppSettings"
-    },
-    "CustomFileSystemConfigs": {
-     "items": {
-      "$ref": "#/definitions/CustomFileSystemConfig"
-     },
-     "maxItems": 2,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "CustomPosixUserConfig": {
-     "$ref": "#/definitions/CustomPosixUserConfig"
-    },
-    "DefaultLandingUri": {
-     "maxLength": 1023,
-     "type": "string"
-    },
-    "ExecutionRole": {
-     "maxLength": 2048,
-     "minLength": 20,
-     "pattern": "^arn:aws[a-z\\-]*:iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+$",
-     "type": "string"
-    },
-    "JupyterLabAppSettings": {
-     "$ref": "#/definitions/JupyterLabAppSettings"
-    },
-    "JupyterServerAppSettings": {
-     "$ref": "#/definitions/JupyterServerAppSettings"
-    },
-    "KernelGatewayAppSettings": {
-     "$ref": "#/definitions/KernelGatewayAppSettings"
-    },
-    "RSessionAppSettings": {
-     "$ref": "#/definitions/RSessionAppSettings"
-    },
-    "RStudioServerProAppSettings": {
-     "$ref": "#/definitions/RStudioServerProAppSettings"
-    },
-    "SecurityGroups": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "insertionOrder": false,
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.Id",
-      "maxLength": 32,
-      "pattern": "[-0-9a-zA-Z]+",
-      "type": "string"
-     },
-     "maxItems": 5,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "SharingSettings": {
-     "$ref": "#/definitions/SharingSettings"
-    },
-    "SpaceStorageSettings": {
-     "$ref": "#/definitions/DefaultSpaceStorageSettings"
-    },
-    "StudioWebPortal": {
-     "enum": [
-      "ENABLED",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "StudioWebPortalSettings": {
-     "$ref": "#/definitions/StudioWebPortalSettings"
-    }
-   },
-   "required": [
-    "ExecutionRole"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/DomainId"
- ],
- "properties": {
-  "AppNetworkAccessType": {
-   "enum": [
-    "PublicInternetOnly",
-    "VpcOnly"
-   ],
-   "type": "string"
-  },
-  "AppSecurityGroupManagement": {
-   "enum": [
-    "Service",
-    "Customer"
-   ],
-   "type": "string"
-  },
-  "AuthMode": {
-   "enum": [
-    "SSO",
-    "IAM"
-   ],
-   "type": "string"
-  },
-  "DefaultSpaceSettings": {
-   "$ref": "#/definitions/DefaultSpaceSettings"
-  },
-  "DefaultUserSettings": {
-   "$ref": "#/definitions/UserSettings"
-  },
-  "DomainArn": {
-   "maxLength": 256,
-   "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:domain/.*",
-   "type": "string"
-  },
-  "DomainId": {
-   "maxLength": 63,
-   "pattern": "^d-(-*[a-z0-9])+",
-   "type": "string"
-  },
-  "DomainName": {
-   "maxLength": 63,
-   "pattern": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}",
-   "type": "string"
-  },
-  "DomainSettings": {
-   "$ref": "#/definitions/DomainSettings"
-  },
-  "HomeEfsFileSystemId": {
-   "maxLength": 32,
-   "type": "string"
-  },
-  "KmsKeyId": {
-   "maxLength": 2048,
-   "pattern": ".*",
-   "type": "string"
-  },
-  "SecurityGroupIdForDomainBoundary": {
-   "maxLength": 32,
-   "pattern": "[-0-9a-zA-Z]+",
-   "type": "string"
-  },
-  "SingleSignOnApplicationArn": {
-   "pattern": "^arn:(aws|aws-us-gov|aws-cn|aws-iso|aws-iso-b):sso::[0-9]+:application/[a-zA-Z0-9-_.]+/apl-[a-zA-Z0-9]+$",
-   "type": "string"
-  },
-  "SingleSignOnManagedApplicationInstanceId": {
-   "maxLength": 256,
-   "type": "string"
-  },
-  "SubnetIds": {
-   "insertionOrder": false,
-   "items": {
-    "maxLength": 32,
-    "pattern": "[-0-9a-zA-Z]+",
-    "type": "string"
-   },
-   "maxItems": 16,
-   "minItems": 1,
-   "type": "array",
-   "uniqueItems": false
-  },
-  "TagPropagation": {
-   "enum": [
-    "ENABLED",
-    "DISABLED"
-   ],
-   "type": "string"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 50,
-   "minItems": 0,
-   "type": "array",
-   "uniqueItems": false
-  },
-  "Url": {
-   "maxLength": 1024,
-   "type": "string"
-  },
-  "VpcId": {
-   "format": "AWS::EC2::VPC.Id",
-   "maxLength": 32,
-   "pattern": "[-0-9a-zA-Z]+",
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/DomainArn",
-  "/properties/Url",
-  "/properties/DomainId",
-  "/properties/HomeEfsFileSystemId",
-  "/properties/SecurityGroupIdForDomainBoundary",
-  "/properties/SingleSignOnManagedApplicationInstanceId",
-  "/properties/SingleSignOnApplicationArn"
- ],
- "required": [
-  "AuthMode",
-  "DefaultUserSettings",
-  "DomainName",
-  "SubnetIds",
-  "VpcId"
- ],
- "typeName": "AWS::SageMaker::Domain",
- "writeOnlyProperties": [
-  "/properties/Tags"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-sagemaker-userprofile.json b/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-sagemaker-userprofile.json
deleted file mode 100644
index a21ea9e798..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_northeast_1/aws-sagemaker-userprofile.json
+++ /dev/null
@@ -1,662 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/DomainId",
-  "/properties/UserProfileName",
-  "/properties/SingleSignOnUserIdentifier",
-  "/properties/SingleSignOnUserValue",
-  "/properties/UserSettings/RStudioServerProAppSettings/AccessStatus",
-  "/properties/UserSettings/RStudioServerProAppSettings/UserGroup",
-  "/properties/Tags"
- ],
- "definitions": {
-  "AppLifecycleManagement": {
-   "additionalProperties": false,
-   "properties": {
-    "IdleSettings": {
-     "$ref": "#/definitions/IdleSettings"
-    }
-   },
-   "type": "object"
-  },
-  "AppType": {
-   "enum": [
-    "JupyterServer",
-    "TensorBoard",
-    "RStudioServerPro",
-    "JupyterLab",
-    "CodeEditor",
-    "DetailedProfiler",
-    "Canvas"
-   ],
-   "type": "string"
-  },
-  "CodeEditorAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomImages": {
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "CodeRepository": {
-   "additionalProperties": false,
-   "properties": {
-    "RepositoryUrl": {
-     "maxLength": 256,
-     "pattern": "^https://([.\\-_a-zA-Z0-9]+/?){3,1016}$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "RepositoryUrl"
-   ],
-   "type": "object"
-  },
-  "CustomFileSystemConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "EFSFileSystemConfig": {
-     "$ref": "#/definitions/EFSFileSystemConfig"
-    },
-    "FSxLustreFileSystemConfig": {
-     "$ref": "#/definitions/FSxLustreFileSystemConfig"
-    }
-   },
-   "type": "object"
-  },
-  "CustomImage": {
-   "additionalProperties": false,
-   "properties": {
-    "AppImageConfigName": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}",
-     "type": "string"
-    },
-    "ImageName": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9]([-.]?[a-zA-Z0-9]){0,62}$",
-     "type": "string"
-    },
-    "ImageVersionNumber": {
-     "minimum": 0,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "AppImageConfigName",
-    "ImageName"
-   ],
-   "type": "object"
-  },
-  "CustomPosixUserConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "Gid": {
-     "maximum": 4000000,
-     "minimum": 1001,
-     "type": "integer"
-    },
-    "Uid": {
-     "maximum": 4000000,
-     "minimum": 10000,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "Uid",
-    "Gid"
-   ],
-   "type": "object"
-  },
-  "DefaultEbsStorageSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultEbsVolumeSizeInGb": {
-     "$ref": "#/definitions/SpaceEbsVolumeSizeInGb"
-    },
-    "MaximumEbsVolumeSizeInGb": {
-     "$ref": "#/definitions/SpaceEbsVolumeSizeInGb"
-    }
-   },
-   "required": [
-    "DefaultEbsVolumeSizeInGb",
-    "MaximumEbsVolumeSizeInGb"
-   ],
-   "type": "object"
-  },
-  "DefaultSpaceStorageSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultEbsStorageSettings": {
-     "$ref": "#/definitions/DefaultEbsStorageSettings"
-    }
-   },
-   "type": "object"
-  },
-  "EFSFileSystemConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "FileSystemId": {
-     "maxLength": 21,
-     "minLength": 11,
-     "pattern": "^(fs-[0-9a-f]{8,})$",
-     "type": "string"
-    },
-    "FileSystemPath": {
-     "maxLength": 256,
-     "minLength": 1,
-     "pattern": "^\\/\\S*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "FileSystemId"
-   ],
-   "type": "object"
-  },
-  "FSxLustreFileSystemConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "FileSystemId": {
-     "maxLength": 21,
-     "minLength": 11,
-     "pattern": "^(fs-[0-9a-f]{8,})$",
-     "type": "string"
-    },
-    "FileSystemPath": {
-     "maxLength": 256,
-     "minLength": 1,
-     "pattern": "^\\/\\S*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "FileSystemId"
-   ],
-   "type": "object"
-  },
-  "IdleSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "IdleTimeoutInMinutes": {
-     "$ref": "#/definitions/IdleTimeoutInMinutes"
-    },
-    "LifecycleManagement": {
-     "$ref": "#/definitions/LifecycleManagement"
-    },
-    "MaxIdleTimeoutInMinutes": {
-     "$ref": "#/definitions/MaxIdleTimeoutInMinutes"
-    },
-    "MinIdleTimeoutInMinutes": {
-     "$ref": "#/definitions/MinIdleTimeoutInMinutes"
-    }
-   },
-   "type": "object"
-  },
-  "IdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "JupyterLabAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CodeRepositories": {
-     "items": {
-      "$ref": "#/definitions/CodeRepository"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "CustomImages": {
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "JupyterServerAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "KernelGatewayAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomImages": {
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "LifecycleManagement": {
-   "enum": [
-    "ENABLED",
-    "DISABLED"
-   ],
-   "type": "string"
-  },
-  "MaxIdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "MinIdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "MlTools": {
-   "enum": [
-    "DataWrangler",
-    "FeatureStore",
-    "EmrClusters",
-    "AutoMl",
-    "Experiments",
-    "Training",
-    "ModelEvaluation",
-    "Pipelines",
-    "Models",
-    "JumpStart",
-    "InferenceRecommender",
-    "Endpoints",
-    "Projects",
-    "InferenceOptimization",
-    "HyperPodClusters",
-    "Comet",
-    "DeepchecksLLMEvaluation",
-    "Fiddler",
-    "LakeraGuard"
-   ],
-   "type": "string"
-  },
-  "RStudioServerProAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "AccessStatus": {
-     "enum": [
-      "ENABLED",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "UserGroup": {
-     "enum": [
-      "R_STUDIO_ADMIN",
-      "R_STUDIO_USER"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ResourceSpec": {
-   "additionalProperties": false,
-   "properties": {
-    "InstanceType": {
-     "enum": [
-      "system",
-      "ml.t3.micro",
-      "ml.t3.small",
-      "ml.t3.medium",
-      "ml.t3.large",
-      "ml.t3.xlarge",
-      "ml.t3.2xlarge",
-      "ml.m5.large",
-      "ml.m5.xlarge",
-      "ml.m5.2xlarge",
-      "ml.m5.4xlarge",
-      "ml.m5.8xlarge",
-      "ml.m5.12xlarge",
-      "ml.m5.16xlarge",
-      "ml.m5.24xlarge",
-      "ml.c5.large",
-      "ml.c5.xlarge",
-      "ml.c5.2xlarge",
-      "ml.c5.4xlarge",
-      "ml.c5.9xlarge",
-      "ml.c5.12xlarge",
-      "ml.c5.18xlarge",
-      "ml.c5.24xlarge",
-      "ml.p3.2xlarge",
-      "ml.p3.8xlarge",
-      "ml.p3.16xlarge",
-      "ml.g4dn.xlarge",
-      "ml.g4dn.2xlarge",
-      "ml.g4dn.4xlarge",
-      "ml.g4dn.8xlarge",
-      "ml.g4dn.12xlarge",
-      "ml.g4dn.16xlarge",
-      "ml.r5.large",
-      "ml.r5.xlarge",
-      "ml.r5.2xlarge",
-      "ml.r5.4xlarge",
-      "ml.r5.8xlarge",
-      "ml.r5.12xlarge",
-      "ml.r5.16xlarge",
-      "ml.r5.24xlarge",
-      "ml.p3dn.24xlarge",
-      "ml.m5d.large",
-      "ml.m5d.xlarge",
-      "ml.m5d.2xlarge",
-      "ml.m5d.4xlarge",
-      "ml.m5d.8xlarge",
-      "ml.m5d.12xlarge",
-      "ml.m5d.16xlarge",
-      "ml.m5d.24xlarge",
-      "ml.g5.xlarge",
-      "ml.g5.2xlarge",
-      "ml.g5.4xlarge",
-      "ml.g5.8xlarge",
-      "ml.g5.12xlarge",
-      "ml.g5.16xlarge",
-      "ml.g5.24xlarge",
-      "ml.g5.48xlarge",
-      "ml.p4d.24xlarge",
-      "ml.p4de.24xlarge",
-      "ml.geospatial.interactive",
-      "ml.trn1.2xlarge",
-      "ml.trn1.32xlarge",
-      "ml.trn1n.32xlarge"
-     ],
-     "type": "string"
-    },
-    "LifecycleConfigArn": {
-     "maxLength": 256,
-     "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:studio-lifecycle-config/.*",
-     "type": "string"
-    },
-    "SageMakerImageArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws(-[\\w]+)*:sagemaker:.+:[0-9]{12}:image/[a-z0-9]([-.]?[a-z0-9])*$",
-     "type": "string"
-    },
-    "SageMakerImageVersionArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws(-[\\w]+)*:sagemaker:.+:[0-9]{12}:image-version/[a-z0-9]([-.]?[a-z0-9])*/[0-9]+$",
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SharingSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "NotebookOutputOption": {
-     "enum": [
-      "Allowed",
-      "Disabled"
-     ],
-     "type": "string"
-    },
-    "S3KmsKeyId": {
-     "maxLength": 2048,
-     "pattern": ".*",
-     "type": "string"
-    },
-    "S3OutputPath": {
-     "maxLength": 1024,
-     "pattern": "^(https|s3)://([^/]+)/?(.*)$",
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SpaceEbsVolumeSizeInGb": {
-   "maximum": 16384,
-   "minimum": 5,
-   "type": "integer"
-  },
-  "StudioLifecycleConfigArn": {
-   "maxLength": 256,
-   "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:studio-lifecycle-config/.*",
-   "type": "string"
-  },
-  "StudioWebPortalSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "HiddenAppTypes": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/AppType"
-     },
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "HiddenMlTools": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/MlTools"
-     },
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$",
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "UserSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CodeEditorAppSettings": {
-     "$ref": "#/definitions/CodeEditorAppSettings"
-    },
-    "CustomFileSystemConfigs": {
-     "items": {
-      "$ref": "#/definitions/CustomFileSystemConfig"
-     },
-     "maxItems": 2,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "CustomPosixUserConfig": {
-     "$ref": "#/definitions/CustomPosixUserConfig"
-    },
-    "DefaultLandingUri": {
-     "maxLength": 1023,
-     "type": "string"
-    },
-    "ExecutionRole": {
-     "maxLength": 2048,
-     "minLength": 20,
-     "pattern": "^arn:aws[a-z\\-]*:iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+$",
-     "type": "string"
-    },
-    "JupyterLabAppSettings": {
-     "$ref": "#/definitions/JupyterLabAppSettings"
-    },
-    "JupyterServerAppSettings": {
-     "$ref": "#/definitions/JupyterServerAppSettings"
-    },
-    "KernelGatewayAppSettings": {
-     "$ref": "#/definitions/KernelGatewayAppSettings"
-    },
-    "RStudioServerProAppSettings": {
-     "$ref": "#/definitions/RStudioServerProAppSettings"
-    },
-    "SecurityGroups": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.Id",
-      "maxLength": 32,
-      "pattern": "[-0-9a-zA-Z]+",
-      "type": "string"
-     },
-     "maxItems": 5,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "SharingSettings": {
-     "$ref": "#/definitions/SharingSettings"
-    },
-    "SpaceStorageSettings": {
-     "$ref": "#/definitions/DefaultSpaceStorageSettings"
-    },
-    "StudioWebPortal": {
-     "enum": [
-      "ENABLED",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "StudioWebPortalSettings": {
-     "$ref": "#/definitions/StudioWebPortalSettings"
-    }
-   },
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/UserProfileName",
-  "/properties/DomainId"
- ],
- "properties": {
-  "DomainId": {
-   "maxLength": 63,
-   "minLength": 1,
-   "pattern": "^d-(-*[a-z0-9]){1,61}",
-   "type": "string"
-  },
-  "SingleSignOnUserIdentifier": {
-   "pattern": "UserName",
-   "type": "string"
-  },
-  "SingleSignOnUserValue": {
-   "maxLength": 256,
-   "minLength": 1,
-   "type": "string"
-  },
-  "Tags": {
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 50,
-   "minItems": 0,
-   "type": "array",
-   "uniqueItems": false
-  },
-  "UserProfileArn": {
-   "maxLength": 256,
-   "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:user-profile/.*",
-   "type": "string"
-  },
-  "UserProfileName": {
-   "maxLength": 63,
-   "minLength": 1,
-   "pattern": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}",
-   "type": "string"
-  },
-  "UserSettings": {
-   "$ref": "#/definitions/UserSettings",
-   "maxItems": 50,
-   "minItems": 0,
-   "uniqueItems": false
-  }
- },
- "readOnlyProperties": [
-  "/properties/UserProfileArn"
- ],
- "required": [
-  "DomainId",
-  "UserProfileName"
- ],
- "typeName": "AWS::SageMaker::UserProfile",
- "writeOnlyProperties": [
-  "/properties/Tags"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_2/__init__.py b/src/cfnlint/data/schemas/providers/ap_northeast_2/__init__.py
index e621f07118..efca55e3ee 100644
--- a/src/cfnlint/data/schemas/providers/ap_northeast_2/__init__.py
+++ b/src/cfnlint/data/schemas/providers/ap_northeast_2/__init__.py
@@ -1539,6 +1539,7 @@
     "aws-docdbelastic-cluster.json",
     "aws-dynamodb-globaltable.json",
     "aws-dynamodb-table.json",
+    "aws-ec2-capacityreservation.json",
     "aws-ec2-capacityreservationfleet.json",
     "aws-ec2-carriergateway.json",
     "aws-ec2-clientvpnauthorizationrule.json",
@@ -1707,6 +1708,7 @@
     "aws-fis-experimenttemplate.json",
     "aws-fis-targetaccountconfiguration.json",
     "aws-fms-notificationchannel.json",
+    "aws-fms-policy.json",
     "aws-fms-resourceset.json",
     "aws-forecast-dataset.json",
     "aws-forecast-datasetgroup.json",
diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-ec2-capacityreservation.json b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-ec2-capacityreservation.json
deleted file mode 100644
index 5a10969ce5..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-ec2-capacityreservation.json
+++ /dev/null
@@ -1,250 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/Tenancy",
-  "/properties/InstancePlatform",
-  "/properties/InstanceType",
-  "/properties/AvailabilityZone",
-  "/properties/TagSpecifications",
-  "/properties/OutPostArn",
-  "/properties/EphemeralStorage",
-  "/properties/EbsOptimized",
-  "/properties/PlacementGroupArn"
- ],
- "definitions": {
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "type": "string"
-    },
-    "Value": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "TagSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "ResourceType": {
-     "enum": [
-      "capacity-reservation",
-      "capacity-reservation-fleet",
-      "carrier-gateway",
-      "client-vpn-endpoint",
-      "coip-pool",
-      "customer-gateway",
-      "declarative-policies-report",
-      "dedicated-host",
-      "dhcp-options",
-      "egress-only-internet-gateway",
-      "elastic-gpu",
-      "elastic-ip",
-      "export-image-task",
-      "export-instance-task",
-      "fleet",
-      "fpga-image",
-      "host-reservation",
-      "image",
-      "import-image-task",
-      "import-snapshot-task",
-      "instance",
-      "instance-connect-endpoint",
-      "instance-event-window",
-      "internet-gateway",
-      "ipam",
-      "ipam-external-resource-verification-token",
-      "ipam-pool",
-      "ipam-resource-discovery",
-      "ipam-resource-discovery-association",
-      "ipam-scope",
-      "ipv4pool-ec2",
-      "ipv6pool-ec2",
-      "key-pair",
-      "launch-template",
-      "local-gateway",
-      "local-gateway-route-table",
-      "local-gateway-route-table-virtual-interface-group-association",
-      "local-gateway-route-table-vpc-association",
-      "local-gateway-virtual-interface",
-      "local-gateway-virtual-interface-group",
-      "natgateway",
-      "network-acl",
-      "network-insights-access-scope",
-      "network-insights-access-scope-analysis",
-      "network-insights-analysis",
-      "network-insights-path",
-      "network-interface",
-      "placement-group",
-      "prefix-list",
-      "replace-root-volume-task",
-      "reserved-instances",
-      "route-table",
-      "security-group",
-      "security-group-rule",
-      "snapshot",
-      "spot-fleet-request",
-      "spot-instances-request",
-      "subnet",
-      "subnet-cidr-reservation",
-      "traffic-mirror-filter",
-      "traffic-mirror-filter-rule",
-      "traffic-mirror-session",
-      "traffic-mirror-target",
-      "transit-gateway",
-      "transit-gateway-attachment",
-      "transit-gateway-connect-peer",
-      "transit-gateway-multicast-domain",
-      "transit-gateway-policy-table",
-      "transit-gateway-route-table",
-      "transit-gateway-route-table-announcement",
-      "verified-access-endpoint",
-      "verified-access-endpoint-target",
-      "verified-access-group",
-      "verified-access-instance",
-      "verified-access-policy",
-      "verified-access-trust-provider",
-      "volume",
-      "vpc",
-      "vpc-block-public-access-exclusion",
-      "vpc-endpoint",
-      "vpc-endpoint-connection",
-      "vpc-endpoint-connection-device-type",
-      "vpc-endpoint-service",
-      "vpc-endpoint-service-permission",
-      "vpc-flow-log",
-      "vpc-peering-connection",
-      "vpn-connection",
-      "vpn-connection-device-type",
-      "vpn-gateway"
-     ],
-     "type": "string"
-    },
-    "Tags": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Tag"
-     },
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "AvailabilityZone": {
-   "type": "string"
-  },
-  "AvailableInstanceCount": {
-   "type": "integer"
-  },
-  "EbsOptimized": {
-   "type": "boolean"
-  },
-  "EndDate": {
-   "type": "string"
-  },
-  "EndDateType": {
-   "enum": [
-    "limited",
-    "unlimited"
-   ],
-   "type": "string"
-  },
-  "EphemeralStorage": {
-   "type": "boolean"
-  },
-  "Id": {
-   "type": "string"
-  },
-  "InstanceCount": {
-   "type": "integer"
-  },
-  "InstanceMatchCriteria": {
-   "enum": [
-    "open",
-    "targeted"
-   ],
-   "type": "string"
-  },
-  "InstancePlatform": {
-   "enum": [
-    "Linux with SQL Server Enterprise",
-    "Linux with SQL Server Standard",
-    "Linux with SQL Server Web",
-    "Linux/UNIX",
-    "RHEL with HA",
-    "RHEL with HA and SQL Server Enterprise",
-    "RHEL with HA and SQL Server Standard",
-    "RHEL with SQL Server Enterprise",
-    "RHEL with SQL Server Standard",
-    "RHEL with SQL Server Web",
-    "Red Hat Enterprise Linux",
-    "SUSE Linux",
-    "Ubuntu Pro",
-    "Windows",
-    "Windows with SQL Server",
-    "Windows with SQL Server Enterprise",
-    "Windows with SQL Server Standard",
-    "Windows with SQL Server Web"
-   ],
-   "type": "string"
-  },
-  "InstanceType": {
-   "type": "string"
-  },
-  "OutPostArn": {
-   "pattern": "^arn:aws([a-z-]+)?:outposts:[a-z\\d-]+:\\d{12}:outpost/op-[a-f0-9]{17}$",
-   "type": "string"
-  },
-  "PlacementGroupArn": {
-   "pattern": "^arn:aws([a-z-]+)?:ec2:[a-z\\d-]+:\\d{12}:placement-group/^.{1,255}$",
-   "type": "string"
-  },
-  "TagSpecifications": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/TagSpecification"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "Tenancy": {
-   "enum": [
-    "dedicated",
-    "default"
-   ],
-   "type": "string"
-  },
-  "TotalInstanceCount": {
-   "type": "integer"
-  },
-  "UnusedReservationBillingOwnerId": {
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id",
-  "/properties/AvailableInstanceCount",
-  "/properties/TotalInstanceCount"
- ],
- "required": [
-  "InstanceCount",
-  "AvailabilityZone",
-  "InstancePlatform",
-  "InstanceType"
- ],
- "typeName": "AWS::EC2::CapacityReservation",
- "writeOnlyProperties": [
-  "/properties/UnusedReservationBillingOwnerId"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-fms-policy.json
deleted file mode 100644
index 8422693828..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_northeast_2/aws-fms-policy.json
+++ /dev/null
@@ -1,416 +0,0 @@
-{
- "additionalProperties": false,
- "definitions": {
-  "AccountId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^([0-9]*)$",
-   "type": "string"
-  },
-  "Base62Id": {
-   "maxLength": 22,
-   "minLength": 22,
-   "pattern": "^[a-z0-9A-Z]{22}$",
-   "type": "string"
-  },
-  "FirewallDeploymentModel": {
-   "enum": [
-    "DISTRIBUTED",
-    "CENTRALIZED"
-   ],
-   "type": "string"
-  },
-  "IEMap": {
-   "additionalProperties": false,
-   "properties": {
-    "ACCOUNT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/AccountId"
-     },
-     "type": "array"
-    },
-    "ORGUNIT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/OrganizationalUnitId"
-     },
-     "type": "array"
-    }
-   },
-   "type": "object"
-  },
-  "ManagedServiceData": {
-   "maxLength": 30000,
-   "minLength": 1,
-   "type": "string"
-  },
-  "NetworkAclCommonPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "NetworkAclEntrySet": {
-     "$ref": "#/definitions/NetworkAclEntrySet"
-    }
-   },
-   "required": [
-    "NetworkAclEntrySet"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntry": {
-   "additionalProperties": false,
-   "properties": {
-    "CidrBlock": {
-     "pattern": "^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(\\/([0-9]|[1-2][0-9]|3[0-2]))$",
-     "type": "string"
-    },
-    "Egress": {
-     "type": "boolean"
-    },
-    "IcmpTypeCode": {
-     "additionalProperties": false,
-     "properties": {
-      "Code": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "Type": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "Code",
-      "Type"
-     ],
-     "type": "object"
-    },
-    "Ipv6CidrBlock": {
-     "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))(/(1[0-2]|[0-9]))?$",
-     "type": "string"
-    },
-    "PortRange": {
-     "additionalProperties": false,
-     "properties": {
-      "From": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "To": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "From",
-      "To"
-     ],
-     "type": "object"
-    },
-    "Protocol": {
-     "pattern": "^(tcp|udp|icmp|-1|([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))$",
-     "type": "string"
-    },
-    "RuleAction": {
-     "enum": [
-      "allow",
-      "deny"
-     ],
-     "type": "string"
-    }
-   },
-   "required": [
-    "Egress",
-    "Protocol",
-    "RuleAction"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntryList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/NetworkAclEntry"
-   },
-   "type": "array"
-  },
-  "NetworkAclEntrySet": {
-   "additionalProperties": false,
-   "anyOf": [
-    {
-     "required": [
-      "FirstEntries"
-     ]
-    },
-    {
-     "required": [
-      "LastEntries"
-     ]
-    }
-   ],
-   "properties": {
-    "FirstEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    },
-    "ForceRemediateForFirstEntries": {
-     "type": "boolean"
-    },
-    "ForceRemediateForLastEntries": {
-     "type": "boolean"
-    },
-    "LastEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    }
-   },
-   "required": [
-    "ForceRemediateForFirstEntries",
-    "ForceRemediateForLastEntries"
-   ],
-   "type": "object"
-  },
-  "NetworkFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  },
-  "OrganizationalUnitId": {
-   "maxLength": 68,
-   "minLength": 16,
-   "pattern": "^(ou-[0-9a-z]{4,32}-[a-z0-9]{8,32})$",
-   "type": "string"
-  },
-  "PolicyOption": {
-   "additionalProperties": false,
-   "oneOf": [
-    {
-     "required": [
-      "NetworkFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "ThirdPartyFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "NetworkAclCommonPolicy"
-     ]
-    }
-   ],
-   "properties": {
-    "NetworkAclCommonPolicy": {
-     "$ref": "#/definitions/NetworkAclCommonPolicy"
-    },
-    "NetworkFirewallPolicy": {
-     "$ref": "#/definitions/NetworkFirewallPolicy"
-    },
-    "ThirdPartyFirewallPolicy": {
-     "$ref": "#/definitions/ThirdPartyFirewallPolicy"
-    }
-   },
-   "type": "object"
-  },
-  "PolicyTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "PolicyType": {
-   "enum": [
-    "WAF",
-    "WAFV2",
-    "SHIELD_ADVANCED",
-    "SECURITY_GROUPS_COMMON",
-    "SECURITY_GROUPS_CONTENT_AUDIT",
-    "SECURITY_GROUPS_USAGE_AUDIT",
-    "NETWORK_FIREWALL",
-    "THIRD_PARTY_FIREWALL",
-    "DNS_FIREWALL",
-    "IMPORT_NETWORK_FIREWALL",
-    "NETWORK_ACL_COMMON"
-   ],
-   "type": "string"
-  },
-  "ResourceArn": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "ResourceTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key"
-   ],
-   "type": "object"
-  },
-  "ResourceType": {
-   "maxLength": 128,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "SecurityServicePolicyData": {
-   "additionalProperties": false,
-   "properties": {
-    "ManagedServiceData": {
-     "$ref": "#/definitions/ManagedServiceData"
-    },
-    "PolicyOption": {
-     "$ref": "#/definitions/PolicyOption"
-    },
-    "Type": {
-     "$ref": "#/definitions/PolicyType"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "ThirdPartyFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "Arn": {
-   "$ref": "#/definitions/ResourceArn"
-  },
-  "DeleteAllPolicyResources": {
-   "type": "boolean"
-  },
-  "ExcludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "ExcludeResourceTags": {
-   "type": "boolean"
-  },
-  "Id": {
-   "maxLength": 36,
-   "minLength": 36,
-   "pattern": "^[a-z0-9A-Z-]{36}$",
-   "type": "string"
-  },
-  "IncludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "PolicyDescription": {
-   "maxLength": 256,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "PolicyName": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "RemediationEnabled": {
-   "type": "boolean"
-  },
-  "ResourceSetIds": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/Base62Id"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "ResourceTags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceTag"
-   },
-   "maxItems": 8,
-   "type": "array"
-  },
-  "ResourceType": {
-   "$ref": "#/definitions/ResourceType"
-  },
-  "ResourceTypeList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceType"
-   },
-   "type": "array"
-  },
-  "ResourcesCleanUp": {
-   "type": "boolean"
-  },
-  "SecurityServicePolicyData": {
-   "$ref": "#/definitions/SecurityServicePolicyData"
-  },
-  "Tags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/PolicyTag"
-   },
-   "type": "array"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/Id"
- ],
- "required": [
-  "ExcludeResourceTags",
-  "PolicyName",
-  "RemediationEnabled",
-  "SecurityServicePolicyData"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-fms.git",
- "typeName": "AWS::FMS::Policy",
- "writeOnlyProperties": [
-  "/properties/DeleteAllPolicyResources"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_3/__init__.py b/src/cfnlint/data/schemas/providers/ap_northeast_3/__init__.py
index 9652f1a89f..0548fb3365 100644
--- a/src/cfnlint/data/schemas/providers/ap_northeast_3/__init__.py
+++ b/src/cfnlint/data/schemas/providers/ap_northeast_3/__init__.py
@@ -843,6 +843,7 @@
     "Module",
     "aws-accessanalyzer-analyzer.json",
     "aws-acmpca-certificate.json",
+    "aws-acmpca-certificateauthority.json",
     "aws-acmpca-certificateauthorityactivation.json",
     "aws-acmpca-permission.json",
     "aws-amazonmq-broker.json",
@@ -1138,6 +1139,7 @@
     "aws-ec2-vpcendpointservicepermissions.json",
     "aws-ec2-vpcgatewayattachment.json",
     "aws-ec2-vpcpeeringconnection.json",
+    "aws-ec2-vpnconnection.json",
     "aws-ec2-vpnconnectionroute.json",
     "aws-ec2-vpngateway.json",
     "aws-ec2-vpngatewayroutepropagation.json",
@@ -1207,6 +1209,7 @@
     "aws-eventschemas-registrypolicy.json",
     "aws-eventschemas-schema.json",
     "aws-fms-notificationchannel.json",
+    "aws-fms-policy.json",
     "aws-fms-resourceset.json",
     "aws-fsx-datarepositoryassociation.json",
     "aws-fsx-snapshot.json",
diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-acmpca-certificateauthority.json b/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-acmpca-certificateauthority.json
deleted file mode 100644
index 54c1fdba4c..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-acmpca-certificateauthority.json
+++ /dev/null
@@ -1,424 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/Type",
-  "/properties/KeyAlgorithm",
-  "/properties/SigningAlgorithm",
-  "/properties/Subject",
-  "/properties/CsrExtensions",
-  "/properties/KeyStorageSecurityStandard",
-  "/properties/UsageMode"
- ],
- "definitions": {
-  "AccessDescription": {
-   "additionalProperties": false,
-   "properties": {
-    "AccessLocation": {
-     "$ref": "#/definitions/GeneralName"
-    },
-    "AccessMethod": {
-     "$ref": "#/definitions/AccessMethod"
-    }
-   },
-   "required": [
-    "AccessMethod",
-    "AccessLocation"
-   ],
-   "type": "object"
-  },
-  "AccessMethod": {
-   "additionalProperties": false,
-   "properties": {
-    "AccessMethodType": {
-     "$ref": "#/definitions/AccessMethodType"
-    },
-    "CustomObjectIdentifier": {
-     "$ref": "#/definitions/CustomObjectIdentifier"
-    }
-   },
-   "type": "object"
-  },
-  "AccessMethodType": {
-   "type": "string"
-  },
-  "Arn": {
-   "type": "string"
-  },
-  "CrlConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "CrlDistributionPointExtensionConfiguration": {
-     "$ref": "#/definitions/CrlDistributionPointExtensionConfiguration"
-    },
-    "CustomCname": {
-     "pattern": "[-a-zA-Z0-9;/?:@&=+$,%_.!~*()']*",
-     "type": "string"
-    },
-    "Enabled": {
-     "type": "boolean"
-    },
-    "ExpirationInDays": {
-     "type": "integer"
-    },
-    "S3BucketName": {
-     "pattern": "[-a-zA-Z0-9._/]+",
-     "type": "string"
-    },
-    "S3ObjectAcl": {
-     "enum": [
-      "BUCKET_OWNER_FULL_CONTROL",
-      "PUBLIC_READ"
-     ],
-     "type": "string"
-    }
-   },
-   "required": [
-    "Enabled"
-   ],
-   "type": "object"
-  },
-  "CrlDistributionPointExtensionConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "OmitExtension": {
-     "type": "boolean"
-    }
-   },
-   "required": [
-    "OmitExtension"
-   ],
-   "type": "object"
-  },
-  "CsrExtensions": {
-   "additionalProperties": false,
-   "properties": {
-    "KeyUsage": {
-     "$ref": "#/definitions/KeyUsage"
-    },
-    "SubjectInformationAccess": {
-     "$ref": "#/definitions/SubjectInformationAccess"
-    }
-   },
-   "type": "object"
-  },
-  "CustomAttribute": {
-   "additionalProperties": false,
-   "properties": {
-    "ObjectIdentifier": {
-     "$ref": "#/definitions/CustomObjectIdentifier"
-    },
-    "Value": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "ObjectIdentifier",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "CustomAttributeList": {
-   "items": {
-    "$ref": "#/definitions/CustomAttribute"
-   },
-   "type": "array"
-  },
-  "CustomObjectIdentifier": {
-   "type": "string"
-  },
-  "DnsName": {
-   "type": "string"
-  },
-  "EdiPartyName": {
-   "additionalProperties": false,
-   "properties": {
-    "NameAssigner": {
-     "type": "string"
-    },
-    "PartyName": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "PartyName"
-   ],
-   "type": "object"
-  },
-  "GeneralName": {
-   "additionalProperties": false,
-   "properties": {
-    "DirectoryName": {
-     "$ref": "#/definitions/Subject"
-    },
-    "DnsName": {
-     "$ref": "#/definitions/DnsName"
-    },
-    "EdiPartyName": {
-     "$ref": "#/definitions/EdiPartyName"
-    },
-    "IpAddress": {
-     "$ref": "#/definitions/IpAddress"
-    },
-    "OtherName": {
-     "$ref": "#/definitions/OtherName"
-    },
-    "RegisteredId": {
-     "$ref": "#/definitions/CustomObjectIdentifier"
-    },
-    "Rfc822Name": {
-     "$ref": "#/definitions/Rfc822Name"
-    },
-    "UniformResourceIdentifier": {
-     "$ref": "#/definitions/UniformResourceIdentifier"
-    }
-   },
-   "type": "object"
-  },
-  "IpAddress": {
-   "type": "string"
-  },
-  "KeyUsage": {
-   "additionalProperties": false,
-   "properties": {
-    "CRLSign": {
-     "default": false,
-     "type": "boolean"
-    },
-    "DataEncipherment": {
-     "default": false,
-     "type": "boolean"
-    },
-    "DecipherOnly": {
-     "default": false,
-     "type": "boolean"
-    },
-    "DigitalSignature": {
-     "default": false,
-     "type": "boolean"
-    },
-    "EncipherOnly": {
-     "default": false,
-     "type": "boolean"
-    },
-    "KeyAgreement": {
-     "default": false,
-     "type": "boolean"
-    },
-    "KeyCertSign": {
-     "default": false,
-     "type": "boolean"
-    },
-    "KeyEncipherment": {
-     "default": false,
-     "type": "boolean"
-    },
-    "NonRepudiation": {
-     "default": false,
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "OcspConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "OcspCustomCname": {
-     "pattern": "[-a-zA-Z0-9;/?:@&=+$,%_.!~*()']*",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Enabled"
-   ],
-   "type": "object"
-  },
-  "OtherName": {
-   "additionalProperties": false,
-   "properties": {
-    "TypeId": {
-     "$ref": "#/definitions/CustomObjectIdentifier"
-    },
-    "Value": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "TypeId",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "RevocationConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "CrlConfiguration": {
-     "$ref": "#/definitions/CrlConfiguration"
-    },
-    "OcspConfiguration": {
-     "$ref": "#/definitions/OcspConfiguration"
-    }
-   },
-   "type": "object"
-  },
-  "Rfc822Name": {
-   "type": "string"
-  },
-  "Subject": {
-   "additionalProperties": false,
-   "properties": {
-    "CommonName": {
-     "type": "string"
-    },
-    "Country": {
-     "type": "string"
-    },
-    "CustomAttributes": {
-     "$ref": "#/definitions/CustomAttributeList"
-    },
-    "DistinguishedNameQualifier": {
-     "type": "string"
-    },
-    "GenerationQualifier": {
-     "type": "string"
-    },
-    "GivenName": {
-     "type": "string"
-    },
-    "Initials": {
-     "type": "string"
-    },
-    "Locality": {
-     "type": "string"
-    },
-    "Organization": {
-     "type": "string"
-    },
-    "OrganizationalUnit": {
-     "type": "string"
-    },
-    "Pseudonym": {
-     "type": "string"
-    },
-    "SerialNumber": {
-     "type": "string"
-    },
-    "State": {
-     "type": "string"
-    },
-    "Surname": {
-     "type": "string"
-    },
-    "Title": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SubjectInformationAccess": {
-   "items": {
-    "$ref": "#/definitions/AccessDescription"
-   },
-   "type": "array"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "pattern": "([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)",
-     "type": "string"
-    },
-    "Value": {
-     "pattern": "([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key"
-   ],
-   "type": "object"
-  },
-  "UniformResourceIdentifier": {
-   "type": "string"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Arn"
- ],
- "properties": {
-  "Arn": {
-   "$ref": "#/definitions/Arn"
-  },
-  "CertificateSigningRequest": {
-   "type": "string"
-  },
-  "CsrExtensions": {
-   "$ref": "#/definitions/CsrExtensions"
-  },
-  "KeyAlgorithm": {
-   "type": "string"
-  },
-  "KeyStorageSecurityStandard": {
-   "enum": [
-    "CCPC_LEVEL_1_OR_HIGHER",
-    "FIPS_140_2_LEVEL_2_OR_HIGHER",
-    "FIPS_140_2_LEVEL_3_OR_HIGHER"
-   ],
-   "type": "string"
-  },
-  "RevocationConfiguration": {
-   "$ref": "#/definitions/RevocationConfiguration"
-  },
-  "SigningAlgorithm": {
-   "type": "string"
-  },
-  "Subject": {
-   "$ref": "#/definitions/Subject"
-  },
-  "Tags": {
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array"
-  },
-  "Type": {
-   "type": "string"
-  },
-  "UsageMode": {
-   "enum": [
-    "GENERAL_PURPOSE",
-    "SHORT_LIVED_CERTIFICATE"
-   ],
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/CertificateSigningRequest"
- ],
- "required": [
-  "Type",
-  "KeyAlgorithm",
-  "SigningAlgorithm",
-  "Subject"
- ],
- "sourceUrl": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/AWS_ACMPCA.html",
- "tagging": {
-  "cloudFormationSystemTags": false,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::ACMPCA::CertificateAuthority",
- "writeOnlyProperties": [
-  "/properties/Subject",
-  "/properties/Subject",
-  "/properties/CsrExtensions",
-  "/properties/Tags",
-  "/properties/RevocationConfiguration",
-  "/properties/KeyStorageSecurityStandard"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-ec2-vpnconnection.json b/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-ec2-vpnconnection.json
deleted file mode 100644
index 5f9a8ac704..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-ec2-vpnconnection.json
+++ /dev/null
@@ -1,384 +0,0 @@
-{
- "$schema": "https://raw.githubusercontent.com/aws-cloudformation/cloudformation-resource-schema/blob/master/src/main/resources/schema/provider.definition.schema.v1.json",
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/Type",
-  "/properties/CustomerGatewayId",
-  "/properties/VpnGatewayId",
-  "/properties/TransitGatewayId",
-  "/properties/EnableAcceleration",
-  "/properties/LocalIpv4NetworkCidr",
-  "/properties/LocalIpv6NetworkCidr",
-  "/properties/OutsideIpAddressType",
-  "/properties/RemoteIpv4NetworkCidr",
-  "/properties/RemoteIpv6NetworkCidr",
-  "/properties/StaticRoutesOnly",
-  "/properties/TransportTransitGatewayAttachmentId",
-  "/properties/TunnelInsideIpVersion",
-  "/properties/VpnTunnelOptionsSpecifications"
- ],
- "definitions": {
-  "CloudwatchLogOptionsSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "LogEnabled": {
-     "type": "boolean"
-    },
-    "LogGroupArn": {
-     "type": "string"
-    },
-    "LogOutputFormat": {
-     "enum": [
-      "json",
-      "text"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "IKEVersionsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "ikev1",
-      "ikev2"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Phase1DHGroupNumbersRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      2,
-      14,
-      15,
-      16,
-      17,
-      18,
-      19,
-      20,
-      21,
-      22,
-      23,
-      24
-     ],
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "Phase1EncryptionAlgorithmsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "AES128",
-      "AES256",
-      "AES128-GCM-16",
-      "AES256-GCM-16"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Phase1IntegrityAlgorithmsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "SHA1",
-      "SHA2-256",
-      "SHA2-384",
-      "SHA2-512"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Phase2DHGroupNumbersRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      2,
-      5,
-      14,
-      15,
-      16,
-      17,
-      18,
-      19,
-      20,
-      21,
-      22,
-      23,
-      24
-     ],
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "Phase2EncryptionAlgorithmsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "AES128",
-      "AES256",
-      "AES128-GCM-16",
-      "AES256-GCM-16"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Phase2IntegrityAlgorithmsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "SHA1",
-      "SHA2-256",
-      "SHA2-384",
-      "SHA2-512"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "type": "string"
-    },
-    "Value": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "VpnTunnelLogOptionsSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "CloudwatchLogOptions": {
-     "$ref": "#/definitions/CloudwatchLogOptionsSpecification"
-    }
-   },
-   "type": "object"
-  },
-  "VpnTunnelOptionsSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "DPDTimeoutAction": {
-     "enum": [
-      "clear",
-      "none",
-      "restart"
-     ],
-     "type": "string"
-    },
-    "DPDTimeoutSeconds": {
-     "minimum": 30,
-     "type": "integer"
-    },
-    "EnableTunnelLifecycleControl": {
-     "type": "boolean"
-    },
-    "IKEVersions": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/IKEVersionsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "LogOptions": {
-     "$ref": "#/definitions/VpnTunnelLogOptionsSpecification"
-    },
-    "Phase1DHGroupNumbers": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase1DHGroupNumbersRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase1EncryptionAlgorithms": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase1EncryptionAlgorithmsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase1IntegrityAlgorithms": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase1IntegrityAlgorithmsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase1LifetimeSeconds": {
-     "maximum": 28800,
-     "minimum": 900,
-     "type": "integer"
-    },
-    "Phase2DHGroupNumbers": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase2DHGroupNumbersRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase2EncryptionAlgorithms": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase2EncryptionAlgorithmsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase2IntegrityAlgorithms": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase2IntegrityAlgorithmsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase2LifetimeSeconds": {
-     "maximum": 3600,
-     "minimum": 900,
-     "type": "integer"
-    },
-    "PreSharedKey": {
-     "type": "string"
-    },
-    "RekeyFuzzPercentage": {
-     "maximum": 100,
-     "minimum": 0,
-     "type": "integer"
-    },
-    "RekeyMarginTimeSeconds": {
-     "minimum": 60,
-     "type": "integer"
-    },
-    "ReplayWindowSize": {
-     "maximum": 2048,
-     "minimum": 64,
-     "type": "integer"
-    },
-    "StartupAction": {
-     "enum": [
-      "add",
-      "start"
-     ],
-     "type": "string"
-    },
-    "TunnelInsideCidr": {
-     "type": "string"
-    },
-    "TunnelInsideIpv6Cidr": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/VpnConnectionId"
- ],
- "properties": {
-  "CustomerGatewayId": {
-   "type": "string"
-  },
-  "EnableAcceleration": {
-   "type": "boolean"
-  },
-  "LocalIpv4NetworkCidr": {
-   "type": "string"
-  },
-  "LocalIpv6NetworkCidr": {
-   "type": "string"
-  },
-  "OutsideIpAddressType": {
-   "type": "string"
-  },
-  "RemoteIpv4NetworkCidr": {
-   "type": "string"
-  },
-  "RemoteIpv6NetworkCidr": {
-   "type": "string"
-  },
-  "StaticRoutesOnly": {
-   "type": "boolean"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "TransitGatewayId": {
-   "type": "string"
-  },
-  "TransportTransitGatewayAttachmentId": {
-   "type": "string"
-  },
-  "TunnelInsideIpVersion": {
-   "type": "string"
-  },
-  "Type": {
-   "type": "string"
-  },
-  "VpnConnectionId": {
-   "type": "string"
-  },
-  "VpnGatewayId": {
-   "type": "string"
-  },
-  "VpnTunnelOptionsSpecifications": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/VpnTunnelOptionsSpecification"
-   },
-   "type": "array",
-   "uniqueItems": false
-  }
- },
- "readOnlyProperties": [
-  "/properties/VpnConnectionId"
- ],
- "required": [
-  "Type",
-  "CustomerGatewayId"
- ],
- "tagging": {
-  "cloudFormationSystemTags": false,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::EC2::VPNConnection"
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-fms-policy.json
deleted file mode 100644
index 8422693828..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_northeast_3/aws-fms-policy.json
+++ /dev/null
@@ -1,416 +0,0 @@
-{
- "additionalProperties": false,
- "definitions": {
-  "AccountId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^([0-9]*)$",
-   "type": "string"
-  },
-  "Base62Id": {
-   "maxLength": 22,
-   "minLength": 22,
-   "pattern": "^[a-z0-9A-Z]{22}$",
-   "type": "string"
-  },
-  "FirewallDeploymentModel": {
-   "enum": [
-    "DISTRIBUTED",
-    "CENTRALIZED"
-   ],
-   "type": "string"
-  },
-  "IEMap": {
-   "additionalProperties": false,
-   "properties": {
-    "ACCOUNT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/AccountId"
-     },
-     "type": "array"
-    },
-    "ORGUNIT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/OrganizationalUnitId"
-     },
-     "type": "array"
-    }
-   },
-   "type": "object"
-  },
-  "ManagedServiceData": {
-   "maxLength": 30000,
-   "minLength": 1,
-   "type": "string"
-  },
-  "NetworkAclCommonPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "NetworkAclEntrySet": {
-     "$ref": "#/definitions/NetworkAclEntrySet"
-    }
-   },
-   "required": [
-    "NetworkAclEntrySet"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntry": {
-   "additionalProperties": false,
-   "properties": {
-    "CidrBlock": {
-     "pattern": "^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(\\/([0-9]|[1-2][0-9]|3[0-2]))$",
-     "type": "string"
-    },
-    "Egress": {
-     "type": "boolean"
-    },
-    "IcmpTypeCode": {
-     "additionalProperties": false,
-     "properties": {
-      "Code": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "Type": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "Code",
-      "Type"
-     ],
-     "type": "object"
-    },
-    "Ipv6CidrBlock": {
-     "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))(/(1[0-2]|[0-9]))?$",
-     "type": "string"
-    },
-    "PortRange": {
-     "additionalProperties": false,
-     "properties": {
-      "From": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "To": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "From",
-      "To"
-     ],
-     "type": "object"
-    },
-    "Protocol": {
-     "pattern": "^(tcp|udp|icmp|-1|([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))$",
-     "type": "string"
-    },
-    "RuleAction": {
-     "enum": [
-      "allow",
-      "deny"
-     ],
-     "type": "string"
-    }
-   },
-   "required": [
-    "Egress",
-    "Protocol",
-    "RuleAction"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntryList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/NetworkAclEntry"
-   },
-   "type": "array"
-  },
-  "NetworkAclEntrySet": {
-   "additionalProperties": false,
-   "anyOf": [
-    {
-     "required": [
-      "FirstEntries"
-     ]
-    },
-    {
-     "required": [
-      "LastEntries"
-     ]
-    }
-   ],
-   "properties": {
-    "FirstEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    },
-    "ForceRemediateForFirstEntries": {
-     "type": "boolean"
-    },
-    "ForceRemediateForLastEntries": {
-     "type": "boolean"
-    },
-    "LastEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    }
-   },
-   "required": [
-    "ForceRemediateForFirstEntries",
-    "ForceRemediateForLastEntries"
-   ],
-   "type": "object"
-  },
-  "NetworkFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  },
-  "OrganizationalUnitId": {
-   "maxLength": 68,
-   "minLength": 16,
-   "pattern": "^(ou-[0-9a-z]{4,32}-[a-z0-9]{8,32})$",
-   "type": "string"
-  },
-  "PolicyOption": {
-   "additionalProperties": false,
-   "oneOf": [
-    {
-     "required": [
-      "NetworkFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "ThirdPartyFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "NetworkAclCommonPolicy"
-     ]
-    }
-   ],
-   "properties": {
-    "NetworkAclCommonPolicy": {
-     "$ref": "#/definitions/NetworkAclCommonPolicy"
-    },
-    "NetworkFirewallPolicy": {
-     "$ref": "#/definitions/NetworkFirewallPolicy"
-    },
-    "ThirdPartyFirewallPolicy": {
-     "$ref": "#/definitions/ThirdPartyFirewallPolicy"
-    }
-   },
-   "type": "object"
-  },
-  "PolicyTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "PolicyType": {
-   "enum": [
-    "WAF",
-    "WAFV2",
-    "SHIELD_ADVANCED",
-    "SECURITY_GROUPS_COMMON",
-    "SECURITY_GROUPS_CONTENT_AUDIT",
-    "SECURITY_GROUPS_USAGE_AUDIT",
-    "NETWORK_FIREWALL",
-    "THIRD_PARTY_FIREWALL",
-    "DNS_FIREWALL",
-    "IMPORT_NETWORK_FIREWALL",
-    "NETWORK_ACL_COMMON"
-   ],
-   "type": "string"
-  },
-  "ResourceArn": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "ResourceTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key"
-   ],
-   "type": "object"
-  },
-  "ResourceType": {
-   "maxLength": 128,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "SecurityServicePolicyData": {
-   "additionalProperties": false,
-   "properties": {
-    "ManagedServiceData": {
-     "$ref": "#/definitions/ManagedServiceData"
-    },
-    "PolicyOption": {
-     "$ref": "#/definitions/PolicyOption"
-    },
-    "Type": {
-     "$ref": "#/definitions/PolicyType"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "ThirdPartyFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "Arn": {
-   "$ref": "#/definitions/ResourceArn"
-  },
-  "DeleteAllPolicyResources": {
-   "type": "boolean"
-  },
-  "ExcludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "ExcludeResourceTags": {
-   "type": "boolean"
-  },
-  "Id": {
-   "maxLength": 36,
-   "minLength": 36,
-   "pattern": "^[a-z0-9A-Z-]{36}$",
-   "type": "string"
-  },
-  "IncludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "PolicyDescription": {
-   "maxLength": 256,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "PolicyName": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "RemediationEnabled": {
-   "type": "boolean"
-  },
-  "ResourceSetIds": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/Base62Id"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "ResourceTags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceTag"
-   },
-   "maxItems": 8,
-   "type": "array"
-  },
-  "ResourceType": {
-   "$ref": "#/definitions/ResourceType"
-  },
-  "ResourceTypeList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceType"
-   },
-   "type": "array"
-  },
-  "ResourcesCleanUp": {
-   "type": "boolean"
-  },
-  "SecurityServicePolicyData": {
-   "$ref": "#/definitions/SecurityServicePolicyData"
-  },
-  "Tags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/PolicyTag"
-   },
-   "type": "array"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/Id"
- ],
- "required": [
-  "ExcludeResourceTags",
-  "PolicyName",
-  "RemediationEnabled",
-  "SecurityServicePolicyData"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-fms.git",
- "typeName": "AWS::FMS::Policy",
- "writeOnlyProperties": [
-  "/properties/DeleteAllPolicyResources"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_south_1/__init__.py b/src/cfnlint/data/schemas/providers/ap_south_1/__init__.py
index 812210a15b..8134434784 100644
--- a/src/cfnlint/data/schemas/providers/ap_south_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/ap_south_1/__init__.py
@@ -1827,7 +1827,6 @@
     "aws-iotfleetwise-fleet.json",
     "aws-iotfleetwise-modelmanifest.json",
     "aws-iotfleetwise-signalcatalog.json",
-    "aws-iotfleetwise-statetemplate.json",
     "aws-iotfleetwise-vehicle.json",
     "aws-iotsitewise-accesspolicy.json",
     "aws-iotsitewise-asset.json",
diff --git a/src/cfnlint/data/schemas/providers/ap_south_1/aws-iotfleetwise-statetemplate.json b/src/cfnlint/data/schemas/providers/ap_south_1/aws-iotfleetwise-statetemplate.json
new file mode 100644
index 0000000000..ba4c630118
--- /dev/null
+++ b/src/cfnlint/data/schemas/providers/ap_south_1/aws-iotfleetwise-statetemplate.json
@@ -0,0 +1,128 @@
+{
+ "additionalProperties": false,
+ "createOnlyProperties": [
+  "/properties/Name",
+  "/properties/SignalCatalogArn"
+ ],
+ "definitions": {
+  "Tag": {
+   "additionalProperties": false,
+   "properties": {
+    "Key": {
+     "maxLength": 128,
+     "minLength": 1,
+     "type": "string"
+    },
+    "Value": {
+     "maxLength": 256,
+     "minLength": 0,
+     "type": "string"
+    }
+   },
+   "required": [
+    "Key",
+    "Value"
+   ],
+   "type": "object"
+  },
+  "Unit": {
+   "additionalProperties": false,
+   "type": "object"
+  }
+ },
+ "primaryIdentifier": [
+  "/properties/Name"
+ ],
+ "properties": {
+  "Arn": {
+   "type": "string"
+  },
+  "CreationTime": {
+   "format": "date-time",
+   "type": "string"
+  },
+  "DataExtraDimensions": {
+   "insertionOrder": false,
+   "items": {
+    "maxLength": 150,
+    "minLength": 1,
+    "pattern": "^[a-zA-Z0-9_.]+$",
+    "type": "string"
+   },
+   "maxItems": 5,
+   "minItems": 0,
+   "type": "array"
+  },
+  "Description": {
+   "maxLength": 2048,
+   "minLength": 1,
+   "pattern": "^[^\\u0000-\\u001F\\u007F]+$",
+   "type": "string"
+  },
+  "LastModificationTime": {
+   "format": "date-time",
+   "type": "string"
+  },
+  "MetadataExtraDimensions": {
+   "insertionOrder": false,
+   "items": {
+    "maxLength": 150,
+    "minLength": 1,
+    "pattern": "^[a-zA-Z0-9_.]+$",
+    "type": "string"
+   },
+   "maxItems": 5,
+   "minItems": 0,
+   "type": "array"
+  },
+  "Name": {
+   "maxLength": 100,
+   "minLength": 1,
+   "pattern": "^[a-zA-Z\\d\\-_:]+$",
+   "type": "string"
+  },
+  "SignalCatalogArn": {
+   "type": "string"
+  },
+  "StateTemplateProperties": {
+   "insertionOrder": false,
+   "items": {
+    "maxLength": 150,
+    "minLength": 1,
+    "pattern": "^[a-zA-Z0-9_.]+$",
+    "type": "string"
+   },
+   "maxItems": 500,
+   "minItems": 1,
+   "type": "array"
+  },
+  "Tags": {
+   "insertionOrder": false,
+   "items": {
+    "$ref": "#/definitions/Tag"
+   },
+   "maxItems": 50,
+   "minItems": 0,
+   "type": "array",
+   "uniqueItems": true
+  }
+ },
+ "readOnlyProperties": [
+  "/properties/Arn",
+  "/properties/CreationTime",
+  "/properties/LastModificationTime"
+ ],
+ "required": [
+  "Name",
+  "SignalCatalogArn",
+  "StateTemplateProperties"
+ ],
+ "tagging": {
+  "cloudFormationSystemTags": true,
+  "tagOnCreate": true,
+  "tagProperty": "/properties/Tags",
+  "tagUpdatable": true,
+  "taggable": true
+ },
+ "typeName": "AWS::IoTFleetWise::StateTemplate"
+}
diff --git a/src/cfnlint/data/schemas/providers/ap_south_2/__init__.py b/src/cfnlint/data/schemas/providers/ap_south_2/__init__.py
index 7a183a3da0..1ce080ccda 100644
--- a/src/cfnlint/data/schemas/providers/ap_south_2/__init__.py
+++ b/src/cfnlint/data/schemas/providers/ap_south_2/__init__.py
@@ -1007,6 +1007,7 @@
     "aws-events-eventbuspolicy.json",
     "aws-events-rule.json",
     "aws-fms-notificationchannel.json",
+    "aws-fms-policy.json",
     "aws-fms-resourceset.json",
     "aws-fsx-datarepositoryassociation.json",
     "aws-fsx-snapshot.json",
diff --git a/src/cfnlint/data/schemas/providers/ap_south_2/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/ap_south_2/aws-fms-policy.json
deleted file mode 100644
index 8422693828..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_south_2/aws-fms-policy.json
+++ /dev/null
@@ -1,416 +0,0 @@
-{
- "additionalProperties": false,
- "definitions": {
-  "AccountId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^([0-9]*)$",
-   "type": "string"
-  },
-  "Base62Id": {
-   "maxLength": 22,
-   "minLength": 22,
-   "pattern": "^[a-z0-9A-Z]{22}$",
-   "type": "string"
-  },
-  "FirewallDeploymentModel": {
-   "enum": [
-    "DISTRIBUTED",
-    "CENTRALIZED"
-   ],
-   "type": "string"
-  },
-  "IEMap": {
-   "additionalProperties": false,
-   "properties": {
-    "ACCOUNT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/AccountId"
-     },
-     "type": "array"
-    },
-    "ORGUNIT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/OrganizationalUnitId"
-     },
-     "type": "array"
-    }
-   },
-   "type": "object"
-  },
-  "ManagedServiceData": {
-   "maxLength": 30000,
-   "minLength": 1,
-   "type": "string"
-  },
-  "NetworkAclCommonPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "NetworkAclEntrySet": {
-     "$ref": "#/definitions/NetworkAclEntrySet"
-    }
-   },
-   "required": [
-    "NetworkAclEntrySet"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntry": {
-   "additionalProperties": false,
-   "properties": {
-    "CidrBlock": {
-     "pattern": "^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(\\/([0-9]|[1-2][0-9]|3[0-2]))$",
-     "type": "string"
-    },
-    "Egress": {
-     "type": "boolean"
-    },
-    "IcmpTypeCode": {
-     "additionalProperties": false,
-     "properties": {
-      "Code": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "Type": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "Code",
-      "Type"
-     ],
-     "type": "object"
-    },
-    "Ipv6CidrBlock": {
-     "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))(/(1[0-2]|[0-9]))?$",
-     "type": "string"
-    },
-    "PortRange": {
-     "additionalProperties": false,
-     "properties": {
-      "From": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "To": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "From",
-      "To"
-     ],
-     "type": "object"
-    },
-    "Protocol": {
-     "pattern": "^(tcp|udp|icmp|-1|([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))$",
-     "type": "string"
-    },
-    "RuleAction": {
-     "enum": [
-      "allow",
-      "deny"
-     ],
-     "type": "string"
-    }
-   },
-   "required": [
-    "Egress",
-    "Protocol",
-    "RuleAction"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntryList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/NetworkAclEntry"
-   },
-   "type": "array"
-  },
-  "NetworkAclEntrySet": {
-   "additionalProperties": false,
-   "anyOf": [
-    {
-     "required": [
-      "FirstEntries"
-     ]
-    },
-    {
-     "required": [
-      "LastEntries"
-     ]
-    }
-   ],
-   "properties": {
-    "FirstEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    },
-    "ForceRemediateForFirstEntries": {
-     "type": "boolean"
-    },
-    "ForceRemediateForLastEntries": {
-     "type": "boolean"
-    },
-    "LastEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    }
-   },
-   "required": [
-    "ForceRemediateForFirstEntries",
-    "ForceRemediateForLastEntries"
-   ],
-   "type": "object"
-  },
-  "NetworkFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  },
-  "OrganizationalUnitId": {
-   "maxLength": 68,
-   "minLength": 16,
-   "pattern": "^(ou-[0-9a-z]{4,32}-[a-z0-9]{8,32})$",
-   "type": "string"
-  },
-  "PolicyOption": {
-   "additionalProperties": false,
-   "oneOf": [
-    {
-     "required": [
-      "NetworkFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "ThirdPartyFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "NetworkAclCommonPolicy"
-     ]
-    }
-   ],
-   "properties": {
-    "NetworkAclCommonPolicy": {
-     "$ref": "#/definitions/NetworkAclCommonPolicy"
-    },
-    "NetworkFirewallPolicy": {
-     "$ref": "#/definitions/NetworkFirewallPolicy"
-    },
-    "ThirdPartyFirewallPolicy": {
-     "$ref": "#/definitions/ThirdPartyFirewallPolicy"
-    }
-   },
-   "type": "object"
-  },
-  "PolicyTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "PolicyType": {
-   "enum": [
-    "WAF",
-    "WAFV2",
-    "SHIELD_ADVANCED",
-    "SECURITY_GROUPS_COMMON",
-    "SECURITY_GROUPS_CONTENT_AUDIT",
-    "SECURITY_GROUPS_USAGE_AUDIT",
-    "NETWORK_FIREWALL",
-    "THIRD_PARTY_FIREWALL",
-    "DNS_FIREWALL",
-    "IMPORT_NETWORK_FIREWALL",
-    "NETWORK_ACL_COMMON"
-   ],
-   "type": "string"
-  },
-  "ResourceArn": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "ResourceTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key"
-   ],
-   "type": "object"
-  },
-  "ResourceType": {
-   "maxLength": 128,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "SecurityServicePolicyData": {
-   "additionalProperties": false,
-   "properties": {
-    "ManagedServiceData": {
-     "$ref": "#/definitions/ManagedServiceData"
-    },
-    "PolicyOption": {
-     "$ref": "#/definitions/PolicyOption"
-    },
-    "Type": {
-     "$ref": "#/definitions/PolicyType"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "ThirdPartyFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "Arn": {
-   "$ref": "#/definitions/ResourceArn"
-  },
-  "DeleteAllPolicyResources": {
-   "type": "boolean"
-  },
-  "ExcludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "ExcludeResourceTags": {
-   "type": "boolean"
-  },
-  "Id": {
-   "maxLength": 36,
-   "minLength": 36,
-   "pattern": "^[a-z0-9A-Z-]{36}$",
-   "type": "string"
-  },
-  "IncludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "PolicyDescription": {
-   "maxLength": 256,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "PolicyName": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "RemediationEnabled": {
-   "type": "boolean"
-  },
-  "ResourceSetIds": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/Base62Id"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "ResourceTags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceTag"
-   },
-   "maxItems": 8,
-   "type": "array"
-  },
-  "ResourceType": {
-   "$ref": "#/definitions/ResourceType"
-  },
-  "ResourceTypeList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceType"
-   },
-   "type": "array"
-  },
-  "ResourcesCleanUp": {
-   "type": "boolean"
-  },
-  "SecurityServicePolicyData": {
-   "$ref": "#/definitions/SecurityServicePolicyData"
-  },
-  "Tags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/PolicyTag"
-   },
-   "type": "array"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/Id"
- ],
- "required": [
-  "ExcludeResourceTags",
-  "PolicyName",
-  "RemediationEnabled",
-  "SecurityServicePolicyData"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-fms.git",
- "typeName": "AWS::FMS::Policy",
- "writeOnlyProperties": [
-  "/properties/DeleteAllPolicyResources"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_1/__init__.py b/src/cfnlint/data/schemas/providers/ap_southeast_1/__init__.py
index 6af654b220..af5f953dc2 100644
--- a/src/cfnlint/data/schemas/providers/ap_southeast_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/ap_southeast_1/__init__.py
@@ -206,6 +206,7 @@
     "AWS::CloudFront::RealtimeLogConfig",
     "AWS::CloudFront::ResponseHeadersPolicy",
     "AWS::CloudFront::StreamingDistribution",
+    "AWS::CloudFront::VpcOrigin",
     "AWS::CloudTrail::Channel",
     "AWS::CloudTrail::Dashboard",
     "AWS::CloudTrail::EventDataStore",
@@ -1476,6 +1477,7 @@
     "aws-cloudfront-realtimelogconfig.json",
     "aws-cloudfront-responseheaderspolicy.json",
     "aws-cloudfront-streamingdistribution.json",
+    "aws-cloudfront-vpcorigin.json",
     "aws-cloudtrail-channel.json",
     "aws-cloudtrail-dashboard.json",
     "aws-cloudtrail-eventdatastore.json",
@@ -1591,6 +1593,7 @@
     "aws-datasync-locationsmb.json",
     "aws-datasync-storagesystem.json",
     "aws-datasync-task.json",
+    "aws-datazone-datasource.json",
     "aws-datazone-domain.json",
     "aws-datazone-environment.json",
     "aws-datazone-environmentactions.json",
@@ -2165,6 +2168,9 @@
     "aws-organizations-policy.json",
     "aws-organizations-resourcepolicy.json",
     "aws-osis-pipeline.json",
+    "aws-panorama-applicationinstance.json",
+    "aws-panorama-package.json",
+    "aws-panorama-packageversion.json",
     "aws-paymentcryptography-alias.json",
     "aws-paymentcryptography-key.json",
     "aws-pcaconnectorad-connector.json",
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-datazone-datasource.json b/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-datazone-datasource.json
deleted file mode 100644
index 1f1745b36e..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-datazone-datasource.json
+++ /dev/null
@@ -1,552 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/ConnectionIdentifier",
-  "/properties/EnvironmentIdentifier",
-  "/properties/DomainIdentifier",
-  "/properties/ProjectIdentifier",
-  "/properties/Type"
- ],
- "definitions": {
-  "AccountId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^\\d{12}$",
-   "type": "string"
-  },
-  "DataAccessRole": {
-   "pattern": "^arn:aws[^:]*:iam::\\d{12}:(role|role/service-role)/[\\w+=,.@-]{1,128}$",
-   "type": "string"
-  },
-  "DataSourceConfigurationInput": {
-   "oneOf": [
-    {
-     "additionalProperties": false,
-     "properties": {
-      "GlueRunConfiguration": {
-       "$ref": "#/definitions/GlueRunConfigurationInput"
-      }
-     },
-     "title": "GlueRunConfiguration",
-     "type": "object"
-    },
-    {
-     "additionalProperties": false,
-     "properties": {
-      "RedshiftRunConfiguration": {
-       "$ref": "#/definitions/RedshiftRunConfigurationInput"
-      }
-     },
-     "title": "RedshiftRunConfiguration",
-     "type": "object"
-    },
-    {
-     "additionalProperties": false,
-     "properties": {
-      "SageMakerRunConfiguration": {
-       "$ref": "#/definitions/SageMakerRunConfigurationInput"
-      }
-     },
-     "title": "SageMakerRunConfiguration",
-     "type": "object"
-    }
-   ]
-  },
-  "DataSourceStatus": {
-   "enum": [
-    "CREATING",
-    "FAILED_CREATION",
-    "READY",
-    "UPDATING",
-    "FAILED_UPDATE",
-    "RUNNING",
-    "DELETING",
-    "FAILED_DELETION"
-   ],
-   "type": "string"
-  },
-  "EnableSetting": {
-   "enum": [
-    "ENABLED",
-    "DISABLED"
-   ],
-   "type": "string"
-  },
-  "FilterExpression": {
-   "additionalProperties": false,
-   "properties": {
-    "Expression": {
-     "maxLength": 2048,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Type": {
-     "$ref": "#/definitions/FilterExpressionType"
-    }
-   },
-   "required": [
-    "Expression",
-    "Type"
-   ],
-   "type": "object"
-  },
-  "FilterExpressionType": {
-   "enum": [
-    "INCLUDE",
-    "EXCLUDE"
-   ],
-   "type": "string"
-  },
-  "FormInput": {
-   "additionalProperties": false,
-   "properties": {
-    "Content": {
-     "maxLength": 75000,
-     "type": "string"
-    },
-    "FormName": {
-     "$ref": "#/definitions/FormName"
-    },
-    "TypeIdentifier": {
-     "maxLength": 385,
-     "minLength": 1,
-     "pattern": "^(?!\\.)[\\w\\.]*\\w$",
-     "type": "string"
-    },
-    "TypeRevision": {
-     "$ref": "#/definitions/TypeRevision"
-    }
-   },
-   "required": [
-    "FormName"
-   ],
-   "type": "object"
-  },
-  "FormName": {
-   "maxLength": 128,
-   "minLength": 1,
-   "pattern": "^(?![0-9_])\\w+$|^_\\w*[a-zA-Z0-9]\\w*$",
-   "type": "string"
-  },
-  "GlueRunConfigurationInput": {
-   "additionalProperties": false,
-   "properties": {
-    "AutoImportDataQualityResult": {
-     "type": "boolean"
-    },
-    "CatalogName": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "DataAccessRole": {
-     "$ref": "#/definitions/DataAccessRole"
-    },
-    "RelationalFilterConfigurations": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/RelationalFilterConfiguration"
-     },
-     "type": "array"
-    }
-   },
-   "required": [
-    "RelationalFilterConfigurations"
-   ],
-   "type": "object"
-  },
-  "RecommendationConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "EnableBusinessNameGeneration": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "RedshiftClusterStorage": {
-   "additionalProperties": false,
-   "properties": {
-    "ClusterName": {
-     "maxLength": 63,
-     "minLength": 1,
-     "pattern": "^[0-9a-z].[a-z0-9\\-]*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "ClusterName"
-   ],
-   "type": "object"
-  },
-  "RedshiftCredentialConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "SecretManagerArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws[^:]*:secretsmanager:[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]:\\d{12}:secret:.*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "SecretManagerArn"
-   ],
-   "type": "object"
-  },
-  "RedshiftRunConfigurationInput": {
-   "additionalProperties": false,
-   "properties": {
-    "DataAccessRole": {
-     "$ref": "#/definitions/DataAccessRole"
-    },
-    "RedshiftCredentialConfiguration": {
-     "$ref": "#/definitions/RedshiftCredentialConfiguration"
-    },
-    "RedshiftStorage": {
-     "$ref": "#/definitions/RedshiftStorage"
-    },
-    "RelationalFilterConfigurations": {
-     "$ref": "#/definitions/RelationalFilterConfigurations"
-    }
-   },
-   "required": [
-    "RelationalFilterConfigurations"
-   ],
-   "type": "object"
-  },
-  "RedshiftServerlessStorage": {
-   "additionalProperties": false,
-   "properties": {
-    "WorkgroupName": {
-     "maxLength": 64,
-     "minLength": 3,
-     "pattern": "^[a-z0-9-]+$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "WorkgroupName"
-   ],
-   "type": "object"
-  },
-  "RedshiftStorage": {
-   "oneOf": [
-    {
-     "additionalProperties": false,
-     "properties": {
-      "RedshiftClusterSource": {
-       "$ref": "#/definitions/RedshiftClusterStorage"
-      }
-     },
-     "required": [
-      "RedshiftClusterSource"
-     ],
-     "title": "RedshiftClusterSource",
-     "type": "object"
-    },
-    {
-     "additionalProperties": false,
-     "properties": {
-      "RedshiftServerlessSource": {
-       "$ref": "#/definitions/RedshiftServerlessStorage"
-      }
-     },
-     "required": [
-      "RedshiftServerlessSource"
-     ],
-     "title": "RedshiftServerlessSource",
-     "type": "object"
-    }
-   ]
-  },
-  "Region": {
-   "maxLength": 16,
-   "minLength": 4,
-   "pattern": "[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]",
-   "type": "string"
-  },
-  "RelationalFilterConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "DatabaseName": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "FilterExpressions": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/FilterExpression"
-     },
-     "type": "array"
-    },
-    "SchemaName": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "DatabaseName"
-   ],
-   "type": "object"
-  },
-  "RelationalFilterConfigurations": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/RelationalFilterConfiguration"
-   },
-   "type": "array"
-  },
-  "SageMakerRunConfigurationInput": {
-   "additionalProperties": false,
-   "properties": {
-    "TrackingAssets": {
-     "$ref": "#/definitions/TrackingAssets"
-    }
-   },
-   "required": [
-    "TrackingAssets"
-   ],
-   "type": "object"
-  },
-  "ScheduleConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "Schedule": {
-     "maxLength": 256,
-     "minLength": 1,
-     "pattern": "cron\\((\\b[0-5]?[0-9]\\b) (\\b2[0-3]\\b|\\b[0-1]?[0-9]\\b) (.*){1,5} (.*){1,5} (.*){1,5} (.*){1,5}\\)",
-     "type": "string"
-    },
-    "Timezone": {
-     "$ref": "#/definitions/Timezone"
-    }
-   },
-   "type": "object"
-  },
-  "Timezone": {
-   "enum": [
-    "AFRICA_JOHANNESBURG",
-    "AMERICA_MONTREAL",
-    "AMERICA_SAO_PAULO",
-    "ASIA_BAHRAIN",
-    "ASIA_BANGKOK",
-    "ASIA_CALCUTTA",
-    "ASIA_DUBAI",
-    "ASIA_HONG_KONG",
-    "ASIA_JAKARTA",
-    "ASIA_KUALA_LUMPUR",
-    "ASIA_SEOUL",
-    "ASIA_SHANGHAI",
-    "ASIA_SINGAPORE",
-    "ASIA_TAIPEI",
-    "ASIA_TOKYO",
-    "AUSTRALIA_MELBOURNE",
-    "AUSTRALIA_SYDNEY",
-    "CANADA_CENTRAL",
-    "CET",
-    "CST6CDT",
-    "ETC_GMT",
-    "ETC_GMT0",
-    "ETC_GMT_ADD_0",
-    "ETC_GMT_ADD_1",
-    "ETC_GMT_ADD_10",
-    "ETC_GMT_ADD_11",
-    "ETC_GMT_ADD_12",
-    "ETC_GMT_ADD_2",
-    "ETC_GMT_ADD_3",
-    "ETC_GMT_ADD_4",
-    "ETC_GMT_ADD_5",
-    "ETC_GMT_ADD_6",
-    "ETC_GMT_ADD_7",
-    "ETC_GMT_ADD_8",
-    "ETC_GMT_ADD_9",
-    "ETC_GMT_NEG_0",
-    "ETC_GMT_NEG_1",
-    "ETC_GMT_NEG_10",
-    "ETC_GMT_NEG_11",
-    "ETC_GMT_NEG_12",
-    "ETC_GMT_NEG_13",
-    "ETC_GMT_NEG_14",
-    "ETC_GMT_NEG_2",
-    "ETC_GMT_NEG_3",
-    "ETC_GMT_NEG_4",
-    "ETC_GMT_NEG_5",
-    "ETC_GMT_NEG_6",
-    "ETC_GMT_NEG_7",
-    "ETC_GMT_NEG_8",
-    "ETC_GMT_NEG_9",
-    "EUROPE_DUBLIN",
-    "EUROPE_LONDON",
-    "EUROPE_PARIS",
-    "EUROPE_STOCKHOLM",
-    "EUROPE_ZURICH",
-    "ISRAEL",
-    "MEXICO_GENERAL",
-    "MST7MDT",
-    "PACIFIC_AUCKLAND",
-    "US_CENTRAL",
-    "US_EASTERN",
-    "US_MOUNTAIN",
-    "US_PACIFIC",
-    "UTC"
-   ],
-   "type": "string"
-  },
-  "TrackingAssets": {
-   "additionalProperties": false,
-   "maxProperties": 1,
-   "patternProperties": {
-    "^.{1,64}$": {
-     "items": {
-      "pattern": "^arn:aws[^:]*:sagemaker:[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]:\\d{12}:[\\w+=,.@-]{1,128}/[\\w+=,.@-]{1,256}$",
-      "type": "string"
-     },
-     "maxItems": 500,
-     "minItems": 0,
-     "type": "array"
-    }
-   },
-   "type": "object"
-  },
-  "TypeRevision": {
-   "maxLength": 64,
-   "minLength": 1,
-   "pattern": "^[a-zA-Z0-9_-]+$",
-   "type": "string"
-  }
- },
- "primaryIdentifier": [
-  "/properties/DomainId",
-  "/properties/Id"
- ],
- "properties": {
-  "AssetFormsInput": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/FormInput"
-   },
-   "maxItems": 10,
-   "minItems": 0,
-   "type": "array"
-  },
-  "Configuration": {
-   "$ref": "#/definitions/DataSourceConfigurationInput"
-  },
-  "ConnectionId": {
-   "type": "string"
-  },
-  "ConnectionIdentifier": {
-   "type": "string"
-  },
-  "CreatedAt": {
-   "format": "date-time",
-   "type": "string"
-  },
-  "Description": {
-   "maxLength": 2048,
-   "type": "string"
-  },
-  "DomainId": {
-   "pattern": "^dzd[-_][a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "DomainIdentifier": {
-   "pattern": "^dzd[-_][a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "EnableSetting": {
-   "$ref": "#/definitions/EnableSetting"
-  },
-  "EnvironmentId": {
-   "type": "string"
-  },
-  "EnvironmentIdentifier": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "Id": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "LastRunAssetCount": {
-   "type": "number"
-  },
-  "LastRunAt": {
-   "type": "string"
-  },
-  "LastRunStatus": {
-   "type": "string"
-  },
-  "Name": {
-   "maxLength": 256,
-   "minLength": 1,
-   "type": "string"
-  },
-  "ProjectId": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "ProjectIdentifier": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "PublishOnImport": {
-   "type": "boolean"
-  },
-  "Recommendation": {
-   "$ref": "#/definitions/RecommendationConfiguration"
-  },
-  "Schedule": {
-   "$ref": "#/definitions/ScheduleConfiguration"
-  },
-  "Status": {
-   "$ref": "#/definitions/DataSourceStatus"
-  },
-  "Type": {
-   "maxLength": 256,
-   "minLength": 1,
-   "type": "string"
-  },
-  "UpdatedAt": {
-   "format": "date-time",
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/ConnectionId",
-  "/properties/CreatedAt",
-  "/properties/DomainId",
-  "/properties/EnvironmentId",
-  "/properties/Id",
-  "/properties/LastRunAssetCount",
-  "/properties/LastRunAt",
-  "/properties/LastRunStatus",
-  "/properties/ProjectId",
-  "/properties/Status",
-  "/properties/UpdatedAt"
- ],
- "required": [
-  "Name",
-  "DomainIdentifier",
-  "ProjectIdentifier",
-  "Type"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-datazone",
- "tagging": {
-  "cloudFormationSystemTags": false,
-  "tagOnCreate": false,
-  "tagUpdatable": false,
-  "taggable": false
- },
- "typeName": "AWS::DataZone::DataSource",
- "writeOnlyProperties": [
-  "/properties/AssetFormsInput",
-  "/properties/ConnectionIdentifier",
-  "/properties/EnvironmentIdentifier",
-  "/properties/DomainIdentifier",
-  "/properties/Configuration",
-  "/properties/ProjectIdentifier"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-panorama-package.json b/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-panorama-package.json
deleted file mode 100644
index a8ea1b7b3e..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-panorama-package.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/PackageName"
- ],
- "definitions": {
-  "NodePackageArn": {
-   "maxLength": 255,
-   "minLength": 1,
-   "type": "string"
-  },
-  "NodePackageId": {
-   "maxLength": 255,
-   "minLength": 1,
-   "pattern": "^[a-zA-Z0-9\\-\\_\\/]+$",
-   "type": "string"
-  },
-  "NodePackageName": {
-   "maxLength": 128,
-   "minLength": 1,
-   "pattern": "^[a-zA-Z0-9\\-\\_]+$",
-   "type": "string"
-  },
-  "StorageLocation": {
-   "additionalProperties": false,
-   "properties": {
-    "BinaryPrefixLocation": {
-     "type": "string"
-    },
-    "Bucket": {
-     "type": "string"
-    },
-    "GeneratedPrefixLocation": {
-     "type": "string"
-    },
-    "ManifestPrefixLocation": {
-     "type": "string"
-    },
-    "RepoPrefixLocation": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^.+$",
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "minLength": 0,
-     "pattern": "^.+$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "TagList": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "Timestamp": {
-   "type": "integer"
-  }
- },
- "primaryIdentifier": [
-  "/properties/PackageId"
- ],
- "properties": {
-  "Arn": {
-   "$ref": "#/definitions/NodePackageArn"
-  },
-  "CreatedTime": {
-   "$ref": "#/definitions/Timestamp"
-  },
-  "PackageId": {
-   "$ref": "#/definitions/NodePackageId"
-  },
-  "PackageName": {
-   "$ref": "#/definitions/NodePackageName"
-  },
-  "StorageLocation": {
-   "$ref": "#/definitions/StorageLocation"
-  },
-  "Tags": {
-   "$ref": "#/definitions/TagList"
-  }
- },
- "readOnlyProperties": [
-  "/properties/PackageId",
-  "/properties/Arn",
-  "/properties/CreatedTime",
-  "/properties/StorageLocation/Bucket",
-  "/properties/StorageLocation/RepoPrefixLocation",
-  "/properties/StorageLocation/GeneratedPrefixLocation",
-  "/properties/StorageLocation/BinaryPrefixLocation",
-  "/properties/StorageLocation/ManifestPrefixLocation"
- ],
- "required": [
-  "PackageName"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git",
- "tagging": {
-  "cloudFormationSystemTags": true,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::Panorama::Package"
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-panorama-packageversion.json b/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-panorama-packageversion.json
deleted file mode 100644
index 4e1669e777..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-panorama-packageversion.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/OwnerAccount",
-  "/properties/PackageId",
-  "/properties/PackageVersion",
-  "/properties/PatchVersion"
- ],
- "definitions": {
-  "NodePackageArn": {
-   "maxLength": 255,
-   "minLength": 1,
-   "type": "string"
-  },
-  "NodePackageId": {
-   "maxLength": 255,
-   "minLength": 1,
-   "pattern": "^[a-zA-Z0-9\\-\\_\\/]+$",
-   "type": "string"
-  },
-  "NodePackageName": {
-   "maxLength": 128,
-   "minLength": 1,
-   "pattern": "^[a-zA-Z0-9\\-\\_]+$",
-   "type": "string"
-  },
-  "NodePackagePatchVersion": {
-   "maxLength": 255,
-   "minLength": 1,
-   "pattern": "^[a-z0-9]+$",
-   "type": "string"
-  },
-  "NodePackageVersion": {
-   "maxLength": 255,
-   "minLength": 1,
-   "pattern": "^([0-9]+)\\.([0-9]+)$",
-   "type": "string"
-  },
-  "PackageOwnerAccount": {
-   "maxLength": 12,
-   "minLength": 1,
-   "pattern": "^[0-9a-z\\_]+$",
-   "type": "string"
-  },
-  "PackageVersionStatus": {
-   "enum": [
-    "REGISTER_PENDING",
-    "REGISTER_COMPLETED",
-    "FAILED",
-    "DELETING"
-   ],
-   "type": "string"
-  },
-  "PackageVersionStatusDescription": {
-   "maxLength": 255,
-   "minLength": 1,
-   "type": "string"
-  },
-  "TimeStamp": {
-   "type": "integer"
-  }
- },
- "primaryIdentifier": [
-  "/properties/PackageId",
-  "/properties/PackageVersion",
-  "/properties/PatchVersion"
- ],
- "properties": {
-  "IsLatestPatch": {
-   "type": "boolean"
-  },
-  "MarkLatest": {
-   "type": "boolean"
-  },
-  "OwnerAccount": {
-   "$ref": "#/definitions/PackageOwnerAccount"
-  },
-  "PackageArn": {
-   "$ref": "#/definitions/NodePackageArn"
-  },
-  "PackageId": {
-   "$ref": "#/definitions/NodePackageId"
-  },
-  "PackageName": {
-   "$ref": "#/definitions/NodePackageName"
-  },
-  "PackageVersion": {
-   "$ref": "#/definitions/NodePackageVersion"
-  },
-  "PatchVersion": {
-   "$ref": "#/definitions/NodePackagePatchVersion"
-  },
-  "RegisteredTime": {
-   "$ref": "#/definitions/TimeStamp"
-  },
-  "Status": {
-   "$ref": "#/definitions/PackageVersionStatus"
-  },
-  "StatusDescription": {
-   "$ref": "#/definitions/PackageVersionStatusDescription"
-  },
-  "UpdatedLatestPatchVersion": {
-   "$ref": "#/definitions/NodePackagePatchVersion"
-  }
- },
- "readOnlyProperties": [
-  "/properties/PackageName",
-  "/properties/PackageArn",
-  "/properties/Status",
-  "/properties/StatusDescription",
-  "/properties/IsLatestPatch",
-  "/properties/RegisteredTime"
- ],
- "required": [
-  "PackageId",
-  "PackageVersion",
-  "PatchVersion"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-panorama.git",
- "typeName": "AWS::Panorama::PackageVersion",
- "writeOnlyProperties": [
-  "/properties/UpdatedLatestPatchVersion"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_2/__init__.py b/src/cfnlint/data/schemas/providers/ap_southeast_2/__init__.py
index c08dace334..f7c23c835b 100644
--- a/src/cfnlint/data/schemas/providers/ap_southeast_2/__init__.py
+++ b/src/cfnlint/data/schemas/providers/ap_southeast_2/__init__.py
@@ -1618,6 +1618,7 @@
     "aws-datasync-locationsmb.json",
     "aws-datasync-storagesystem.json",
     "aws-datasync-task.json",
+    "aws-datazone-datasource.json",
     "aws-datazone-domain.json",
     "aws-datazone-environment.json",
     "aws-datazone-environmentactions.json",
@@ -1999,7 +2000,6 @@
     "aws-iotsitewise-asset.json",
     "aws-iotsitewise-assetmodel.json",
     "aws-iotsitewise-dashboard.json",
-    "aws-iotsitewise-gateway.json",
     "aws-iotsitewise-portal.json",
     "aws-iotsitewise-project.json",
     "aws-iotthingsgraph-flowtemplate.json",
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-datazone-datasource.json b/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-datazone-datasource.json
deleted file mode 100644
index 1f1745b36e..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-datazone-datasource.json
+++ /dev/null
@@ -1,552 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/ConnectionIdentifier",
-  "/properties/EnvironmentIdentifier",
-  "/properties/DomainIdentifier",
-  "/properties/ProjectIdentifier",
-  "/properties/Type"
- ],
- "definitions": {
-  "AccountId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^\\d{12}$",
-   "type": "string"
-  },
-  "DataAccessRole": {
-   "pattern": "^arn:aws[^:]*:iam::\\d{12}:(role|role/service-role)/[\\w+=,.@-]{1,128}$",
-   "type": "string"
-  },
-  "DataSourceConfigurationInput": {
-   "oneOf": [
-    {
-     "additionalProperties": false,
-     "properties": {
-      "GlueRunConfiguration": {
-       "$ref": "#/definitions/GlueRunConfigurationInput"
-      }
-     },
-     "title": "GlueRunConfiguration",
-     "type": "object"
-    },
-    {
-     "additionalProperties": false,
-     "properties": {
-      "RedshiftRunConfiguration": {
-       "$ref": "#/definitions/RedshiftRunConfigurationInput"
-      }
-     },
-     "title": "RedshiftRunConfiguration",
-     "type": "object"
-    },
-    {
-     "additionalProperties": false,
-     "properties": {
-      "SageMakerRunConfiguration": {
-       "$ref": "#/definitions/SageMakerRunConfigurationInput"
-      }
-     },
-     "title": "SageMakerRunConfiguration",
-     "type": "object"
-    }
-   ]
-  },
-  "DataSourceStatus": {
-   "enum": [
-    "CREATING",
-    "FAILED_CREATION",
-    "READY",
-    "UPDATING",
-    "FAILED_UPDATE",
-    "RUNNING",
-    "DELETING",
-    "FAILED_DELETION"
-   ],
-   "type": "string"
-  },
-  "EnableSetting": {
-   "enum": [
-    "ENABLED",
-    "DISABLED"
-   ],
-   "type": "string"
-  },
-  "FilterExpression": {
-   "additionalProperties": false,
-   "properties": {
-    "Expression": {
-     "maxLength": 2048,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Type": {
-     "$ref": "#/definitions/FilterExpressionType"
-    }
-   },
-   "required": [
-    "Expression",
-    "Type"
-   ],
-   "type": "object"
-  },
-  "FilterExpressionType": {
-   "enum": [
-    "INCLUDE",
-    "EXCLUDE"
-   ],
-   "type": "string"
-  },
-  "FormInput": {
-   "additionalProperties": false,
-   "properties": {
-    "Content": {
-     "maxLength": 75000,
-     "type": "string"
-    },
-    "FormName": {
-     "$ref": "#/definitions/FormName"
-    },
-    "TypeIdentifier": {
-     "maxLength": 385,
-     "minLength": 1,
-     "pattern": "^(?!\\.)[\\w\\.]*\\w$",
-     "type": "string"
-    },
-    "TypeRevision": {
-     "$ref": "#/definitions/TypeRevision"
-    }
-   },
-   "required": [
-    "FormName"
-   ],
-   "type": "object"
-  },
-  "FormName": {
-   "maxLength": 128,
-   "minLength": 1,
-   "pattern": "^(?![0-9_])\\w+$|^_\\w*[a-zA-Z0-9]\\w*$",
-   "type": "string"
-  },
-  "GlueRunConfigurationInput": {
-   "additionalProperties": false,
-   "properties": {
-    "AutoImportDataQualityResult": {
-     "type": "boolean"
-    },
-    "CatalogName": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "DataAccessRole": {
-     "$ref": "#/definitions/DataAccessRole"
-    },
-    "RelationalFilterConfigurations": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/RelationalFilterConfiguration"
-     },
-     "type": "array"
-    }
-   },
-   "required": [
-    "RelationalFilterConfigurations"
-   ],
-   "type": "object"
-  },
-  "RecommendationConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "EnableBusinessNameGeneration": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "RedshiftClusterStorage": {
-   "additionalProperties": false,
-   "properties": {
-    "ClusterName": {
-     "maxLength": 63,
-     "minLength": 1,
-     "pattern": "^[0-9a-z].[a-z0-9\\-]*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "ClusterName"
-   ],
-   "type": "object"
-  },
-  "RedshiftCredentialConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "SecretManagerArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws[^:]*:secretsmanager:[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]:\\d{12}:secret:.*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "SecretManagerArn"
-   ],
-   "type": "object"
-  },
-  "RedshiftRunConfigurationInput": {
-   "additionalProperties": false,
-   "properties": {
-    "DataAccessRole": {
-     "$ref": "#/definitions/DataAccessRole"
-    },
-    "RedshiftCredentialConfiguration": {
-     "$ref": "#/definitions/RedshiftCredentialConfiguration"
-    },
-    "RedshiftStorage": {
-     "$ref": "#/definitions/RedshiftStorage"
-    },
-    "RelationalFilterConfigurations": {
-     "$ref": "#/definitions/RelationalFilterConfigurations"
-    }
-   },
-   "required": [
-    "RelationalFilterConfigurations"
-   ],
-   "type": "object"
-  },
-  "RedshiftServerlessStorage": {
-   "additionalProperties": false,
-   "properties": {
-    "WorkgroupName": {
-     "maxLength": 64,
-     "minLength": 3,
-     "pattern": "^[a-z0-9-]+$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "WorkgroupName"
-   ],
-   "type": "object"
-  },
-  "RedshiftStorage": {
-   "oneOf": [
-    {
-     "additionalProperties": false,
-     "properties": {
-      "RedshiftClusterSource": {
-       "$ref": "#/definitions/RedshiftClusterStorage"
-      }
-     },
-     "required": [
-      "RedshiftClusterSource"
-     ],
-     "title": "RedshiftClusterSource",
-     "type": "object"
-    },
-    {
-     "additionalProperties": false,
-     "properties": {
-      "RedshiftServerlessSource": {
-       "$ref": "#/definitions/RedshiftServerlessStorage"
-      }
-     },
-     "required": [
-      "RedshiftServerlessSource"
-     ],
-     "title": "RedshiftServerlessSource",
-     "type": "object"
-    }
-   ]
-  },
-  "Region": {
-   "maxLength": 16,
-   "minLength": 4,
-   "pattern": "[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]",
-   "type": "string"
-  },
-  "RelationalFilterConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "DatabaseName": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "FilterExpressions": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/FilterExpression"
-     },
-     "type": "array"
-    },
-    "SchemaName": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "DatabaseName"
-   ],
-   "type": "object"
-  },
-  "RelationalFilterConfigurations": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/RelationalFilterConfiguration"
-   },
-   "type": "array"
-  },
-  "SageMakerRunConfigurationInput": {
-   "additionalProperties": false,
-   "properties": {
-    "TrackingAssets": {
-     "$ref": "#/definitions/TrackingAssets"
-    }
-   },
-   "required": [
-    "TrackingAssets"
-   ],
-   "type": "object"
-  },
-  "ScheduleConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "Schedule": {
-     "maxLength": 256,
-     "minLength": 1,
-     "pattern": "cron\\((\\b[0-5]?[0-9]\\b) (\\b2[0-3]\\b|\\b[0-1]?[0-9]\\b) (.*){1,5} (.*){1,5} (.*){1,5} (.*){1,5}\\)",
-     "type": "string"
-    },
-    "Timezone": {
-     "$ref": "#/definitions/Timezone"
-    }
-   },
-   "type": "object"
-  },
-  "Timezone": {
-   "enum": [
-    "AFRICA_JOHANNESBURG",
-    "AMERICA_MONTREAL",
-    "AMERICA_SAO_PAULO",
-    "ASIA_BAHRAIN",
-    "ASIA_BANGKOK",
-    "ASIA_CALCUTTA",
-    "ASIA_DUBAI",
-    "ASIA_HONG_KONG",
-    "ASIA_JAKARTA",
-    "ASIA_KUALA_LUMPUR",
-    "ASIA_SEOUL",
-    "ASIA_SHANGHAI",
-    "ASIA_SINGAPORE",
-    "ASIA_TAIPEI",
-    "ASIA_TOKYO",
-    "AUSTRALIA_MELBOURNE",
-    "AUSTRALIA_SYDNEY",
-    "CANADA_CENTRAL",
-    "CET",
-    "CST6CDT",
-    "ETC_GMT",
-    "ETC_GMT0",
-    "ETC_GMT_ADD_0",
-    "ETC_GMT_ADD_1",
-    "ETC_GMT_ADD_10",
-    "ETC_GMT_ADD_11",
-    "ETC_GMT_ADD_12",
-    "ETC_GMT_ADD_2",
-    "ETC_GMT_ADD_3",
-    "ETC_GMT_ADD_4",
-    "ETC_GMT_ADD_5",
-    "ETC_GMT_ADD_6",
-    "ETC_GMT_ADD_7",
-    "ETC_GMT_ADD_8",
-    "ETC_GMT_ADD_9",
-    "ETC_GMT_NEG_0",
-    "ETC_GMT_NEG_1",
-    "ETC_GMT_NEG_10",
-    "ETC_GMT_NEG_11",
-    "ETC_GMT_NEG_12",
-    "ETC_GMT_NEG_13",
-    "ETC_GMT_NEG_14",
-    "ETC_GMT_NEG_2",
-    "ETC_GMT_NEG_3",
-    "ETC_GMT_NEG_4",
-    "ETC_GMT_NEG_5",
-    "ETC_GMT_NEG_6",
-    "ETC_GMT_NEG_7",
-    "ETC_GMT_NEG_8",
-    "ETC_GMT_NEG_9",
-    "EUROPE_DUBLIN",
-    "EUROPE_LONDON",
-    "EUROPE_PARIS",
-    "EUROPE_STOCKHOLM",
-    "EUROPE_ZURICH",
-    "ISRAEL",
-    "MEXICO_GENERAL",
-    "MST7MDT",
-    "PACIFIC_AUCKLAND",
-    "US_CENTRAL",
-    "US_EASTERN",
-    "US_MOUNTAIN",
-    "US_PACIFIC",
-    "UTC"
-   ],
-   "type": "string"
-  },
-  "TrackingAssets": {
-   "additionalProperties": false,
-   "maxProperties": 1,
-   "patternProperties": {
-    "^.{1,64}$": {
-     "items": {
-      "pattern": "^arn:aws[^:]*:sagemaker:[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]:\\d{12}:[\\w+=,.@-]{1,128}/[\\w+=,.@-]{1,256}$",
-      "type": "string"
-     },
-     "maxItems": 500,
-     "minItems": 0,
-     "type": "array"
-    }
-   },
-   "type": "object"
-  },
-  "TypeRevision": {
-   "maxLength": 64,
-   "minLength": 1,
-   "pattern": "^[a-zA-Z0-9_-]+$",
-   "type": "string"
-  }
- },
- "primaryIdentifier": [
-  "/properties/DomainId",
-  "/properties/Id"
- ],
- "properties": {
-  "AssetFormsInput": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/FormInput"
-   },
-   "maxItems": 10,
-   "minItems": 0,
-   "type": "array"
-  },
-  "Configuration": {
-   "$ref": "#/definitions/DataSourceConfigurationInput"
-  },
-  "ConnectionId": {
-   "type": "string"
-  },
-  "ConnectionIdentifier": {
-   "type": "string"
-  },
-  "CreatedAt": {
-   "format": "date-time",
-   "type": "string"
-  },
-  "Description": {
-   "maxLength": 2048,
-   "type": "string"
-  },
-  "DomainId": {
-   "pattern": "^dzd[-_][a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "DomainIdentifier": {
-   "pattern": "^dzd[-_][a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "EnableSetting": {
-   "$ref": "#/definitions/EnableSetting"
-  },
-  "EnvironmentId": {
-   "type": "string"
-  },
-  "EnvironmentIdentifier": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "Id": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "LastRunAssetCount": {
-   "type": "number"
-  },
-  "LastRunAt": {
-   "type": "string"
-  },
-  "LastRunStatus": {
-   "type": "string"
-  },
-  "Name": {
-   "maxLength": 256,
-   "minLength": 1,
-   "type": "string"
-  },
-  "ProjectId": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "ProjectIdentifier": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "PublishOnImport": {
-   "type": "boolean"
-  },
-  "Recommendation": {
-   "$ref": "#/definitions/RecommendationConfiguration"
-  },
-  "Schedule": {
-   "$ref": "#/definitions/ScheduleConfiguration"
-  },
-  "Status": {
-   "$ref": "#/definitions/DataSourceStatus"
-  },
-  "Type": {
-   "maxLength": 256,
-   "minLength": 1,
-   "type": "string"
-  },
-  "UpdatedAt": {
-   "format": "date-time",
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/ConnectionId",
-  "/properties/CreatedAt",
-  "/properties/DomainId",
-  "/properties/EnvironmentId",
-  "/properties/Id",
-  "/properties/LastRunAssetCount",
-  "/properties/LastRunAt",
-  "/properties/LastRunStatus",
-  "/properties/ProjectId",
-  "/properties/Status",
-  "/properties/UpdatedAt"
- ],
- "required": [
-  "Name",
-  "DomainIdentifier",
-  "ProjectIdentifier",
-  "Type"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-datazone",
- "tagging": {
-  "cloudFormationSystemTags": false,
-  "tagOnCreate": false,
-  "tagUpdatable": false,
-  "taggable": false
- },
- "typeName": "AWS::DataZone::DataSource",
- "writeOnlyProperties": [
-  "/properties/AssetFormsInput",
-  "/properties/ConnectionIdentifier",
-  "/properties/EnvironmentIdentifier",
-  "/properties/DomainIdentifier",
-  "/properties/Configuration",
-  "/properties/ProjectIdentifier"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-iotsitewise-gateway.json b/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-iotsitewise-gateway.json
new file mode 100644
index 0000000000..e5be069ce5
--- /dev/null
+++ b/src/cfnlint/data/schemas/providers/ap_southeast_2/aws-iotsitewise-gateway.json
@@ -0,0 +1,164 @@
+{
+ "additionalProperties": false,
+ "createOnlyProperties": [
+  "/properties/GatewayPlatform",
+  "/properties/GatewayVersion"
+ ],
+ "definitions": {
+  "CapabilityConfiguration": {
+   "type": "string"
+  },
+  "CapabilityNamespace": {
+   "type": "string"
+  },
+  "GatewayCapabilitySummary": {
+   "additionalProperties": false,
+   "properties": {
+    "CapabilityConfiguration": {
+     "$ref": "#/definitions/CapabilityConfiguration"
+    },
+    "CapabilityNamespace": {
+     "$ref": "#/definitions/CapabilityNamespace"
+    }
+   },
+   "required": [
+    "CapabilityNamespace"
+   ],
+   "type": "object"
+  },
+  "GatewayPlatform": {
+   "additionalProperties": false,
+   "oneOf": [
+    {
+     "required": [
+      "Greengrass"
+     ]
+    },
+    {
+     "required": [
+      "GreengrassV2"
+     ]
+    },
+    {
+     "required": [
+      "SiemensIE"
+     ]
+    }
+   ],
+   "properties": {
+    "Greengrass": {},
+    "GreengrassV2": {
+     "$ref": "#/definitions/GreengrassV2"
+    },
+    "SiemensIE": {
+     "$ref": "#/definitions/SiemensIE"
+    }
+   },
+   "type": "object"
+  },
+  "GatewayVersion": {
+   "type": "string"
+  },
+  "GreengrassV2": {
+   "additionalProperties": false,
+   "properties": {
+    "CoreDeviceOperatingSystem": {
+     "enum": [
+      "LINUX_AARCH64",
+      "LINUX_AMD64",
+      "WINDOWS_AMD64"
+     ],
+     "type": "string"
+    },
+    "CoreDeviceThingName": {
+     "type": "string"
+    }
+   },
+   "required": [
+    "CoreDeviceThingName"
+   ],
+   "type": "object"
+  },
+  "SiemensIE": {
+   "additionalProperties": false,
+   "properties": {
+    "IotCoreThingName": {
+     "type": "string"
+    }
+   },
+   "required": [
+    "IotCoreThingName"
+   ],
+   "type": "object"
+  },
+  "Tag": {
+   "additionalProperties": false,
+   "properties": {
+    "Key": {
+     "type": "string"
+    },
+    "Value": {
+     "type": "string"
+    }
+   },
+   "required": [
+    "Key",
+    "Value"
+   ],
+   "type": "object"
+  }
+ },
+ "deprecatedProperties": [
+  "/properties/GatewayPlatform/Greengrass"
+ ],
+ "primaryIdentifier": [
+  "/properties/GatewayId"
+ ],
+ "properties": {
+  "GatewayCapabilitySummaries": {
+   "insertionOrder": true,
+   "items": {
+    "$ref": "#/definitions/GatewayCapabilitySummary"
+   },
+   "type": "array",
+   "uniqueItems": true
+  },
+  "GatewayId": {
+   "type": "string"
+  },
+  "GatewayName": {
+   "pattern": "[^\\u0000-\\u001F\\u007F]+",
+   "type": "string"
+  },
+  "GatewayPlatform": {
+   "$ref": "#/definitions/GatewayPlatform"
+  },
+  "GatewayVersion": {
+   "type": "string"
+  },
+  "Tags": {
+   "insertionOrder": false,
+   "items": {
+    "$ref": "#/definitions/Tag"
+   },
+   "type": "array",
+   "uniqueItems": false
+  }
+ },
+ "readOnlyProperties": [
+  "/properties/GatewayId"
+ ],
+ "required": [
+  "GatewayName",
+  "GatewayPlatform"
+ ],
+ "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-IoTSiteWise.git",
+ "tagging": {
+  "cloudFormationSystemTags": true,
+  "tagOnCreate": true,
+  "tagProperty": "/properties/Tags",
+  "tagUpdatable": true,
+  "taggable": true
+ },
+ "typeName": "AWS::IoTSiteWise::Gateway"
+}
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_3/__init__.py b/src/cfnlint/data/schemas/providers/ap_southeast_3/__init__.py
index c5cf5b952b..a4e9072271 100644
--- a/src/cfnlint/data/schemas/providers/ap_southeast_3/__init__.py
+++ b/src/cfnlint/data/schemas/providers/ap_southeast_3/__init__.py
@@ -896,6 +896,7 @@
     "aws-cloudwatch-compositealarm.json",
     "aws-cloudwatch-dashboard.json",
     "aws-cloudwatch-insightrule.json",
+    "aws-cloudwatch-metricstream.json",
     "aws-codebuild-project.json",
     "aws-codebuild-reportgroup.json",
     "aws-codebuild-sourcecredential.json",
@@ -951,6 +952,7 @@
     "aws-dms-replicationconfig.json",
     "aws-dynamodb-globaltable.json",
     "aws-dynamodb-table.json",
+    "aws-ec2-capacityreservation.json",
     "aws-ec2-capacityreservationfleet.json",
     "aws-ec2-clientvpnroute.json",
     "aws-ec2-clientvpntargetnetworkassociation.json",
@@ -1097,6 +1099,7 @@
     "aws-eventschemas-registrypolicy.json",
     "aws-eventschemas-schema.json",
     "aws-fms-notificationchannel.json",
+    "aws-fms-policy.json",
     "aws-fms-resourceset.json",
     "aws-fsx-datarepositoryassociation.json",
     "aws-fsx-filesystem.json",
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-cloudwatch-metricstream.json b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-cloudwatch-metricstream.json
deleted file mode 100644
index 89ca2654d5..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-cloudwatch-metricstream.json
+++ /dev/null
@@ -1,228 +0,0 @@
-{
- "additionalProperties": false,
- "allOf": [
-  {
-   "required": [
-    "FirehoseArn",
-    "RoleArn",
-    "OutputFormat"
-   ]
-  },
-  {
-   "oneOf": [
-    {},
-    {
-     "required": [
-      "IncludeFilters",
-      "ExcludeFilters"
-     ]
-    }
-   ]
-  }
- ],
- "createOnlyProperties": [
-  "/properties/Name"
- ],
- "definitions": {
-  "MetricStreamFilter": {
-   "additionalProperties": false,
-   "properties": {
-    "MetricNames": {
-     "items": {
-      "maxLength": 255,
-      "minLength": 1,
-      "type": "string"
-     },
-     "maxItems": 999,
-     "type": "array"
-    },
-    "Namespace": {
-     "maxLength": 255,
-     "minLength": 1,
-     "pattern": "[^:].*",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Namespace"
-   ],
-   "type": "object"
-  },
-  "MetricStreamStatisticsConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "AdditionalStatistics": {
-     "items": {
-      "type": "string"
-     },
-     "maxItems": 20,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "IncludeMetrics": {
-     "items": {
-      "$ref": "#/definitions/MetricStreamStatisticsMetric"
-     },
-     "maxItems": 100,
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "required": [
-    "AdditionalStatistics",
-    "IncludeMetrics"
-   ],
-   "type": "object"
-  },
-  "MetricStreamStatisticsMetric": {
-   "additionalProperties": false,
-   "properties": {
-    "MetricName": {
-     "maxLength": 255,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Namespace": {
-     "maxLength": 255,
-     "minLength": 1,
-     "pattern": "[^:].*",
-     "type": "string"
-    }
-   },
-   "required": [
-    "MetricName",
-    "Namespace"
-   ],
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "minLength": 0,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Name"
- ],
- "properties": {
-  "Arn": {
-   "maxLength": 2048,
-   "minLength": 20,
-   "type": "string"
-  },
-  "CreationDate": {
-   "anyOf": [
-    {
-     "format": "date-time"
-    },
-    {
-     "format": "timestamp"
-    }
-   ],
-   "type": "string"
-  },
-  "ExcludeFilters": {
-   "items": {
-    "$ref": "#/definitions/MetricStreamFilter"
-   },
-   "maxItems": 1000,
-   "type": "array",
-   "uniqueItems": true
-  },
-  "FirehoseArn": {
-   "maxLength": 2048,
-   "minLength": 20,
-   "type": "string"
-  },
-  "IncludeFilters": {
-   "items": {
-    "$ref": "#/definitions/MetricStreamFilter"
-   },
-   "maxItems": 1000,
-   "type": "array",
-   "uniqueItems": true
-  },
-  "IncludeLinkedAccountsMetrics": {
-   "type": "boolean"
-  },
-  "LastUpdateDate": {
-   "anyOf": [
-    {
-     "format": "date-time"
-    },
-    {
-     "format": "timestamp"
-    }
-   ],
-   "type": "string"
-  },
-  "Name": {
-   "maxLength": 255,
-   "minLength": 1,
-   "type": "string"
-  },
-  "OutputFormat": {
-   "enum": [
-    "json",
-    "opentelemetry0.7",
-    "opentelemetry1.0"
-   ],
-   "maxLength": 255,
-   "minLength": 1,
-   "type": "string"
-  },
-  "RoleArn": {
-   "maxLength": 2048,
-   "minLength": 20,
-   "type": "string"
-  },
-  "State": {
-   "maxLength": 255,
-   "minLength": 1,
-   "type": "string"
-  },
-  "StatisticsConfigurations": {
-   "items": {
-    "$ref": "#/definitions/MetricStreamStatisticsConfiguration"
-   },
-   "maxItems": 100,
-   "type": "array",
-   "uniqueItems": true
-  },
-  "Tags": {
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 50,
-   "type": "array",
-   "uniqueItems": true
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/CreationDate",
-  "/properties/LastUpdateDate",
-  "/properties/State"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-cloudwatch.git",
- "taggable": true,
- "typeName": "AWS::CloudWatch::MetricStream",
- "writeOnlyProperties": [
-  "/properties/Tags"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-ec2-capacityreservation.json b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-ec2-capacityreservation.json
deleted file mode 100644
index 5a10969ce5..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-ec2-capacityreservation.json
+++ /dev/null
@@ -1,250 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/Tenancy",
-  "/properties/InstancePlatform",
-  "/properties/InstanceType",
-  "/properties/AvailabilityZone",
-  "/properties/TagSpecifications",
-  "/properties/OutPostArn",
-  "/properties/EphemeralStorage",
-  "/properties/EbsOptimized",
-  "/properties/PlacementGroupArn"
- ],
- "definitions": {
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "type": "string"
-    },
-    "Value": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "TagSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "ResourceType": {
-     "enum": [
-      "capacity-reservation",
-      "capacity-reservation-fleet",
-      "carrier-gateway",
-      "client-vpn-endpoint",
-      "coip-pool",
-      "customer-gateway",
-      "declarative-policies-report",
-      "dedicated-host",
-      "dhcp-options",
-      "egress-only-internet-gateway",
-      "elastic-gpu",
-      "elastic-ip",
-      "export-image-task",
-      "export-instance-task",
-      "fleet",
-      "fpga-image",
-      "host-reservation",
-      "image",
-      "import-image-task",
-      "import-snapshot-task",
-      "instance",
-      "instance-connect-endpoint",
-      "instance-event-window",
-      "internet-gateway",
-      "ipam",
-      "ipam-external-resource-verification-token",
-      "ipam-pool",
-      "ipam-resource-discovery",
-      "ipam-resource-discovery-association",
-      "ipam-scope",
-      "ipv4pool-ec2",
-      "ipv6pool-ec2",
-      "key-pair",
-      "launch-template",
-      "local-gateway",
-      "local-gateway-route-table",
-      "local-gateway-route-table-virtual-interface-group-association",
-      "local-gateway-route-table-vpc-association",
-      "local-gateway-virtual-interface",
-      "local-gateway-virtual-interface-group",
-      "natgateway",
-      "network-acl",
-      "network-insights-access-scope",
-      "network-insights-access-scope-analysis",
-      "network-insights-analysis",
-      "network-insights-path",
-      "network-interface",
-      "placement-group",
-      "prefix-list",
-      "replace-root-volume-task",
-      "reserved-instances",
-      "route-table",
-      "security-group",
-      "security-group-rule",
-      "snapshot",
-      "spot-fleet-request",
-      "spot-instances-request",
-      "subnet",
-      "subnet-cidr-reservation",
-      "traffic-mirror-filter",
-      "traffic-mirror-filter-rule",
-      "traffic-mirror-session",
-      "traffic-mirror-target",
-      "transit-gateway",
-      "transit-gateway-attachment",
-      "transit-gateway-connect-peer",
-      "transit-gateway-multicast-domain",
-      "transit-gateway-policy-table",
-      "transit-gateway-route-table",
-      "transit-gateway-route-table-announcement",
-      "verified-access-endpoint",
-      "verified-access-endpoint-target",
-      "verified-access-group",
-      "verified-access-instance",
-      "verified-access-policy",
-      "verified-access-trust-provider",
-      "volume",
-      "vpc",
-      "vpc-block-public-access-exclusion",
-      "vpc-endpoint",
-      "vpc-endpoint-connection",
-      "vpc-endpoint-connection-device-type",
-      "vpc-endpoint-service",
-      "vpc-endpoint-service-permission",
-      "vpc-flow-log",
-      "vpc-peering-connection",
-      "vpn-connection",
-      "vpn-connection-device-type",
-      "vpn-gateway"
-     ],
-     "type": "string"
-    },
-    "Tags": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Tag"
-     },
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "AvailabilityZone": {
-   "type": "string"
-  },
-  "AvailableInstanceCount": {
-   "type": "integer"
-  },
-  "EbsOptimized": {
-   "type": "boolean"
-  },
-  "EndDate": {
-   "type": "string"
-  },
-  "EndDateType": {
-   "enum": [
-    "limited",
-    "unlimited"
-   ],
-   "type": "string"
-  },
-  "EphemeralStorage": {
-   "type": "boolean"
-  },
-  "Id": {
-   "type": "string"
-  },
-  "InstanceCount": {
-   "type": "integer"
-  },
-  "InstanceMatchCriteria": {
-   "enum": [
-    "open",
-    "targeted"
-   ],
-   "type": "string"
-  },
-  "InstancePlatform": {
-   "enum": [
-    "Linux with SQL Server Enterprise",
-    "Linux with SQL Server Standard",
-    "Linux with SQL Server Web",
-    "Linux/UNIX",
-    "RHEL with HA",
-    "RHEL with HA and SQL Server Enterprise",
-    "RHEL with HA and SQL Server Standard",
-    "RHEL with SQL Server Enterprise",
-    "RHEL with SQL Server Standard",
-    "RHEL with SQL Server Web",
-    "Red Hat Enterprise Linux",
-    "SUSE Linux",
-    "Ubuntu Pro",
-    "Windows",
-    "Windows with SQL Server",
-    "Windows with SQL Server Enterprise",
-    "Windows with SQL Server Standard",
-    "Windows with SQL Server Web"
-   ],
-   "type": "string"
-  },
-  "InstanceType": {
-   "type": "string"
-  },
-  "OutPostArn": {
-   "pattern": "^arn:aws([a-z-]+)?:outposts:[a-z\\d-]+:\\d{12}:outpost/op-[a-f0-9]{17}$",
-   "type": "string"
-  },
-  "PlacementGroupArn": {
-   "pattern": "^arn:aws([a-z-]+)?:ec2:[a-z\\d-]+:\\d{12}:placement-group/^.{1,255}$",
-   "type": "string"
-  },
-  "TagSpecifications": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/TagSpecification"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "Tenancy": {
-   "enum": [
-    "dedicated",
-    "default"
-   ],
-   "type": "string"
-  },
-  "TotalInstanceCount": {
-   "type": "integer"
-  },
-  "UnusedReservationBillingOwnerId": {
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id",
-  "/properties/AvailableInstanceCount",
-  "/properties/TotalInstanceCount"
- ],
- "required": [
-  "InstanceCount",
-  "AvailabilityZone",
-  "InstancePlatform",
-  "InstanceType"
- ],
- "typeName": "AWS::EC2::CapacityReservation",
- "writeOnlyProperties": [
-  "/properties/UnusedReservationBillingOwnerId"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-fms-policy.json
deleted file mode 100644
index 8422693828..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_southeast_3/aws-fms-policy.json
+++ /dev/null
@@ -1,416 +0,0 @@
-{
- "additionalProperties": false,
- "definitions": {
-  "AccountId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^([0-9]*)$",
-   "type": "string"
-  },
-  "Base62Id": {
-   "maxLength": 22,
-   "minLength": 22,
-   "pattern": "^[a-z0-9A-Z]{22}$",
-   "type": "string"
-  },
-  "FirewallDeploymentModel": {
-   "enum": [
-    "DISTRIBUTED",
-    "CENTRALIZED"
-   ],
-   "type": "string"
-  },
-  "IEMap": {
-   "additionalProperties": false,
-   "properties": {
-    "ACCOUNT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/AccountId"
-     },
-     "type": "array"
-    },
-    "ORGUNIT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/OrganizationalUnitId"
-     },
-     "type": "array"
-    }
-   },
-   "type": "object"
-  },
-  "ManagedServiceData": {
-   "maxLength": 30000,
-   "minLength": 1,
-   "type": "string"
-  },
-  "NetworkAclCommonPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "NetworkAclEntrySet": {
-     "$ref": "#/definitions/NetworkAclEntrySet"
-    }
-   },
-   "required": [
-    "NetworkAclEntrySet"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntry": {
-   "additionalProperties": false,
-   "properties": {
-    "CidrBlock": {
-     "pattern": "^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(\\/([0-9]|[1-2][0-9]|3[0-2]))$",
-     "type": "string"
-    },
-    "Egress": {
-     "type": "boolean"
-    },
-    "IcmpTypeCode": {
-     "additionalProperties": false,
-     "properties": {
-      "Code": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "Type": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "Code",
-      "Type"
-     ],
-     "type": "object"
-    },
-    "Ipv6CidrBlock": {
-     "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))(/(1[0-2]|[0-9]))?$",
-     "type": "string"
-    },
-    "PortRange": {
-     "additionalProperties": false,
-     "properties": {
-      "From": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "To": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "From",
-      "To"
-     ],
-     "type": "object"
-    },
-    "Protocol": {
-     "pattern": "^(tcp|udp|icmp|-1|([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))$",
-     "type": "string"
-    },
-    "RuleAction": {
-     "enum": [
-      "allow",
-      "deny"
-     ],
-     "type": "string"
-    }
-   },
-   "required": [
-    "Egress",
-    "Protocol",
-    "RuleAction"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntryList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/NetworkAclEntry"
-   },
-   "type": "array"
-  },
-  "NetworkAclEntrySet": {
-   "additionalProperties": false,
-   "anyOf": [
-    {
-     "required": [
-      "FirstEntries"
-     ]
-    },
-    {
-     "required": [
-      "LastEntries"
-     ]
-    }
-   ],
-   "properties": {
-    "FirstEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    },
-    "ForceRemediateForFirstEntries": {
-     "type": "boolean"
-    },
-    "ForceRemediateForLastEntries": {
-     "type": "boolean"
-    },
-    "LastEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    }
-   },
-   "required": [
-    "ForceRemediateForFirstEntries",
-    "ForceRemediateForLastEntries"
-   ],
-   "type": "object"
-  },
-  "NetworkFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  },
-  "OrganizationalUnitId": {
-   "maxLength": 68,
-   "minLength": 16,
-   "pattern": "^(ou-[0-9a-z]{4,32}-[a-z0-9]{8,32})$",
-   "type": "string"
-  },
-  "PolicyOption": {
-   "additionalProperties": false,
-   "oneOf": [
-    {
-     "required": [
-      "NetworkFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "ThirdPartyFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "NetworkAclCommonPolicy"
-     ]
-    }
-   ],
-   "properties": {
-    "NetworkAclCommonPolicy": {
-     "$ref": "#/definitions/NetworkAclCommonPolicy"
-    },
-    "NetworkFirewallPolicy": {
-     "$ref": "#/definitions/NetworkFirewallPolicy"
-    },
-    "ThirdPartyFirewallPolicy": {
-     "$ref": "#/definitions/ThirdPartyFirewallPolicy"
-    }
-   },
-   "type": "object"
-  },
-  "PolicyTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "PolicyType": {
-   "enum": [
-    "WAF",
-    "WAFV2",
-    "SHIELD_ADVANCED",
-    "SECURITY_GROUPS_COMMON",
-    "SECURITY_GROUPS_CONTENT_AUDIT",
-    "SECURITY_GROUPS_USAGE_AUDIT",
-    "NETWORK_FIREWALL",
-    "THIRD_PARTY_FIREWALL",
-    "DNS_FIREWALL",
-    "IMPORT_NETWORK_FIREWALL",
-    "NETWORK_ACL_COMMON"
-   ],
-   "type": "string"
-  },
-  "ResourceArn": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "ResourceTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key"
-   ],
-   "type": "object"
-  },
-  "ResourceType": {
-   "maxLength": 128,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "SecurityServicePolicyData": {
-   "additionalProperties": false,
-   "properties": {
-    "ManagedServiceData": {
-     "$ref": "#/definitions/ManagedServiceData"
-    },
-    "PolicyOption": {
-     "$ref": "#/definitions/PolicyOption"
-    },
-    "Type": {
-     "$ref": "#/definitions/PolicyType"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "ThirdPartyFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "Arn": {
-   "$ref": "#/definitions/ResourceArn"
-  },
-  "DeleteAllPolicyResources": {
-   "type": "boolean"
-  },
-  "ExcludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "ExcludeResourceTags": {
-   "type": "boolean"
-  },
-  "Id": {
-   "maxLength": 36,
-   "minLength": 36,
-   "pattern": "^[a-z0-9A-Z-]{36}$",
-   "type": "string"
-  },
-  "IncludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "PolicyDescription": {
-   "maxLength": 256,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "PolicyName": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "RemediationEnabled": {
-   "type": "boolean"
-  },
-  "ResourceSetIds": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/Base62Id"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "ResourceTags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceTag"
-   },
-   "maxItems": 8,
-   "type": "array"
-  },
-  "ResourceType": {
-   "$ref": "#/definitions/ResourceType"
-  },
-  "ResourceTypeList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceType"
-   },
-   "type": "array"
-  },
-  "ResourcesCleanUp": {
-   "type": "boolean"
-  },
-  "SecurityServicePolicyData": {
-   "$ref": "#/definitions/SecurityServicePolicyData"
-  },
-  "Tags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/PolicyTag"
-   },
-   "type": "array"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/Id"
- ],
- "required": [
-  "ExcludeResourceTags",
-  "PolicyName",
-  "RemediationEnabled",
-  "SecurityServicePolicyData"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-fms.git",
- "typeName": "AWS::FMS::Policy",
- "writeOnlyProperties": [
-  "/properties/DeleteAllPolicyResources"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_4/__init__.py b/src/cfnlint/data/schemas/providers/ap_southeast_4/__init__.py
index a072ccd8f3..0ba0a8ac26 100644
--- a/src/cfnlint/data/schemas/providers/ap_southeast_4/__init__.py
+++ b/src/cfnlint/data/schemas/providers/ap_southeast_4/__init__.py
@@ -868,6 +868,7 @@
     "aws-dms-replicationconfig.json",
     "aws-dynamodb-globaltable.json",
     "aws-dynamodb-table.json",
+    "aws-ec2-capacityreservation.json",
     "aws-ec2-capacityreservationfleet.json",
     "aws-ec2-clientvpnroute.json",
     "aws-ec2-clientvpntargetnetworkassociation.json",
@@ -939,6 +940,7 @@
     "aws-ec2-vpcendpointservicepermissions.json",
     "aws-ec2-vpcgatewayattachment.json",
     "aws-ec2-vpcpeeringconnection.json",
+    "aws-ec2-vpnconnection.json",
     "aws-ec2-vpnconnectionroute.json",
     "aws-ec2-vpngateway.json",
     "aws-ecr-pullthroughcacherule.json",
@@ -990,6 +992,7 @@
     "aws-events-eventbuspolicy.json",
     "aws-events-rule.json",
     "aws-fms-notificationchannel.json",
+    "aws-fms-policy.json",
     "aws-fsx-datarepositoryassociation.json",
     "aws-fsx-filesystem.json",
     "aws-fsx-snapshot.json",
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-ec2-capacityreservation.json b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-ec2-capacityreservation.json
deleted file mode 100644
index 5a10969ce5..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-ec2-capacityreservation.json
+++ /dev/null
@@ -1,250 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/Tenancy",
-  "/properties/InstancePlatform",
-  "/properties/InstanceType",
-  "/properties/AvailabilityZone",
-  "/properties/TagSpecifications",
-  "/properties/OutPostArn",
-  "/properties/EphemeralStorage",
-  "/properties/EbsOptimized",
-  "/properties/PlacementGroupArn"
- ],
- "definitions": {
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "type": "string"
-    },
-    "Value": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "TagSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "ResourceType": {
-     "enum": [
-      "capacity-reservation",
-      "capacity-reservation-fleet",
-      "carrier-gateway",
-      "client-vpn-endpoint",
-      "coip-pool",
-      "customer-gateway",
-      "declarative-policies-report",
-      "dedicated-host",
-      "dhcp-options",
-      "egress-only-internet-gateway",
-      "elastic-gpu",
-      "elastic-ip",
-      "export-image-task",
-      "export-instance-task",
-      "fleet",
-      "fpga-image",
-      "host-reservation",
-      "image",
-      "import-image-task",
-      "import-snapshot-task",
-      "instance",
-      "instance-connect-endpoint",
-      "instance-event-window",
-      "internet-gateway",
-      "ipam",
-      "ipam-external-resource-verification-token",
-      "ipam-pool",
-      "ipam-resource-discovery",
-      "ipam-resource-discovery-association",
-      "ipam-scope",
-      "ipv4pool-ec2",
-      "ipv6pool-ec2",
-      "key-pair",
-      "launch-template",
-      "local-gateway",
-      "local-gateway-route-table",
-      "local-gateway-route-table-virtual-interface-group-association",
-      "local-gateway-route-table-vpc-association",
-      "local-gateway-virtual-interface",
-      "local-gateway-virtual-interface-group",
-      "natgateway",
-      "network-acl",
-      "network-insights-access-scope",
-      "network-insights-access-scope-analysis",
-      "network-insights-analysis",
-      "network-insights-path",
-      "network-interface",
-      "placement-group",
-      "prefix-list",
-      "replace-root-volume-task",
-      "reserved-instances",
-      "route-table",
-      "security-group",
-      "security-group-rule",
-      "snapshot",
-      "spot-fleet-request",
-      "spot-instances-request",
-      "subnet",
-      "subnet-cidr-reservation",
-      "traffic-mirror-filter",
-      "traffic-mirror-filter-rule",
-      "traffic-mirror-session",
-      "traffic-mirror-target",
-      "transit-gateway",
-      "transit-gateway-attachment",
-      "transit-gateway-connect-peer",
-      "transit-gateway-multicast-domain",
-      "transit-gateway-policy-table",
-      "transit-gateway-route-table",
-      "transit-gateway-route-table-announcement",
-      "verified-access-endpoint",
-      "verified-access-endpoint-target",
-      "verified-access-group",
-      "verified-access-instance",
-      "verified-access-policy",
-      "verified-access-trust-provider",
-      "volume",
-      "vpc",
-      "vpc-block-public-access-exclusion",
-      "vpc-endpoint",
-      "vpc-endpoint-connection",
-      "vpc-endpoint-connection-device-type",
-      "vpc-endpoint-service",
-      "vpc-endpoint-service-permission",
-      "vpc-flow-log",
-      "vpc-peering-connection",
-      "vpn-connection",
-      "vpn-connection-device-type",
-      "vpn-gateway"
-     ],
-     "type": "string"
-    },
-    "Tags": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Tag"
-     },
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "AvailabilityZone": {
-   "type": "string"
-  },
-  "AvailableInstanceCount": {
-   "type": "integer"
-  },
-  "EbsOptimized": {
-   "type": "boolean"
-  },
-  "EndDate": {
-   "type": "string"
-  },
-  "EndDateType": {
-   "enum": [
-    "limited",
-    "unlimited"
-   ],
-   "type": "string"
-  },
-  "EphemeralStorage": {
-   "type": "boolean"
-  },
-  "Id": {
-   "type": "string"
-  },
-  "InstanceCount": {
-   "type": "integer"
-  },
-  "InstanceMatchCriteria": {
-   "enum": [
-    "open",
-    "targeted"
-   ],
-   "type": "string"
-  },
-  "InstancePlatform": {
-   "enum": [
-    "Linux with SQL Server Enterprise",
-    "Linux with SQL Server Standard",
-    "Linux with SQL Server Web",
-    "Linux/UNIX",
-    "RHEL with HA",
-    "RHEL with HA and SQL Server Enterprise",
-    "RHEL with HA and SQL Server Standard",
-    "RHEL with SQL Server Enterprise",
-    "RHEL with SQL Server Standard",
-    "RHEL with SQL Server Web",
-    "Red Hat Enterprise Linux",
-    "SUSE Linux",
-    "Ubuntu Pro",
-    "Windows",
-    "Windows with SQL Server",
-    "Windows with SQL Server Enterprise",
-    "Windows with SQL Server Standard",
-    "Windows with SQL Server Web"
-   ],
-   "type": "string"
-  },
-  "InstanceType": {
-   "type": "string"
-  },
-  "OutPostArn": {
-   "pattern": "^arn:aws([a-z-]+)?:outposts:[a-z\\d-]+:\\d{12}:outpost/op-[a-f0-9]{17}$",
-   "type": "string"
-  },
-  "PlacementGroupArn": {
-   "pattern": "^arn:aws([a-z-]+)?:ec2:[a-z\\d-]+:\\d{12}:placement-group/^.{1,255}$",
-   "type": "string"
-  },
-  "TagSpecifications": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/TagSpecification"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "Tenancy": {
-   "enum": [
-    "dedicated",
-    "default"
-   ],
-   "type": "string"
-  },
-  "TotalInstanceCount": {
-   "type": "integer"
-  },
-  "UnusedReservationBillingOwnerId": {
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id",
-  "/properties/AvailableInstanceCount",
-  "/properties/TotalInstanceCount"
- ],
- "required": [
-  "InstanceCount",
-  "AvailabilityZone",
-  "InstancePlatform",
-  "InstanceType"
- ],
- "typeName": "AWS::EC2::CapacityReservation",
- "writeOnlyProperties": [
-  "/properties/UnusedReservationBillingOwnerId"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-ec2-vpnconnection.json b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-ec2-vpnconnection.json
deleted file mode 100644
index 5f9a8ac704..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-ec2-vpnconnection.json
+++ /dev/null
@@ -1,384 +0,0 @@
-{
- "$schema": "https://raw.githubusercontent.com/aws-cloudformation/cloudformation-resource-schema/blob/master/src/main/resources/schema/provider.definition.schema.v1.json",
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/Type",
-  "/properties/CustomerGatewayId",
-  "/properties/VpnGatewayId",
-  "/properties/TransitGatewayId",
-  "/properties/EnableAcceleration",
-  "/properties/LocalIpv4NetworkCidr",
-  "/properties/LocalIpv6NetworkCidr",
-  "/properties/OutsideIpAddressType",
-  "/properties/RemoteIpv4NetworkCidr",
-  "/properties/RemoteIpv6NetworkCidr",
-  "/properties/StaticRoutesOnly",
-  "/properties/TransportTransitGatewayAttachmentId",
-  "/properties/TunnelInsideIpVersion",
-  "/properties/VpnTunnelOptionsSpecifications"
- ],
- "definitions": {
-  "CloudwatchLogOptionsSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "LogEnabled": {
-     "type": "boolean"
-    },
-    "LogGroupArn": {
-     "type": "string"
-    },
-    "LogOutputFormat": {
-     "enum": [
-      "json",
-      "text"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "IKEVersionsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "ikev1",
-      "ikev2"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Phase1DHGroupNumbersRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      2,
-      14,
-      15,
-      16,
-      17,
-      18,
-      19,
-      20,
-      21,
-      22,
-      23,
-      24
-     ],
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "Phase1EncryptionAlgorithmsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "AES128",
-      "AES256",
-      "AES128-GCM-16",
-      "AES256-GCM-16"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Phase1IntegrityAlgorithmsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "SHA1",
-      "SHA2-256",
-      "SHA2-384",
-      "SHA2-512"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Phase2DHGroupNumbersRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      2,
-      5,
-      14,
-      15,
-      16,
-      17,
-      18,
-      19,
-      20,
-      21,
-      22,
-      23,
-      24
-     ],
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "Phase2EncryptionAlgorithmsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "AES128",
-      "AES256",
-      "AES128-GCM-16",
-      "AES256-GCM-16"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Phase2IntegrityAlgorithmsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "SHA1",
-      "SHA2-256",
-      "SHA2-384",
-      "SHA2-512"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "type": "string"
-    },
-    "Value": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "VpnTunnelLogOptionsSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "CloudwatchLogOptions": {
-     "$ref": "#/definitions/CloudwatchLogOptionsSpecification"
-    }
-   },
-   "type": "object"
-  },
-  "VpnTunnelOptionsSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "DPDTimeoutAction": {
-     "enum": [
-      "clear",
-      "none",
-      "restart"
-     ],
-     "type": "string"
-    },
-    "DPDTimeoutSeconds": {
-     "minimum": 30,
-     "type": "integer"
-    },
-    "EnableTunnelLifecycleControl": {
-     "type": "boolean"
-    },
-    "IKEVersions": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/IKEVersionsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "LogOptions": {
-     "$ref": "#/definitions/VpnTunnelLogOptionsSpecification"
-    },
-    "Phase1DHGroupNumbers": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase1DHGroupNumbersRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase1EncryptionAlgorithms": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase1EncryptionAlgorithmsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase1IntegrityAlgorithms": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase1IntegrityAlgorithmsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase1LifetimeSeconds": {
-     "maximum": 28800,
-     "minimum": 900,
-     "type": "integer"
-    },
-    "Phase2DHGroupNumbers": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase2DHGroupNumbersRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase2EncryptionAlgorithms": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase2EncryptionAlgorithmsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase2IntegrityAlgorithms": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase2IntegrityAlgorithmsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase2LifetimeSeconds": {
-     "maximum": 3600,
-     "minimum": 900,
-     "type": "integer"
-    },
-    "PreSharedKey": {
-     "type": "string"
-    },
-    "RekeyFuzzPercentage": {
-     "maximum": 100,
-     "minimum": 0,
-     "type": "integer"
-    },
-    "RekeyMarginTimeSeconds": {
-     "minimum": 60,
-     "type": "integer"
-    },
-    "ReplayWindowSize": {
-     "maximum": 2048,
-     "minimum": 64,
-     "type": "integer"
-    },
-    "StartupAction": {
-     "enum": [
-      "add",
-      "start"
-     ],
-     "type": "string"
-    },
-    "TunnelInsideCidr": {
-     "type": "string"
-    },
-    "TunnelInsideIpv6Cidr": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/VpnConnectionId"
- ],
- "properties": {
-  "CustomerGatewayId": {
-   "type": "string"
-  },
-  "EnableAcceleration": {
-   "type": "boolean"
-  },
-  "LocalIpv4NetworkCidr": {
-   "type": "string"
-  },
-  "LocalIpv6NetworkCidr": {
-   "type": "string"
-  },
-  "OutsideIpAddressType": {
-   "type": "string"
-  },
-  "RemoteIpv4NetworkCidr": {
-   "type": "string"
-  },
-  "RemoteIpv6NetworkCidr": {
-   "type": "string"
-  },
-  "StaticRoutesOnly": {
-   "type": "boolean"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "TransitGatewayId": {
-   "type": "string"
-  },
-  "TransportTransitGatewayAttachmentId": {
-   "type": "string"
-  },
-  "TunnelInsideIpVersion": {
-   "type": "string"
-  },
-  "Type": {
-   "type": "string"
-  },
-  "VpnConnectionId": {
-   "type": "string"
-  },
-  "VpnGatewayId": {
-   "type": "string"
-  },
-  "VpnTunnelOptionsSpecifications": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/VpnTunnelOptionsSpecification"
-   },
-   "type": "array",
-   "uniqueItems": false
-  }
- },
- "readOnlyProperties": [
-  "/properties/VpnConnectionId"
- ],
- "required": [
-  "Type",
-  "CustomerGatewayId"
- ],
- "tagging": {
-  "cloudFormationSystemTags": false,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::EC2::VPNConnection"
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-fms-policy.json
deleted file mode 100644
index 8422693828..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_southeast_4/aws-fms-policy.json
+++ /dev/null
@@ -1,416 +0,0 @@
-{
- "additionalProperties": false,
- "definitions": {
-  "AccountId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^([0-9]*)$",
-   "type": "string"
-  },
-  "Base62Id": {
-   "maxLength": 22,
-   "minLength": 22,
-   "pattern": "^[a-z0-9A-Z]{22}$",
-   "type": "string"
-  },
-  "FirewallDeploymentModel": {
-   "enum": [
-    "DISTRIBUTED",
-    "CENTRALIZED"
-   ],
-   "type": "string"
-  },
-  "IEMap": {
-   "additionalProperties": false,
-   "properties": {
-    "ACCOUNT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/AccountId"
-     },
-     "type": "array"
-    },
-    "ORGUNIT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/OrganizationalUnitId"
-     },
-     "type": "array"
-    }
-   },
-   "type": "object"
-  },
-  "ManagedServiceData": {
-   "maxLength": 30000,
-   "minLength": 1,
-   "type": "string"
-  },
-  "NetworkAclCommonPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "NetworkAclEntrySet": {
-     "$ref": "#/definitions/NetworkAclEntrySet"
-    }
-   },
-   "required": [
-    "NetworkAclEntrySet"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntry": {
-   "additionalProperties": false,
-   "properties": {
-    "CidrBlock": {
-     "pattern": "^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(\\/([0-9]|[1-2][0-9]|3[0-2]))$",
-     "type": "string"
-    },
-    "Egress": {
-     "type": "boolean"
-    },
-    "IcmpTypeCode": {
-     "additionalProperties": false,
-     "properties": {
-      "Code": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "Type": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "Code",
-      "Type"
-     ],
-     "type": "object"
-    },
-    "Ipv6CidrBlock": {
-     "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))(/(1[0-2]|[0-9]))?$",
-     "type": "string"
-    },
-    "PortRange": {
-     "additionalProperties": false,
-     "properties": {
-      "From": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "To": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "From",
-      "To"
-     ],
-     "type": "object"
-    },
-    "Protocol": {
-     "pattern": "^(tcp|udp|icmp|-1|([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))$",
-     "type": "string"
-    },
-    "RuleAction": {
-     "enum": [
-      "allow",
-      "deny"
-     ],
-     "type": "string"
-    }
-   },
-   "required": [
-    "Egress",
-    "Protocol",
-    "RuleAction"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntryList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/NetworkAclEntry"
-   },
-   "type": "array"
-  },
-  "NetworkAclEntrySet": {
-   "additionalProperties": false,
-   "anyOf": [
-    {
-     "required": [
-      "FirstEntries"
-     ]
-    },
-    {
-     "required": [
-      "LastEntries"
-     ]
-    }
-   ],
-   "properties": {
-    "FirstEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    },
-    "ForceRemediateForFirstEntries": {
-     "type": "boolean"
-    },
-    "ForceRemediateForLastEntries": {
-     "type": "boolean"
-    },
-    "LastEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    }
-   },
-   "required": [
-    "ForceRemediateForFirstEntries",
-    "ForceRemediateForLastEntries"
-   ],
-   "type": "object"
-  },
-  "NetworkFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  },
-  "OrganizationalUnitId": {
-   "maxLength": 68,
-   "minLength": 16,
-   "pattern": "^(ou-[0-9a-z]{4,32}-[a-z0-9]{8,32})$",
-   "type": "string"
-  },
-  "PolicyOption": {
-   "additionalProperties": false,
-   "oneOf": [
-    {
-     "required": [
-      "NetworkFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "ThirdPartyFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "NetworkAclCommonPolicy"
-     ]
-    }
-   ],
-   "properties": {
-    "NetworkAclCommonPolicy": {
-     "$ref": "#/definitions/NetworkAclCommonPolicy"
-    },
-    "NetworkFirewallPolicy": {
-     "$ref": "#/definitions/NetworkFirewallPolicy"
-    },
-    "ThirdPartyFirewallPolicy": {
-     "$ref": "#/definitions/ThirdPartyFirewallPolicy"
-    }
-   },
-   "type": "object"
-  },
-  "PolicyTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "PolicyType": {
-   "enum": [
-    "WAF",
-    "WAFV2",
-    "SHIELD_ADVANCED",
-    "SECURITY_GROUPS_COMMON",
-    "SECURITY_GROUPS_CONTENT_AUDIT",
-    "SECURITY_GROUPS_USAGE_AUDIT",
-    "NETWORK_FIREWALL",
-    "THIRD_PARTY_FIREWALL",
-    "DNS_FIREWALL",
-    "IMPORT_NETWORK_FIREWALL",
-    "NETWORK_ACL_COMMON"
-   ],
-   "type": "string"
-  },
-  "ResourceArn": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "ResourceTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key"
-   ],
-   "type": "object"
-  },
-  "ResourceType": {
-   "maxLength": 128,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "SecurityServicePolicyData": {
-   "additionalProperties": false,
-   "properties": {
-    "ManagedServiceData": {
-     "$ref": "#/definitions/ManagedServiceData"
-    },
-    "PolicyOption": {
-     "$ref": "#/definitions/PolicyOption"
-    },
-    "Type": {
-     "$ref": "#/definitions/PolicyType"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "ThirdPartyFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "Arn": {
-   "$ref": "#/definitions/ResourceArn"
-  },
-  "DeleteAllPolicyResources": {
-   "type": "boolean"
-  },
-  "ExcludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "ExcludeResourceTags": {
-   "type": "boolean"
-  },
-  "Id": {
-   "maxLength": 36,
-   "minLength": 36,
-   "pattern": "^[a-z0-9A-Z-]{36}$",
-   "type": "string"
-  },
-  "IncludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "PolicyDescription": {
-   "maxLength": 256,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "PolicyName": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "RemediationEnabled": {
-   "type": "boolean"
-  },
-  "ResourceSetIds": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/Base62Id"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "ResourceTags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceTag"
-   },
-   "maxItems": 8,
-   "type": "array"
-  },
-  "ResourceType": {
-   "$ref": "#/definitions/ResourceType"
-  },
-  "ResourceTypeList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceType"
-   },
-   "type": "array"
-  },
-  "ResourcesCleanUp": {
-   "type": "boolean"
-  },
-  "SecurityServicePolicyData": {
-   "$ref": "#/definitions/SecurityServicePolicyData"
-  },
-  "Tags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/PolicyTag"
-   },
-   "type": "array"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/Id"
- ],
- "required": [
-  "ExcludeResourceTags",
-  "PolicyName",
-  "RemediationEnabled",
-  "SecurityServicePolicyData"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-fms.git",
- "typeName": "AWS::FMS::Policy",
- "writeOnlyProperties": [
-  "/properties/DeleteAllPolicyResources"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_5/__init__.py b/src/cfnlint/data/schemas/providers/ap_southeast_5/__init__.py
index 9db56651ca..bb2cf07772 100644
--- a/src/cfnlint/data/schemas/providers/ap_southeast_5/__init__.py
+++ b/src/cfnlint/data/schemas/providers/ap_southeast_5/__init__.py
@@ -559,6 +559,7 @@
     "aws-datasync-task.json",
     "aws-dynamodb-globaltable.json",
     "aws-dynamodb-table.json",
+    "aws-ec2-capacityreservation.json",
     "aws-ec2-customergateway.json",
     "aws-ec2-dhcpoptions.json",
     "aws-ec2-ec2fleet.json",
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ec2-capacityreservation.json b/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ec2-capacityreservation.json
deleted file mode 100644
index 5a10969ce5..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_southeast_5/aws-ec2-capacityreservation.json
+++ /dev/null
@@ -1,250 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/Tenancy",
-  "/properties/InstancePlatform",
-  "/properties/InstanceType",
-  "/properties/AvailabilityZone",
-  "/properties/TagSpecifications",
-  "/properties/OutPostArn",
-  "/properties/EphemeralStorage",
-  "/properties/EbsOptimized",
-  "/properties/PlacementGroupArn"
- ],
- "definitions": {
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "type": "string"
-    },
-    "Value": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "TagSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "ResourceType": {
-     "enum": [
-      "capacity-reservation",
-      "capacity-reservation-fleet",
-      "carrier-gateway",
-      "client-vpn-endpoint",
-      "coip-pool",
-      "customer-gateway",
-      "declarative-policies-report",
-      "dedicated-host",
-      "dhcp-options",
-      "egress-only-internet-gateway",
-      "elastic-gpu",
-      "elastic-ip",
-      "export-image-task",
-      "export-instance-task",
-      "fleet",
-      "fpga-image",
-      "host-reservation",
-      "image",
-      "import-image-task",
-      "import-snapshot-task",
-      "instance",
-      "instance-connect-endpoint",
-      "instance-event-window",
-      "internet-gateway",
-      "ipam",
-      "ipam-external-resource-verification-token",
-      "ipam-pool",
-      "ipam-resource-discovery",
-      "ipam-resource-discovery-association",
-      "ipam-scope",
-      "ipv4pool-ec2",
-      "ipv6pool-ec2",
-      "key-pair",
-      "launch-template",
-      "local-gateway",
-      "local-gateway-route-table",
-      "local-gateway-route-table-virtual-interface-group-association",
-      "local-gateway-route-table-vpc-association",
-      "local-gateway-virtual-interface",
-      "local-gateway-virtual-interface-group",
-      "natgateway",
-      "network-acl",
-      "network-insights-access-scope",
-      "network-insights-access-scope-analysis",
-      "network-insights-analysis",
-      "network-insights-path",
-      "network-interface",
-      "placement-group",
-      "prefix-list",
-      "replace-root-volume-task",
-      "reserved-instances",
-      "route-table",
-      "security-group",
-      "security-group-rule",
-      "snapshot",
-      "spot-fleet-request",
-      "spot-instances-request",
-      "subnet",
-      "subnet-cidr-reservation",
-      "traffic-mirror-filter",
-      "traffic-mirror-filter-rule",
-      "traffic-mirror-session",
-      "traffic-mirror-target",
-      "transit-gateway",
-      "transit-gateway-attachment",
-      "transit-gateway-connect-peer",
-      "transit-gateway-multicast-domain",
-      "transit-gateway-policy-table",
-      "transit-gateway-route-table",
-      "transit-gateway-route-table-announcement",
-      "verified-access-endpoint",
-      "verified-access-endpoint-target",
-      "verified-access-group",
-      "verified-access-instance",
-      "verified-access-policy",
-      "verified-access-trust-provider",
-      "volume",
-      "vpc",
-      "vpc-block-public-access-exclusion",
-      "vpc-endpoint",
-      "vpc-endpoint-connection",
-      "vpc-endpoint-connection-device-type",
-      "vpc-endpoint-service",
-      "vpc-endpoint-service-permission",
-      "vpc-flow-log",
-      "vpc-peering-connection",
-      "vpn-connection",
-      "vpn-connection-device-type",
-      "vpn-gateway"
-     ],
-     "type": "string"
-    },
-    "Tags": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Tag"
-     },
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "AvailabilityZone": {
-   "type": "string"
-  },
-  "AvailableInstanceCount": {
-   "type": "integer"
-  },
-  "EbsOptimized": {
-   "type": "boolean"
-  },
-  "EndDate": {
-   "type": "string"
-  },
-  "EndDateType": {
-   "enum": [
-    "limited",
-    "unlimited"
-   ],
-   "type": "string"
-  },
-  "EphemeralStorage": {
-   "type": "boolean"
-  },
-  "Id": {
-   "type": "string"
-  },
-  "InstanceCount": {
-   "type": "integer"
-  },
-  "InstanceMatchCriteria": {
-   "enum": [
-    "open",
-    "targeted"
-   ],
-   "type": "string"
-  },
-  "InstancePlatform": {
-   "enum": [
-    "Linux with SQL Server Enterprise",
-    "Linux with SQL Server Standard",
-    "Linux with SQL Server Web",
-    "Linux/UNIX",
-    "RHEL with HA",
-    "RHEL with HA and SQL Server Enterprise",
-    "RHEL with HA and SQL Server Standard",
-    "RHEL with SQL Server Enterprise",
-    "RHEL with SQL Server Standard",
-    "RHEL with SQL Server Web",
-    "Red Hat Enterprise Linux",
-    "SUSE Linux",
-    "Ubuntu Pro",
-    "Windows",
-    "Windows with SQL Server",
-    "Windows with SQL Server Enterprise",
-    "Windows with SQL Server Standard",
-    "Windows with SQL Server Web"
-   ],
-   "type": "string"
-  },
-  "InstanceType": {
-   "type": "string"
-  },
-  "OutPostArn": {
-   "pattern": "^arn:aws([a-z-]+)?:outposts:[a-z\\d-]+:\\d{12}:outpost/op-[a-f0-9]{17}$",
-   "type": "string"
-  },
-  "PlacementGroupArn": {
-   "pattern": "^arn:aws([a-z-]+)?:ec2:[a-z\\d-]+:\\d{12}:placement-group/^.{1,255}$",
-   "type": "string"
-  },
-  "TagSpecifications": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/TagSpecification"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "Tenancy": {
-   "enum": [
-    "dedicated",
-    "default"
-   ],
-   "type": "string"
-  },
-  "TotalInstanceCount": {
-   "type": "integer"
-  },
-  "UnusedReservationBillingOwnerId": {
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id",
-  "/properties/AvailableInstanceCount",
-  "/properties/TotalInstanceCount"
- ],
- "required": [
-  "InstanceCount",
-  "AvailabilityZone",
-  "InstancePlatform",
-  "InstanceType"
- ],
- "typeName": "AWS::EC2::CapacityReservation",
- "writeOnlyProperties": [
-  "/properties/UnusedReservationBillingOwnerId"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_7/__init__.py b/src/cfnlint/data/schemas/providers/ap_southeast_7/__init__.py
index e58ca190b5..a073060b70 100644
--- a/src/cfnlint/data/schemas/providers/ap_southeast_7/__init__.py
+++ b/src/cfnlint/data/schemas/providers/ap_southeast_7/__init__.py
@@ -441,6 +441,7 @@
     "aws-dlm-lifecyclepolicy.json",
     "aws-dynamodb-globaltable.json",
     "aws-dynamodb-table.json",
+    "aws-ec2-capacityreservation.json",
     "aws-ec2-dhcpoptions.json",
     "aws-ec2-ec2fleet.json",
     "aws-ec2-egressonlyinternetgateway.json",
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_7/aws-ec2-capacityreservation.json b/src/cfnlint/data/schemas/providers/ap_southeast_7/aws-ec2-capacityreservation.json
deleted file mode 100644
index 5a10969ce5..0000000000
--- a/src/cfnlint/data/schemas/providers/ap_southeast_7/aws-ec2-capacityreservation.json
+++ /dev/null
@@ -1,250 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/Tenancy",
-  "/properties/InstancePlatform",
-  "/properties/InstanceType",
-  "/properties/AvailabilityZone",
-  "/properties/TagSpecifications",
-  "/properties/OutPostArn",
-  "/properties/EphemeralStorage",
-  "/properties/EbsOptimized",
-  "/properties/PlacementGroupArn"
- ],
- "definitions": {
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "type": "string"
-    },
-    "Value": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "TagSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "ResourceType": {
-     "enum": [
-      "capacity-reservation",
-      "capacity-reservation-fleet",
-      "carrier-gateway",
-      "client-vpn-endpoint",
-      "coip-pool",
-      "customer-gateway",
-      "declarative-policies-report",
-      "dedicated-host",
-      "dhcp-options",
-      "egress-only-internet-gateway",
-      "elastic-gpu",
-      "elastic-ip",
-      "export-image-task",
-      "export-instance-task",
-      "fleet",
-      "fpga-image",
-      "host-reservation",
-      "image",
-      "import-image-task",
-      "import-snapshot-task",
-      "instance",
-      "instance-connect-endpoint",
-      "instance-event-window",
-      "internet-gateway",
-      "ipam",
-      "ipam-external-resource-verification-token",
-      "ipam-pool",
-      "ipam-resource-discovery",
-      "ipam-resource-discovery-association",
-      "ipam-scope",
-      "ipv4pool-ec2",
-      "ipv6pool-ec2",
-      "key-pair",
-      "launch-template",
-      "local-gateway",
-      "local-gateway-route-table",
-      "local-gateway-route-table-virtual-interface-group-association",
-      "local-gateway-route-table-vpc-association",
-      "local-gateway-virtual-interface",
-      "local-gateway-virtual-interface-group",
-      "natgateway",
-      "network-acl",
-      "network-insights-access-scope",
-      "network-insights-access-scope-analysis",
-      "network-insights-analysis",
-      "network-insights-path",
-      "network-interface",
-      "placement-group",
-      "prefix-list",
-      "replace-root-volume-task",
-      "reserved-instances",
-      "route-table",
-      "security-group",
-      "security-group-rule",
-      "snapshot",
-      "spot-fleet-request",
-      "spot-instances-request",
-      "subnet",
-      "subnet-cidr-reservation",
-      "traffic-mirror-filter",
-      "traffic-mirror-filter-rule",
-      "traffic-mirror-session",
-      "traffic-mirror-target",
-      "transit-gateway",
-      "transit-gateway-attachment",
-      "transit-gateway-connect-peer",
-      "transit-gateway-multicast-domain",
-      "transit-gateway-policy-table",
-      "transit-gateway-route-table",
-      "transit-gateway-route-table-announcement",
-      "verified-access-endpoint",
-      "verified-access-endpoint-target",
-      "verified-access-group",
-      "verified-access-instance",
-      "verified-access-policy",
-      "verified-access-trust-provider",
-      "volume",
-      "vpc",
-      "vpc-block-public-access-exclusion",
-      "vpc-endpoint",
-      "vpc-endpoint-connection",
-      "vpc-endpoint-connection-device-type",
-      "vpc-endpoint-service",
-      "vpc-endpoint-service-permission",
-      "vpc-flow-log",
-      "vpc-peering-connection",
-      "vpn-connection",
-      "vpn-connection-device-type",
-      "vpn-gateway"
-     ],
-     "type": "string"
-    },
-    "Tags": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Tag"
-     },
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "AvailabilityZone": {
-   "type": "string"
-  },
-  "AvailableInstanceCount": {
-   "type": "integer"
-  },
-  "EbsOptimized": {
-   "type": "boolean"
-  },
-  "EndDate": {
-   "type": "string"
-  },
-  "EndDateType": {
-   "enum": [
-    "limited",
-    "unlimited"
-   ],
-   "type": "string"
-  },
-  "EphemeralStorage": {
-   "type": "boolean"
-  },
-  "Id": {
-   "type": "string"
-  },
-  "InstanceCount": {
-   "type": "integer"
-  },
-  "InstanceMatchCriteria": {
-   "enum": [
-    "open",
-    "targeted"
-   ],
-   "type": "string"
-  },
-  "InstancePlatform": {
-   "enum": [
-    "Linux with SQL Server Enterprise",
-    "Linux with SQL Server Standard",
-    "Linux with SQL Server Web",
-    "Linux/UNIX",
-    "RHEL with HA",
-    "RHEL with HA and SQL Server Enterprise",
-    "RHEL with HA and SQL Server Standard",
-    "RHEL with SQL Server Enterprise",
-    "RHEL with SQL Server Standard",
-    "RHEL with SQL Server Web",
-    "Red Hat Enterprise Linux",
-    "SUSE Linux",
-    "Ubuntu Pro",
-    "Windows",
-    "Windows with SQL Server",
-    "Windows with SQL Server Enterprise",
-    "Windows with SQL Server Standard",
-    "Windows with SQL Server Web"
-   ],
-   "type": "string"
-  },
-  "InstanceType": {
-   "type": "string"
-  },
-  "OutPostArn": {
-   "pattern": "^arn:aws([a-z-]+)?:outposts:[a-z\\d-]+:\\d{12}:outpost/op-[a-f0-9]{17}$",
-   "type": "string"
-  },
-  "PlacementGroupArn": {
-   "pattern": "^arn:aws([a-z-]+)?:ec2:[a-z\\d-]+:\\d{12}:placement-group/^.{1,255}$",
-   "type": "string"
-  },
-  "TagSpecifications": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/TagSpecification"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "Tenancy": {
-   "enum": [
-    "dedicated",
-    "default"
-   ],
-   "type": "string"
-  },
-  "TotalInstanceCount": {
-   "type": "integer"
-  },
-  "UnusedReservationBillingOwnerId": {
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id",
-  "/properties/AvailableInstanceCount",
-  "/properties/TotalInstanceCount"
- ],
- "required": [
-  "InstanceCount",
-  "AvailabilityZone",
-  "InstancePlatform",
-  "InstanceType"
- ],
- "typeName": "AWS::EC2::CapacityReservation",
- "writeOnlyProperties": [
-  "/properties/UnusedReservationBillingOwnerId"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ca_central_1/__init__.py b/src/cfnlint/data/schemas/providers/ca_central_1/__init__.py
index a442172668..020c354027 100644
--- a/src/cfnlint/data/schemas/providers/ca_central_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/ca_central_1/__init__.py
@@ -1450,6 +1450,7 @@
     "aws-datasync-locationsmb.json",
     "aws-datasync-storagesystem.json",
     "aws-datasync-task.json",
+    "aws-datazone-datasource.json",
     "aws-datazone-domain.json",
     "aws-datazone-environment.json",
     "aws-datazone-environmentactions.json",
@@ -1651,6 +1652,7 @@
     "aws-fis-experimenttemplate.json",
     "aws-fis-targetaccountconfiguration.json",
     "aws-fms-notificationchannel.json",
+    "aws-fms-policy.json",
     "aws-fms-resourceset.json",
     "aws-fsx-datarepositoryassociation.json",
     "aws-fsx-filesystem.json",
@@ -1946,6 +1948,9 @@
     "aws-organizations-policy.json",
     "aws-organizations-resourcepolicy.json",
     "aws-osis-pipeline.json",
+    "aws-panorama-applicationinstance.json",
+    "aws-panorama-package.json",
+    "aws-panorama-packageversion.json",
     "aws-pcaconnectorad-connector.json",
     "aws-pcaconnectorad-directoryregistration.json",
     "aws-pcaconnectorad-serviceprincipalname.json",
diff --git a/src/cfnlint/data/schemas/providers/ca_central_1/aws-datazone-datasource.json b/src/cfnlint/data/schemas/providers/ca_central_1/aws-datazone-datasource.json
deleted file mode 100644
index 1f1745b36e..0000000000
--- a/src/cfnlint/data/schemas/providers/ca_central_1/aws-datazone-datasource.json
+++ /dev/null
@@ -1,552 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/ConnectionIdentifier",
-  "/properties/EnvironmentIdentifier",
-  "/properties/DomainIdentifier",
-  "/properties/ProjectIdentifier",
-  "/properties/Type"
- ],
- "definitions": {
-  "AccountId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^\\d{12}$",
-   "type": "string"
-  },
-  "DataAccessRole": {
-   "pattern": "^arn:aws[^:]*:iam::\\d{12}:(role|role/service-role)/[\\w+=,.@-]{1,128}$",
-   "type": "string"
-  },
-  "DataSourceConfigurationInput": {
-   "oneOf": [
-    {
-     "additionalProperties": false,
-     "properties": {
-      "GlueRunConfiguration": {
-       "$ref": "#/definitions/GlueRunConfigurationInput"
-      }
-     },
-     "title": "GlueRunConfiguration",
-     "type": "object"
-    },
-    {
-     "additionalProperties": false,
-     "properties": {
-      "RedshiftRunConfiguration": {
-       "$ref": "#/definitions/RedshiftRunConfigurationInput"
-      }
-     },
-     "title": "RedshiftRunConfiguration",
-     "type": "object"
-    },
-    {
-     "additionalProperties": false,
-     "properties": {
-      "SageMakerRunConfiguration": {
-       "$ref": "#/definitions/SageMakerRunConfigurationInput"
-      }
-     },
-     "title": "SageMakerRunConfiguration",
-     "type": "object"
-    }
-   ]
-  },
-  "DataSourceStatus": {
-   "enum": [
-    "CREATING",
-    "FAILED_CREATION",
-    "READY",
-    "UPDATING",
-    "FAILED_UPDATE",
-    "RUNNING",
-    "DELETING",
-    "FAILED_DELETION"
-   ],
-   "type": "string"
-  },
-  "EnableSetting": {
-   "enum": [
-    "ENABLED",
-    "DISABLED"
-   ],
-   "type": "string"
-  },
-  "FilterExpression": {
-   "additionalProperties": false,
-   "properties": {
-    "Expression": {
-     "maxLength": 2048,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Type": {
-     "$ref": "#/definitions/FilterExpressionType"
-    }
-   },
-   "required": [
-    "Expression",
-    "Type"
-   ],
-   "type": "object"
-  },
-  "FilterExpressionType": {
-   "enum": [
-    "INCLUDE",
-    "EXCLUDE"
-   ],
-   "type": "string"
-  },
-  "FormInput": {
-   "additionalProperties": false,
-   "properties": {
-    "Content": {
-     "maxLength": 75000,
-     "type": "string"
-    },
-    "FormName": {
-     "$ref": "#/definitions/FormName"
-    },
-    "TypeIdentifier": {
-     "maxLength": 385,
-     "minLength": 1,
-     "pattern": "^(?!\\.)[\\w\\.]*\\w$",
-     "type": "string"
-    },
-    "TypeRevision": {
-     "$ref": "#/definitions/TypeRevision"
-    }
-   },
-   "required": [
-    "FormName"
-   ],
-   "type": "object"
-  },
-  "FormName": {
-   "maxLength": 128,
-   "minLength": 1,
-   "pattern": "^(?![0-9_])\\w+$|^_\\w*[a-zA-Z0-9]\\w*$",
-   "type": "string"
-  },
-  "GlueRunConfigurationInput": {
-   "additionalProperties": false,
-   "properties": {
-    "AutoImportDataQualityResult": {
-     "type": "boolean"
-    },
-    "CatalogName": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "DataAccessRole": {
-     "$ref": "#/definitions/DataAccessRole"
-    },
-    "RelationalFilterConfigurations": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/RelationalFilterConfiguration"
-     },
-     "type": "array"
-    }
-   },
-   "required": [
-    "RelationalFilterConfigurations"
-   ],
-   "type": "object"
-  },
-  "RecommendationConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "EnableBusinessNameGeneration": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "RedshiftClusterStorage": {
-   "additionalProperties": false,
-   "properties": {
-    "ClusterName": {
-     "maxLength": 63,
-     "minLength": 1,
-     "pattern": "^[0-9a-z].[a-z0-9\\-]*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "ClusterName"
-   ],
-   "type": "object"
-  },
-  "RedshiftCredentialConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "SecretManagerArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws[^:]*:secretsmanager:[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]:\\d{12}:secret:.*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "SecretManagerArn"
-   ],
-   "type": "object"
-  },
-  "RedshiftRunConfigurationInput": {
-   "additionalProperties": false,
-   "properties": {
-    "DataAccessRole": {
-     "$ref": "#/definitions/DataAccessRole"
-    },
-    "RedshiftCredentialConfiguration": {
-     "$ref": "#/definitions/RedshiftCredentialConfiguration"
-    },
-    "RedshiftStorage": {
-     "$ref": "#/definitions/RedshiftStorage"
-    },
-    "RelationalFilterConfigurations": {
-     "$ref": "#/definitions/RelationalFilterConfigurations"
-    }
-   },
-   "required": [
-    "RelationalFilterConfigurations"
-   ],
-   "type": "object"
-  },
-  "RedshiftServerlessStorage": {
-   "additionalProperties": false,
-   "properties": {
-    "WorkgroupName": {
-     "maxLength": 64,
-     "minLength": 3,
-     "pattern": "^[a-z0-9-]+$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "WorkgroupName"
-   ],
-   "type": "object"
-  },
-  "RedshiftStorage": {
-   "oneOf": [
-    {
-     "additionalProperties": false,
-     "properties": {
-      "RedshiftClusterSource": {
-       "$ref": "#/definitions/RedshiftClusterStorage"
-      }
-     },
-     "required": [
-      "RedshiftClusterSource"
-     ],
-     "title": "RedshiftClusterSource",
-     "type": "object"
-    },
-    {
-     "additionalProperties": false,
-     "properties": {
-      "RedshiftServerlessSource": {
-       "$ref": "#/definitions/RedshiftServerlessStorage"
-      }
-     },
-     "required": [
-      "RedshiftServerlessSource"
-     ],
-     "title": "RedshiftServerlessSource",
-     "type": "object"
-    }
-   ]
-  },
-  "Region": {
-   "maxLength": 16,
-   "minLength": 4,
-   "pattern": "[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]",
-   "type": "string"
-  },
-  "RelationalFilterConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "DatabaseName": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "FilterExpressions": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/FilterExpression"
-     },
-     "type": "array"
-    },
-    "SchemaName": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "DatabaseName"
-   ],
-   "type": "object"
-  },
-  "RelationalFilterConfigurations": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/RelationalFilterConfiguration"
-   },
-   "type": "array"
-  },
-  "SageMakerRunConfigurationInput": {
-   "additionalProperties": false,
-   "properties": {
-    "TrackingAssets": {
-     "$ref": "#/definitions/TrackingAssets"
-    }
-   },
-   "required": [
-    "TrackingAssets"
-   ],
-   "type": "object"
-  },
-  "ScheduleConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "Schedule": {
-     "maxLength": 256,
-     "minLength": 1,
-     "pattern": "cron\\((\\b[0-5]?[0-9]\\b) (\\b2[0-3]\\b|\\b[0-1]?[0-9]\\b) (.*){1,5} (.*){1,5} (.*){1,5} (.*){1,5}\\)",
-     "type": "string"
-    },
-    "Timezone": {
-     "$ref": "#/definitions/Timezone"
-    }
-   },
-   "type": "object"
-  },
-  "Timezone": {
-   "enum": [
-    "AFRICA_JOHANNESBURG",
-    "AMERICA_MONTREAL",
-    "AMERICA_SAO_PAULO",
-    "ASIA_BAHRAIN",
-    "ASIA_BANGKOK",
-    "ASIA_CALCUTTA",
-    "ASIA_DUBAI",
-    "ASIA_HONG_KONG",
-    "ASIA_JAKARTA",
-    "ASIA_KUALA_LUMPUR",
-    "ASIA_SEOUL",
-    "ASIA_SHANGHAI",
-    "ASIA_SINGAPORE",
-    "ASIA_TAIPEI",
-    "ASIA_TOKYO",
-    "AUSTRALIA_MELBOURNE",
-    "AUSTRALIA_SYDNEY",
-    "CANADA_CENTRAL",
-    "CET",
-    "CST6CDT",
-    "ETC_GMT",
-    "ETC_GMT0",
-    "ETC_GMT_ADD_0",
-    "ETC_GMT_ADD_1",
-    "ETC_GMT_ADD_10",
-    "ETC_GMT_ADD_11",
-    "ETC_GMT_ADD_12",
-    "ETC_GMT_ADD_2",
-    "ETC_GMT_ADD_3",
-    "ETC_GMT_ADD_4",
-    "ETC_GMT_ADD_5",
-    "ETC_GMT_ADD_6",
-    "ETC_GMT_ADD_7",
-    "ETC_GMT_ADD_8",
-    "ETC_GMT_ADD_9",
-    "ETC_GMT_NEG_0",
-    "ETC_GMT_NEG_1",
-    "ETC_GMT_NEG_10",
-    "ETC_GMT_NEG_11",
-    "ETC_GMT_NEG_12",
-    "ETC_GMT_NEG_13",
-    "ETC_GMT_NEG_14",
-    "ETC_GMT_NEG_2",
-    "ETC_GMT_NEG_3",
-    "ETC_GMT_NEG_4",
-    "ETC_GMT_NEG_5",
-    "ETC_GMT_NEG_6",
-    "ETC_GMT_NEG_7",
-    "ETC_GMT_NEG_8",
-    "ETC_GMT_NEG_9",
-    "EUROPE_DUBLIN",
-    "EUROPE_LONDON",
-    "EUROPE_PARIS",
-    "EUROPE_STOCKHOLM",
-    "EUROPE_ZURICH",
-    "ISRAEL",
-    "MEXICO_GENERAL",
-    "MST7MDT",
-    "PACIFIC_AUCKLAND",
-    "US_CENTRAL",
-    "US_EASTERN",
-    "US_MOUNTAIN",
-    "US_PACIFIC",
-    "UTC"
-   ],
-   "type": "string"
-  },
-  "TrackingAssets": {
-   "additionalProperties": false,
-   "maxProperties": 1,
-   "patternProperties": {
-    "^.{1,64}$": {
-     "items": {
-      "pattern": "^arn:aws[^:]*:sagemaker:[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]:\\d{12}:[\\w+=,.@-]{1,128}/[\\w+=,.@-]{1,256}$",
-      "type": "string"
-     },
-     "maxItems": 500,
-     "minItems": 0,
-     "type": "array"
-    }
-   },
-   "type": "object"
-  },
-  "TypeRevision": {
-   "maxLength": 64,
-   "minLength": 1,
-   "pattern": "^[a-zA-Z0-9_-]+$",
-   "type": "string"
-  }
- },
- "primaryIdentifier": [
-  "/properties/DomainId",
-  "/properties/Id"
- ],
- "properties": {
-  "AssetFormsInput": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/FormInput"
-   },
-   "maxItems": 10,
-   "minItems": 0,
-   "type": "array"
-  },
-  "Configuration": {
-   "$ref": "#/definitions/DataSourceConfigurationInput"
-  },
-  "ConnectionId": {
-   "type": "string"
-  },
-  "ConnectionIdentifier": {
-   "type": "string"
-  },
-  "CreatedAt": {
-   "format": "date-time",
-   "type": "string"
-  },
-  "Description": {
-   "maxLength": 2048,
-   "type": "string"
-  },
-  "DomainId": {
-   "pattern": "^dzd[-_][a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "DomainIdentifier": {
-   "pattern": "^dzd[-_][a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "EnableSetting": {
-   "$ref": "#/definitions/EnableSetting"
-  },
-  "EnvironmentId": {
-   "type": "string"
-  },
-  "EnvironmentIdentifier": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "Id": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "LastRunAssetCount": {
-   "type": "number"
-  },
-  "LastRunAt": {
-   "type": "string"
-  },
-  "LastRunStatus": {
-   "type": "string"
-  },
-  "Name": {
-   "maxLength": 256,
-   "minLength": 1,
-   "type": "string"
-  },
-  "ProjectId": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "ProjectIdentifier": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "PublishOnImport": {
-   "type": "boolean"
-  },
-  "Recommendation": {
-   "$ref": "#/definitions/RecommendationConfiguration"
-  },
-  "Schedule": {
-   "$ref": "#/definitions/ScheduleConfiguration"
-  },
-  "Status": {
-   "$ref": "#/definitions/DataSourceStatus"
-  },
-  "Type": {
-   "maxLength": 256,
-   "minLength": 1,
-   "type": "string"
-  },
-  "UpdatedAt": {
-   "format": "date-time",
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/ConnectionId",
-  "/properties/CreatedAt",
-  "/properties/DomainId",
-  "/properties/EnvironmentId",
-  "/properties/Id",
-  "/properties/LastRunAssetCount",
-  "/properties/LastRunAt",
-  "/properties/LastRunStatus",
-  "/properties/ProjectId",
-  "/properties/Status",
-  "/properties/UpdatedAt"
- ],
- "required": [
-  "Name",
-  "DomainIdentifier",
-  "ProjectIdentifier",
-  "Type"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-datazone",
- "tagging": {
-  "cloudFormationSystemTags": false,
-  "tagOnCreate": false,
-  "tagUpdatable": false,
-  "taggable": false
- },
- "typeName": "AWS::DataZone::DataSource",
- "writeOnlyProperties": [
-  "/properties/AssetFormsInput",
-  "/properties/ConnectionIdentifier",
-  "/properties/EnvironmentIdentifier",
-  "/properties/DomainIdentifier",
-  "/properties/Configuration",
-  "/properties/ProjectIdentifier"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ca_central_1/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/ca_central_1/aws-fms-policy.json
deleted file mode 100644
index 8422693828..0000000000
--- a/src/cfnlint/data/schemas/providers/ca_central_1/aws-fms-policy.json
+++ /dev/null
@@ -1,416 +0,0 @@
-{
- "additionalProperties": false,
- "definitions": {
-  "AccountId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^([0-9]*)$",
-   "type": "string"
-  },
-  "Base62Id": {
-   "maxLength": 22,
-   "minLength": 22,
-   "pattern": "^[a-z0-9A-Z]{22}$",
-   "type": "string"
-  },
-  "FirewallDeploymentModel": {
-   "enum": [
-    "DISTRIBUTED",
-    "CENTRALIZED"
-   ],
-   "type": "string"
-  },
-  "IEMap": {
-   "additionalProperties": false,
-   "properties": {
-    "ACCOUNT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/AccountId"
-     },
-     "type": "array"
-    },
-    "ORGUNIT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/OrganizationalUnitId"
-     },
-     "type": "array"
-    }
-   },
-   "type": "object"
-  },
-  "ManagedServiceData": {
-   "maxLength": 30000,
-   "minLength": 1,
-   "type": "string"
-  },
-  "NetworkAclCommonPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "NetworkAclEntrySet": {
-     "$ref": "#/definitions/NetworkAclEntrySet"
-    }
-   },
-   "required": [
-    "NetworkAclEntrySet"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntry": {
-   "additionalProperties": false,
-   "properties": {
-    "CidrBlock": {
-     "pattern": "^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(\\/([0-9]|[1-2][0-9]|3[0-2]))$",
-     "type": "string"
-    },
-    "Egress": {
-     "type": "boolean"
-    },
-    "IcmpTypeCode": {
-     "additionalProperties": false,
-     "properties": {
-      "Code": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "Type": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "Code",
-      "Type"
-     ],
-     "type": "object"
-    },
-    "Ipv6CidrBlock": {
-     "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))(/(1[0-2]|[0-9]))?$",
-     "type": "string"
-    },
-    "PortRange": {
-     "additionalProperties": false,
-     "properties": {
-      "From": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "To": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "From",
-      "To"
-     ],
-     "type": "object"
-    },
-    "Protocol": {
-     "pattern": "^(tcp|udp|icmp|-1|([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))$",
-     "type": "string"
-    },
-    "RuleAction": {
-     "enum": [
-      "allow",
-      "deny"
-     ],
-     "type": "string"
-    }
-   },
-   "required": [
-    "Egress",
-    "Protocol",
-    "RuleAction"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntryList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/NetworkAclEntry"
-   },
-   "type": "array"
-  },
-  "NetworkAclEntrySet": {
-   "additionalProperties": false,
-   "anyOf": [
-    {
-     "required": [
-      "FirstEntries"
-     ]
-    },
-    {
-     "required": [
-      "LastEntries"
-     ]
-    }
-   ],
-   "properties": {
-    "FirstEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    },
-    "ForceRemediateForFirstEntries": {
-     "type": "boolean"
-    },
-    "ForceRemediateForLastEntries": {
-     "type": "boolean"
-    },
-    "LastEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    }
-   },
-   "required": [
-    "ForceRemediateForFirstEntries",
-    "ForceRemediateForLastEntries"
-   ],
-   "type": "object"
-  },
-  "NetworkFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  },
-  "OrganizationalUnitId": {
-   "maxLength": 68,
-   "minLength": 16,
-   "pattern": "^(ou-[0-9a-z]{4,32}-[a-z0-9]{8,32})$",
-   "type": "string"
-  },
-  "PolicyOption": {
-   "additionalProperties": false,
-   "oneOf": [
-    {
-     "required": [
-      "NetworkFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "ThirdPartyFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "NetworkAclCommonPolicy"
-     ]
-    }
-   ],
-   "properties": {
-    "NetworkAclCommonPolicy": {
-     "$ref": "#/definitions/NetworkAclCommonPolicy"
-    },
-    "NetworkFirewallPolicy": {
-     "$ref": "#/definitions/NetworkFirewallPolicy"
-    },
-    "ThirdPartyFirewallPolicy": {
-     "$ref": "#/definitions/ThirdPartyFirewallPolicy"
-    }
-   },
-   "type": "object"
-  },
-  "PolicyTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "PolicyType": {
-   "enum": [
-    "WAF",
-    "WAFV2",
-    "SHIELD_ADVANCED",
-    "SECURITY_GROUPS_COMMON",
-    "SECURITY_GROUPS_CONTENT_AUDIT",
-    "SECURITY_GROUPS_USAGE_AUDIT",
-    "NETWORK_FIREWALL",
-    "THIRD_PARTY_FIREWALL",
-    "DNS_FIREWALL",
-    "IMPORT_NETWORK_FIREWALL",
-    "NETWORK_ACL_COMMON"
-   ],
-   "type": "string"
-  },
-  "ResourceArn": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "ResourceTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key"
-   ],
-   "type": "object"
-  },
-  "ResourceType": {
-   "maxLength": 128,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "SecurityServicePolicyData": {
-   "additionalProperties": false,
-   "properties": {
-    "ManagedServiceData": {
-     "$ref": "#/definitions/ManagedServiceData"
-    },
-    "PolicyOption": {
-     "$ref": "#/definitions/PolicyOption"
-    },
-    "Type": {
-     "$ref": "#/definitions/PolicyType"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "ThirdPartyFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "Arn": {
-   "$ref": "#/definitions/ResourceArn"
-  },
-  "DeleteAllPolicyResources": {
-   "type": "boolean"
-  },
-  "ExcludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "ExcludeResourceTags": {
-   "type": "boolean"
-  },
-  "Id": {
-   "maxLength": 36,
-   "minLength": 36,
-   "pattern": "^[a-z0-9A-Z-]{36}$",
-   "type": "string"
-  },
-  "IncludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "PolicyDescription": {
-   "maxLength": 256,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "PolicyName": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "RemediationEnabled": {
-   "type": "boolean"
-  },
-  "ResourceSetIds": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/Base62Id"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "ResourceTags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceTag"
-   },
-   "maxItems": 8,
-   "type": "array"
-  },
-  "ResourceType": {
-   "$ref": "#/definitions/ResourceType"
-  },
-  "ResourceTypeList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceType"
-   },
-   "type": "array"
-  },
-  "ResourcesCleanUp": {
-   "type": "boolean"
-  },
-  "SecurityServicePolicyData": {
-   "$ref": "#/definitions/SecurityServicePolicyData"
-  },
-  "Tags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/PolicyTag"
-   },
-   "type": "array"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/Id"
- ],
- "required": [
-  "ExcludeResourceTags",
-  "PolicyName",
-  "RemediationEnabled",
-  "SecurityServicePolicyData"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-fms.git",
- "typeName": "AWS::FMS::Policy",
- "writeOnlyProperties": [
-  "/properties/DeleteAllPolicyResources"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ca_central_1/aws-panorama-package.json b/src/cfnlint/data/schemas/providers/ca_central_1/aws-panorama-package.json
deleted file mode 100644
index a8ea1b7b3e..0000000000
--- a/src/cfnlint/data/schemas/providers/ca_central_1/aws-panorama-package.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/PackageName"
- ],
- "definitions": {
-  "NodePackageArn": {
-   "maxLength": 255,
-   "minLength": 1,
-   "type": "string"
-  },
-  "NodePackageId": {
-   "maxLength": 255,
-   "minLength": 1,
-   "pattern": "^[a-zA-Z0-9\\-\\_\\/]+$",
-   "type": "string"
-  },
-  "NodePackageName": {
-   "maxLength": 128,
-   "minLength": 1,
-   "pattern": "^[a-zA-Z0-9\\-\\_]+$",
-   "type": "string"
-  },
-  "StorageLocation": {
-   "additionalProperties": false,
-   "properties": {
-    "BinaryPrefixLocation": {
-     "type": "string"
-    },
-    "Bucket": {
-     "type": "string"
-    },
-    "GeneratedPrefixLocation": {
-     "type": "string"
-    },
-    "ManifestPrefixLocation": {
-     "type": "string"
-    },
-    "RepoPrefixLocation": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^.+$",
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "minLength": 0,
-     "pattern": "^.+$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "TagList": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "Timestamp": {
-   "type": "integer"
-  }
- },
- "primaryIdentifier": [
-  "/properties/PackageId"
- ],
- "properties": {
-  "Arn": {
-   "$ref": "#/definitions/NodePackageArn"
-  },
-  "CreatedTime": {
-   "$ref": "#/definitions/Timestamp"
-  },
-  "PackageId": {
-   "$ref": "#/definitions/NodePackageId"
-  },
-  "PackageName": {
-   "$ref": "#/definitions/NodePackageName"
-  },
-  "StorageLocation": {
-   "$ref": "#/definitions/StorageLocation"
-  },
-  "Tags": {
-   "$ref": "#/definitions/TagList"
-  }
- },
- "readOnlyProperties": [
-  "/properties/PackageId",
-  "/properties/Arn",
-  "/properties/CreatedTime",
-  "/properties/StorageLocation/Bucket",
-  "/properties/StorageLocation/RepoPrefixLocation",
-  "/properties/StorageLocation/GeneratedPrefixLocation",
-  "/properties/StorageLocation/BinaryPrefixLocation",
-  "/properties/StorageLocation/ManifestPrefixLocation"
- ],
- "required": [
-  "PackageName"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git",
- "tagging": {
-  "cloudFormationSystemTags": true,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::Panorama::Package"
-}
diff --git a/src/cfnlint/data/schemas/providers/ca_central_1/aws-panorama-packageversion.json b/src/cfnlint/data/schemas/providers/ca_central_1/aws-panorama-packageversion.json
deleted file mode 100644
index 4e1669e777..0000000000
--- a/src/cfnlint/data/schemas/providers/ca_central_1/aws-panorama-packageversion.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/OwnerAccount",
-  "/properties/PackageId",
-  "/properties/PackageVersion",
-  "/properties/PatchVersion"
- ],
- "definitions": {
-  "NodePackageArn": {
-   "maxLength": 255,
-   "minLength": 1,
-   "type": "string"
-  },
-  "NodePackageId": {
-   "maxLength": 255,
-   "minLength": 1,
-   "pattern": "^[a-zA-Z0-9\\-\\_\\/]+$",
-   "type": "string"
-  },
-  "NodePackageName": {
-   "maxLength": 128,
-   "minLength": 1,
-   "pattern": "^[a-zA-Z0-9\\-\\_]+$",
-   "type": "string"
-  },
-  "NodePackagePatchVersion": {
-   "maxLength": 255,
-   "minLength": 1,
-   "pattern": "^[a-z0-9]+$",
-   "type": "string"
-  },
-  "NodePackageVersion": {
-   "maxLength": 255,
-   "minLength": 1,
-   "pattern": "^([0-9]+)\\.([0-9]+)$",
-   "type": "string"
-  },
-  "PackageOwnerAccount": {
-   "maxLength": 12,
-   "minLength": 1,
-   "pattern": "^[0-9a-z\\_]+$",
-   "type": "string"
-  },
-  "PackageVersionStatus": {
-   "enum": [
-    "REGISTER_PENDING",
-    "REGISTER_COMPLETED",
-    "FAILED",
-    "DELETING"
-   ],
-   "type": "string"
-  },
-  "PackageVersionStatusDescription": {
-   "maxLength": 255,
-   "minLength": 1,
-   "type": "string"
-  },
-  "TimeStamp": {
-   "type": "integer"
-  }
- },
- "primaryIdentifier": [
-  "/properties/PackageId",
-  "/properties/PackageVersion",
-  "/properties/PatchVersion"
- ],
- "properties": {
-  "IsLatestPatch": {
-   "type": "boolean"
-  },
-  "MarkLatest": {
-   "type": "boolean"
-  },
-  "OwnerAccount": {
-   "$ref": "#/definitions/PackageOwnerAccount"
-  },
-  "PackageArn": {
-   "$ref": "#/definitions/NodePackageArn"
-  },
-  "PackageId": {
-   "$ref": "#/definitions/NodePackageId"
-  },
-  "PackageName": {
-   "$ref": "#/definitions/NodePackageName"
-  },
-  "PackageVersion": {
-   "$ref": "#/definitions/NodePackageVersion"
-  },
-  "PatchVersion": {
-   "$ref": "#/definitions/NodePackagePatchVersion"
-  },
-  "RegisteredTime": {
-   "$ref": "#/definitions/TimeStamp"
-  },
-  "Status": {
-   "$ref": "#/definitions/PackageVersionStatus"
-  },
-  "StatusDescription": {
-   "$ref": "#/definitions/PackageVersionStatusDescription"
-  },
-  "UpdatedLatestPatchVersion": {
-   "$ref": "#/definitions/NodePackagePatchVersion"
-  }
- },
- "readOnlyProperties": [
-  "/properties/PackageName",
-  "/properties/PackageArn",
-  "/properties/Status",
-  "/properties/StatusDescription",
-  "/properties/IsLatestPatch",
-  "/properties/RegisteredTime"
- ],
- "required": [
-  "PackageId",
-  "PackageVersion",
-  "PatchVersion"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-panorama.git",
- "typeName": "AWS::Panorama::PackageVersion",
- "writeOnlyProperties": [
-  "/properties/UpdatedLatestPatchVersion"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/__init__.py b/src/cfnlint/data/schemas/providers/ca_west_1/__init__.py
index 9fd993e51e..7aea126d1a 100644
--- a/src/cfnlint/data/schemas/providers/ca_west_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/ca_west_1/__init__.py
@@ -712,6 +712,7 @@
     "aws-cloudwatch-compositealarm.json",
     "aws-cloudwatch-dashboard.json",
     "aws-cloudwatch-insightrule.json",
+    "aws-cloudwatch-metricstream.json",
     "aws-codedeploy-application.json",
     "aws-codedeploy-deploymentconfig.json",
     "aws-codedeploy-deploymentgroup.json",
@@ -762,6 +763,7 @@
     "aws-dms-replicationconfig.json",
     "aws-dynamodb-globaltable.json",
     "aws-dynamodb-table.json",
+    "aws-ec2-capacityreservation.json",
     "aws-ec2-capacityreservationfleet.json",
     "aws-ec2-customergateway.json",
     "aws-ec2-dhcpoptions.json",
@@ -877,6 +879,7 @@
     "aws-events-eventbuspolicy.json",
     "aws-events-rule.json",
     "aws-fms-notificationchannel.json",
+    "aws-fms-policy.json",
     "aws-fsx-datarepositoryassociation.json",
     "aws-fsx-filesystem.json",
     "aws-fsx-snapshot.json",
diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/aws-cloudwatch-metricstream.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-cloudwatch-metricstream.json
deleted file mode 100644
index 89ca2654d5..0000000000
--- a/src/cfnlint/data/schemas/providers/ca_west_1/aws-cloudwatch-metricstream.json
+++ /dev/null
@@ -1,228 +0,0 @@
-{
- "additionalProperties": false,
- "allOf": [
-  {
-   "required": [
-    "FirehoseArn",
-    "RoleArn",
-    "OutputFormat"
-   ]
-  },
-  {
-   "oneOf": [
-    {},
-    {
-     "required": [
-      "IncludeFilters",
-      "ExcludeFilters"
-     ]
-    }
-   ]
-  }
- ],
- "createOnlyProperties": [
-  "/properties/Name"
- ],
- "definitions": {
-  "MetricStreamFilter": {
-   "additionalProperties": false,
-   "properties": {
-    "MetricNames": {
-     "items": {
-      "maxLength": 255,
-      "minLength": 1,
-      "type": "string"
-     },
-     "maxItems": 999,
-     "type": "array"
-    },
-    "Namespace": {
-     "maxLength": 255,
-     "minLength": 1,
-     "pattern": "[^:].*",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Namespace"
-   ],
-   "type": "object"
-  },
-  "MetricStreamStatisticsConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "AdditionalStatistics": {
-     "items": {
-      "type": "string"
-     },
-     "maxItems": 20,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "IncludeMetrics": {
-     "items": {
-      "$ref": "#/definitions/MetricStreamStatisticsMetric"
-     },
-     "maxItems": 100,
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "required": [
-    "AdditionalStatistics",
-    "IncludeMetrics"
-   ],
-   "type": "object"
-  },
-  "MetricStreamStatisticsMetric": {
-   "additionalProperties": false,
-   "properties": {
-    "MetricName": {
-     "maxLength": 255,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Namespace": {
-     "maxLength": 255,
-     "minLength": 1,
-     "pattern": "[^:].*",
-     "type": "string"
-    }
-   },
-   "required": [
-    "MetricName",
-    "Namespace"
-   ],
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "minLength": 0,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Name"
- ],
- "properties": {
-  "Arn": {
-   "maxLength": 2048,
-   "minLength": 20,
-   "type": "string"
-  },
-  "CreationDate": {
-   "anyOf": [
-    {
-     "format": "date-time"
-    },
-    {
-     "format": "timestamp"
-    }
-   ],
-   "type": "string"
-  },
-  "ExcludeFilters": {
-   "items": {
-    "$ref": "#/definitions/MetricStreamFilter"
-   },
-   "maxItems": 1000,
-   "type": "array",
-   "uniqueItems": true
-  },
-  "FirehoseArn": {
-   "maxLength": 2048,
-   "minLength": 20,
-   "type": "string"
-  },
-  "IncludeFilters": {
-   "items": {
-    "$ref": "#/definitions/MetricStreamFilter"
-   },
-   "maxItems": 1000,
-   "type": "array",
-   "uniqueItems": true
-  },
-  "IncludeLinkedAccountsMetrics": {
-   "type": "boolean"
-  },
-  "LastUpdateDate": {
-   "anyOf": [
-    {
-     "format": "date-time"
-    },
-    {
-     "format": "timestamp"
-    }
-   ],
-   "type": "string"
-  },
-  "Name": {
-   "maxLength": 255,
-   "minLength": 1,
-   "type": "string"
-  },
-  "OutputFormat": {
-   "enum": [
-    "json",
-    "opentelemetry0.7",
-    "opentelemetry1.0"
-   ],
-   "maxLength": 255,
-   "minLength": 1,
-   "type": "string"
-  },
-  "RoleArn": {
-   "maxLength": 2048,
-   "minLength": 20,
-   "type": "string"
-  },
-  "State": {
-   "maxLength": 255,
-   "minLength": 1,
-   "type": "string"
-  },
-  "StatisticsConfigurations": {
-   "items": {
-    "$ref": "#/definitions/MetricStreamStatisticsConfiguration"
-   },
-   "maxItems": 100,
-   "type": "array",
-   "uniqueItems": true
-  },
-  "Tags": {
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 50,
-   "type": "array",
-   "uniqueItems": true
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/CreationDate",
-  "/properties/LastUpdateDate",
-  "/properties/State"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-cloudwatch.git",
- "taggable": true,
- "typeName": "AWS::CloudWatch::MetricStream",
- "writeOnlyProperties": [
-  "/properties/Tags"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/aws-ec2-capacityreservation.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-ec2-capacityreservation.json
deleted file mode 100644
index 5a10969ce5..0000000000
--- a/src/cfnlint/data/schemas/providers/ca_west_1/aws-ec2-capacityreservation.json
+++ /dev/null
@@ -1,250 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/Tenancy",
-  "/properties/InstancePlatform",
-  "/properties/InstanceType",
-  "/properties/AvailabilityZone",
-  "/properties/TagSpecifications",
-  "/properties/OutPostArn",
-  "/properties/EphemeralStorage",
-  "/properties/EbsOptimized",
-  "/properties/PlacementGroupArn"
- ],
- "definitions": {
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "type": "string"
-    },
-    "Value": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "TagSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "ResourceType": {
-     "enum": [
-      "capacity-reservation",
-      "capacity-reservation-fleet",
-      "carrier-gateway",
-      "client-vpn-endpoint",
-      "coip-pool",
-      "customer-gateway",
-      "declarative-policies-report",
-      "dedicated-host",
-      "dhcp-options",
-      "egress-only-internet-gateway",
-      "elastic-gpu",
-      "elastic-ip",
-      "export-image-task",
-      "export-instance-task",
-      "fleet",
-      "fpga-image",
-      "host-reservation",
-      "image",
-      "import-image-task",
-      "import-snapshot-task",
-      "instance",
-      "instance-connect-endpoint",
-      "instance-event-window",
-      "internet-gateway",
-      "ipam",
-      "ipam-external-resource-verification-token",
-      "ipam-pool",
-      "ipam-resource-discovery",
-      "ipam-resource-discovery-association",
-      "ipam-scope",
-      "ipv4pool-ec2",
-      "ipv6pool-ec2",
-      "key-pair",
-      "launch-template",
-      "local-gateway",
-      "local-gateway-route-table",
-      "local-gateway-route-table-virtual-interface-group-association",
-      "local-gateway-route-table-vpc-association",
-      "local-gateway-virtual-interface",
-      "local-gateway-virtual-interface-group",
-      "natgateway",
-      "network-acl",
-      "network-insights-access-scope",
-      "network-insights-access-scope-analysis",
-      "network-insights-analysis",
-      "network-insights-path",
-      "network-interface",
-      "placement-group",
-      "prefix-list",
-      "replace-root-volume-task",
-      "reserved-instances",
-      "route-table",
-      "security-group",
-      "security-group-rule",
-      "snapshot",
-      "spot-fleet-request",
-      "spot-instances-request",
-      "subnet",
-      "subnet-cidr-reservation",
-      "traffic-mirror-filter",
-      "traffic-mirror-filter-rule",
-      "traffic-mirror-session",
-      "traffic-mirror-target",
-      "transit-gateway",
-      "transit-gateway-attachment",
-      "transit-gateway-connect-peer",
-      "transit-gateway-multicast-domain",
-      "transit-gateway-policy-table",
-      "transit-gateway-route-table",
-      "transit-gateway-route-table-announcement",
-      "verified-access-endpoint",
-      "verified-access-endpoint-target",
-      "verified-access-group",
-      "verified-access-instance",
-      "verified-access-policy",
-      "verified-access-trust-provider",
-      "volume",
-      "vpc",
-      "vpc-block-public-access-exclusion",
-      "vpc-endpoint",
-      "vpc-endpoint-connection",
-      "vpc-endpoint-connection-device-type",
-      "vpc-endpoint-service",
-      "vpc-endpoint-service-permission",
-      "vpc-flow-log",
-      "vpc-peering-connection",
-      "vpn-connection",
-      "vpn-connection-device-type",
-      "vpn-gateway"
-     ],
-     "type": "string"
-    },
-    "Tags": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Tag"
-     },
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "AvailabilityZone": {
-   "type": "string"
-  },
-  "AvailableInstanceCount": {
-   "type": "integer"
-  },
-  "EbsOptimized": {
-   "type": "boolean"
-  },
-  "EndDate": {
-   "type": "string"
-  },
-  "EndDateType": {
-   "enum": [
-    "limited",
-    "unlimited"
-   ],
-   "type": "string"
-  },
-  "EphemeralStorage": {
-   "type": "boolean"
-  },
-  "Id": {
-   "type": "string"
-  },
-  "InstanceCount": {
-   "type": "integer"
-  },
-  "InstanceMatchCriteria": {
-   "enum": [
-    "open",
-    "targeted"
-   ],
-   "type": "string"
-  },
-  "InstancePlatform": {
-   "enum": [
-    "Linux with SQL Server Enterprise",
-    "Linux with SQL Server Standard",
-    "Linux with SQL Server Web",
-    "Linux/UNIX",
-    "RHEL with HA",
-    "RHEL with HA and SQL Server Enterprise",
-    "RHEL with HA and SQL Server Standard",
-    "RHEL with SQL Server Enterprise",
-    "RHEL with SQL Server Standard",
-    "RHEL with SQL Server Web",
-    "Red Hat Enterprise Linux",
-    "SUSE Linux",
-    "Ubuntu Pro",
-    "Windows",
-    "Windows with SQL Server",
-    "Windows with SQL Server Enterprise",
-    "Windows with SQL Server Standard",
-    "Windows with SQL Server Web"
-   ],
-   "type": "string"
-  },
-  "InstanceType": {
-   "type": "string"
-  },
-  "OutPostArn": {
-   "pattern": "^arn:aws([a-z-]+)?:outposts:[a-z\\d-]+:\\d{12}:outpost/op-[a-f0-9]{17}$",
-   "type": "string"
-  },
-  "PlacementGroupArn": {
-   "pattern": "^arn:aws([a-z-]+)?:ec2:[a-z\\d-]+:\\d{12}:placement-group/^.{1,255}$",
-   "type": "string"
-  },
-  "TagSpecifications": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/TagSpecification"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "Tenancy": {
-   "enum": [
-    "dedicated",
-    "default"
-   ],
-   "type": "string"
-  },
-  "TotalInstanceCount": {
-   "type": "integer"
-  },
-  "UnusedReservationBillingOwnerId": {
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id",
-  "/properties/AvailableInstanceCount",
-  "/properties/TotalInstanceCount"
- ],
- "required": [
-  "InstanceCount",
-  "AvailabilityZone",
-  "InstancePlatform",
-  "InstanceType"
- ],
- "typeName": "AWS::EC2::CapacityReservation",
- "writeOnlyProperties": [
-  "/properties/UnusedReservationBillingOwnerId"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ca_west_1/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/ca_west_1/aws-fms-policy.json
deleted file mode 100644
index 8422693828..0000000000
--- a/src/cfnlint/data/schemas/providers/ca_west_1/aws-fms-policy.json
+++ /dev/null
@@ -1,416 +0,0 @@
-{
- "additionalProperties": false,
- "definitions": {
-  "AccountId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^([0-9]*)$",
-   "type": "string"
-  },
-  "Base62Id": {
-   "maxLength": 22,
-   "minLength": 22,
-   "pattern": "^[a-z0-9A-Z]{22}$",
-   "type": "string"
-  },
-  "FirewallDeploymentModel": {
-   "enum": [
-    "DISTRIBUTED",
-    "CENTRALIZED"
-   ],
-   "type": "string"
-  },
-  "IEMap": {
-   "additionalProperties": false,
-   "properties": {
-    "ACCOUNT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/AccountId"
-     },
-     "type": "array"
-    },
-    "ORGUNIT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/OrganizationalUnitId"
-     },
-     "type": "array"
-    }
-   },
-   "type": "object"
-  },
-  "ManagedServiceData": {
-   "maxLength": 30000,
-   "minLength": 1,
-   "type": "string"
-  },
-  "NetworkAclCommonPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "NetworkAclEntrySet": {
-     "$ref": "#/definitions/NetworkAclEntrySet"
-    }
-   },
-   "required": [
-    "NetworkAclEntrySet"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntry": {
-   "additionalProperties": false,
-   "properties": {
-    "CidrBlock": {
-     "pattern": "^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(\\/([0-9]|[1-2][0-9]|3[0-2]))$",
-     "type": "string"
-    },
-    "Egress": {
-     "type": "boolean"
-    },
-    "IcmpTypeCode": {
-     "additionalProperties": false,
-     "properties": {
-      "Code": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "Type": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "Code",
-      "Type"
-     ],
-     "type": "object"
-    },
-    "Ipv6CidrBlock": {
-     "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))(/(1[0-2]|[0-9]))?$",
-     "type": "string"
-    },
-    "PortRange": {
-     "additionalProperties": false,
-     "properties": {
-      "From": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "To": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "From",
-      "To"
-     ],
-     "type": "object"
-    },
-    "Protocol": {
-     "pattern": "^(tcp|udp|icmp|-1|([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))$",
-     "type": "string"
-    },
-    "RuleAction": {
-     "enum": [
-      "allow",
-      "deny"
-     ],
-     "type": "string"
-    }
-   },
-   "required": [
-    "Egress",
-    "Protocol",
-    "RuleAction"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntryList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/NetworkAclEntry"
-   },
-   "type": "array"
-  },
-  "NetworkAclEntrySet": {
-   "additionalProperties": false,
-   "anyOf": [
-    {
-     "required": [
-      "FirstEntries"
-     ]
-    },
-    {
-     "required": [
-      "LastEntries"
-     ]
-    }
-   ],
-   "properties": {
-    "FirstEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    },
-    "ForceRemediateForFirstEntries": {
-     "type": "boolean"
-    },
-    "ForceRemediateForLastEntries": {
-     "type": "boolean"
-    },
-    "LastEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    }
-   },
-   "required": [
-    "ForceRemediateForFirstEntries",
-    "ForceRemediateForLastEntries"
-   ],
-   "type": "object"
-  },
-  "NetworkFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  },
-  "OrganizationalUnitId": {
-   "maxLength": 68,
-   "minLength": 16,
-   "pattern": "^(ou-[0-9a-z]{4,32}-[a-z0-9]{8,32})$",
-   "type": "string"
-  },
-  "PolicyOption": {
-   "additionalProperties": false,
-   "oneOf": [
-    {
-     "required": [
-      "NetworkFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "ThirdPartyFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "NetworkAclCommonPolicy"
-     ]
-    }
-   ],
-   "properties": {
-    "NetworkAclCommonPolicy": {
-     "$ref": "#/definitions/NetworkAclCommonPolicy"
-    },
-    "NetworkFirewallPolicy": {
-     "$ref": "#/definitions/NetworkFirewallPolicy"
-    },
-    "ThirdPartyFirewallPolicy": {
-     "$ref": "#/definitions/ThirdPartyFirewallPolicy"
-    }
-   },
-   "type": "object"
-  },
-  "PolicyTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "PolicyType": {
-   "enum": [
-    "WAF",
-    "WAFV2",
-    "SHIELD_ADVANCED",
-    "SECURITY_GROUPS_COMMON",
-    "SECURITY_GROUPS_CONTENT_AUDIT",
-    "SECURITY_GROUPS_USAGE_AUDIT",
-    "NETWORK_FIREWALL",
-    "THIRD_PARTY_FIREWALL",
-    "DNS_FIREWALL",
-    "IMPORT_NETWORK_FIREWALL",
-    "NETWORK_ACL_COMMON"
-   ],
-   "type": "string"
-  },
-  "ResourceArn": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "ResourceTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key"
-   ],
-   "type": "object"
-  },
-  "ResourceType": {
-   "maxLength": 128,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "SecurityServicePolicyData": {
-   "additionalProperties": false,
-   "properties": {
-    "ManagedServiceData": {
-     "$ref": "#/definitions/ManagedServiceData"
-    },
-    "PolicyOption": {
-     "$ref": "#/definitions/PolicyOption"
-    },
-    "Type": {
-     "$ref": "#/definitions/PolicyType"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "ThirdPartyFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "Arn": {
-   "$ref": "#/definitions/ResourceArn"
-  },
-  "DeleteAllPolicyResources": {
-   "type": "boolean"
-  },
-  "ExcludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "ExcludeResourceTags": {
-   "type": "boolean"
-  },
-  "Id": {
-   "maxLength": 36,
-   "minLength": 36,
-   "pattern": "^[a-z0-9A-Z-]{36}$",
-   "type": "string"
-  },
-  "IncludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "PolicyDescription": {
-   "maxLength": 256,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "PolicyName": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "RemediationEnabled": {
-   "type": "boolean"
-  },
-  "ResourceSetIds": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/Base62Id"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "ResourceTags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceTag"
-   },
-   "maxItems": 8,
-   "type": "array"
-  },
-  "ResourceType": {
-   "$ref": "#/definitions/ResourceType"
-  },
-  "ResourceTypeList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceType"
-   },
-   "type": "array"
-  },
-  "ResourcesCleanUp": {
-   "type": "boolean"
-  },
-  "SecurityServicePolicyData": {
-   "$ref": "#/definitions/SecurityServicePolicyData"
-  },
-  "Tags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/PolicyTag"
-   },
-   "type": "array"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/Id"
- ],
- "required": [
-  "ExcludeResourceTags",
-  "PolicyName",
-  "RemediationEnabled",
-  "SecurityServicePolicyData"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-fms.git",
- "typeName": "AWS::FMS::Policy",
- "writeOnlyProperties": [
-  "/properties/DeleteAllPolicyResources"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/cn_northwest_1/__init__.py b/src/cfnlint/data/schemas/providers/cn_northwest_1/__init__.py
index 6f14e66af9..25b847a462 100644
--- a/src/cfnlint/data/schemas/providers/cn_northwest_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/cn_northwest_1/__init__.py
@@ -805,6 +805,7 @@
     "aws-cloudwatch-compositealarm.json",
     "aws-cloudwatch-dashboard.json",
     "aws-cloudwatch-insightrule.json",
+    "aws-cloudwatch-metricstream.json",
     "aws-codebuild-project.json",
     "aws-codebuild-reportgroup.json",
     "aws-codebuild-sourcecredential.json",
diff --git a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-cloudwatch-metricstream.json b/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-cloudwatch-metricstream.json
deleted file mode 100644
index 89ca2654d5..0000000000
--- a/src/cfnlint/data/schemas/providers/cn_northwest_1/aws-cloudwatch-metricstream.json
+++ /dev/null
@@ -1,228 +0,0 @@
-{
- "additionalProperties": false,
- "allOf": [
-  {
-   "required": [
-    "FirehoseArn",
-    "RoleArn",
-    "OutputFormat"
-   ]
-  },
-  {
-   "oneOf": [
-    {},
-    {
-     "required": [
-      "IncludeFilters",
-      "ExcludeFilters"
-     ]
-    }
-   ]
-  }
- ],
- "createOnlyProperties": [
-  "/properties/Name"
- ],
- "definitions": {
-  "MetricStreamFilter": {
-   "additionalProperties": false,
-   "properties": {
-    "MetricNames": {
-     "items": {
-      "maxLength": 255,
-      "minLength": 1,
-      "type": "string"
-     },
-     "maxItems": 999,
-     "type": "array"
-    },
-    "Namespace": {
-     "maxLength": 255,
-     "minLength": 1,
-     "pattern": "[^:].*",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Namespace"
-   ],
-   "type": "object"
-  },
-  "MetricStreamStatisticsConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "AdditionalStatistics": {
-     "items": {
-      "type": "string"
-     },
-     "maxItems": 20,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "IncludeMetrics": {
-     "items": {
-      "$ref": "#/definitions/MetricStreamStatisticsMetric"
-     },
-     "maxItems": 100,
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "required": [
-    "AdditionalStatistics",
-    "IncludeMetrics"
-   ],
-   "type": "object"
-  },
-  "MetricStreamStatisticsMetric": {
-   "additionalProperties": false,
-   "properties": {
-    "MetricName": {
-     "maxLength": 255,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Namespace": {
-     "maxLength": 255,
-     "minLength": 1,
-     "pattern": "[^:].*",
-     "type": "string"
-    }
-   },
-   "required": [
-    "MetricName",
-    "Namespace"
-   ],
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "minLength": 0,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Name"
- ],
- "properties": {
-  "Arn": {
-   "maxLength": 2048,
-   "minLength": 20,
-   "type": "string"
-  },
-  "CreationDate": {
-   "anyOf": [
-    {
-     "format": "date-time"
-    },
-    {
-     "format": "timestamp"
-    }
-   ],
-   "type": "string"
-  },
-  "ExcludeFilters": {
-   "items": {
-    "$ref": "#/definitions/MetricStreamFilter"
-   },
-   "maxItems": 1000,
-   "type": "array",
-   "uniqueItems": true
-  },
-  "FirehoseArn": {
-   "maxLength": 2048,
-   "minLength": 20,
-   "type": "string"
-  },
-  "IncludeFilters": {
-   "items": {
-    "$ref": "#/definitions/MetricStreamFilter"
-   },
-   "maxItems": 1000,
-   "type": "array",
-   "uniqueItems": true
-  },
-  "IncludeLinkedAccountsMetrics": {
-   "type": "boolean"
-  },
-  "LastUpdateDate": {
-   "anyOf": [
-    {
-     "format": "date-time"
-    },
-    {
-     "format": "timestamp"
-    }
-   ],
-   "type": "string"
-  },
-  "Name": {
-   "maxLength": 255,
-   "minLength": 1,
-   "type": "string"
-  },
-  "OutputFormat": {
-   "enum": [
-    "json",
-    "opentelemetry0.7",
-    "opentelemetry1.0"
-   ],
-   "maxLength": 255,
-   "minLength": 1,
-   "type": "string"
-  },
-  "RoleArn": {
-   "maxLength": 2048,
-   "minLength": 20,
-   "type": "string"
-  },
-  "State": {
-   "maxLength": 255,
-   "minLength": 1,
-   "type": "string"
-  },
-  "StatisticsConfigurations": {
-   "items": {
-    "$ref": "#/definitions/MetricStreamStatisticsConfiguration"
-   },
-   "maxItems": 100,
-   "type": "array",
-   "uniqueItems": true
-  },
-  "Tags": {
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 50,
-   "type": "array",
-   "uniqueItems": true
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/CreationDate",
-  "/properties/LastUpdateDate",
-  "/properties/State"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-cloudwatch.git",
- "taggable": true,
- "typeName": "AWS::CloudWatch::MetricStream",
- "writeOnlyProperties": [
-  "/properties/Tags"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/eu_central_1/__init__.py b/src/cfnlint/data/schemas/providers/eu_central_1/__init__.py
index 433f6b1f5d..c2add0c355 100644
--- a/src/cfnlint/data/schemas/providers/eu_central_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/eu_central_1/__init__.py
@@ -1451,7 +1451,6 @@
     "aws-backup-restoretestingselection.json",
     "aws-backupgateway-hypervisor.json",
     "aws-batch-computeenvironment.json",
-    "aws-batch-jobdefinition.json",
     "aws-batch-jobqueue.json",
     "aws-batch-schedulingpolicy.json",
     "aws-bedrock-agent.json",
@@ -1519,6 +1518,7 @@
     "aws-cloudfront-realtimelogconfig.json",
     "aws-cloudfront-responseheaderspolicy.json",
     "aws-cloudfront-streamingdistribution.json",
+    "aws-cloudfront-vpcorigin.json",
     "aws-cloudtrail-channel.json",
     "aws-cloudtrail-dashboard.json",
     "aws-cloudtrail-eventdatastore.json",
@@ -1636,6 +1636,7 @@
     "aws-datasync-locationsmb.json",
     "aws-datasync-storagesystem.json",
     "aws-datasync-task.json",
+    "aws-datazone-datasource.json",
     "aws-datazone-domain.json",
     "aws-datazone-environment.json",
     "aws-datazone-environmentactions.json",
@@ -1790,7 +1791,6 @@
     "aws-ecs-cluster.json",
     "aws-ecs-clustercapacityproviderassociations.json",
     "aws-ecs-primarytaskset.json",
-    "aws-ecs-service.json",
     "aws-ecs-taskdefinition.json",
     "aws-ecs-taskset.json",
     "aws-efs-accesspoint.json",
@@ -2418,7 +2418,6 @@
     "aws-sagemaker-notebookinstance.json",
     "aws-sagemaker-notebookinstancelifecycleconfig.json",
     "aws-sagemaker-partnerapp.json",
-    "aws-sagemaker-pipeline.json",
     "aws-sagemaker-project.json",
     "aws-sagemaker-space.json",
     "aws-sagemaker-studiolifecycleconfig.json",
diff --git a/src/cfnlint/data/schemas/providers/eu_central_1/aws-batch-jobdefinition.json b/src/cfnlint/data/schemas/providers/eu_central_1/aws-batch-jobdefinition.json
new file mode 100644
index 0000000000..7957fd7312
--- /dev/null
+++ b/src/cfnlint/data/schemas/providers/eu_central_1/aws-batch-jobdefinition.json
@@ -0,0 +1,1268 @@
+{
+ "additionalProperties": false,
+ "createOnlyProperties": [
+  "/properties/JobDefinitionName"
+ ],
+ "definitions": {
+  "ContainerProperties": {
+   "additionalProperties": false,
+   "properties": {
+    "Command": {
+     "insertionOrder": true,
+     "items": {
+      "type": "string"
+     },
+     "type": "array",
+     "uniqueItems": false
+    },
+    "Environment": {
+     "insertionOrder": true,
+     "items": {
+      "$ref": "#/definitions/Environment"
+     },
+     "type": "array",
+     "uniqueItems": false
+    },
+    "EphemeralStorage": {
+     "$ref": "#/definitions/EphemeralStorage"
+    },
+    "ExecutionRoleArn": {
+     "type": "string"
+    },
+    "FargatePlatformConfiguration": {
+     "additionalProperties": false,
+     "properties": {
+      "PlatformVersion": {
+       "type": "string"
+      }
+     },
+     "type": "object"
+    },
+    "Image": {
+     "type": "string"
+    },
+    "JobRoleArn": {
+     "type": "string"
+    },
+    "LinuxParameters": {
+     "$ref": "#/definitions/LinuxParameters"
+    },
+    "LogConfiguration": {
+     "$ref": "#/definitions/LogConfiguration"
+    },
+    "Memory": {
+     "type": "integer"
+    },
+    "MountPoints": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/MountPoint"
+     },
+     "type": "array",
+     "uniqueItems": false
+    },
+    "NetworkConfiguration": {
+     "$ref": "#/definitions/NetworkConfiguration"
+    },
+    "Privileged": {
+     "type": "boolean"
+    },
+    "ReadonlyRootFilesystem": {
+     "type": "boolean"
+    },
+    "RepositoryCredentials": {
+     "$ref": "#/definitions/RepositoryCredentials"
+    },
+    "ResourceRequirements": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/ResourceRequirement"
+     },
+     "type": "array",
+     "uniqueItems": false
+    },
+    "RuntimePlatform": {
+     "$ref": "#/definitions/RuntimePlatform"
+    },
+    "Secrets": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/Secret"
+     },
+     "type": "array",
+     "uniqueItems": false
+    },
+    "Ulimits": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/Ulimit"
+     },
+     "type": "array",
+     "uniqueItems": false
+    },
+    "User": {
+     "type": "string"
+    },
+    "Vcpus": {
+     "type": "integer"
+    },
+    "Volumes": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/Volume"
+     },
+     "type": "array",
+     "uniqueItems": false
+    }
+   },
+   "required": [
+    "Image"
+   ],
+   "type": "object"
+  },
+  "Device": {
+   "additionalProperties": false,
+   "properties": {
+    "ContainerPath": {
+     "type": "string"
+    },
+    "HostPath": {
+     "type": "string"
+    },
+    "Permissions": {
+     "insertionOrder": false,
+     "items": {
+      "enumCaseInsensitive": [
+       "mknod",
+       "read",
+       "write"
+      ],
+      "type": "string"
+     },
+     "type": "array",
+     "uniqueItems": false
+    }
+   },
+   "type": "object"
+  },
+  "EFSAuthorizationConfig": {
+   "additionalProperties": false,
+   "properties": {
+    "AccessPointId": {
+     "type": "string"
+    },
+    "Iam": {
+     "enumCaseInsensitive": [
+      "disabled",
+      "enabled"
+     ],
+     "type": "string"
+    }
+   },
+   "type": "object"
+  },
+  "EFSVolumeConfiguration": {
+   "additionalProperties": false,
+   "properties": {
+    "AuthorizationConfig": {
+     "$ref": "#/definitions/EFSAuthorizationConfig"
+    },
+    "FileSystemId": {
+     "type": "string"
+    },
+    "RootDirectory": {
+     "type": "string"
+    },
+    "TransitEncryption": {
+     "enumCaseInsensitive": [
+      "disabled",
+      "enabled"
+     ],
+     "type": "string"
+    },
+    "TransitEncryptionPort": {
+     "type": "integer"
+    }
+   },
+   "required": [
+    "FileSystemId"
+   ],
+   "type": "object"
+  },
+  "EcsProperties": {
+   "additionalProperties": false,
+   "properties": {
+    "TaskProperties": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/EcsTaskProperties"
+     },
+     "type": "array",
+     "uniqueItems": false
+    }
+   },
+   "required": [
+    "TaskProperties"
+   ],
+   "type": "object"
+  },
+  "EcsTaskProperties": {
+   "additionalProperties": false,
+   "properties": {
+    "Containers": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/TaskContainerProperties"
+     },
+     "type": "array",
+     "uniqueItems": false
+    },
+    "EphemeralStorage": {
+     "$ref": "#/definitions/EphemeralStorage"
+    },
+    "ExecutionRoleArn": {
+     "type": "string"
+    },
+    "IpcMode": {
+     "type": "string"
+    },
+    "NetworkConfiguration": {
+     "$ref": "#/definitions/NetworkConfiguration"
+    },
+    "PidMode": {
+     "type": "string"
+    },
+    "PlatformVersion": {
+     "type": "string"
+    },
+    "RuntimePlatform": {
+     "$ref": "#/definitions/RuntimePlatform"
+    },
+    "TaskRoleArn": {
+     "type": "string"
+    },
+    "Volumes": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/Volume"
+     },
+     "type": "array",
+     "uniqueItems": false
+    }
+   },
+   "type": "object"
+  },
+  "EksContainer": {
+   "additionalProperties": false,
+   "properties": {
+    "Args": {
+     "insertionOrder": true,
+     "items": {
+      "type": "string"
+     },
+     "type": "array",
+     "uniqueItems": false
+    },
+    "Command": {
+     "insertionOrder": true,
+     "items": {
+      "type": "string"
+     },
+     "type": "array",
+     "uniqueItems": false
+    },
+    "Env": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/EksContainerEnvironmentVariable"
+     },
+     "type": "array",
+     "uniqueItems": false
+    },
+    "Image": {
+     "type": "string"
+    },
+    "ImagePullPolicy": {
+     "type": "string"
+    },
+    "Name": {
+     "type": "string"
+    },
+    "Resources": {
+     "$ref": "#/definitions/EksContainerResourceRequirements"
+    },
+    "SecurityContext": {
+     "$ref": "#/definitions/EksContainerSecurityContext"
+    },
+    "VolumeMounts": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/EksContainerVolumeMount"
+     },
+     "type": "array",
+     "uniqueItems": false
+    }
+   },
+   "required": [
+    "Image"
+   ],
+   "type": "object"
+  },
+  "EksContainerEnvironmentVariable": {
+   "additionalProperties": false,
+   "properties": {
+    "Name": {
+     "type": "string"
+    },
+    "Value": {
+     "type": "string"
+    }
+   },
+   "required": [
+    "Name"
+   ],
+   "type": "object"
+  },
+  "EksContainerResourceRequirements": {
+   "additionalProperties": false,
+   "properties": {
+    "Limits": {
+     "additionalProperties": false,
+     "patternProperties": {
+      ".*": {
+       "type": "string"
+      }
+     },
+     "type": "object"
+    },
+    "Requests": {
+     "additionalProperties": false,
+     "patternProperties": {
+      ".*": {
+       "type": "string"
+      }
+     },
+     "type": "object"
+    }
+   },
+   "type": "object"
+  },
+  "EksContainerSecurityContext": {
+   "additionalProperties": false,
+   "properties": {
+    "AllowPrivilegeEscalation": {
+     "type": "boolean"
+    },
+    "Privileged": {
+     "type": "boolean"
+    },
+    "ReadOnlyRootFilesystem": {
+     "type": "boolean"
+    },
+    "RunAsGroup": {
+     "type": "integer"
+    },
+    "RunAsNonRoot": {
+     "type": "boolean"
+    },
+    "RunAsUser": {
+     "type": "integer"
+    }
+   },
+   "type": "object"
+  },
+  "EksContainerVolumeMount": {
+   "additionalProperties": false,
+   "properties": {
+    "MountPath": {
+     "type": "string"
+    },
+    "Name": {
+     "type": "string"
+    },
+    "ReadOnly": {
+     "type": "boolean"
+    },
+    "SubPath": {
+     "type": "string"
+    }
+   },
+   "type": "object"
+  },
+  "EksEmptyDir": {
+   "additionalProperties": false,
+   "properties": {
+    "Medium": {
+     "type": "string"
+    },
+    "SizeLimit": {
+     "type": "string"
+    }
+   },
+   "type": "object"
+  },
+  "EksHostPath": {
+   "additionalProperties": false,
+   "properties": {
+    "Path": {
+     "type": "string"
+    }
+   },
+   "type": "object"
+  },
+  "EksMetadata": {
+   "additionalProperties": false,
+   "properties": {
+    "Annotations": {
+     "additionalProperties": false,
+     "patternProperties": {
+      ".*": {
+       "type": "string"
+      }
+     },
+     "type": "object"
+    },
+    "Labels": {
+     "additionalProperties": false,
+     "patternProperties": {
+      ".*": {
+       "type": "string"
+      }
+     },
+     "type": "object"
+    },
+    "Namespace": {
+     "type": "string"
+    }
+   },
+   "type": "object"
+  },
+  "EksPersistentVolumeClaim": {
+   "additionalProperties": false,
+   "properties": {
+    "ClaimName": {
+     "type": "string"
+    },
+    "ReadOnly": {
+     "type": "boolean"
+    }
+   },
+   "required": [
+    "ClaimName"
+   ],
+   "type": "object"
+  },
+  "EksPodProperties": {
+   "additionalProperties": false,
+   "properties": {
+    "Containers": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/EksContainer"
+     },
+     "type": "array",
+     "uniqueItems": false
+    },
+    "DnsPolicy": {
+     "type": "string"
+    },
+    "HostNetwork": {
+     "type": "boolean"
+    },
+    "ImagePullSecrets": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/ImagePullSecret"
+     },
+     "type": "array",
+     "uniqueItems": false
+    },
+    "InitContainers": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/EksContainer"
+     },
+     "type": "array",
+     "uniqueItems": false
+    },
+    "Metadata": {
+     "$ref": "#/definitions/EksMetadata"
+    },
+    "ServiceAccountName": {
+     "type": "string"
+    },
+    "ShareProcessNamespace": {
+     "type": "boolean"
+    },
+    "Volumes": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/EksVolume"
+     },
+     "type": "array",
+     "uniqueItems": false
+    }
+   },
+   "type": "object"
+  },
+  "EksProperties": {
+   "additionalProperties": false,
+   "properties": {
+    "PodProperties": {
+     "$ref": "#/definitions/EksPodProperties"
+    }
+   },
+   "type": "object"
+  },
+  "EksSecret": {
+   "additionalProperties": false,
+   "properties": {
+    "Optional": {
+     "type": "boolean"
+    },
+    "SecretName": {
+     "type": "string"
+    }
+   },
+   "required": [
+    "SecretName"
+   ],
+   "type": "object"
+  },
+  "EksVolume": {
+   "additionalProperties": false,
+   "properties": {
+    "EmptyDir": {
+     "$ref": "#/definitions/EksEmptyDir"
+    },
+    "HostPath": {
+     "$ref": "#/definitions/EksHostPath"
+    },
+    "Name": {
+     "type": "string"
+    },
+    "PersistentVolumeClaim": {
+     "$ref": "#/definitions/EksPersistentVolumeClaim"
+    },
+    "Secret": {
+     "$ref": "#/definitions/EksSecret"
+    }
+   },
+   "required": [
+    "Name"
+   ],
+   "type": "object"
+  },
+  "Environment": {
+   "additionalProperties": false,
+   "properties": {
+    "Name": {
+     "type": "string"
+    },
+    "Value": {
+     "type": "string"
+    }
+   },
+   "type": "object"
+  },
+  "EphemeralStorage": {
+   "additionalProperties": false,
+   "properties": {
+    "SizeInGiB": {
+     "type": "integer"
+    }
+   },
+   "required": [
+    "SizeInGiB"
+   ],
+   "type": "object"
+  },
+  "EvaluateOnExit": {
+   "additionalProperties": false,
+   "properties": {
+    "Action": {
+     "enumCaseInsensitive": [
+      "exit",
+      "retry"
+     ],
+     "type": "string"
+    },
+    "OnExitCode": {
+     "type": "string"
+    },
+    "OnReason": {
+     "type": "string"
+    },
+    "OnStatusReason": {
+     "type": "string"
+    }
+   },
+   "required": [
+    "Action"
+   ],
+   "type": "object"
+  },
+  "Host": {
+   "additionalProperties": false,
+   "properties": {
+    "SourcePath": {
+     "type": "string"
+    }
+   },
+   "type": "object"
+  },
+  "ImagePullSecret": {
+   "additionalProperties": false,
+   "properties": {
+    "Name": {
+     "type": "string"
+    }
+   },
+   "type": "object"
+  },
+  "JobTimeout": {
+   "additionalProperties": false,
+   "properties": {
+    "AttemptDurationSeconds": {
+     "type": "integer"
+    }
+   },
+   "type": "object"
+  },
+  "LinuxParameters": {
+   "additionalProperties": false,
+   "properties": {
+    "Devices": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/Device"
+     },
+     "type": "array",
+     "uniqueItems": false
+    },
+    "InitProcessEnabled": {
+     "type": "boolean"
+    },
+    "MaxSwap": {
+     "type": "integer"
+    },
+    "SharedMemorySize": {
+     "type": "integer"
+    },
+    "Swappiness": {
+     "type": "integer"
+    },
+    "Tmpfs": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/Tmpfs"
+     },
+     "type": "array",
+     "uniqueItems": false
+    }
+   },
+   "type": "object"
+  },
+  "LogConfiguration": {
+   "additionalProperties": false,
+   "properties": {
+    "LogDriver": {
+     "enumCaseInsensitive": [
+      "awslogs",
+      "fluentd",
+      "gelf",
+      "journald",
+      "json-file",
+      "splunk",
+      "syslog"
+     ],
+     "type": "string"
+    },
+    "Options": {
+     "additionalProperties": false,
+     "patternProperties": {
+      ".*": {
+       "type": "string"
+      }
+     },
+     "type": "object"
+    },
+    "SecretOptions": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/Secret"
+     },
+     "type": "array",
+     "uniqueItems": false
+    }
+   },
+   "required": [
+    "LogDriver"
+   ],
+   "type": "object"
+  },
+  "MountPoint": {
+   "additionalProperties": false,
+   "properties": {
+    "ContainerPath": {
+     "type": "string"
+    },
+    "ReadOnly": {
+     "type": "boolean"
+    },
+    "SourceVolume": {
+     "type": "string"
+    }
+   },
+   "type": "object"
+  },
+  "MultiNodeContainerProperties": {
+   "additionalProperties": false,
+   "properties": {
+    "Command": {
+     "insertionOrder": true,
+     "items": {
+      "type": "string"
+     },
+     "type": "array",
+     "uniqueItems": false
+    },
+    "Environment": {
+     "insertionOrder": true,
+     "items": {
+      "$ref": "#/definitions/Environment"
+     },
+     "type": "array",
+     "uniqueItems": false
+    },
+    "EphemeralStorage": {
+     "$ref": "#/definitions/EphemeralStorage"
+    },
+    "ExecutionRoleArn": {
+     "type": "string"
+    },
+    "Image": {
+     "type": "string"
+    },
+    "InstanceType": {
+     "type": "string"
+    },
+    "JobRoleArn": {
+     "type": "string"
+    },
+    "LinuxParameters": {
+     "$ref": "#/definitions/LinuxParameters"
+    },
+    "LogConfiguration": {
+     "$ref": "#/definitions/LogConfiguration"
+    },
+    "Memory": {
+     "type": "integer"
+    },
+    "MountPoints": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/MountPoint"
+     },
+     "type": "array",
+     "uniqueItems": false
+    },
+    "Privileged": {
+     "type": "boolean"
+    },
+    "ReadonlyRootFilesystem": {
+     "type": "boolean"
+    },
+    "RepositoryCredentials": {
+     "$ref": "#/definitions/RepositoryCredentials"
+    },
+    "ResourceRequirements": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/ResourceRequirement"
+     },
+     "type": "array",
+     "uniqueItems": false
+    },
+    "RuntimePlatform": {
+     "$ref": "#/definitions/RuntimePlatform"
+    },
+    "Secrets": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/Secret"
+     },
+     "type": "array",
+     "uniqueItems": false
+    },
+    "Ulimits": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/Ulimit"
+     },
+     "type": "array",
+     "uniqueItems": false
+    },
+    "User": {
+     "type": "string"
+    },
+    "Vcpus": {
+     "type": "integer"
+    },
+    "Volumes": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/Volume"
+     },
+     "type": "array",
+     "uniqueItems": false
+    }
+   },
+   "required": [
+    "Image"
+   ],
+   "type": "object"
+  },
+  "MultiNodeEcsProperties": {
+   "additionalProperties": false,
+   "properties": {
+    "TaskProperties": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/MultiNodeEcsTaskProperties"
+     },
+     "type": "array",
+     "uniqueItems": false
+    }
+   },
+   "required": [
+    "TaskProperties"
+   ],
+   "type": "object"
+  },
+  "MultiNodeEcsTaskProperties": {
+   "additionalProperties": false,
+   "properties": {
+    "Containers": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/TaskContainerProperties"
+     },
+     "type": "array",
+     "uniqueItems": false
+    },
+    "ExecutionRoleArn": {
+     "type": "string"
+    },
+    "IpcMode": {
+     "type": "string"
+    },
+    "PidMode": {
+     "type": "string"
+    },
+    "TaskRoleArn": {
+     "type": "string"
+    },
+    "Volumes": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/Volume"
+     },
+     "type": "array",
+     "uniqueItems": false
+    }
+   },
+   "type": "object"
+  },
+  "NetworkConfiguration": {
+   "additionalProperties": false,
+   "properties": {
+    "AssignPublicIp": {
+     "enumCaseInsensitive": [
+      "disabled",
+      "enabled"
+     ],
+     "type": "string"
+    }
+   },
+   "type": "object"
+  },
+  "NodeProperties": {
+   "additionalProperties": false,
+   "properties": {
+    "MainNode": {
+     "type": "integer"
+    },
+    "NodeRangeProperties": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/NodeRangeProperty"
+     },
+     "type": "array",
+     "uniqueItems": false
+    },
+    "NumNodes": {
+     "type": "integer"
+    }
+   },
+   "required": [
+    "NumNodes",
+    "MainNode",
+    "NodeRangeProperties"
+   ],
+   "type": "object"
+  },
+  "NodeRangeProperty": {
+   "additionalProperties": false,
+   "properties": {
+    "Container": {
+     "$ref": "#/definitions/MultiNodeContainerProperties"
+    },
+    "EcsProperties": {
+     "$ref": "#/definitions/MultiNodeEcsProperties"
+    },
+    "EksProperties": {
+     "$ref": "#/definitions/EksProperties"
+    },
+    "InstanceTypes": {
+     "insertionOrder": false,
+     "items": {
+      "type": "string"
+     },
+     "type": "array",
+     "uniqueItems": false
+    },
+    "TargetNodes": {
+     "type": "string"
+    }
+   },
+   "required": [
+    "TargetNodes"
+   ],
+   "type": "object"
+  },
+  "RepositoryCredentials": {
+   "additionalProperties": false,
+   "properties": {
+    "CredentialsParameter": {
+     "type": "string"
+    }
+   },
+   "required": [
+    "CredentialsParameter"
+   ],
+   "type": "object"
+  },
+  "ResourceRequirement": {
+   "additionalProperties": false,
+   "properties": {
+    "Type": {
+     "enumCaseInsensitive": [
+      "gpu",
+      "memory",
+      "vcpu"
+     ],
+     "type": "string"
+    },
+    "Value": {
+     "type": "string"
+    }
+   },
+   "type": "object"
+  },
+  "RetryStrategy": {
+   "additionalProperties": false,
+   "properties": {
+    "Attempts": {
+     "type": "integer"
+    },
+    "EvaluateOnExit": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/EvaluateOnExit"
+     },
+     "type": "array",
+     "uniqueItems": false
+    }
+   },
+   "type": "object"
+  },
+  "RuntimePlatform": {
+   "additionalProperties": false,
+   "properties": {
+    "CpuArchitecture": {
+     "type": "string"
+    },
+    "OperatingSystemFamily": {
+     "type": "string"
+    }
+   },
+   "type": "object"
+  },
+  "Secret": {
+   "additionalProperties": false,
+   "properties": {
+    "Name": {
+     "type": "string"
+    },
+    "ValueFrom": {
+     "type": "string"
+    }
+   },
+   "required": [
+    "Name",
+    "ValueFrom"
+   ],
+   "type": "object"
+  },
+  "TaskContainerDependency": {
+   "additionalProperties": false,
+   "properties": {
+    "Condition": {
+     "type": "string"
+    },
+    "ContainerName": {
+     "type": "string"
+    }
+   },
+   "required": [
+    "ContainerName",
+    "Condition"
+   ],
+   "type": "object"
+  },
+  "TaskContainerProperties": {
+   "additionalProperties": false,
+   "properties": {
+    "Command": {
+     "insertionOrder": true,
+     "items": {
+      "type": "string"
+     },
+     "type": "array",
+     "uniqueItems": false
+    },
+    "DependsOn": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/TaskContainerDependency"
+     },
+     "type": "array",
+     "uniqueItems": false
+    },
+    "Environment": {
+     "insertionOrder": true,
+     "items": {
+      "$ref": "#/definitions/Environment"
+     },
+     "type": "array",
+     "uniqueItems": false
+    },
+    "Essential": {
+     "type": "boolean"
+    },
+    "Image": {
+     "type": "string"
+    },
+    "LinuxParameters": {
+     "$ref": "#/definitions/LinuxParameters"
+    },
+    "LogConfiguration": {
+     "$ref": "#/definitions/LogConfiguration"
+    },
+    "MountPoints": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/MountPoint"
+     },
+     "type": "array",
+     "uniqueItems": false
+    },
+    "Name": {
+     "type": "string"
+    },
+    "Privileged": {
+     "type": "boolean"
+    },
+    "ReadonlyRootFilesystem": {
+     "type": "boolean"
+    },
+    "RepositoryCredentials": {
+     "$ref": "#/definitions/RepositoryCredentials"
+    },
+    "ResourceRequirements": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/ResourceRequirement"
+     },
+     "type": "array",
+     "uniqueItems": false
+    },
+    "Secrets": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/Secret"
+     },
+     "type": "array",
+     "uniqueItems": false
+    },
+    "Ulimits": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/Ulimit"
+     },
+     "type": "array",
+     "uniqueItems": false
+    },
+    "User": {
+     "type": "string"
+    }
+   },
+   "required": [
+    "Image"
+   ],
+   "type": "object"
+  },
+  "Tmpfs": {
+   "additionalProperties": false,
+   "properties": {
+    "ContainerPath": {
+     "type": "string"
+    },
+    "MountOptions": {
+     "insertionOrder": false,
+     "items": {
+      "type": "string"
+     },
+     "type": "array",
+     "uniqueItems": false
+    },
+    "Size": {
+     "type": "integer"
+    }
+   },
+   "required": [
+    "ContainerPath",
+    "Size"
+   ],
+   "type": "object"
+  },
+  "Ulimit": {
+   "additionalProperties": false,
+   "properties": {
+    "HardLimit": {
+     "type": "integer"
+    },
+    "Name": {
+     "type": "string"
+    },
+    "SoftLimit": {
+     "type": "integer"
+    }
+   },
+   "required": [
+    "HardLimit",
+    "Name",
+    "SoftLimit"
+   ],
+   "type": "object"
+  },
+  "Volume": {
+   "additionalProperties": false,
+   "properties": {
+    "EfsVolumeConfiguration": {
+     "$ref": "#/definitions/EFSVolumeConfiguration"
+    },
+    "Host": {
+     "$ref": "#/definitions/Host"
+    },
+    "Name": {
+     "type": "string"
+    }
+   },
+   "type": "object"
+  }
+ },
+ "primaryIdentifier": [
+  "/properties/JobDefinitionName"
+ ],
+ "properties": {
+  "ContainerProperties": {
+   "$ref": "#/definitions/ContainerProperties"
+  },
+  "EcsProperties": {
+   "$ref": "#/definitions/EcsProperties"
+  },
+  "EksProperties": {
+   "$ref": "#/definitions/EksProperties"
+  },
+  "JobDefinitionName": {
+   "maxLength": 128,
+   "type": "string"
+  },
+  "NodeProperties": {
+   "$ref": "#/definitions/NodeProperties"
+  },
+  "Parameters": {
+   "additionalProperties": false,
+   "patternProperties": {
+    ".*": {
+     "type": "string"
+    }
+   },
+   "type": "object"
+  },
+  "PlatformCapabilities": {
+   "insertionOrder": true,
+   "items": {
+    "enumCaseInsensitive": [
+     "ec2",
+     "fargate"
+    ],
+    "type": "string"
+   },
+   "type": "array",
+   "uniqueItems": false
+  },
+  "PropagateTags": {
+   "type": "boolean"
+  },
+  "RetryStrategy": {
+   "$ref": "#/definitions/RetryStrategy"
+  },
+  "SchedulingPriority": {
+   "type": "integer"
+  },
+  "Tags": {
+   "additionalProperties": false,
+   "patternProperties": {
+    ".*": {
+     "type": "string"
+    }
+   },
+   "type": "object"
+  },
+  "Timeout": {
+   "$ref": "#/definitions/JobTimeout"
+  },
+  "Type": {
+   "enumCaseInsensitive": [
+    "container",
+    "multinode"
+   ],
+   "type": "string"
+  }
+ },
+ "required": [
+  "Type"
+ ],
+ "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git",
+ "tagging": {
+  "cloudFormationSystemTags": true,
+  "tagOnCreate": true,
+  "tagProperty": "/properties/Tags",
+  "tagUpdatable": true,
+  "taggable": true
+ },
+ "typeName": "AWS::Batch::JobDefinition"
+}
diff --git a/src/cfnlint/data/schemas/providers/eu_central_1/aws-datazone-datasource.json b/src/cfnlint/data/schemas/providers/eu_central_1/aws-datazone-datasource.json
deleted file mode 100644
index 1f1745b36e..0000000000
--- a/src/cfnlint/data/schemas/providers/eu_central_1/aws-datazone-datasource.json
+++ /dev/null
@@ -1,552 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/ConnectionIdentifier",
-  "/properties/EnvironmentIdentifier",
-  "/properties/DomainIdentifier",
-  "/properties/ProjectIdentifier",
-  "/properties/Type"
- ],
- "definitions": {
-  "AccountId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^\\d{12}$",
-   "type": "string"
-  },
-  "DataAccessRole": {
-   "pattern": "^arn:aws[^:]*:iam::\\d{12}:(role|role/service-role)/[\\w+=,.@-]{1,128}$",
-   "type": "string"
-  },
-  "DataSourceConfigurationInput": {
-   "oneOf": [
-    {
-     "additionalProperties": false,
-     "properties": {
-      "GlueRunConfiguration": {
-       "$ref": "#/definitions/GlueRunConfigurationInput"
-      }
-     },
-     "title": "GlueRunConfiguration",
-     "type": "object"
-    },
-    {
-     "additionalProperties": false,
-     "properties": {
-      "RedshiftRunConfiguration": {
-       "$ref": "#/definitions/RedshiftRunConfigurationInput"
-      }
-     },
-     "title": "RedshiftRunConfiguration",
-     "type": "object"
-    },
-    {
-     "additionalProperties": false,
-     "properties": {
-      "SageMakerRunConfiguration": {
-       "$ref": "#/definitions/SageMakerRunConfigurationInput"
-      }
-     },
-     "title": "SageMakerRunConfiguration",
-     "type": "object"
-    }
-   ]
-  },
-  "DataSourceStatus": {
-   "enum": [
-    "CREATING",
-    "FAILED_CREATION",
-    "READY",
-    "UPDATING",
-    "FAILED_UPDATE",
-    "RUNNING",
-    "DELETING",
-    "FAILED_DELETION"
-   ],
-   "type": "string"
-  },
-  "EnableSetting": {
-   "enum": [
-    "ENABLED",
-    "DISABLED"
-   ],
-   "type": "string"
-  },
-  "FilterExpression": {
-   "additionalProperties": false,
-   "properties": {
-    "Expression": {
-     "maxLength": 2048,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Type": {
-     "$ref": "#/definitions/FilterExpressionType"
-    }
-   },
-   "required": [
-    "Expression",
-    "Type"
-   ],
-   "type": "object"
-  },
-  "FilterExpressionType": {
-   "enum": [
-    "INCLUDE",
-    "EXCLUDE"
-   ],
-   "type": "string"
-  },
-  "FormInput": {
-   "additionalProperties": false,
-   "properties": {
-    "Content": {
-     "maxLength": 75000,
-     "type": "string"
-    },
-    "FormName": {
-     "$ref": "#/definitions/FormName"
-    },
-    "TypeIdentifier": {
-     "maxLength": 385,
-     "minLength": 1,
-     "pattern": "^(?!\\.)[\\w\\.]*\\w$",
-     "type": "string"
-    },
-    "TypeRevision": {
-     "$ref": "#/definitions/TypeRevision"
-    }
-   },
-   "required": [
-    "FormName"
-   ],
-   "type": "object"
-  },
-  "FormName": {
-   "maxLength": 128,
-   "minLength": 1,
-   "pattern": "^(?![0-9_])\\w+$|^_\\w*[a-zA-Z0-9]\\w*$",
-   "type": "string"
-  },
-  "GlueRunConfigurationInput": {
-   "additionalProperties": false,
-   "properties": {
-    "AutoImportDataQualityResult": {
-     "type": "boolean"
-    },
-    "CatalogName": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "DataAccessRole": {
-     "$ref": "#/definitions/DataAccessRole"
-    },
-    "RelationalFilterConfigurations": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/RelationalFilterConfiguration"
-     },
-     "type": "array"
-    }
-   },
-   "required": [
-    "RelationalFilterConfigurations"
-   ],
-   "type": "object"
-  },
-  "RecommendationConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "EnableBusinessNameGeneration": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "RedshiftClusterStorage": {
-   "additionalProperties": false,
-   "properties": {
-    "ClusterName": {
-     "maxLength": 63,
-     "minLength": 1,
-     "pattern": "^[0-9a-z].[a-z0-9\\-]*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "ClusterName"
-   ],
-   "type": "object"
-  },
-  "RedshiftCredentialConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "SecretManagerArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws[^:]*:secretsmanager:[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]:\\d{12}:secret:.*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "SecretManagerArn"
-   ],
-   "type": "object"
-  },
-  "RedshiftRunConfigurationInput": {
-   "additionalProperties": false,
-   "properties": {
-    "DataAccessRole": {
-     "$ref": "#/definitions/DataAccessRole"
-    },
-    "RedshiftCredentialConfiguration": {
-     "$ref": "#/definitions/RedshiftCredentialConfiguration"
-    },
-    "RedshiftStorage": {
-     "$ref": "#/definitions/RedshiftStorage"
-    },
-    "RelationalFilterConfigurations": {
-     "$ref": "#/definitions/RelationalFilterConfigurations"
-    }
-   },
-   "required": [
-    "RelationalFilterConfigurations"
-   ],
-   "type": "object"
-  },
-  "RedshiftServerlessStorage": {
-   "additionalProperties": false,
-   "properties": {
-    "WorkgroupName": {
-     "maxLength": 64,
-     "minLength": 3,
-     "pattern": "^[a-z0-9-]+$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "WorkgroupName"
-   ],
-   "type": "object"
-  },
-  "RedshiftStorage": {
-   "oneOf": [
-    {
-     "additionalProperties": false,
-     "properties": {
-      "RedshiftClusterSource": {
-       "$ref": "#/definitions/RedshiftClusterStorage"
-      }
-     },
-     "required": [
-      "RedshiftClusterSource"
-     ],
-     "title": "RedshiftClusterSource",
-     "type": "object"
-    },
-    {
-     "additionalProperties": false,
-     "properties": {
-      "RedshiftServerlessSource": {
-       "$ref": "#/definitions/RedshiftServerlessStorage"
-      }
-     },
-     "required": [
-      "RedshiftServerlessSource"
-     ],
-     "title": "RedshiftServerlessSource",
-     "type": "object"
-    }
-   ]
-  },
-  "Region": {
-   "maxLength": 16,
-   "minLength": 4,
-   "pattern": "[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]",
-   "type": "string"
-  },
-  "RelationalFilterConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "DatabaseName": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "FilterExpressions": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/FilterExpression"
-     },
-     "type": "array"
-    },
-    "SchemaName": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "DatabaseName"
-   ],
-   "type": "object"
-  },
-  "RelationalFilterConfigurations": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/RelationalFilterConfiguration"
-   },
-   "type": "array"
-  },
-  "SageMakerRunConfigurationInput": {
-   "additionalProperties": false,
-   "properties": {
-    "TrackingAssets": {
-     "$ref": "#/definitions/TrackingAssets"
-    }
-   },
-   "required": [
-    "TrackingAssets"
-   ],
-   "type": "object"
-  },
-  "ScheduleConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "Schedule": {
-     "maxLength": 256,
-     "minLength": 1,
-     "pattern": "cron\\((\\b[0-5]?[0-9]\\b) (\\b2[0-3]\\b|\\b[0-1]?[0-9]\\b) (.*){1,5} (.*){1,5} (.*){1,5} (.*){1,5}\\)",
-     "type": "string"
-    },
-    "Timezone": {
-     "$ref": "#/definitions/Timezone"
-    }
-   },
-   "type": "object"
-  },
-  "Timezone": {
-   "enum": [
-    "AFRICA_JOHANNESBURG",
-    "AMERICA_MONTREAL",
-    "AMERICA_SAO_PAULO",
-    "ASIA_BAHRAIN",
-    "ASIA_BANGKOK",
-    "ASIA_CALCUTTA",
-    "ASIA_DUBAI",
-    "ASIA_HONG_KONG",
-    "ASIA_JAKARTA",
-    "ASIA_KUALA_LUMPUR",
-    "ASIA_SEOUL",
-    "ASIA_SHANGHAI",
-    "ASIA_SINGAPORE",
-    "ASIA_TAIPEI",
-    "ASIA_TOKYO",
-    "AUSTRALIA_MELBOURNE",
-    "AUSTRALIA_SYDNEY",
-    "CANADA_CENTRAL",
-    "CET",
-    "CST6CDT",
-    "ETC_GMT",
-    "ETC_GMT0",
-    "ETC_GMT_ADD_0",
-    "ETC_GMT_ADD_1",
-    "ETC_GMT_ADD_10",
-    "ETC_GMT_ADD_11",
-    "ETC_GMT_ADD_12",
-    "ETC_GMT_ADD_2",
-    "ETC_GMT_ADD_3",
-    "ETC_GMT_ADD_4",
-    "ETC_GMT_ADD_5",
-    "ETC_GMT_ADD_6",
-    "ETC_GMT_ADD_7",
-    "ETC_GMT_ADD_8",
-    "ETC_GMT_ADD_9",
-    "ETC_GMT_NEG_0",
-    "ETC_GMT_NEG_1",
-    "ETC_GMT_NEG_10",
-    "ETC_GMT_NEG_11",
-    "ETC_GMT_NEG_12",
-    "ETC_GMT_NEG_13",
-    "ETC_GMT_NEG_14",
-    "ETC_GMT_NEG_2",
-    "ETC_GMT_NEG_3",
-    "ETC_GMT_NEG_4",
-    "ETC_GMT_NEG_5",
-    "ETC_GMT_NEG_6",
-    "ETC_GMT_NEG_7",
-    "ETC_GMT_NEG_8",
-    "ETC_GMT_NEG_9",
-    "EUROPE_DUBLIN",
-    "EUROPE_LONDON",
-    "EUROPE_PARIS",
-    "EUROPE_STOCKHOLM",
-    "EUROPE_ZURICH",
-    "ISRAEL",
-    "MEXICO_GENERAL",
-    "MST7MDT",
-    "PACIFIC_AUCKLAND",
-    "US_CENTRAL",
-    "US_EASTERN",
-    "US_MOUNTAIN",
-    "US_PACIFIC",
-    "UTC"
-   ],
-   "type": "string"
-  },
-  "TrackingAssets": {
-   "additionalProperties": false,
-   "maxProperties": 1,
-   "patternProperties": {
-    "^.{1,64}$": {
-     "items": {
-      "pattern": "^arn:aws[^:]*:sagemaker:[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]:\\d{12}:[\\w+=,.@-]{1,128}/[\\w+=,.@-]{1,256}$",
-      "type": "string"
-     },
-     "maxItems": 500,
-     "minItems": 0,
-     "type": "array"
-    }
-   },
-   "type": "object"
-  },
-  "TypeRevision": {
-   "maxLength": 64,
-   "minLength": 1,
-   "pattern": "^[a-zA-Z0-9_-]+$",
-   "type": "string"
-  }
- },
- "primaryIdentifier": [
-  "/properties/DomainId",
-  "/properties/Id"
- ],
- "properties": {
-  "AssetFormsInput": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/FormInput"
-   },
-   "maxItems": 10,
-   "minItems": 0,
-   "type": "array"
-  },
-  "Configuration": {
-   "$ref": "#/definitions/DataSourceConfigurationInput"
-  },
-  "ConnectionId": {
-   "type": "string"
-  },
-  "ConnectionIdentifier": {
-   "type": "string"
-  },
-  "CreatedAt": {
-   "format": "date-time",
-   "type": "string"
-  },
-  "Description": {
-   "maxLength": 2048,
-   "type": "string"
-  },
-  "DomainId": {
-   "pattern": "^dzd[-_][a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "DomainIdentifier": {
-   "pattern": "^dzd[-_][a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "EnableSetting": {
-   "$ref": "#/definitions/EnableSetting"
-  },
-  "EnvironmentId": {
-   "type": "string"
-  },
-  "EnvironmentIdentifier": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "Id": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "LastRunAssetCount": {
-   "type": "number"
-  },
-  "LastRunAt": {
-   "type": "string"
-  },
-  "LastRunStatus": {
-   "type": "string"
-  },
-  "Name": {
-   "maxLength": 256,
-   "minLength": 1,
-   "type": "string"
-  },
-  "ProjectId": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "ProjectIdentifier": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "PublishOnImport": {
-   "type": "boolean"
-  },
-  "Recommendation": {
-   "$ref": "#/definitions/RecommendationConfiguration"
-  },
-  "Schedule": {
-   "$ref": "#/definitions/ScheduleConfiguration"
-  },
-  "Status": {
-   "$ref": "#/definitions/DataSourceStatus"
-  },
-  "Type": {
-   "maxLength": 256,
-   "minLength": 1,
-   "type": "string"
-  },
-  "UpdatedAt": {
-   "format": "date-time",
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/ConnectionId",
-  "/properties/CreatedAt",
-  "/properties/DomainId",
-  "/properties/EnvironmentId",
-  "/properties/Id",
-  "/properties/LastRunAssetCount",
-  "/properties/LastRunAt",
-  "/properties/LastRunStatus",
-  "/properties/ProjectId",
-  "/properties/Status",
-  "/properties/UpdatedAt"
- ],
- "required": [
-  "Name",
-  "DomainIdentifier",
-  "ProjectIdentifier",
-  "Type"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-datazone",
- "tagging": {
-  "cloudFormationSystemTags": false,
-  "tagOnCreate": false,
-  "tagUpdatable": false,
-  "taggable": false
- },
- "typeName": "AWS::DataZone::DataSource",
- "writeOnlyProperties": [
-  "/properties/AssetFormsInput",
-  "/properties/ConnectionIdentifier",
-  "/properties/EnvironmentIdentifier",
-  "/properties/DomainIdentifier",
-  "/properties/Configuration",
-  "/properties/ProjectIdentifier"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/eu_central_1/aws-ecs-service.json b/src/cfnlint/data/schemas/providers/eu_central_1/aws-ecs-service.json
new file mode 100644
index 0000000000..39c164ea67
--- /dev/null
+++ b/src/cfnlint/data/schemas/providers/eu_central_1/aws-ecs-service.json
@@ -0,0 +1,646 @@
+{
+ "additionalProperties": false,
+ "createOnlyProperties": [
+  "/properties/Cluster",
+  "/properties/DeploymentController",
+  "/properties/LaunchType",
+  "/properties/Role",
+  "/properties/SchedulingStrategy",
+  "/properties/ServiceName"
+ ],
+ "definitions": {
+  "AwsVpcConfiguration": {
+   "additionalProperties": false,
+   "properties": {
+    "AssignPublicIp": {
+     "enum": [
+      "DISABLED",
+      "ENABLED"
+     ],
+     "type": "string"
+    },
+    "SecurityGroups": {
+     "format": "AWS::EC2::SecurityGroup.Ids",
+     "items": {
+      "format": "AWS::EC2::SecurityGroup.Id",
+      "type": "string"
+     },
+     "type": "array"
+    },
+    "Subnets": {
+     "format": "AWS::EC2::Subnet.Ids",
+     "items": {
+      "format": "AWS::EC2::Subnet.Id",
+      "type": "string"
+     },
+     "type": "array"
+    }
+   },
+   "type": "object"
+  },
+  "CapacityProviderStrategyItem": {
+   "additionalProperties": false,
+   "properties": {
+    "Base": {
+     "type": "integer"
+    },
+    "CapacityProvider": {
+     "type": "string"
+    },
+    "Weight": {
+     "type": "integer"
+    }
+   },
+   "type": "object"
+  },
+  "DeploymentAlarms": {
+   "additionalProperties": false,
+   "properties": {
+    "AlarmNames": {
+     "items": {
+      "type": "string"
+     },
+     "type": "array"
+    },
+    "Enable": {
+     "type": "boolean"
+    },
+    "Rollback": {
+     "type": "boolean"
+    }
+   },
+   "required": [
+    "AlarmNames",
+    "Rollback",
+    "Enable"
+   ],
+   "type": "object"
+  },
+  "DeploymentCircuitBreaker": {
+   "additionalProperties": false,
+   "properties": {
+    "Enable": {
+     "type": "boolean"
+    },
+    "Rollback": {
+     "type": "boolean"
+    }
+   },
+   "required": [
+    "Enable",
+    "Rollback"
+   ],
+   "type": "object"
+  },
+  "DeploymentConfiguration": {
+   "additionalProperties": false,
+   "properties": {
+    "Alarms": {
+     "$ref": "#/definitions/DeploymentAlarms"
+    },
+    "DeploymentCircuitBreaker": {
+     "$ref": "#/definitions/DeploymentCircuitBreaker"
+    },
+    "MaximumPercent": {
+     "type": "integer"
+    },
+    "MinimumHealthyPercent": {
+     "type": "integer"
+    }
+   },
+   "type": "object"
+  },
+  "DeploymentController": {
+   "additionalProperties": false,
+   "properties": {
+    "Type": {
+     "enum": [
+      "CODE_DEPLOY",
+      "ECS",
+      "EXTERNAL"
+     ],
+     "type": "string"
+    }
+   },
+   "type": "object"
+  },
+  "EBSTagSpecification": {
+   "additionalProperties": false,
+   "properties": {
+    "PropagateTags": {
+     "enum": [
+      "SERVICE",
+      "TASK_DEFINITION"
+     ],
+     "type": "string"
+    },
+    "ResourceType": {
+     "enum": [
+      "volume"
+     ],
+     "type": "string"
+    },
+    "Tags": {
+     "items": {
+      "$ref": "#/definitions/Tag"
+     },
+     "type": "array"
+    }
+   },
+   "required": [
+    "ResourceType"
+   ],
+   "type": "object"
+  },
+  "LoadBalancer": {
+   "additionalProperties": false,
+   "properties": {
+    "ContainerName": {
+     "type": "string"
+    },
+    "ContainerPort": {
+     "type": "integer"
+    },
+    "LoadBalancerName": {
+     "type": "string"
+    },
+    "TargetGroupArn": {
+     "type": "string"
+    }
+   },
+   "type": "object"
+  },
+  "LogConfiguration": {
+   "additionalProperties": false,
+   "properties": {
+    "LogDriver": {
+     "enum": [
+      "awsfirelens",
+      "awslogs",
+      "fluentd",
+      "gelf",
+      "journald",
+      "json-file",
+      "splunk",
+      "syslog"
+     ],
+     "type": "string"
+    },
+    "Options": {
+     "additionalProperties": false,
+     "patternProperties": {
+      ".{1,}": {
+       "type": "string"
+      }
+     },
+     "type": "object"
+    },
+    "SecretOptions": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/Secret"
+     },
+     "type": "array"
+    }
+   },
+   "type": "object"
+  },
+  "NetworkConfiguration": {
+   "additionalProperties": false,
+   "properties": {
+    "AwsvpcConfiguration": {
+     "$ref": "#/definitions/AwsVpcConfiguration"
+    }
+   },
+   "type": "object"
+  },
+  "PlacementConstraint": {
+   "additionalProperties": false,
+   "properties": {
+    "Expression": {
+     "type": "string"
+    },
+    "Type": {
+     "enum": [
+      "distinctInstance",
+      "memberOf"
+     ],
+     "type": "string"
+    }
+   },
+   "required": [
+    "Type"
+   ],
+   "type": "object"
+  },
+  "PlacementStrategy": {
+   "additionalProperties": false,
+   "properties": {
+    "Field": {
+     "type": "string"
+    },
+    "Type": {
+     "enum": [
+      "binpack",
+      "random",
+      "spread"
+     ],
+     "type": "string"
+    }
+   },
+   "required": [
+    "Type"
+   ],
+   "type": "object"
+  },
+  "Secret": {
+   "additionalProperties": false,
+   "properties": {
+    "Name": {
+     "type": "string"
+    },
+    "ValueFrom": {
+     "type": "string"
+    }
+   },
+   "required": [
+    "Name",
+    "ValueFrom"
+   ],
+   "type": "object"
+  },
+  "ServiceConnectClientAlias": {
+   "additionalProperties": false,
+   "properties": {
+    "DnsName": {
+     "type": "string"
+    },
+    "Port": {
+     "type": "integer"
+    }
+   },
+   "required": [
+    "Port"
+   ],
+   "type": "object"
+  },
+  "ServiceConnectConfiguration": {
+   "additionalProperties": false,
+   "properties": {
+    "Enabled": {
+     "type": "boolean"
+    },
+    "LogConfiguration": {
+     "$ref": "#/definitions/LogConfiguration"
+    },
+    "Namespace": {
+     "type": "string"
+    },
+    "Services": {
+     "items": {
+      "$ref": "#/definitions/ServiceConnectService"
+     },
+     "type": "array"
+    }
+   },
+   "required": [
+    "Enabled"
+   ],
+   "type": "object"
+  },
+  "ServiceConnectService": {
+   "additionalProperties": false,
+   "properties": {
+    "ClientAliases": {
+     "items": {
+      "$ref": "#/definitions/ServiceConnectClientAlias"
+     },
+     "type": "array"
+    },
+    "DiscoveryName": {
+     "type": "string"
+    },
+    "IngressPortOverride": {
+     "type": "integer"
+    },
+    "PortName": {
+     "type": "string"
+    },
+    "Timeout": {
+     "$ref": "#/definitions/TimeoutConfiguration"
+    },
+    "Tls": {
+     "$ref": "#/definitions/ServiceConnectTlsConfiguration"
+    }
+   },
+   "required": [
+    "PortName"
+   ],
+   "type": "object"
+  },
+  "ServiceConnectTlsCertificateAuthority": {
+   "additionalProperties": false,
+   "properties": {
+    "AwsPcaAuthorityArn": {
+     "type": "string"
+    }
+   },
+   "type": "object"
+  },
+  "ServiceConnectTlsConfiguration": {
+   "additionalProperties": false,
+   "properties": {
+    "IssuerCertificateAuthority": {
+     "$ref": "#/definitions/ServiceConnectTlsCertificateAuthority"
+    },
+    "KmsKey": {
+     "type": "string"
+    },
+    "RoleArn": {
+     "type": "string"
+    }
+   },
+   "required": [
+    "IssuerCertificateAuthority"
+   ],
+   "type": "object"
+  },
+  "ServiceManagedEBSVolumeConfiguration": {
+   "additionalProperties": false,
+   "properties": {
+    "Encrypted": {
+     "type": "boolean"
+    },
+    "FilesystemType": {
+     "enum": [
+      "ext3",
+      "ext4",
+      "ntfs",
+      "xfs"
+     ],
+     "type": "string"
+    },
+    "Iops": {
+     "type": "integer"
+    },
+    "KmsKeyId": {
+     "type": "string"
+    },
+    "RoleArn": {
+     "type": "string"
+    },
+    "SizeInGiB": {
+     "type": "integer"
+    },
+    "SnapshotId": {
+     "type": "string"
+    },
+    "TagSpecifications": {
+     "items": {
+      "$ref": "#/definitions/EBSTagSpecification"
+     },
+     "type": "array"
+    },
+    "Throughput": {
+     "type": "integer"
+    },
+    "VolumeType": {
+     "type": "string"
+    }
+   },
+   "required": [
+    "RoleArn"
+   ],
+   "type": "object"
+  },
+  "ServiceRegistry": {
+   "additionalProperties": false,
+   "properties": {
+    "ContainerName": {
+     "type": "string"
+    },
+    "ContainerPort": {
+     "type": "integer"
+    },
+    "Port": {
+     "type": "integer"
+    },
+    "RegistryArn": {
+     "type": "string"
+    }
+   },
+   "type": "object"
+  },
+  "ServiceVolumeConfiguration": {
+   "additionalProperties": false,
+   "properties": {
+    "ManagedEBSVolume": {
+     "$ref": "#/definitions/ServiceManagedEBSVolumeConfiguration"
+    },
+    "Name": {
+     "type": "string"
+    }
+   },
+   "required": [
+    "Name"
+   ],
+   "type": "object"
+  },
+  "Tag": {
+   "additionalProperties": false,
+   "properties": {
+    "Key": {
+     "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$",
+     "type": "string"
+    },
+    "Value": {
+     "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$",
+     "type": "string"
+    }
+   },
+   "type": "object"
+  },
+  "TimeoutConfiguration": {
+   "additionalProperties": false,
+   "properties": {
+    "IdleTimeoutSeconds": {
+     "type": "integer"
+    },
+    "PerRequestTimeoutSeconds": {
+     "type": "integer"
+    }
+   },
+   "type": "object"
+  },
+  "VpcLatticeConfiguration": {
+   "additionalProperties": false,
+   "properties": {
+    "PortName": {
+     "type": "string"
+    },
+    "RoleArn": {
+     "type": "string"
+    },
+    "TargetGroupArn": {
+     "type": "string"
+    }
+   },
+   "required": [
+    "RoleArn",
+    "TargetGroupArn",
+    "PortName"
+   ],
+   "type": "object"
+  }
+ },
+ "primaryIdentifier": [
+  "/properties/ServiceArn",
+  "/properties/Cluster"
+ ],
+ "properties": {
+  "AvailabilityZoneRebalancing": {
+   "default": "DISABLED",
+   "enum": [
+    "ENABLED",
+    "DISABLED"
+   ],
+   "type": "string"
+  },
+  "CapacityProviderStrategy": {
+   "items": {
+    "$ref": "#/definitions/CapacityProviderStrategyItem"
+   },
+   "type": "array"
+  },
+  "Cluster": {
+   "type": "string"
+  },
+  "DeploymentConfiguration": {
+   "$ref": "#/definitions/DeploymentConfiguration"
+  },
+  "DeploymentController": {
+   "$ref": "#/definitions/DeploymentController"
+  },
+  "DesiredCount": {
+   "type": "integer"
+  },
+  "EnableECSManagedTags": {
+   "type": "boolean"
+  },
+  "EnableExecuteCommand": {
+   "type": "boolean"
+  },
+  "HealthCheckGracePeriodSeconds": {
+   "type": "integer"
+  },
+  "LaunchType": {
+   "enum": [
+    "EC2",
+    "FARGATE",
+    "EXTERNAL"
+   ],
+   "type": "string"
+  },
+  "LoadBalancers": {
+   "items": {
+    "$ref": "#/definitions/LoadBalancer"
+   },
+   "type": "array"
+  },
+  "Name": {
+   "type": "string"
+  },
+  "NetworkConfiguration": {
+   "$ref": "#/definitions/NetworkConfiguration"
+  },
+  "PlacementConstraints": {
+   "items": {
+    "$ref": "#/definitions/PlacementConstraint"
+   },
+   "type": "array"
+  },
+  "PlacementStrategies": {
+   "items": {
+    "$ref": "#/definitions/PlacementStrategy"
+   },
+   "type": "array"
+  },
+  "PlatformVersion": {
+   "default": "LATEST",
+   "type": "string"
+  },
+  "PropagateTags": {
+   "enum": [
+    "SERVICE",
+    "TASK_DEFINITION"
+   ],
+   "type": "string"
+  },
+  "Role": {
+   "type": "string"
+  },
+  "SchedulingStrategy": {
+   "enum": [
+    "DAEMON",
+    "REPLICA"
+   ],
+   "type": "string"
+  },
+  "ServiceArn": {
+   "type": "string"
+  },
+  "ServiceConnectConfiguration": {
+   "$ref": "#/definitions/ServiceConnectConfiguration"
+  },
+  "ServiceName": {
+   "type": "string"
+  },
+  "ServiceRegistries": {
+   "items": {
+    "$ref": "#/definitions/ServiceRegistry"
+   },
+   "type": "array"
+  },
+  "Tags": {
+   "items": {
+    "$ref": "#/definitions/Tag"
+   },
+   "type": "array"
+  },
+  "TaskDefinition": {
+   "type": "string"
+  },
+  "VolumeConfigurations": {
+   "items": {
+    "$ref": "#/definitions/ServiceVolumeConfiguration"
+   },
+   "type": "array"
+  },
+  "VpcLatticeConfigurations": {
+   "items": {
+    "$ref": "#/definitions/VpcLatticeConfiguration"
+   },
+   "type": "array"
+  }
+ },
+ "propertyTransform": {
+  "/properties/Role": "Role $OR $join([\"arn:(aws)[-]{0,1}[a-z]{0,3}[-]{0,1}[a-z]{0,3}:iam::[0-9]{12}[:]role/{1}\", Role])",
+  "/properties/TaskDefinition": "TaskDefinition $OR $join([\"arn:(aws)[-]{0,1}[a-z]{0,3}[-]{0,1}[a-z]{0,3}:ecs:[a-z0-9-]+:[0-9]{12}:task-definition/\", $contains(TaskDefinition,\":\")?TaskDefinition:$join([TaskDefinition, \":[0-9]+\"])])"
+ },
+ "readOnlyProperties": [
+  "/properties/ServiceArn",
+  "/properties/Name"
+ ],
+ "tagging": {
+  "cloudFormationSystemTags": false,
+  "tagOnCreate": true,
+  "tagProperty": "/properties/Tags",
+  "tagUpdatable": true,
+  "taggable": true
+ },
+ "typeName": "AWS::ECS::Service",
+ "writeOnlyProperties": [
+  "/properties/ServiceConnectConfiguration",
+  "/properties/VolumeConfigurations"
+ ]
+}
diff --git a/src/cfnlint/data/schemas/providers/eu_central_1/aws-sagemaker-pipeline.json b/src/cfnlint/data/schemas/providers/eu_central_1/aws-sagemaker-pipeline.json
new file mode 100644
index 0000000000..e839258b5d
--- /dev/null
+++ b/src/cfnlint/data/schemas/providers/eu_central_1/aws-sagemaker-pipeline.json
@@ -0,0 +1,137 @@
+{
+ "additionalProperties": false,
+ "createOnlyProperties": [
+  "/properties/PipelineName"
+ ],
+ "definitions": {
+  "S3Location": {
+   "additionalProperties": false,
+   "properties": {
+    "Bucket": {
+     "type": "string"
+    },
+    "ETag": {
+     "type": "string"
+    },
+    "Key": {
+     "type": "string"
+    },
+    "Version": {
+     "type": "string"
+    }
+   },
+   "required": [
+    "Bucket",
+    "Key"
+   ],
+   "type": "object"
+  },
+  "Tag": {
+   "additionalProperties": false,
+   "properties": {
+    "Key": {
+     "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$",
+     "type": "string"
+    },
+    "Value": {
+     "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$",
+     "type": "string"
+    }
+   },
+   "required": [
+    "Value",
+    "Key"
+   ],
+   "type": "object"
+  }
+ },
+ "primaryIdentifier": [
+  "/properties/PipelineName"
+ ],
+ "properties": {
+  "ParallelismConfiguration": {
+   "additionalProperties": false,
+   "properties": {
+    "MaxParallelExecutionSteps": {
+     "minimum": 1,
+     "type": "integer"
+    }
+   },
+   "required": [
+    "MaxParallelExecutionSteps"
+   ],
+   "type": "object"
+  },
+  "PipelineDefinition": {
+   "oneOf": [
+    {
+     "additionalProperties": false,
+     "properties": {
+      "PipelineDefinitionBody": {
+       "type": "string"
+      }
+     },
+     "required": [
+      "PipelineDefinitionBody"
+     ]
+    },
+    {
+     "additionalProperties": false,
+     "properties": {
+      "PipelineDefinitionS3Location": {
+       "$ref": "#/definitions/S3Location"
+      }
+     },
+     "required": [
+      "PipelineDefinitionS3Location"
+     ]
+    }
+   ],
+   "pattern": ".*(?:[ \\r\\n\\t].*)*",
+   "type": "object"
+  },
+  "PipelineDescription": {
+   "maxLength": 3072,
+   "minLength": 0,
+   "type": "string"
+  },
+  "PipelineDisplayName": {
+   "maxLength": 256,
+   "minLength": 1,
+   "pattern": "^[a-zA-Z0-9](-*[a-zA-Z0-9])*",
+   "type": "string"
+  },
+  "PipelineName": {
+   "maxLength": 256,
+   "minLength": 1,
+   "pattern": "^[a-zA-Z0-9](-*[a-zA-Z0-9])*",
+   "type": "string"
+  },
+  "RoleArn": {
+   "maxLength": 2048,
+   "minLength": 20,
+   "pattern": "^arn:aws[a-z\\-]*:iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+$",
+   "type": "string"
+  },
+  "Tags": {
+   "items": {
+    "$ref": "#/definitions/Tag"
+   },
+   "type": "array",
+   "uniqueItems": false
+  }
+ },
+ "required": [
+  "PipelineName",
+  "PipelineDefinition",
+  "RoleArn"
+ ],
+ "tagging": {
+  "cloudFormationSystemTags": true,
+  "tagOnCreate": true,
+  "tagProperty": "/properties/Tags",
+  "tagUpdatable": true,
+  "taggable": true
+ },
+ "typeName": "AWS::SageMaker::Pipeline"
+}
diff --git a/src/cfnlint/data/schemas/providers/eu_central_2/__init__.py b/src/cfnlint/data/schemas/providers/eu_central_2/__init__.py
index 9e3fc312f7..484b9b4415 100644
--- a/src/cfnlint/data/schemas/providers/eu_central_2/__init__.py
+++ b/src/cfnlint/data/schemas/providers/eu_central_2/__init__.py
@@ -821,6 +821,7 @@
     "aws-bedrock-guardrailversion.json",
     "aws-bedrock-knowledgebase.json",
     "aws-bedrock-prompt.json",
+    "aws-bedrock-promptversion.json",
     "aws-ce-anomalymonitor.json",
     "aws-ce-anomalysubscription.json",
     "aws-certificatemanager-certificate.json",
@@ -919,6 +920,7 @@
     "aws-dms-replicationconfig.json",
     "aws-dynamodb-globaltable.json",
     "aws-dynamodb-table.json",
+    "aws-ec2-capacityreservation.json",
     "aws-ec2-capacityreservationfleet.json",
     "aws-ec2-clientvpnroute.json",
     "aws-ec2-clientvpntargetnetworkassociation.json",
diff --git a/src/cfnlint/data/schemas/providers/eu_central_2/aws-bedrock-promptversion.json b/src/cfnlint/data/schemas/providers/eu_central_2/aws-bedrock-promptversion.json
deleted file mode 100644
index b79f1da1a7..0000000000
--- a/src/cfnlint/data/schemas/providers/eu_central_2/aws-bedrock-promptversion.json
+++ /dev/null
@@ -1,244 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/PromptArn",
-  "/properties/Description",
-  "/properties/Tags"
- ],
- "definitions": {
-  "PromptInferenceConfiguration": {
-   "oneOf": [
-    {
-     "additionalProperties": false,
-     "properties": {
-      "Text": {
-       "$ref": "#/definitions/PromptModelInferenceConfiguration"
-      }
-     },
-     "required": [
-      "Text"
-     ],
-     "title": "Text",
-     "type": "object"
-    }
-   ]
-  },
-  "PromptInputVariable": {
-   "additionalProperties": false,
-   "properties": {
-    "Name": {
-     "pattern": "^([0-9a-zA-Z][_-]?){1,100}$",
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "PromptModelInferenceConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "MaxTokens": {
-     "maximum": 4096,
-     "minimum": 0,
-     "type": "number"
-    },
-    "StopSequences": {
-     "insertionOrder": true,
-     "items": {
-      "type": "string"
-     },
-     "maxItems": 4,
-     "minItems": 0,
-     "type": "array"
-    },
-    "Temperature": {
-     "maximum": 1,
-     "minimum": 0,
-     "type": "number"
-    },
-    "TopP": {
-     "maximum": 1,
-     "minimum": 0,
-     "type": "number"
-    }
-   },
-   "type": "object"
-  },
-  "PromptTemplateConfiguration": {
-   "oneOf": [
-    {
-     "additionalProperties": false,
-     "properties": {
-      "Text": {
-       "$ref": "#/definitions/TextPromptTemplateConfiguration"
-      }
-     },
-     "required": [
-      "Text"
-     ],
-     "title": "Text",
-     "type": "object"
-    }
-   ]
-  },
-  "PromptTemplateType": {
-   "enum": [
-    "TEXT"
-   ],
-   "type": "string"
-  },
-  "PromptVariant": {
-   "additionalProperties": false,
-   "properties": {
-    "InferenceConfiguration": {
-     "$ref": "#/definitions/PromptInferenceConfiguration"
-    },
-    "ModelId": {
-     "maxLength": 2048,
-     "minLength": 1,
-     "pattern": "^(arn:aws(-[^:]{1,12})?:(bedrock|sagemaker):[a-z0-9-]{1,20}:([0-9]{12})?:([a-z-]+/)?)?([a-zA-Z0-9.-]{1,63}){0,2}(([:][a-z0-9-]{1,63}){0,2})?(/[a-z0-9]{1,12})?$",
-     "type": "string"
-    },
-    "Name": {
-     "pattern": "^([0-9a-zA-Z][_-]?){1,100}$",
-     "type": "string"
-    },
-    "TemplateConfiguration": {
-     "$ref": "#/definitions/PromptTemplateConfiguration"
-    },
-    "TemplateType": {
-     "$ref": "#/definitions/PromptTemplateType"
-    }
-   },
-   "required": [
-    "Name",
-    "TemplateType",
-    "TemplateConfiguration"
-   ],
-   "type": "object"
-  },
-  "TagsMap": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "^[a-zA-Z0-9\\s._:/=+@-]*$": {
-     "maxLength": 256,
-     "minLength": 0,
-     "pattern": "^[a-zA-Z0-9\\s._:/=+@-]*$",
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "TextPromptTemplateConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "InputVariables": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/PromptInputVariable"
-     },
-     "maxItems": 5,
-     "minItems": 0,
-     "type": "array"
-    },
-    "Text": {
-     "maxLength": 200000,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Text"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Arn"
- ],
- "properties": {
-  "Arn": {
-   "maxLength": 2048,
-   "minLength": 1,
-   "pattern": "^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:prompt/[0-9a-zA-Z]{10}:[0-9]{1,20})$",
-   "type": "string"
-  },
-  "CreatedAt": {
-   "format": "date-time",
-   "type": "string"
-  },
-  "CustomerEncryptionKeyArn": {
-   "maxLength": 2048,
-   "minLength": 1,
-   "pattern": "^arn:aws(|-cn|-us-gov):kms:[a-zA-Z0-9-]*:[0-9]{12}:key/[a-zA-Z0-9-]{36}$",
-   "type": "string"
-  },
-  "DefaultVariant": {
-   "pattern": "^([0-9a-zA-Z][_-]?){1,100}$",
-   "type": "string"
-  },
-  "Description": {
-   "maxLength": 200,
-   "minLength": 1,
-   "type": "string"
-  },
-  "Name": {
-   "pattern": "^([0-9a-zA-Z][_-]?){1,100}$",
-   "type": "string"
-  },
-  "PromptArn": {
-   "maxLength": 2048,
-   "minLength": 1,
-   "pattern": "^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:prompt/[0-9a-zA-Z]{10})$",
-   "type": "string"
-  },
-  "PromptId": {
-   "pattern": "^[0-9a-zA-Z]{10}$",
-   "type": "string"
-  },
-  "Tags": {
-   "$ref": "#/definitions/TagsMap"
-  },
-  "UpdatedAt": {
-   "format": "date-time",
-   "type": "string"
-  },
-  "Variants": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/PromptVariant"
-   },
-   "maxItems": 1,
-   "minItems": 1,
-   "type": "array"
-  },
-  "Version": {
-   "maxLength": 5,
-   "minLength": 1,
-   "pattern": "^(DRAFT|[0-9]{0,4}[1-9][0-9]{0,4})$",
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/CreatedAt",
-  "/properties/PromptId",
-  "/properties/UpdatedAt",
-  "/properties/Version",
-  "/properties/Name",
-  "/properties/DefaultVariant",
-  "/properties/Variants",
-  "/properties/CustomerEncryptionKeyArn"
- ],
- "required": [
-  "PromptArn"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-bedrock-prompts",
- "tagging": {
-  "cloudFormationSystemTags": false,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": false,
-  "taggable": true
- },
- "typeName": "AWS::Bedrock::PromptVersion"
-}
diff --git a/src/cfnlint/data/schemas/providers/eu_central_2/aws-ec2-capacityreservation.json b/src/cfnlint/data/schemas/providers/eu_central_2/aws-ec2-capacityreservation.json
deleted file mode 100644
index 5a10969ce5..0000000000
--- a/src/cfnlint/data/schemas/providers/eu_central_2/aws-ec2-capacityreservation.json
+++ /dev/null
@@ -1,250 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/Tenancy",
-  "/properties/InstancePlatform",
-  "/properties/InstanceType",
-  "/properties/AvailabilityZone",
-  "/properties/TagSpecifications",
-  "/properties/OutPostArn",
-  "/properties/EphemeralStorage",
-  "/properties/EbsOptimized",
-  "/properties/PlacementGroupArn"
- ],
- "definitions": {
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "type": "string"
-    },
-    "Value": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "TagSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "ResourceType": {
-     "enum": [
-      "capacity-reservation",
-      "capacity-reservation-fleet",
-      "carrier-gateway",
-      "client-vpn-endpoint",
-      "coip-pool",
-      "customer-gateway",
-      "declarative-policies-report",
-      "dedicated-host",
-      "dhcp-options",
-      "egress-only-internet-gateway",
-      "elastic-gpu",
-      "elastic-ip",
-      "export-image-task",
-      "export-instance-task",
-      "fleet",
-      "fpga-image",
-      "host-reservation",
-      "image",
-      "import-image-task",
-      "import-snapshot-task",
-      "instance",
-      "instance-connect-endpoint",
-      "instance-event-window",
-      "internet-gateway",
-      "ipam",
-      "ipam-external-resource-verification-token",
-      "ipam-pool",
-      "ipam-resource-discovery",
-      "ipam-resource-discovery-association",
-      "ipam-scope",
-      "ipv4pool-ec2",
-      "ipv6pool-ec2",
-      "key-pair",
-      "launch-template",
-      "local-gateway",
-      "local-gateway-route-table",
-      "local-gateway-route-table-virtual-interface-group-association",
-      "local-gateway-route-table-vpc-association",
-      "local-gateway-virtual-interface",
-      "local-gateway-virtual-interface-group",
-      "natgateway",
-      "network-acl",
-      "network-insights-access-scope",
-      "network-insights-access-scope-analysis",
-      "network-insights-analysis",
-      "network-insights-path",
-      "network-interface",
-      "placement-group",
-      "prefix-list",
-      "replace-root-volume-task",
-      "reserved-instances",
-      "route-table",
-      "security-group",
-      "security-group-rule",
-      "snapshot",
-      "spot-fleet-request",
-      "spot-instances-request",
-      "subnet",
-      "subnet-cidr-reservation",
-      "traffic-mirror-filter",
-      "traffic-mirror-filter-rule",
-      "traffic-mirror-session",
-      "traffic-mirror-target",
-      "transit-gateway",
-      "transit-gateway-attachment",
-      "transit-gateway-connect-peer",
-      "transit-gateway-multicast-domain",
-      "transit-gateway-policy-table",
-      "transit-gateway-route-table",
-      "transit-gateway-route-table-announcement",
-      "verified-access-endpoint",
-      "verified-access-endpoint-target",
-      "verified-access-group",
-      "verified-access-instance",
-      "verified-access-policy",
-      "verified-access-trust-provider",
-      "volume",
-      "vpc",
-      "vpc-block-public-access-exclusion",
-      "vpc-endpoint",
-      "vpc-endpoint-connection",
-      "vpc-endpoint-connection-device-type",
-      "vpc-endpoint-service",
-      "vpc-endpoint-service-permission",
-      "vpc-flow-log",
-      "vpc-peering-connection",
-      "vpn-connection",
-      "vpn-connection-device-type",
-      "vpn-gateway"
-     ],
-     "type": "string"
-    },
-    "Tags": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Tag"
-     },
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "AvailabilityZone": {
-   "type": "string"
-  },
-  "AvailableInstanceCount": {
-   "type": "integer"
-  },
-  "EbsOptimized": {
-   "type": "boolean"
-  },
-  "EndDate": {
-   "type": "string"
-  },
-  "EndDateType": {
-   "enum": [
-    "limited",
-    "unlimited"
-   ],
-   "type": "string"
-  },
-  "EphemeralStorage": {
-   "type": "boolean"
-  },
-  "Id": {
-   "type": "string"
-  },
-  "InstanceCount": {
-   "type": "integer"
-  },
-  "InstanceMatchCriteria": {
-   "enum": [
-    "open",
-    "targeted"
-   ],
-   "type": "string"
-  },
-  "InstancePlatform": {
-   "enum": [
-    "Linux with SQL Server Enterprise",
-    "Linux with SQL Server Standard",
-    "Linux with SQL Server Web",
-    "Linux/UNIX",
-    "RHEL with HA",
-    "RHEL with HA and SQL Server Enterprise",
-    "RHEL with HA and SQL Server Standard",
-    "RHEL with SQL Server Enterprise",
-    "RHEL with SQL Server Standard",
-    "RHEL with SQL Server Web",
-    "Red Hat Enterprise Linux",
-    "SUSE Linux",
-    "Ubuntu Pro",
-    "Windows",
-    "Windows with SQL Server",
-    "Windows with SQL Server Enterprise",
-    "Windows with SQL Server Standard",
-    "Windows with SQL Server Web"
-   ],
-   "type": "string"
-  },
-  "InstanceType": {
-   "type": "string"
-  },
-  "OutPostArn": {
-   "pattern": "^arn:aws([a-z-]+)?:outposts:[a-z\\d-]+:\\d{12}:outpost/op-[a-f0-9]{17}$",
-   "type": "string"
-  },
-  "PlacementGroupArn": {
-   "pattern": "^arn:aws([a-z-]+)?:ec2:[a-z\\d-]+:\\d{12}:placement-group/^.{1,255}$",
-   "type": "string"
-  },
-  "TagSpecifications": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/TagSpecification"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "Tenancy": {
-   "enum": [
-    "dedicated",
-    "default"
-   ],
-   "type": "string"
-  },
-  "TotalInstanceCount": {
-   "type": "integer"
-  },
-  "UnusedReservationBillingOwnerId": {
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id",
-  "/properties/AvailableInstanceCount",
-  "/properties/TotalInstanceCount"
- ],
- "required": [
-  "InstanceCount",
-  "AvailabilityZone",
-  "InstancePlatform",
-  "InstanceType"
- ],
- "typeName": "AWS::EC2::CapacityReservation",
- "writeOnlyProperties": [
-  "/properties/UnusedReservationBillingOwnerId"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/eu_north_1/__init__.py b/src/cfnlint/data/schemas/providers/eu_north_1/__init__.py
index 00217bcc1c..074d44e774 100644
--- a/src/cfnlint/data/schemas/providers/eu_north_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/eu_north_1/__init__.py
@@ -1272,6 +1272,7 @@
     "aws-datasync-locationsmb.json",
     "aws-datasync-storagesystem.json",
     "aws-datasync-task.json",
+    "aws-datazone-datasource.json",
     "aws-datazone-domain.json",
     "aws-datazone-environment.json",
     "aws-datazone-environmentactions.json",
@@ -1394,6 +1395,7 @@
     "aws-ec2-vpcendpointservicepermissions.json",
     "aws-ec2-vpcgatewayattachment.json",
     "aws-ec2-vpcpeeringconnection.json",
+    "aws-ec2-vpnconnection.json",
     "aws-ec2-vpnconnectionroute.json",
     "aws-ec2-vpngateway.json",
     "aws-ec2-vpngatewayroutepropagation.json",
@@ -1470,6 +1472,7 @@
     "aws-fis-experimenttemplate.json",
     "aws-fis-targetaccountconfiguration.json",
     "aws-fms-notificationchannel.json",
+    "aws-fms-policy.json",
     "aws-fms-resourceset.json",
     "aws-fsx-datarepositoryassociation.json",
     "aws-fsx-filesystem.json",
@@ -1856,6 +1859,7 @@
     "aws-sagemaker-cluster.json",
     "aws-sagemaker-coderepository.json",
     "aws-sagemaker-dataqualityjobdefinition.json",
+    "aws-sagemaker-domain.json",
     "aws-sagemaker-endpointconfig.json",
     "aws-sagemaker-featuregroup.json",
     "aws-sagemaker-image.json",
@@ -1878,6 +1882,7 @@
     "aws-sagemaker-project.json",
     "aws-sagemaker-space.json",
     "aws-sagemaker-studiolifecycleconfig.json",
+    "aws-sagemaker-userprofile.json",
     "aws-sagemaker-workteam.json",
     "aws-scheduler-schedule.json",
     "aws-scheduler-schedulegroup.json",
@@ -1977,6 +1982,7 @@
     "aws-synthetics-canary.json",
     "aws-synthetics-group.json",
     "aws-systemsmanagersap-application.json",
+    "aws-timestream-influxdbinstance.json",
     "aws-transfer-agreement.json",
     "aws-transfer-certificate.json",
     "aws-transfer-connector.json",
diff --git a/src/cfnlint/data/schemas/providers/eu_north_1/aws-datazone-datasource.json b/src/cfnlint/data/schemas/providers/eu_north_1/aws-datazone-datasource.json
deleted file mode 100644
index 1f1745b36e..0000000000
--- a/src/cfnlint/data/schemas/providers/eu_north_1/aws-datazone-datasource.json
+++ /dev/null
@@ -1,552 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/ConnectionIdentifier",
-  "/properties/EnvironmentIdentifier",
-  "/properties/DomainIdentifier",
-  "/properties/ProjectIdentifier",
-  "/properties/Type"
- ],
- "definitions": {
-  "AccountId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^\\d{12}$",
-   "type": "string"
-  },
-  "DataAccessRole": {
-   "pattern": "^arn:aws[^:]*:iam::\\d{12}:(role|role/service-role)/[\\w+=,.@-]{1,128}$",
-   "type": "string"
-  },
-  "DataSourceConfigurationInput": {
-   "oneOf": [
-    {
-     "additionalProperties": false,
-     "properties": {
-      "GlueRunConfiguration": {
-       "$ref": "#/definitions/GlueRunConfigurationInput"
-      }
-     },
-     "title": "GlueRunConfiguration",
-     "type": "object"
-    },
-    {
-     "additionalProperties": false,
-     "properties": {
-      "RedshiftRunConfiguration": {
-       "$ref": "#/definitions/RedshiftRunConfigurationInput"
-      }
-     },
-     "title": "RedshiftRunConfiguration",
-     "type": "object"
-    },
-    {
-     "additionalProperties": false,
-     "properties": {
-      "SageMakerRunConfiguration": {
-       "$ref": "#/definitions/SageMakerRunConfigurationInput"
-      }
-     },
-     "title": "SageMakerRunConfiguration",
-     "type": "object"
-    }
-   ]
-  },
-  "DataSourceStatus": {
-   "enum": [
-    "CREATING",
-    "FAILED_CREATION",
-    "READY",
-    "UPDATING",
-    "FAILED_UPDATE",
-    "RUNNING",
-    "DELETING",
-    "FAILED_DELETION"
-   ],
-   "type": "string"
-  },
-  "EnableSetting": {
-   "enum": [
-    "ENABLED",
-    "DISABLED"
-   ],
-   "type": "string"
-  },
-  "FilterExpression": {
-   "additionalProperties": false,
-   "properties": {
-    "Expression": {
-     "maxLength": 2048,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Type": {
-     "$ref": "#/definitions/FilterExpressionType"
-    }
-   },
-   "required": [
-    "Expression",
-    "Type"
-   ],
-   "type": "object"
-  },
-  "FilterExpressionType": {
-   "enum": [
-    "INCLUDE",
-    "EXCLUDE"
-   ],
-   "type": "string"
-  },
-  "FormInput": {
-   "additionalProperties": false,
-   "properties": {
-    "Content": {
-     "maxLength": 75000,
-     "type": "string"
-    },
-    "FormName": {
-     "$ref": "#/definitions/FormName"
-    },
-    "TypeIdentifier": {
-     "maxLength": 385,
-     "minLength": 1,
-     "pattern": "^(?!\\.)[\\w\\.]*\\w$",
-     "type": "string"
-    },
-    "TypeRevision": {
-     "$ref": "#/definitions/TypeRevision"
-    }
-   },
-   "required": [
-    "FormName"
-   ],
-   "type": "object"
-  },
-  "FormName": {
-   "maxLength": 128,
-   "minLength": 1,
-   "pattern": "^(?![0-9_])\\w+$|^_\\w*[a-zA-Z0-9]\\w*$",
-   "type": "string"
-  },
-  "GlueRunConfigurationInput": {
-   "additionalProperties": false,
-   "properties": {
-    "AutoImportDataQualityResult": {
-     "type": "boolean"
-    },
-    "CatalogName": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "DataAccessRole": {
-     "$ref": "#/definitions/DataAccessRole"
-    },
-    "RelationalFilterConfigurations": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/RelationalFilterConfiguration"
-     },
-     "type": "array"
-    }
-   },
-   "required": [
-    "RelationalFilterConfigurations"
-   ],
-   "type": "object"
-  },
-  "RecommendationConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "EnableBusinessNameGeneration": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "RedshiftClusterStorage": {
-   "additionalProperties": false,
-   "properties": {
-    "ClusterName": {
-     "maxLength": 63,
-     "minLength": 1,
-     "pattern": "^[0-9a-z].[a-z0-9\\-]*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "ClusterName"
-   ],
-   "type": "object"
-  },
-  "RedshiftCredentialConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "SecretManagerArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws[^:]*:secretsmanager:[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]:\\d{12}:secret:.*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "SecretManagerArn"
-   ],
-   "type": "object"
-  },
-  "RedshiftRunConfigurationInput": {
-   "additionalProperties": false,
-   "properties": {
-    "DataAccessRole": {
-     "$ref": "#/definitions/DataAccessRole"
-    },
-    "RedshiftCredentialConfiguration": {
-     "$ref": "#/definitions/RedshiftCredentialConfiguration"
-    },
-    "RedshiftStorage": {
-     "$ref": "#/definitions/RedshiftStorage"
-    },
-    "RelationalFilterConfigurations": {
-     "$ref": "#/definitions/RelationalFilterConfigurations"
-    }
-   },
-   "required": [
-    "RelationalFilterConfigurations"
-   ],
-   "type": "object"
-  },
-  "RedshiftServerlessStorage": {
-   "additionalProperties": false,
-   "properties": {
-    "WorkgroupName": {
-     "maxLength": 64,
-     "minLength": 3,
-     "pattern": "^[a-z0-9-]+$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "WorkgroupName"
-   ],
-   "type": "object"
-  },
-  "RedshiftStorage": {
-   "oneOf": [
-    {
-     "additionalProperties": false,
-     "properties": {
-      "RedshiftClusterSource": {
-       "$ref": "#/definitions/RedshiftClusterStorage"
-      }
-     },
-     "required": [
-      "RedshiftClusterSource"
-     ],
-     "title": "RedshiftClusterSource",
-     "type": "object"
-    },
-    {
-     "additionalProperties": false,
-     "properties": {
-      "RedshiftServerlessSource": {
-       "$ref": "#/definitions/RedshiftServerlessStorage"
-      }
-     },
-     "required": [
-      "RedshiftServerlessSource"
-     ],
-     "title": "RedshiftServerlessSource",
-     "type": "object"
-    }
-   ]
-  },
-  "Region": {
-   "maxLength": 16,
-   "minLength": 4,
-   "pattern": "[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]",
-   "type": "string"
-  },
-  "RelationalFilterConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "DatabaseName": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "FilterExpressions": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/FilterExpression"
-     },
-     "type": "array"
-    },
-    "SchemaName": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "DatabaseName"
-   ],
-   "type": "object"
-  },
-  "RelationalFilterConfigurations": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/RelationalFilterConfiguration"
-   },
-   "type": "array"
-  },
-  "SageMakerRunConfigurationInput": {
-   "additionalProperties": false,
-   "properties": {
-    "TrackingAssets": {
-     "$ref": "#/definitions/TrackingAssets"
-    }
-   },
-   "required": [
-    "TrackingAssets"
-   ],
-   "type": "object"
-  },
-  "ScheduleConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "Schedule": {
-     "maxLength": 256,
-     "minLength": 1,
-     "pattern": "cron\\((\\b[0-5]?[0-9]\\b) (\\b2[0-3]\\b|\\b[0-1]?[0-9]\\b) (.*){1,5} (.*){1,5} (.*){1,5} (.*){1,5}\\)",
-     "type": "string"
-    },
-    "Timezone": {
-     "$ref": "#/definitions/Timezone"
-    }
-   },
-   "type": "object"
-  },
-  "Timezone": {
-   "enum": [
-    "AFRICA_JOHANNESBURG",
-    "AMERICA_MONTREAL",
-    "AMERICA_SAO_PAULO",
-    "ASIA_BAHRAIN",
-    "ASIA_BANGKOK",
-    "ASIA_CALCUTTA",
-    "ASIA_DUBAI",
-    "ASIA_HONG_KONG",
-    "ASIA_JAKARTA",
-    "ASIA_KUALA_LUMPUR",
-    "ASIA_SEOUL",
-    "ASIA_SHANGHAI",
-    "ASIA_SINGAPORE",
-    "ASIA_TAIPEI",
-    "ASIA_TOKYO",
-    "AUSTRALIA_MELBOURNE",
-    "AUSTRALIA_SYDNEY",
-    "CANADA_CENTRAL",
-    "CET",
-    "CST6CDT",
-    "ETC_GMT",
-    "ETC_GMT0",
-    "ETC_GMT_ADD_0",
-    "ETC_GMT_ADD_1",
-    "ETC_GMT_ADD_10",
-    "ETC_GMT_ADD_11",
-    "ETC_GMT_ADD_12",
-    "ETC_GMT_ADD_2",
-    "ETC_GMT_ADD_3",
-    "ETC_GMT_ADD_4",
-    "ETC_GMT_ADD_5",
-    "ETC_GMT_ADD_6",
-    "ETC_GMT_ADD_7",
-    "ETC_GMT_ADD_8",
-    "ETC_GMT_ADD_9",
-    "ETC_GMT_NEG_0",
-    "ETC_GMT_NEG_1",
-    "ETC_GMT_NEG_10",
-    "ETC_GMT_NEG_11",
-    "ETC_GMT_NEG_12",
-    "ETC_GMT_NEG_13",
-    "ETC_GMT_NEG_14",
-    "ETC_GMT_NEG_2",
-    "ETC_GMT_NEG_3",
-    "ETC_GMT_NEG_4",
-    "ETC_GMT_NEG_5",
-    "ETC_GMT_NEG_6",
-    "ETC_GMT_NEG_7",
-    "ETC_GMT_NEG_8",
-    "ETC_GMT_NEG_9",
-    "EUROPE_DUBLIN",
-    "EUROPE_LONDON",
-    "EUROPE_PARIS",
-    "EUROPE_STOCKHOLM",
-    "EUROPE_ZURICH",
-    "ISRAEL",
-    "MEXICO_GENERAL",
-    "MST7MDT",
-    "PACIFIC_AUCKLAND",
-    "US_CENTRAL",
-    "US_EASTERN",
-    "US_MOUNTAIN",
-    "US_PACIFIC",
-    "UTC"
-   ],
-   "type": "string"
-  },
-  "TrackingAssets": {
-   "additionalProperties": false,
-   "maxProperties": 1,
-   "patternProperties": {
-    "^.{1,64}$": {
-     "items": {
-      "pattern": "^arn:aws[^:]*:sagemaker:[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]:\\d{12}:[\\w+=,.@-]{1,128}/[\\w+=,.@-]{1,256}$",
-      "type": "string"
-     },
-     "maxItems": 500,
-     "minItems": 0,
-     "type": "array"
-    }
-   },
-   "type": "object"
-  },
-  "TypeRevision": {
-   "maxLength": 64,
-   "minLength": 1,
-   "pattern": "^[a-zA-Z0-9_-]+$",
-   "type": "string"
-  }
- },
- "primaryIdentifier": [
-  "/properties/DomainId",
-  "/properties/Id"
- ],
- "properties": {
-  "AssetFormsInput": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/FormInput"
-   },
-   "maxItems": 10,
-   "minItems": 0,
-   "type": "array"
-  },
-  "Configuration": {
-   "$ref": "#/definitions/DataSourceConfigurationInput"
-  },
-  "ConnectionId": {
-   "type": "string"
-  },
-  "ConnectionIdentifier": {
-   "type": "string"
-  },
-  "CreatedAt": {
-   "format": "date-time",
-   "type": "string"
-  },
-  "Description": {
-   "maxLength": 2048,
-   "type": "string"
-  },
-  "DomainId": {
-   "pattern": "^dzd[-_][a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "DomainIdentifier": {
-   "pattern": "^dzd[-_][a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "EnableSetting": {
-   "$ref": "#/definitions/EnableSetting"
-  },
-  "EnvironmentId": {
-   "type": "string"
-  },
-  "EnvironmentIdentifier": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "Id": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "LastRunAssetCount": {
-   "type": "number"
-  },
-  "LastRunAt": {
-   "type": "string"
-  },
-  "LastRunStatus": {
-   "type": "string"
-  },
-  "Name": {
-   "maxLength": 256,
-   "minLength": 1,
-   "type": "string"
-  },
-  "ProjectId": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "ProjectIdentifier": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "PublishOnImport": {
-   "type": "boolean"
-  },
-  "Recommendation": {
-   "$ref": "#/definitions/RecommendationConfiguration"
-  },
-  "Schedule": {
-   "$ref": "#/definitions/ScheduleConfiguration"
-  },
-  "Status": {
-   "$ref": "#/definitions/DataSourceStatus"
-  },
-  "Type": {
-   "maxLength": 256,
-   "minLength": 1,
-   "type": "string"
-  },
-  "UpdatedAt": {
-   "format": "date-time",
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/ConnectionId",
-  "/properties/CreatedAt",
-  "/properties/DomainId",
-  "/properties/EnvironmentId",
-  "/properties/Id",
-  "/properties/LastRunAssetCount",
-  "/properties/LastRunAt",
-  "/properties/LastRunStatus",
-  "/properties/ProjectId",
-  "/properties/Status",
-  "/properties/UpdatedAt"
- ],
- "required": [
-  "Name",
-  "DomainIdentifier",
-  "ProjectIdentifier",
-  "Type"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-datazone",
- "tagging": {
-  "cloudFormationSystemTags": false,
-  "tagOnCreate": false,
-  "tagUpdatable": false,
-  "taggable": false
- },
- "typeName": "AWS::DataZone::DataSource",
- "writeOnlyProperties": [
-  "/properties/AssetFormsInput",
-  "/properties/ConnectionIdentifier",
-  "/properties/EnvironmentIdentifier",
-  "/properties/DomainIdentifier",
-  "/properties/Configuration",
-  "/properties/ProjectIdentifier"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/eu_north_1/aws-ec2-vpnconnection.json b/src/cfnlint/data/schemas/providers/eu_north_1/aws-ec2-vpnconnection.json
deleted file mode 100644
index 5f9a8ac704..0000000000
--- a/src/cfnlint/data/schemas/providers/eu_north_1/aws-ec2-vpnconnection.json
+++ /dev/null
@@ -1,384 +0,0 @@
-{
- "$schema": "https://raw.githubusercontent.com/aws-cloudformation/cloudformation-resource-schema/blob/master/src/main/resources/schema/provider.definition.schema.v1.json",
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/Type",
-  "/properties/CustomerGatewayId",
-  "/properties/VpnGatewayId",
-  "/properties/TransitGatewayId",
-  "/properties/EnableAcceleration",
-  "/properties/LocalIpv4NetworkCidr",
-  "/properties/LocalIpv6NetworkCidr",
-  "/properties/OutsideIpAddressType",
-  "/properties/RemoteIpv4NetworkCidr",
-  "/properties/RemoteIpv6NetworkCidr",
-  "/properties/StaticRoutesOnly",
-  "/properties/TransportTransitGatewayAttachmentId",
-  "/properties/TunnelInsideIpVersion",
-  "/properties/VpnTunnelOptionsSpecifications"
- ],
- "definitions": {
-  "CloudwatchLogOptionsSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "LogEnabled": {
-     "type": "boolean"
-    },
-    "LogGroupArn": {
-     "type": "string"
-    },
-    "LogOutputFormat": {
-     "enum": [
-      "json",
-      "text"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "IKEVersionsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "ikev1",
-      "ikev2"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Phase1DHGroupNumbersRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      2,
-      14,
-      15,
-      16,
-      17,
-      18,
-      19,
-      20,
-      21,
-      22,
-      23,
-      24
-     ],
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "Phase1EncryptionAlgorithmsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "AES128",
-      "AES256",
-      "AES128-GCM-16",
-      "AES256-GCM-16"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Phase1IntegrityAlgorithmsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "SHA1",
-      "SHA2-256",
-      "SHA2-384",
-      "SHA2-512"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Phase2DHGroupNumbersRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      2,
-      5,
-      14,
-      15,
-      16,
-      17,
-      18,
-      19,
-      20,
-      21,
-      22,
-      23,
-      24
-     ],
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "Phase2EncryptionAlgorithmsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "AES128",
-      "AES256",
-      "AES128-GCM-16",
-      "AES256-GCM-16"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Phase2IntegrityAlgorithmsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "SHA1",
-      "SHA2-256",
-      "SHA2-384",
-      "SHA2-512"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "type": "string"
-    },
-    "Value": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "VpnTunnelLogOptionsSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "CloudwatchLogOptions": {
-     "$ref": "#/definitions/CloudwatchLogOptionsSpecification"
-    }
-   },
-   "type": "object"
-  },
-  "VpnTunnelOptionsSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "DPDTimeoutAction": {
-     "enum": [
-      "clear",
-      "none",
-      "restart"
-     ],
-     "type": "string"
-    },
-    "DPDTimeoutSeconds": {
-     "minimum": 30,
-     "type": "integer"
-    },
-    "EnableTunnelLifecycleControl": {
-     "type": "boolean"
-    },
-    "IKEVersions": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/IKEVersionsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "LogOptions": {
-     "$ref": "#/definitions/VpnTunnelLogOptionsSpecification"
-    },
-    "Phase1DHGroupNumbers": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase1DHGroupNumbersRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase1EncryptionAlgorithms": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase1EncryptionAlgorithmsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase1IntegrityAlgorithms": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase1IntegrityAlgorithmsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase1LifetimeSeconds": {
-     "maximum": 28800,
-     "minimum": 900,
-     "type": "integer"
-    },
-    "Phase2DHGroupNumbers": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase2DHGroupNumbersRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase2EncryptionAlgorithms": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase2EncryptionAlgorithmsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase2IntegrityAlgorithms": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase2IntegrityAlgorithmsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase2LifetimeSeconds": {
-     "maximum": 3600,
-     "minimum": 900,
-     "type": "integer"
-    },
-    "PreSharedKey": {
-     "type": "string"
-    },
-    "RekeyFuzzPercentage": {
-     "maximum": 100,
-     "minimum": 0,
-     "type": "integer"
-    },
-    "RekeyMarginTimeSeconds": {
-     "minimum": 60,
-     "type": "integer"
-    },
-    "ReplayWindowSize": {
-     "maximum": 2048,
-     "minimum": 64,
-     "type": "integer"
-    },
-    "StartupAction": {
-     "enum": [
-      "add",
-      "start"
-     ],
-     "type": "string"
-    },
-    "TunnelInsideCidr": {
-     "type": "string"
-    },
-    "TunnelInsideIpv6Cidr": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/VpnConnectionId"
- ],
- "properties": {
-  "CustomerGatewayId": {
-   "type": "string"
-  },
-  "EnableAcceleration": {
-   "type": "boolean"
-  },
-  "LocalIpv4NetworkCidr": {
-   "type": "string"
-  },
-  "LocalIpv6NetworkCidr": {
-   "type": "string"
-  },
-  "OutsideIpAddressType": {
-   "type": "string"
-  },
-  "RemoteIpv4NetworkCidr": {
-   "type": "string"
-  },
-  "RemoteIpv6NetworkCidr": {
-   "type": "string"
-  },
-  "StaticRoutesOnly": {
-   "type": "boolean"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "TransitGatewayId": {
-   "type": "string"
-  },
-  "TransportTransitGatewayAttachmentId": {
-   "type": "string"
-  },
-  "TunnelInsideIpVersion": {
-   "type": "string"
-  },
-  "Type": {
-   "type": "string"
-  },
-  "VpnConnectionId": {
-   "type": "string"
-  },
-  "VpnGatewayId": {
-   "type": "string"
-  },
-  "VpnTunnelOptionsSpecifications": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/VpnTunnelOptionsSpecification"
-   },
-   "type": "array",
-   "uniqueItems": false
-  }
- },
- "readOnlyProperties": [
-  "/properties/VpnConnectionId"
- ],
- "required": [
-  "Type",
-  "CustomerGatewayId"
- ],
- "tagging": {
-  "cloudFormationSystemTags": false,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::EC2::VPNConnection"
-}
diff --git a/src/cfnlint/data/schemas/providers/eu_north_1/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/eu_north_1/aws-fms-policy.json
deleted file mode 100644
index 8422693828..0000000000
--- a/src/cfnlint/data/schemas/providers/eu_north_1/aws-fms-policy.json
+++ /dev/null
@@ -1,416 +0,0 @@
-{
- "additionalProperties": false,
- "definitions": {
-  "AccountId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^([0-9]*)$",
-   "type": "string"
-  },
-  "Base62Id": {
-   "maxLength": 22,
-   "minLength": 22,
-   "pattern": "^[a-z0-9A-Z]{22}$",
-   "type": "string"
-  },
-  "FirewallDeploymentModel": {
-   "enum": [
-    "DISTRIBUTED",
-    "CENTRALIZED"
-   ],
-   "type": "string"
-  },
-  "IEMap": {
-   "additionalProperties": false,
-   "properties": {
-    "ACCOUNT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/AccountId"
-     },
-     "type": "array"
-    },
-    "ORGUNIT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/OrganizationalUnitId"
-     },
-     "type": "array"
-    }
-   },
-   "type": "object"
-  },
-  "ManagedServiceData": {
-   "maxLength": 30000,
-   "minLength": 1,
-   "type": "string"
-  },
-  "NetworkAclCommonPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "NetworkAclEntrySet": {
-     "$ref": "#/definitions/NetworkAclEntrySet"
-    }
-   },
-   "required": [
-    "NetworkAclEntrySet"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntry": {
-   "additionalProperties": false,
-   "properties": {
-    "CidrBlock": {
-     "pattern": "^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(\\/([0-9]|[1-2][0-9]|3[0-2]))$",
-     "type": "string"
-    },
-    "Egress": {
-     "type": "boolean"
-    },
-    "IcmpTypeCode": {
-     "additionalProperties": false,
-     "properties": {
-      "Code": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "Type": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "Code",
-      "Type"
-     ],
-     "type": "object"
-    },
-    "Ipv6CidrBlock": {
-     "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))(/(1[0-2]|[0-9]))?$",
-     "type": "string"
-    },
-    "PortRange": {
-     "additionalProperties": false,
-     "properties": {
-      "From": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "To": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "From",
-      "To"
-     ],
-     "type": "object"
-    },
-    "Protocol": {
-     "pattern": "^(tcp|udp|icmp|-1|([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))$",
-     "type": "string"
-    },
-    "RuleAction": {
-     "enum": [
-      "allow",
-      "deny"
-     ],
-     "type": "string"
-    }
-   },
-   "required": [
-    "Egress",
-    "Protocol",
-    "RuleAction"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntryList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/NetworkAclEntry"
-   },
-   "type": "array"
-  },
-  "NetworkAclEntrySet": {
-   "additionalProperties": false,
-   "anyOf": [
-    {
-     "required": [
-      "FirstEntries"
-     ]
-    },
-    {
-     "required": [
-      "LastEntries"
-     ]
-    }
-   ],
-   "properties": {
-    "FirstEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    },
-    "ForceRemediateForFirstEntries": {
-     "type": "boolean"
-    },
-    "ForceRemediateForLastEntries": {
-     "type": "boolean"
-    },
-    "LastEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    }
-   },
-   "required": [
-    "ForceRemediateForFirstEntries",
-    "ForceRemediateForLastEntries"
-   ],
-   "type": "object"
-  },
-  "NetworkFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  },
-  "OrganizationalUnitId": {
-   "maxLength": 68,
-   "minLength": 16,
-   "pattern": "^(ou-[0-9a-z]{4,32}-[a-z0-9]{8,32})$",
-   "type": "string"
-  },
-  "PolicyOption": {
-   "additionalProperties": false,
-   "oneOf": [
-    {
-     "required": [
-      "NetworkFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "ThirdPartyFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "NetworkAclCommonPolicy"
-     ]
-    }
-   ],
-   "properties": {
-    "NetworkAclCommonPolicy": {
-     "$ref": "#/definitions/NetworkAclCommonPolicy"
-    },
-    "NetworkFirewallPolicy": {
-     "$ref": "#/definitions/NetworkFirewallPolicy"
-    },
-    "ThirdPartyFirewallPolicy": {
-     "$ref": "#/definitions/ThirdPartyFirewallPolicy"
-    }
-   },
-   "type": "object"
-  },
-  "PolicyTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "PolicyType": {
-   "enum": [
-    "WAF",
-    "WAFV2",
-    "SHIELD_ADVANCED",
-    "SECURITY_GROUPS_COMMON",
-    "SECURITY_GROUPS_CONTENT_AUDIT",
-    "SECURITY_GROUPS_USAGE_AUDIT",
-    "NETWORK_FIREWALL",
-    "THIRD_PARTY_FIREWALL",
-    "DNS_FIREWALL",
-    "IMPORT_NETWORK_FIREWALL",
-    "NETWORK_ACL_COMMON"
-   ],
-   "type": "string"
-  },
-  "ResourceArn": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "ResourceTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key"
-   ],
-   "type": "object"
-  },
-  "ResourceType": {
-   "maxLength": 128,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "SecurityServicePolicyData": {
-   "additionalProperties": false,
-   "properties": {
-    "ManagedServiceData": {
-     "$ref": "#/definitions/ManagedServiceData"
-    },
-    "PolicyOption": {
-     "$ref": "#/definitions/PolicyOption"
-    },
-    "Type": {
-     "$ref": "#/definitions/PolicyType"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "ThirdPartyFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "Arn": {
-   "$ref": "#/definitions/ResourceArn"
-  },
-  "DeleteAllPolicyResources": {
-   "type": "boolean"
-  },
-  "ExcludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "ExcludeResourceTags": {
-   "type": "boolean"
-  },
-  "Id": {
-   "maxLength": 36,
-   "minLength": 36,
-   "pattern": "^[a-z0-9A-Z-]{36}$",
-   "type": "string"
-  },
-  "IncludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "PolicyDescription": {
-   "maxLength": 256,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "PolicyName": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "RemediationEnabled": {
-   "type": "boolean"
-  },
-  "ResourceSetIds": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/Base62Id"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "ResourceTags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceTag"
-   },
-   "maxItems": 8,
-   "type": "array"
-  },
-  "ResourceType": {
-   "$ref": "#/definitions/ResourceType"
-  },
-  "ResourceTypeList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceType"
-   },
-   "type": "array"
-  },
-  "ResourcesCleanUp": {
-   "type": "boolean"
-  },
-  "SecurityServicePolicyData": {
-   "$ref": "#/definitions/SecurityServicePolicyData"
-  },
-  "Tags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/PolicyTag"
-   },
-   "type": "array"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/Id"
- ],
- "required": [
-  "ExcludeResourceTags",
-  "PolicyName",
-  "RemediationEnabled",
-  "SecurityServicePolicyData"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-fms.git",
- "typeName": "AWS::FMS::Policy",
- "writeOnlyProperties": [
-  "/properties/DeleteAllPolicyResources"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/eu_north_1/aws-sagemaker-domain.json b/src/cfnlint/data/schemas/providers/eu_north_1/aws-sagemaker-domain.json
deleted file mode 100644
index 69e42e460e..0000000000
--- a/src/cfnlint/data/schemas/providers/eu_north_1/aws-sagemaker-domain.json
+++ /dev/null
@@ -1,905 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/AuthMode",
-  "/properties/DomainName",
-  "/properties/DomainSettings/RStudioServerProDomainSettings/DefaultResourceSpec",
-  "/properties/KmsKeyId",
-  "/properties/VpcId",
-  "/properties/Tags"
- ],
- "definitions": {
-  "AppLifecycleManagement": {
-   "additionalProperties": false,
-   "properties": {
-    "IdleSettings": {
-     "$ref": "#/definitions/IdleSettings"
-    }
-   },
-   "type": "object"
-  },
-  "AppType": {
-   "enum": [
-    "JupyterServer",
-    "TensorBoard",
-    "RStudioServerPro",
-    "JupyterLab",
-    "CodeEditor",
-    "DetailedProfiler",
-    "Canvas"
-   ],
-   "type": "string"
-  },
-  "CodeEditorAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "AppLifecycleManagement": {
-     "$ref": "#/definitions/AppLifecycleManagement"
-    },
-    "CustomImages": {
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 200,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "CodeRepository": {
-   "additionalProperties": false,
-   "properties": {
-    "RepositoryUrl": {
-     "maxLength": 256,
-     "pattern": "^https://([.\\-_a-zA-Z0-9]+/?){3,1016}$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "RepositoryUrl"
-   ],
-   "type": "object"
-  },
-  "CustomFileSystemConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "EFSFileSystemConfig": {
-     "$ref": "#/definitions/EFSFileSystemConfig"
-    },
-    "FSxLustreFileSystemConfig": {
-     "$ref": "#/definitions/FSxLustreFileSystemConfig"
-    }
-   },
-   "type": "object"
-  },
-  "CustomImage": {
-   "additionalProperties": false,
-   "properties": {
-    "AppImageConfigName": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}",
-     "type": "string"
-    },
-    "ImageName": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9]([-.]?[a-zA-Z0-9]){0,62}$",
-     "type": "string"
-    },
-    "ImageVersionNumber": {
-     "minimum": 0,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "AppImageConfigName",
-    "ImageName"
-   ],
-   "type": "object"
-  },
-  "CustomPosixUserConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "Gid": {
-     "maximum": 4000000,
-     "minimum": 1001,
-     "type": "integer"
-    },
-    "Uid": {
-     "maximum": 4000000,
-     "minimum": 10000,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "Uid",
-    "Gid"
-   ],
-   "type": "object"
-  },
-  "DefaultEbsStorageSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultEbsVolumeSizeInGb": {
-     "$ref": "#/definitions/SpaceEbsVolumeSizeInGb"
-    },
-    "MaximumEbsVolumeSizeInGb": {
-     "$ref": "#/definitions/SpaceEbsVolumeSizeInGb"
-    }
-   },
-   "required": [
-    "DefaultEbsVolumeSizeInGb",
-    "MaximumEbsVolumeSizeInGb"
-   ],
-   "type": "object"
-  },
-  "DefaultSpaceSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomFileSystemConfigs": {
-     "items": {
-      "$ref": "#/definitions/CustomFileSystemConfig"
-     },
-     "maxItems": 2,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "CustomPosixUserConfig": {
-     "$ref": "#/definitions/CustomPosixUserConfig"
-    },
-    "ExecutionRole": {
-     "maxLength": 2048,
-     "minLength": 20,
-     "pattern": "^arn:aws[a-z\\-]*:iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+$",
-     "type": "string"
-    },
-    "JupyterLabAppSettings": {
-     "$ref": "#/definitions/JupyterLabAppSettings"
-    },
-    "JupyterServerAppSettings": {
-     "$ref": "#/definitions/JupyterServerAppSettings"
-    },
-    "KernelGatewayAppSettings": {
-     "$ref": "#/definitions/KernelGatewayAppSettings"
-    },
-    "SecurityGroups": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "insertionOrder": false,
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.Id",
-      "maxLength": 32,
-      "pattern": "[-0-9a-zA-Z]+",
-      "type": "string"
-     },
-     "maxItems": 5,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "SpaceStorageSettings": {
-     "$ref": "#/definitions/DefaultSpaceStorageSettings"
-    }
-   },
-   "required": [
-    "ExecutionRole"
-   ],
-   "type": "object"
-  },
-  "DefaultSpaceStorageSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultEbsStorageSettings": {
-     "$ref": "#/definitions/DefaultEbsStorageSettings"
-    }
-   },
-   "type": "object"
-  },
-  "DockerSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "EnableDockerAccess": {
-     "enum": [
-      "ENABLED",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "VpcOnlyTrustedAccounts": {
-     "insertionOrder": false,
-     "items": {
-      "maxLength": 12,
-      "minLength": 12,
-      "pattern": "^\\d+$",
-      "type": "string"
-     },
-     "maxItems": 20,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "DomainSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DockerSettings": {
-     "$ref": "#/definitions/DockerSettings"
-    },
-    "ExecutionRoleIdentityConfig": {
-     "enum": [
-      "USER_PROFILE_NAME",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "RStudioServerProDomainSettings": {
-     "$ref": "#/definitions/RStudioServerProDomainSettings"
-    },
-    "SecurityGroupIds": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "insertionOrder": false,
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.Id",
-      "maxLength": 32,
-      "pattern": "[-0-9a-zA-Z]+",
-      "type": "string"
-     },
-     "maxItems": 3,
-     "minItems": 1,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "EFSFileSystemConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "FileSystemId": {
-     "maxLength": 21,
-     "minLength": 11,
-     "pattern": "^(fs-[0-9a-f]{8,})$",
-     "type": "string"
-    },
-    "FileSystemPath": {
-     "maxLength": 256,
-     "minLength": 1,
-     "pattern": "^\\/\\S*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "FileSystemId"
-   ],
-   "type": "object"
-  },
-  "FSxLustreFileSystemConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "FileSystemId": {
-     "maxLength": 21,
-     "minLength": 11,
-     "pattern": "^(fs-[0-9a-f]{8,})$",
-     "type": "string"
-    },
-    "FileSystemPath": {
-     "maxLength": 256,
-     "minLength": 1,
-     "pattern": "^\\/\\S*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "FileSystemId"
-   ],
-   "type": "object"
-  },
-  "IdleSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "IdleTimeoutInMinutes": {
-     "$ref": "#/definitions/IdleTimeoutInMinutes"
-    },
-    "LifecycleManagement": {
-     "$ref": "#/definitions/LifecycleManagement"
-    },
-    "MaxIdleTimeoutInMinutes": {
-     "$ref": "#/definitions/MaxIdleTimeoutInMinutes"
-    },
-    "MinIdleTimeoutInMinutes": {
-     "$ref": "#/definitions/MinIdleTimeoutInMinutes"
-    }
-   },
-   "type": "object"
-  },
-  "IdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "JupyterLabAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "AppLifecycleManagement": {
-     "$ref": "#/definitions/AppLifecycleManagement"
-    },
-    "CodeRepositories": {
-     "items": {
-      "$ref": "#/definitions/CodeRepository"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "CustomImages": {
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 200,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "JupyterServerAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "KernelGatewayAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomImages": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 200,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "LifecycleManagement": {
-   "enum": [
-    "ENABLED",
-    "DISABLED"
-   ],
-   "type": "string"
-  },
-  "MaxIdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "MinIdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "MlTools": {
-   "enum": [
-    "DataWrangler",
-    "FeatureStore",
-    "EmrClusters",
-    "AutoMl",
-    "Experiments",
-    "Training",
-    "ModelEvaluation",
-    "Pipelines",
-    "Models",
-    "JumpStart",
-    "InferenceRecommender",
-    "Endpoints",
-    "Projects",
-    "InferenceOptimization",
-    "HyperPodClusters",
-    "Comet",
-    "DeepchecksLLMEvaluation",
-    "Fiddler",
-    "LakeraGuard"
-   ],
-   "type": "string"
-  },
-  "RSessionAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomImages": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 200,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    }
-   },
-   "type": "object"
-  },
-  "RStudioServerProAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "AccessStatus": {
-     "enum": [
-      "ENABLED",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "UserGroup": {
-     "enum": [
-      "R_STUDIO_ADMIN",
-      "R_STUDIO_USER"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "RStudioServerProDomainSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "DomainExecutionRoleArn": {
-     "maxLength": 2048,
-     "minLength": 20,
-     "pattern": "^arn:aws[a-z\\-]*:iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+$",
-     "type": "string"
-    },
-    "RStudioConnectUrl": {
-     "pattern": "^(https:|http:|www\\.)\\S*",
-     "type": "string"
-    },
-    "RStudioPackageManagerUrl": {
-     "pattern": "^(https:|http:|www\\.)\\S*",
-     "type": "string"
-    }
-   },
-   "required": [
-    "DomainExecutionRoleArn"
-   ],
-   "type": "object"
-  },
-  "ResourceSpec": {
-   "additionalProperties": false,
-   "properties": {
-    "InstanceType": {
-     "enum": [
-      "system",
-      "ml.t3.micro",
-      "ml.t3.small",
-      "ml.t3.medium",
-      "ml.t3.large",
-      "ml.t3.xlarge",
-      "ml.t3.2xlarge",
-      "ml.m5.large",
-      "ml.m5.xlarge",
-      "ml.m5.2xlarge",
-      "ml.m5.4xlarge",
-      "ml.m5.8xlarge",
-      "ml.m5.12xlarge",
-      "ml.m5.16xlarge",
-      "ml.m5.24xlarge",
-      "ml.c5.large",
-      "ml.c5.xlarge",
-      "ml.c5.2xlarge",
-      "ml.c5.4xlarge",
-      "ml.c5.9xlarge",
-      "ml.c5.12xlarge",
-      "ml.c5.18xlarge",
-      "ml.c5.24xlarge",
-      "ml.p3.2xlarge",
-      "ml.p3.8xlarge",
-      "ml.p3.16xlarge",
-      "ml.g4dn.xlarge",
-      "ml.g4dn.2xlarge",
-      "ml.g4dn.4xlarge",
-      "ml.g4dn.8xlarge",
-      "ml.g4dn.12xlarge",
-      "ml.g4dn.16xlarge",
-      "ml.r5.large",
-      "ml.r5.xlarge",
-      "ml.r5.2xlarge",
-      "ml.r5.4xlarge",
-      "ml.r5.8xlarge",
-      "ml.r5.12xlarge",
-      "ml.r5.16xlarge",
-      "ml.r5.24xlarge",
-      "ml.p3dn.24xlarge",
-      "ml.m5d.large",
-      "ml.m5d.xlarge",
-      "ml.m5d.2xlarge",
-      "ml.m5d.4xlarge",
-      "ml.m5d.8xlarge",
-      "ml.m5d.12xlarge",
-      "ml.m5d.16xlarge",
-      "ml.m5d.24xlarge",
-      "ml.g5.xlarge",
-      "ml.g5.2xlarge",
-      "ml.g5.4xlarge",
-      "ml.g5.8xlarge",
-      "ml.g5.12xlarge",
-      "ml.g5.16xlarge",
-      "ml.g5.24xlarge",
-      "ml.g5.48xlarge",
-      "ml.p4d.24xlarge",
-      "ml.p4de.24xlarge",
-      "ml.geospatial.interactive",
-      "ml.trn1.2xlarge",
-      "ml.trn1.32xlarge",
-      "ml.trn1n.32xlarge"
-     ],
-     "type": "string"
-    },
-    "LifecycleConfigArn": {
-     "maxLength": 256,
-     "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:studio-lifecycle-config/.*",
-     "type": "string"
-    },
-    "SageMakerImageArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws(-[\\w]+)*:sagemaker:.+:[0-9]{12}:image/[a-z0-9]([-.]?[a-z0-9])*$",
-     "type": "string"
-    },
-    "SageMakerImageVersionArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws(-[\\w]+)*:sagemaker:.+:[0-9]{12}:image-version/[a-z0-9]([-.]?[a-z0-9])*/[0-9]+$",
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SharingSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "NotebookOutputOption": {
-     "enum": [
-      "Allowed",
-      "Disabled"
-     ],
-     "type": "string"
-    },
-    "S3KmsKeyId": {
-     "maxLength": 2048,
-     "pattern": ".*",
-     "type": "string"
-    },
-    "S3OutputPath": {
-     "maxLength": 1024,
-     "pattern": "^(https|s3)://([^/]+)/?(.*)$",
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SpaceEbsVolumeSizeInGb": {
-   "maximum": 16384,
-   "minimum": 5,
-   "type": "integer"
-  },
-  "StudioLifecycleConfigArn": {
-   "maxLength": 256,
-   "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:studio-lifecycle-config/.*",
-   "type": "string"
-  },
-  "StudioWebPortalSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "HiddenAppTypes": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/AppType"
-     },
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "HiddenMlTools": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/MlTools"
-     },
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$",
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "UserSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CodeEditorAppSettings": {
-     "$ref": "#/definitions/CodeEditorAppSettings"
-    },
-    "CustomFileSystemConfigs": {
-     "items": {
-      "$ref": "#/definitions/CustomFileSystemConfig"
-     },
-     "maxItems": 2,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "CustomPosixUserConfig": {
-     "$ref": "#/definitions/CustomPosixUserConfig"
-    },
-    "DefaultLandingUri": {
-     "maxLength": 1023,
-     "type": "string"
-    },
-    "ExecutionRole": {
-     "maxLength": 2048,
-     "minLength": 20,
-     "pattern": "^arn:aws[a-z\\-]*:iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+$",
-     "type": "string"
-    },
-    "JupyterLabAppSettings": {
-     "$ref": "#/definitions/JupyterLabAppSettings"
-    },
-    "JupyterServerAppSettings": {
-     "$ref": "#/definitions/JupyterServerAppSettings"
-    },
-    "KernelGatewayAppSettings": {
-     "$ref": "#/definitions/KernelGatewayAppSettings"
-    },
-    "RSessionAppSettings": {
-     "$ref": "#/definitions/RSessionAppSettings"
-    },
-    "RStudioServerProAppSettings": {
-     "$ref": "#/definitions/RStudioServerProAppSettings"
-    },
-    "SecurityGroups": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "insertionOrder": false,
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.Id",
-      "maxLength": 32,
-      "pattern": "[-0-9a-zA-Z]+",
-      "type": "string"
-     },
-     "maxItems": 5,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "SharingSettings": {
-     "$ref": "#/definitions/SharingSettings"
-    },
-    "SpaceStorageSettings": {
-     "$ref": "#/definitions/DefaultSpaceStorageSettings"
-    },
-    "StudioWebPortal": {
-     "enum": [
-      "ENABLED",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "StudioWebPortalSettings": {
-     "$ref": "#/definitions/StudioWebPortalSettings"
-    }
-   },
-   "required": [
-    "ExecutionRole"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/DomainId"
- ],
- "properties": {
-  "AppNetworkAccessType": {
-   "enum": [
-    "PublicInternetOnly",
-    "VpcOnly"
-   ],
-   "type": "string"
-  },
-  "AppSecurityGroupManagement": {
-   "enum": [
-    "Service",
-    "Customer"
-   ],
-   "type": "string"
-  },
-  "AuthMode": {
-   "enum": [
-    "SSO",
-    "IAM"
-   ],
-   "type": "string"
-  },
-  "DefaultSpaceSettings": {
-   "$ref": "#/definitions/DefaultSpaceSettings"
-  },
-  "DefaultUserSettings": {
-   "$ref": "#/definitions/UserSettings"
-  },
-  "DomainArn": {
-   "maxLength": 256,
-   "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:domain/.*",
-   "type": "string"
-  },
-  "DomainId": {
-   "maxLength": 63,
-   "pattern": "^d-(-*[a-z0-9])+",
-   "type": "string"
-  },
-  "DomainName": {
-   "maxLength": 63,
-   "pattern": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}",
-   "type": "string"
-  },
-  "DomainSettings": {
-   "$ref": "#/definitions/DomainSettings"
-  },
-  "HomeEfsFileSystemId": {
-   "maxLength": 32,
-   "type": "string"
-  },
-  "KmsKeyId": {
-   "maxLength": 2048,
-   "pattern": ".*",
-   "type": "string"
-  },
-  "SecurityGroupIdForDomainBoundary": {
-   "maxLength": 32,
-   "pattern": "[-0-9a-zA-Z]+",
-   "type": "string"
-  },
-  "SingleSignOnApplicationArn": {
-   "pattern": "^arn:(aws|aws-us-gov|aws-cn|aws-iso|aws-iso-b):sso::[0-9]+:application/[a-zA-Z0-9-_.]+/apl-[a-zA-Z0-9]+$",
-   "type": "string"
-  },
-  "SingleSignOnManagedApplicationInstanceId": {
-   "maxLength": 256,
-   "type": "string"
-  },
-  "SubnetIds": {
-   "insertionOrder": false,
-   "items": {
-    "maxLength": 32,
-    "pattern": "[-0-9a-zA-Z]+",
-    "type": "string"
-   },
-   "maxItems": 16,
-   "minItems": 1,
-   "type": "array",
-   "uniqueItems": false
-  },
-  "TagPropagation": {
-   "enum": [
-    "ENABLED",
-    "DISABLED"
-   ],
-   "type": "string"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 50,
-   "minItems": 0,
-   "type": "array",
-   "uniqueItems": false
-  },
-  "Url": {
-   "maxLength": 1024,
-   "type": "string"
-  },
-  "VpcId": {
-   "format": "AWS::EC2::VPC.Id",
-   "maxLength": 32,
-   "pattern": "[-0-9a-zA-Z]+",
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/DomainArn",
-  "/properties/Url",
-  "/properties/DomainId",
-  "/properties/HomeEfsFileSystemId",
-  "/properties/SecurityGroupIdForDomainBoundary",
-  "/properties/SingleSignOnManagedApplicationInstanceId",
-  "/properties/SingleSignOnApplicationArn"
- ],
- "required": [
-  "AuthMode",
-  "DefaultUserSettings",
-  "DomainName",
-  "SubnetIds",
-  "VpcId"
- ],
- "typeName": "AWS::SageMaker::Domain",
- "writeOnlyProperties": [
-  "/properties/Tags"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/eu_north_1/aws-sagemaker-userprofile.json b/src/cfnlint/data/schemas/providers/eu_north_1/aws-sagemaker-userprofile.json
deleted file mode 100644
index a21ea9e798..0000000000
--- a/src/cfnlint/data/schemas/providers/eu_north_1/aws-sagemaker-userprofile.json
+++ /dev/null
@@ -1,662 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/DomainId",
-  "/properties/UserProfileName",
-  "/properties/SingleSignOnUserIdentifier",
-  "/properties/SingleSignOnUserValue",
-  "/properties/UserSettings/RStudioServerProAppSettings/AccessStatus",
-  "/properties/UserSettings/RStudioServerProAppSettings/UserGroup",
-  "/properties/Tags"
- ],
- "definitions": {
-  "AppLifecycleManagement": {
-   "additionalProperties": false,
-   "properties": {
-    "IdleSettings": {
-     "$ref": "#/definitions/IdleSettings"
-    }
-   },
-   "type": "object"
-  },
-  "AppType": {
-   "enum": [
-    "JupyterServer",
-    "TensorBoard",
-    "RStudioServerPro",
-    "JupyterLab",
-    "CodeEditor",
-    "DetailedProfiler",
-    "Canvas"
-   ],
-   "type": "string"
-  },
-  "CodeEditorAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomImages": {
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "CodeRepository": {
-   "additionalProperties": false,
-   "properties": {
-    "RepositoryUrl": {
-     "maxLength": 256,
-     "pattern": "^https://([.\\-_a-zA-Z0-9]+/?){3,1016}$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "RepositoryUrl"
-   ],
-   "type": "object"
-  },
-  "CustomFileSystemConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "EFSFileSystemConfig": {
-     "$ref": "#/definitions/EFSFileSystemConfig"
-    },
-    "FSxLustreFileSystemConfig": {
-     "$ref": "#/definitions/FSxLustreFileSystemConfig"
-    }
-   },
-   "type": "object"
-  },
-  "CustomImage": {
-   "additionalProperties": false,
-   "properties": {
-    "AppImageConfigName": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}",
-     "type": "string"
-    },
-    "ImageName": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9]([-.]?[a-zA-Z0-9]){0,62}$",
-     "type": "string"
-    },
-    "ImageVersionNumber": {
-     "minimum": 0,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "AppImageConfigName",
-    "ImageName"
-   ],
-   "type": "object"
-  },
-  "CustomPosixUserConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "Gid": {
-     "maximum": 4000000,
-     "minimum": 1001,
-     "type": "integer"
-    },
-    "Uid": {
-     "maximum": 4000000,
-     "minimum": 10000,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "Uid",
-    "Gid"
-   ],
-   "type": "object"
-  },
-  "DefaultEbsStorageSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultEbsVolumeSizeInGb": {
-     "$ref": "#/definitions/SpaceEbsVolumeSizeInGb"
-    },
-    "MaximumEbsVolumeSizeInGb": {
-     "$ref": "#/definitions/SpaceEbsVolumeSizeInGb"
-    }
-   },
-   "required": [
-    "DefaultEbsVolumeSizeInGb",
-    "MaximumEbsVolumeSizeInGb"
-   ],
-   "type": "object"
-  },
-  "DefaultSpaceStorageSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultEbsStorageSettings": {
-     "$ref": "#/definitions/DefaultEbsStorageSettings"
-    }
-   },
-   "type": "object"
-  },
-  "EFSFileSystemConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "FileSystemId": {
-     "maxLength": 21,
-     "minLength": 11,
-     "pattern": "^(fs-[0-9a-f]{8,})$",
-     "type": "string"
-    },
-    "FileSystemPath": {
-     "maxLength": 256,
-     "minLength": 1,
-     "pattern": "^\\/\\S*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "FileSystemId"
-   ],
-   "type": "object"
-  },
-  "FSxLustreFileSystemConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "FileSystemId": {
-     "maxLength": 21,
-     "minLength": 11,
-     "pattern": "^(fs-[0-9a-f]{8,})$",
-     "type": "string"
-    },
-    "FileSystemPath": {
-     "maxLength": 256,
-     "minLength": 1,
-     "pattern": "^\\/\\S*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "FileSystemId"
-   ],
-   "type": "object"
-  },
-  "IdleSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "IdleTimeoutInMinutes": {
-     "$ref": "#/definitions/IdleTimeoutInMinutes"
-    },
-    "LifecycleManagement": {
-     "$ref": "#/definitions/LifecycleManagement"
-    },
-    "MaxIdleTimeoutInMinutes": {
-     "$ref": "#/definitions/MaxIdleTimeoutInMinutes"
-    },
-    "MinIdleTimeoutInMinutes": {
-     "$ref": "#/definitions/MinIdleTimeoutInMinutes"
-    }
-   },
-   "type": "object"
-  },
-  "IdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "JupyterLabAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CodeRepositories": {
-     "items": {
-      "$ref": "#/definitions/CodeRepository"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "CustomImages": {
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "JupyterServerAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "KernelGatewayAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomImages": {
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "LifecycleManagement": {
-   "enum": [
-    "ENABLED",
-    "DISABLED"
-   ],
-   "type": "string"
-  },
-  "MaxIdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "MinIdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "MlTools": {
-   "enum": [
-    "DataWrangler",
-    "FeatureStore",
-    "EmrClusters",
-    "AutoMl",
-    "Experiments",
-    "Training",
-    "ModelEvaluation",
-    "Pipelines",
-    "Models",
-    "JumpStart",
-    "InferenceRecommender",
-    "Endpoints",
-    "Projects",
-    "InferenceOptimization",
-    "HyperPodClusters",
-    "Comet",
-    "DeepchecksLLMEvaluation",
-    "Fiddler",
-    "LakeraGuard"
-   ],
-   "type": "string"
-  },
-  "RStudioServerProAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "AccessStatus": {
-     "enum": [
-      "ENABLED",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "UserGroup": {
-     "enum": [
-      "R_STUDIO_ADMIN",
-      "R_STUDIO_USER"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ResourceSpec": {
-   "additionalProperties": false,
-   "properties": {
-    "InstanceType": {
-     "enum": [
-      "system",
-      "ml.t3.micro",
-      "ml.t3.small",
-      "ml.t3.medium",
-      "ml.t3.large",
-      "ml.t3.xlarge",
-      "ml.t3.2xlarge",
-      "ml.m5.large",
-      "ml.m5.xlarge",
-      "ml.m5.2xlarge",
-      "ml.m5.4xlarge",
-      "ml.m5.8xlarge",
-      "ml.m5.12xlarge",
-      "ml.m5.16xlarge",
-      "ml.m5.24xlarge",
-      "ml.c5.large",
-      "ml.c5.xlarge",
-      "ml.c5.2xlarge",
-      "ml.c5.4xlarge",
-      "ml.c5.9xlarge",
-      "ml.c5.12xlarge",
-      "ml.c5.18xlarge",
-      "ml.c5.24xlarge",
-      "ml.p3.2xlarge",
-      "ml.p3.8xlarge",
-      "ml.p3.16xlarge",
-      "ml.g4dn.xlarge",
-      "ml.g4dn.2xlarge",
-      "ml.g4dn.4xlarge",
-      "ml.g4dn.8xlarge",
-      "ml.g4dn.12xlarge",
-      "ml.g4dn.16xlarge",
-      "ml.r5.large",
-      "ml.r5.xlarge",
-      "ml.r5.2xlarge",
-      "ml.r5.4xlarge",
-      "ml.r5.8xlarge",
-      "ml.r5.12xlarge",
-      "ml.r5.16xlarge",
-      "ml.r5.24xlarge",
-      "ml.p3dn.24xlarge",
-      "ml.m5d.large",
-      "ml.m5d.xlarge",
-      "ml.m5d.2xlarge",
-      "ml.m5d.4xlarge",
-      "ml.m5d.8xlarge",
-      "ml.m5d.12xlarge",
-      "ml.m5d.16xlarge",
-      "ml.m5d.24xlarge",
-      "ml.g5.xlarge",
-      "ml.g5.2xlarge",
-      "ml.g5.4xlarge",
-      "ml.g5.8xlarge",
-      "ml.g5.12xlarge",
-      "ml.g5.16xlarge",
-      "ml.g5.24xlarge",
-      "ml.g5.48xlarge",
-      "ml.p4d.24xlarge",
-      "ml.p4de.24xlarge",
-      "ml.geospatial.interactive",
-      "ml.trn1.2xlarge",
-      "ml.trn1.32xlarge",
-      "ml.trn1n.32xlarge"
-     ],
-     "type": "string"
-    },
-    "LifecycleConfigArn": {
-     "maxLength": 256,
-     "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:studio-lifecycle-config/.*",
-     "type": "string"
-    },
-    "SageMakerImageArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws(-[\\w]+)*:sagemaker:.+:[0-9]{12}:image/[a-z0-9]([-.]?[a-z0-9])*$",
-     "type": "string"
-    },
-    "SageMakerImageVersionArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws(-[\\w]+)*:sagemaker:.+:[0-9]{12}:image-version/[a-z0-9]([-.]?[a-z0-9])*/[0-9]+$",
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SharingSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "NotebookOutputOption": {
-     "enum": [
-      "Allowed",
-      "Disabled"
-     ],
-     "type": "string"
-    },
-    "S3KmsKeyId": {
-     "maxLength": 2048,
-     "pattern": ".*",
-     "type": "string"
-    },
-    "S3OutputPath": {
-     "maxLength": 1024,
-     "pattern": "^(https|s3)://([^/]+)/?(.*)$",
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SpaceEbsVolumeSizeInGb": {
-   "maximum": 16384,
-   "minimum": 5,
-   "type": "integer"
-  },
-  "StudioLifecycleConfigArn": {
-   "maxLength": 256,
-   "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:studio-lifecycle-config/.*",
-   "type": "string"
-  },
-  "StudioWebPortalSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "HiddenAppTypes": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/AppType"
-     },
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "HiddenMlTools": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/MlTools"
-     },
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$",
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "UserSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CodeEditorAppSettings": {
-     "$ref": "#/definitions/CodeEditorAppSettings"
-    },
-    "CustomFileSystemConfigs": {
-     "items": {
-      "$ref": "#/definitions/CustomFileSystemConfig"
-     },
-     "maxItems": 2,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "CustomPosixUserConfig": {
-     "$ref": "#/definitions/CustomPosixUserConfig"
-    },
-    "DefaultLandingUri": {
-     "maxLength": 1023,
-     "type": "string"
-    },
-    "ExecutionRole": {
-     "maxLength": 2048,
-     "minLength": 20,
-     "pattern": "^arn:aws[a-z\\-]*:iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+$",
-     "type": "string"
-    },
-    "JupyterLabAppSettings": {
-     "$ref": "#/definitions/JupyterLabAppSettings"
-    },
-    "JupyterServerAppSettings": {
-     "$ref": "#/definitions/JupyterServerAppSettings"
-    },
-    "KernelGatewayAppSettings": {
-     "$ref": "#/definitions/KernelGatewayAppSettings"
-    },
-    "RStudioServerProAppSettings": {
-     "$ref": "#/definitions/RStudioServerProAppSettings"
-    },
-    "SecurityGroups": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.Id",
-      "maxLength": 32,
-      "pattern": "[-0-9a-zA-Z]+",
-      "type": "string"
-     },
-     "maxItems": 5,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "SharingSettings": {
-     "$ref": "#/definitions/SharingSettings"
-    },
-    "SpaceStorageSettings": {
-     "$ref": "#/definitions/DefaultSpaceStorageSettings"
-    },
-    "StudioWebPortal": {
-     "enum": [
-      "ENABLED",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "StudioWebPortalSettings": {
-     "$ref": "#/definitions/StudioWebPortalSettings"
-    }
-   },
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/UserProfileName",
-  "/properties/DomainId"
- ],
- "properties": {
-  "DomainId": {
-   "maxLength": 63,
-   "minLength": 1,
-   "pattern": "^d-(-*[a-z0-9]){1,61}",
-   "type": "string"
-  },
-  "SingleSignOnUserIdentifier": {
-   "pattern": "UserName",
-   "type": "string"
-  },
-  "SingleSignOnUserValue": {
-   "maxLength": 256,
-   "minLength": 1,
-   "type": "string"
-  },
-  "Tags": {
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 50,
-   "minItems": 0,
-   "type": "array",
-   "uniqueItems": false
-  },
-  "UserProfileArn": {
-   "maxLength": 256,
-   "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:user-profile/.*",
-   "type": "string"
-  },
-  "UserProfileName": {
-   "maxLength": 63,
-   "minLength": 1,
-   "pattern": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}",
-   "type": "string"
-  },
-  "UserSettings": {
-   "$ref": "#/definitions/UserSettings",
-   "maxItems": 50,
-   "minItems": 0,
-   "uniqueItems": false
-  }
- },
- "readOnlyProperties": [
-  "/properties/UserProfileArn"
- ],
- "required": [
-  "DomainId",
-  "UserProfileName"
- ],
- "typeName": "AWS::SageMaker::UserProfile",
- "writeOnlyProperties": [
-  "/properties/Tags"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/eu_north_1/aws-timestream-influxdbinstance.json b/src/cfnlint/data/schemas/providers/eu_north_1/aws-timestream-influxdbinstance.json
deleted file mode 100644
index 0ca36fcc35..0000000000
--- a/src/cfnlint/data/schemas/providers/eu_north_1/aws-timestream-influxdbinstance.json
+++ /dev/null
@@ -1,233 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/Name",
-  "/properties/Username",
-  "/properties/Password",
-  "/properties/Organization",
-  "/properties/Bucket",
-  "/properties/DbInstanceType",
-  "/properties/VpcSubnetIds",
-  "/properties/VpcSecurityGroupIds",
-  "/properties/PubliclyAccessible",
-  "/properties/DbStorageType",
-  "/properties/AllocatedStorage",
-  "/properties/DeploymentType"
- ],
- "definitions": {
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "minLength": 0,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "AllocatedStorage": {
-   "maximum": 16384,
-   "minimum": 20,
-   "type": "integer"
-  },
-  "Arn": {
-   "maxLength": 1011,
-   "minLength": 1,
-   "pattern": "^arn:aws[a-z\\-]*:timestream\\-influxdb:[a-z0-9\\-]+:[0-9]{12}:(db\\-instance)/[a-zA-Z0-9]{3,64}$",
-   "type": "string"
-  },
-  "AvailabilityZone": {
-   "type": "string"
-  },
-  "Bucket": {
-   "maxLength": 64,
-   "minLength": 2,
-   "pattern": "^[^_][^\"]*$",
-   "type": "string"
-  },
-  "DbInstanceType": {
-   "enum": [
-    "db.influx.medium",
-    "db.influx.large",
-    "db.influx.xlarge",
-    "db.influx.2xlarge",
-    "db.influx.4xlarge",
-    "db.influx.8xlarge",
-    "db.influx.12xlarge",
-    "db.influx.16xlarge"
-   ],
-   "type": "string"
-  },
-  "DbParameterGroupIdentifier": {
-   "maxLength": 64,
-   "minLength": 3,
-   "pattern": "^[a-zA-Z0-9]+$",
-   "type": "string"
-  },
-  "DbStorageType": {
-   "enum": [
-    "InfluxIOIncludedT1",
-    "InfluxIOIncludedT2",
-    "InfluxIOIncludedT3"
-   ],
-   "type": "string"
-  },
-  "DeploymentType": {
-   "enum": [
-    "SINGLE_AZ",
-    "WITH_MULTIAZ_STANDBY"
-   ],
-   "type": "string"
-  },
-  "Endpoint": {
-   "type": "string"
-  },
-  "Id": {
-   "maxLength": 64,
-   "minLength": 3,
-   "pattern": "^[a-zA-Z0-9]+$",
-   "type": "string"
-  },
-  "InfluxAuthParametersSecretArn": {
-   "pattern": "^arn:[a-z]*:secretsmanager:[a-z\\-0-9]*:[0-9]*:secret:[a-zA-Z0-9\\-]*",
-   "type": "string"
-  },
-  "LogDeliveryConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "S3Configuration": {
-     "additionalProperties": false,
-     "properties": {
-      "BucketName": {
-       "maxLength": 63,
-       "minLength": 3,
-       "pattern": "^[0-9a-z]+[0-9a-z\\.\\-]*[0-9a-z]+$",
-       "type": "string"
-      },
-      "Enabled": {
-       "type": "boolean"
-      }
-     },
-     "required": [
-      "Enabled",
-      "BucketName"
-     ],
-     "type": "object"
-    }
-   },
-   "required": [
-    "S3Configuration"
-   ],
-   "type": "object"
-  },
-  "Name": {
-   "maxLength": 40,
-   "minLength": 3,
-   "pattern": "^[a-zA-z][a-zA-Z0-9]*(-[a-zA-Z0-9]+)*$",
-   "type": "string"
-  },
-  "Organization": {
-   "maxLength": 64,
-   "minLength": 1,
-   "type": "string"
-  },
-  "Password": {
-   "maxLength": 64,
-   "minLength": 8,
-   "pattern": "^[a-zA-Z0-9]+$",
-   "type": "string"
-  },
-  "PubliclyAccessible": {
-   "default": false,
-   "type": "boolean"
-  },
-  "SecondaryAvailabilityZone": {
-   "type": "string"
-  },
-  "Status": {
-   "enum": [
-    "CREATING",
-    "AVAILABLE",
-    "DELETING",
-    "MODIFYING",
-    "UPDATING",
-    "DELETED",
-    "FAILED"
-   ],
-   "type": "string"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 200,
-   "minItems": 1,
-   "type": "array",
-   "uniqueItems": true
-  },
-  "Username": {
-   "maxLength": 64,
-   "minLength": 1,
-   "type": "string"
-  },
-  "VpcSecurityGroupIds": {
-   "format": "AWS::EC2::SecurityGroup.Ids",
-   "insertionOrder": false,
-   "items": {
-    "format": "AWS::EC2::SecurityGroup.Id",
-    "type": "string"
-   },
-   "maxItems": 5,
-   "minItems": 1,
-   "type": "array"
-  },
-  "VpcSubnetIds": {
-   "insertionOrder": false,
-   "items": {
-    "type": "string"
-   },
-   "maxItems": 3,
-   "minItems": 1,
-   "type": "array"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Status",
-  "/properties/Arn",
-  "/properties/Id",
-  "/properties/AvailabilityZone",
-  "/properties/Endpoint",
-  "/properties/SecondaryAvailabilityZone",
-  "/properties/InfluxAuthParametersSecretArn"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-timestream.git",
- "tagging": {
-  "cloudFormationSystemTags": true,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::Timestream::InfluxDBInstance",
- "writeOnlyProperties": [
-  "/properties/Username",
-  "/properties/Password",
-  "/properties/Organization",
-  "/properties/Bucket"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/eu_south_1/__init__.py b/src/cfnlint/data/schemas/providers/eu_south_1/__init__.py
index 3e725b58ba..e70bddebb5 100644
--- a/src/cfnlint/data/schemas/providers/eu_south_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/eu_south_1/__init__.py
@@ -983,6 +983,7 @@
     "aws-cloudwatch-compositealarm.json",
     "aws-cloudwatch-dashboard.json",
     "aws-cloudwatch-insightrule.json",
+    "aws-cloudwatch-metricstream.json",
     "aws-codeartifact-domain.json",
     "aws-codeartifact-packagegroup.json",
     "aws-codeartifact-repository.json",
@@ -1068,6 +1069,7 @@
     "aws-docdbelastic-cluster.json",
     "aws-dynamodb-globaltable.json",
     "aws-dynamodb-table.json",
+    "aws-ec2-capacityreservation.json",
     "aws-ec2-capacityreservationfleet.json",
     "aws-ec2-clientvpnroute.json",
     "aws-ec2-clientvpntargetnetworkassociation.json",
diff --git a/src/cfnlint/data/schemas/providers/eu_south_1/aws-cloudwatch-metricstream.json b/src/cfnlint/data/schemas/providers/eu_south_1/aws-cloudwatch-metricstream.json
deleted file mode 100644
index 89ca2654d5..0000000000
--- a/src/cfnlint/data/schemas/providers/eu_south_1/aws-cloudwatch-metricstream.json
+++ /dev/null
@@ -1,228 +0,0 @@
-{
- "additionalProperties": false,
- "allOf": [
-  {
-   "required": [
-    "FirehoseArn",
-    "RoleArn",
-    "OutputFormat"
-   ]
-  },
-  {
-   "oneOf": [
-    {},
-    {
-     "required": [
-      "IncludeFilters",
-      "ExcludeFilters"
-     ]
-    }
-   ]
-  }
- ],
- "createOnlyProperties": [
-  "/properties/Name"
- ],
- "definitions": {
-  "MetricStreamFilter": {
-   "additionalProperties": false,
-   "properties": {
-    "MetricNames": {
-     "items": {
-      "maxLength": 255,
-      "minLength": 1,
-      "type": "string"
-     },
-     "maxItems": 999,
-     "type": "array"
-    },
-    "Namespace": {
-     "maxLength": 255,
-     "minLength": 1,
-     "pattern": "[^:].*",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Namespace"
-   ],
-   "type": "object"
-  },
-  "MetricStreamStatisticsConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "AdditionalStatistics": {
-     "items": {
-      "type": "string"
-     },
-     "maxItems": 20,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "IncludeMetrics": {
-     "items": {
-      "$ref": "#/definitions/MetricStreamStatisticsMetric"
-     },
-     "maxItems": 100,
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "required": [
-    "AdditionalStatistics",
-    "IncludeMetrics"
-   ],
-   "type": "object"
-  },
-  "MetricStreamStatisticsMetric": {
-   "additionalProperties": false,
-   "properties": {
-    "MetricName": {
-     "maxLength": 255,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Namespace": {
-     "maxLength": 255,
-     "minLength": 1,
-     "pattern": "[^:].*",
-     "type": "string"
-    }
-   },
-   "required": [
-    "MetricName",
-    "Namespace"
-   ],
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "minLength": 0,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Name"
- ],
- "properties": {
-  "Arn": {
-   "maxLength": 2048,
-   "minLength": 20,
-   "type": "string"
-  },
-  "CreationDate": {
-   "anyOf": [
-    {
-     "format": "date-time"
-    },
-    {
-     "format": "timestamp"
-    }
-   ],
-   "type": "string"
-  },
-  "ExcludeFilters": {
-   "items": {
-    "$ref": "#/definitions/MetricStreamFilter"
-   },
-   "maxItems": 1000,
-   "type": "array",
-   "uniqueItems": true
-  },
-  "FirehoseArn": {
-   "maxLength": 2048,
-   "minLength": 20,
-   "type": "string"
-  },
-  "IncludeFilters": {
-   "items": {
-    "$ref": "#/definitions/MetricStreamFilter"
-   },
-   "maxItems": 1000,
-   "type": "array",
-   "uniqueItems": true
-  },
-  "IncludeLinkedAccountsMetrics": {
-   "type": "boolean"
-  },
-  "LastUpdateDate": {
-   "anyOf": [
-    {
-     "format": "date-time"
-    },
-    {
-     "format": "timestamp"
-    }
-   ],
-   "type": "string"
-  },
-  "Name": {
-   "maxLength": 255,
-   "minLength": 1,
-   "type": "string"
-  },
-  "OutputFormat": {
-   "enum": [
-    "json",
-    "opentelemetry0.7",
-    "opentelemetry1.0"
-   ],
-   "maxLength": 255,
-   "minLength": 1,
-   "type": "string"
-  },
-  "RoleArn": {
-   "maxLength": 2048,
-   "minLength": 20,
-   "type": "string"
-  },
-  "State": {
-   "maxLength": 255,
-   "minLength": 1,
-   "type": "string"
-  },
-  "StatisticsConfigurations": {
-   "items": {
-    "$ref": "#/definitions/MetricStreamStatisticsConfiguration"
-   },
-   "maxItems": 100,
-   "type": "array",
-   "uniqueItems": true
-  },
-  "Tags": {
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 50,
-   "type": "array",
-   "uniqueItems": true
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/CreationDate",
-  "/properties/LastUpdateDate",
-  "/properties/State"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-cloudwatch.git",
- "taggable": true,
- "typeName": "AWS::CloudWatch::MetricStream",
- "writeOnlyProperties": [
-  "/properties/Tags"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/eu_south_1/aws-ec2-capacityreservation.json b/src/cfnlint/data/schemas/providers/eu_south_1/aws-ec2-capacityreservation.json
deleted file mode 100644
index 5a10969ce5..0000000000
--- a/src/cfnlint/data/schemas/providers/eu_south_1/aws-ec2-capacityreservation.json
+++ /dev/null
@@ -1,250 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/Tenancy",
-  "/properties/InstancePlatform",
-  "/properties/InstanceType",
-  "/properties/AvailabilityZone",
-  "/properties/TagSpecifications",
-  "/properties/OutPostArn",
-  "/properties/EphemeralStorage",
-  "/properties/EbsOptimized",
-  "/properties/PlacementGroupArn"
- ],
- "definitions": {
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "type": "string"
-    },
-    "Value": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "TagSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "ResourceType": {
-     "enum": [
-      "capacity-reservation",
-      "capacity-reservation-fleet",
-      "carrier-gateway",
-      "client-vpn-endpoint",
-      "coip-pool",
-      "customer-gateway",
-      "declarative-policies-report",
-      "dedicated-host",
-      "dhcp-options",
-      "egress-only-internet-gateway",
-      "elastic-gpu",
-      "elastic-ip",
-      "export-image-task",
-      "export-instance-task",
-      "fleet",
-      "fpga-image",
-      "host-reservation",
-      "image",
-      "import-image-task",
-      "import-snapshot-task",
-      "instance",
-      "instance-connect-endpoint",
-      "instance-event-window",
-      "internet-gateway",
-      "ipam",
-      "ipam-external-resource-verification-token",
-      "ipam-pool",
-      "ipam-resource-discovery",
-      "ipam-resource-discovery-association",
-      "ipam-scope",
-      "ipv4pool-ec2",
-      "ipv6pool-ec2",
-      "key-pair",
-      "launch-template",
-      "local-gateway",
-      "local-gateway-route-table",
-      "local-gateway-route-table-virtual-interface-group-association",
-      "local-gateway-route-table-vpc-association",
-      "local-gateway-virtual-interface",
-      "local-gateway-virtual-interface-group",
-      "natgateway",
-      "network-acl",
-      "network-insights-access-scope",
-      "network-insights-access-scope-analysis",
-      "network-insights-analysis",
-      "network-insights-path",
-      "network-interface",
-      "placement-group",
-      "prefix-list",
-      "replace-root-volume-task",
-      "reserved-instances",
-      "route-table",
-      "security-group",
-      "security-group-rule",
-      "snapshot",
-      "spot-fleet-request",
-      "spot-instances-request",
-      "subnet",
-      "subnet-cidr-reservation",
-      "traffic-mirror-filter",
-      "traffic-mirror-filter-rule",
-      "traffic-mirror-session",
-      "traffic-mirror-target",
-      "transit-gateway",
-      "transit-gateway-attachment",
-      "transit-gateway-connect-peer",
-      "transit-gateway-multicast-domain",
-      "transit-gateway-policy-table",
-      "transit-gateway-route-table",
-      "transit-gateway-route-table-announcement",
-      "verified-access-endpoint",
-      "verified-access-endpoint-target",
-      "verified-access-group",
-      "verified-access-instance",
-      "verified-access-policy",
-      "verified-access-trust-provider",
-      "volume",
-      "vpc",
-      "vpc-block-public-access-exclusion",
-      "vpc-endpoint",
-      "vpc-endpoint-connection",
-      "vpc-endpoint-connection-device-type",
-      "vpc-endpoint-service",
-      "vpc-endpoint-service-permission",
-      "vpc-flow-log",
-      "vpc-peering-connection",
-      "vpn-connection",
-      "vpn-connection-device-type",
-      "vpn-gateway"
-     ],
-     "type": "string"
-    },
-    "Tags": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Tag"
-     },
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "AvailabilityZone": {
-   "type": "string"
-  },
-  "AvailableInstanceCount": {
-   "type": "integer"
-  },
-  "EbsOptimized": {
-   "type": "boolean"
-  },
-  "EndDate": {
-   "type": "string"
-  },
-  "EndDateType": {
-   "enum": [
-    "limited",
-    "unlimited"
-   ],
-   "type": "string"
-  },
-  "EphemeralStorage": {
-   "type": "boolean"
-  },
-  "Id": {
-   "type": "string"
-  },
-  "InstanceCount": {
-   "type": "integer"
-  },
-  "InstanceMatchCriteria": {
-   "enum": [
-    "open",
-    "targeted"
-   ],
-   "type": "string"
-  },
-  "InstancePlatform": {
-   "enum": [
-    "Linux with SQL Server Enterprise",
-    "Linux with SQL Server Standard",
-    "Linux with SQL Server Web",
-    "Linux/UNIX",
-    "RHEL with HA",
-    "RHEL with HA and SQL Server Enterprise",
-    "RHEL with HA and SQL Server Standard",
-    "RHEL with SQL Server Enterprise",
-    "RHEL with SQL Server Standard",
-    "RHEL with SQL Server Web",
-    "Red Hat Enterprise Linux",
-    "SUSE Linux",
-    "Ubuntu Pro",
-    "Windows",
-    "Windows with SQL Server",
-    "Windows with SQL Server Enterprise",
-    "Windows with SQL Server Standard",
-    "Windows with SQL Server Web"
-   ],
-   "type": "string"
-  },
-  "InstanceType": {
-   "type": "string"
-  },
-  "OutPostArn": {
-   "pattern": "^arn:aws([a-z-]+)?:outposts:[a-z\\d-]+:\\d{12}:outpost/op-[a-f0-9]{17}$",
-   "type": "string"
-  },
-  "PlacementGroupArn": {
-   "pattern": "^arn:aws([a-z-]+)?:ec2:[a-z\\d-]+:\\d{12}:placement-group/^.{1,255}$",
-   "type": "string"
-  },
-  "TagSpecifications": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/TagSpecification"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "Tenancy": {
-   "enum": [
-    "dedicated",
-    "default"
-   ],
-   "type": "string"
-  },
-  "TotalInstanceCount": {
-   "type": "integer"
-  },
-  "UnusedReservationBillingOwnerId": {
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id",
-  "/properties/AvailableInstanceCount",
-  "/properties/TotalInstanceCount"
- ],
- "required": [
-  "InstanceCount",
-  "AvailabilityZone",
-  "InstancePlatform",
-  "InstanceType"
- ],
- "typeName": "AWS::EC2::CapacityReservation",
- "writeOnlyProperties": [
-  "/properties/UnusedReservationBillingOwnerId"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/eu_south_2/__init__.py b/src/cfnlint/data/schemas/providers/eu_south_2/__init__.py
index cc8b0076d8..bef46493cc 100644
--- a/src/cfnlint/data/schemas/providers/eu_south_2/__init__.py
+++ b/src/cfnlint/data/schemas/providers/eu_south_2/__init__.py
@@ -932,6 +932,7 @@
     "aws-dynamodb-table.json",
     "aws-ec2-capacityreservation.json",
     "aws-ec2-capacityreservationfleet.json",
+    "aws-ec2-clientvpnendpoint.json",
     "aws-ec2-clientvpnroute.json",
     "aws-ec2-clientvpntargetnetworkassociation.json",
     "aws-ec2-customergateway.json",
@@ -1007,6 +1008,7 @@
     "aws-ec2-vpcendpointservicepermissions.json",
     "aws-ec2-vpcgatewayattachment.json",
     "aws-ec2-vpcpeeringconnection.json",
+    "aws-ec2-vpnconnection.json",
     "aws-ec2-vpnconnectionroute.json",
     "aws-ec2-vpngateway.json",
     "aws-ecr-pullthroughcacherule.json",
@@ -1069,6 +1071,7 @@
     "aws-fis-experimenttemplate.json",
     "aws-fis-targetaccountconfiguration.json",
     "aws-fms-notificationchannel.json",
+    "aws-fms-policy.json",
     "aws-fms-resourceset.json",
     "aws-fsx-datarepositoryassociation.json",
     "aws-fsx-filesystem.json",
@@ -1292,6 +1295,7 @@
     "aws-s3objectlambda-accesspointpolicy.json",
     "aws-sagemaker-app.json",
     "aws-sagemaker-appimageconfig.json",
+    "aws-sagemaker-domain.json",
     "aws-sagemaker-featuregroup.json",
     "aws-sagemaker-image.json",
     "aws-sagemaker-imageversion.json",
@@ -1303,6 +1307,7 @@
     "aws-sagemaker-project.json",
     "aws-sagemaker-space.json",
     "aws-sagemaker-studiolifecycleconfig.json",
+    "aws-sagemaker-userprofile.json",
     "aws-scheduler-schedule.json",
     "aws-scheduler-schedulegroup.json",
     "aws-sdb-domain.json",
diff --git a/src/cfnlint/data/schemas/providers/eu_south_2/aws-ec2-clientvpnendpoint.json b/src/cfnlint/data/schemas/providers/eu_south_2/aws-ec2-clientvpnendpoint.json
deleted file mode 100644
index f6410e35e5..0000000000
--- a/src/cfnlint/data/schemas/providers/eu_south_2/aws-ec2-clientvpnendpoint.json
+++ /dev/null
@@ -1,240 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/TransportProtocol",
-  "/properties/ClientCidrBlock",
-  "/properties/TagSpecifications",
-  "/properties/AuthenticationOptions"
- ],
- "definitions": {
-  "CertificateAuthenticationRequest": {
-   "additionalProperties": false,
-   "properties": {
-    "ClientRootCertificateChainArn": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "ClientRootCertificateChainArn"
-   ],
-   "type": "object"
-  },
-  "ClientAuthenticationRequest": {
-   "additionalProperties": false,
-   "properties": {
-    "ActiveDirectory": {
-     "$ref": "#/definitions/DirectoryServiceAuthenticationRequest"
-    },
-    "FederatedAuthentication": {
-     "$ref": "#/definitions/FederatedAuthenticationRequest"
-    },
-    "MutualAuthentication": {
-     "$ref": "#/definitions/CertificateAuthenticationRequest"
-    },
-    "Type": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "ClientConnectOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "Enabled": {
-     "type": "boolean"
-    },
-    "LambdaFunctionArn": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "Enabled"
-   ],
-   "type": "object"
-  },
-  "ClientLoginBannerOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "BannerText": {
-     "type": "string"
-    },
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "required": [
-    "Enabled"
-   ],
-   "type": "object"
-  },
-  "ConnectionLogOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "CloudwatchLogGroup": {
-     "type": "string"
-    },
-    "CloudwatchLogStream": {
-     "type": "string"
-    },
-    "Enabled": {
-     "type": "boolean"
-    }
-   },
-   "required": [
-    "Enabled"
-   ],
-   "type": "object"
-  },
-  "DirectoryServiceAuthenticationRequest": {
-   "additionalProperties": false,
-   "properties": {
-    "DirectoryId": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "DirectoryId"
-   ],
-   "type": "object"
-  },
-  "FederatedAuthenticationRequest": {
-   "additionalProperties": false,
-   "properties": {
-    "SAMLProviderArn": {
-     "type": "string"
-    },
-    "SelfServiceSAMLProviderArn": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "SAMLProviderArn"
-   ],
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "type": "string"
-    },
-    "Value": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "TagSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "ResourceType": {
-     "type": "string"
-    },
-    "Tags": {
-     "items": {
-      "$ref": "#/definitions/Tag"
-     },
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "required": [
-    "ResourceType",
-    "Tags"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "AuthenticationOptions": {
-   "items": {
-    "$ref": "#/definitions/ClientAuthenticationRequest"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "ClientCidrBlock": {
-   "type": "string"
-  },
-  "ClientConnectOptions": {
-   "$ref": "#/definitions/ClientConnectOptions"
-  },
-  "ClientLoginBannerOptions": {
-   "$ref": "#/definitions/ClientLoginBannerOptions"
-  },
-  "ConnectionLogOptions": {
-   "$ref": "#/definitions/ConnectionLogOptions"
-  },
-  "Description": {
-   "type": "string"
-  },
-  "DnsServers": {
-   "items": {
-    "type": "string"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "Id": {
-   "type": "string"
-  },
-  "SecurityGroupIds": {
-   "format": "AWS::EC2::SecurityGroup.Ids",
-   "items": {
-    "format": "AWS::EC2::SecurityGroup.Id",
-    "type": "string"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "SelfServicePortal": {
-   "type": "string"
-  },
-  "ServerCertificateArn": {
-   "type": "string"
-  },
-  "SessionTimeoutHours": {
-   "type": "integer"
-  },
-  "SplitTunnel": {
-   "type": "boolean"
-  },
-  "TagSpecifications": {
-   "items": {
-    "$ref": "#/definitions/TagSpecification"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "TransportProtocol": {
-   "type": "string"
-  },
-  "VpcId": {
-   "format": "AWS::EC2::VPC.Id",
-   "type": "string"
-  },
-  "VpnPort": {
-   "type": "integer"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id"
- ],
- "required": [
-  "ClientCidrBlock",
-  "ConnectionLogOptions",
-  "AuthenticationOptions",
-  "ServerCertificateArn"
- ],
- "typeName": "AWS::EC2::ClientVpnEndpoint"
-}
diff --git a/src/cfnlint/data/schemas/providers/eu_south_2/aws-ec2-vpnconnection.json b/src/cfnlint/data/schemas/providers/eu_south_2/aws-ec2-vpnconnection.json
deleted file mode 100644
index 5f9a8ac704..0000000000
--- a/src/cfnlint/data/schemas/providers/eu_south_2/aws-ec2-vpnconnection.json
+++ /dev/null
@@ -1,384 +0,0 @@
-{
- "$schema": "https://raw.githubusercontent.com/aws-cloudformation/cloudformation-resource-schema/blob/master/src/main/resources/schema/provider.definition.schema.v1.json",
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/Type",
-  "/properties/CustomerGatewayId",
-  "/properties/VpnGatewayId",
-  "/properties/TransitGatewayId",
-  "/properties/EnableAcceleration",
-  "/properties/LocalIpv4NetworkCidr",
-  "/properties/LocalIpv6NetworkCidr",
-  "/properties/OutsideIpAddressType",
-  "/properties/RemoteIpv4NetworkCidr",
-  "/properties/RemoteIpv6NetworkCidr",
-  "/properties/StaticRoutesOnly",
-  "/properties/TransportTransitGatewayAttachmentId",
-  "/properties/TunnelInsideIpVersion",
-  "/properties/VpnTunnelOptionsSpecifications"
- ],
- "definitions": {
-  "CloudwatchLogOptionsSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "LogEnabled": {
-     "type": "boolean"
-    },
-    "LogGroupArn": {
-     "type": "string"
-    },
-    "LogOutputFormat": {
-     "enum": [
-      "json",
-      "text"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "IKEVersionsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "ikev1",
-      "ikev2"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Phase1DHGroupNumbersRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      2,
-      14,
-      15,
-      16,
-      17,
-      18,
-      19,
-      20,
-      21,
-      22,
-      23,
-      24
-     ],
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "Phase1EncryptionAlgorithmsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "AES128",
-      "AES256",
-      "AES128-GCM-16",
-      "AES256-GCM-16"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Phase1IntegrityAlgorithmsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "SHA1",
-      "SHA2-256",
-      "SHA2-384",
-      "SHA2-512"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Phase2DHGroupNumbersRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      2,
-      5,
-      14,
-      15,
-      16,
-      17,
-      18,
-      19,
-      20,
-      21,
-      22,
-      23,
-      24
-     ],
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "Phase2EncryptionAlgorithmsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "AES128",
-      "AES256",
-      "AES128-GCM-16",
-      "AES256-GCM-16"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Phase2IntegrityAlgorithmsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "SHA1",
-      "SHA2-256",
-      "SHA2-384",
-      "SHA2-512"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "type": "string"
-    },
-    "Value": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "VpnTunnelLogOptionsSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "CloudwatchLogOptions": {
-     "$ref": "#/definitions/CloudwatchLogOptionsSpecification"
-    }
-   },
-   "type": "object"
-  },
-  "VpnTunnelOptionsSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "DPDTimeoutAction": {
-     "enum": [
-      "clear",
-      "none",
-      "restart"
-     ],
-     "type": "string"
-    },
-    "DPDTimeoutSeconds": {
-     "minimum": 30,
-     "type": "integer"
-    },
-    "EnableTunnelLifecycleControl": {
-     "type": "boolean"
-    },
-    "IKEVersions": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/IKEVersionsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "LogOptions": {
-     "$ref": "#/definitions/VpnTunnelLogOptionsSpecification"
-    },
-    "Phase1DHGroupNumbers": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase1DHGroupNumbersRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase1EncryptionAlgorithms": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase1EncryptionAlgorithmsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase1IntegrityAlgorithms": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase1IntegrityAlgorithmsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase1LifetimeSeconds": {
-     "maximum": 28800,
-     "minimum": 900,
-     "type": "integer"
-    },
-    "Phase2DHGroupNumbers": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase2DHGroupNumbersRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase2EncryptionAlgorithms": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase2EncryptionAlgorithmsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase2IntegrityAlgorithms": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase2IntegrityAlgorithmsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase2LifetimeSeconds": {
-     "maximum": 3600,
-     "minimum": 900,
-     "type": "integer"
-    },
-    "PreSharedKey": {
-     "type": "string"
-    },
-    "RekeyFuzzPercentage": {
-     "maximum": 100,
-     "minimum": 0,
-     "type": "integer"
-    },
-    "RekeyMarginTimeSeconds": {
-     "minimum": 60,
-     "type": "integer"
-    },
-    "ReplayWindowSize": {
-     "maximum": 2048,
-     "minimum": 64,
-     "type": "integer"
-    },
-    "StartupAction": {
-     "enum": [
-      "add",
-      "start"
-     ],
-     "type": "string"
-    },
-    "TunnelInsideCidr": {
-     "type": "string"
-    },
-    "TunnelInsideIpv6Cidr": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/VpnConnectionId"
- ],
- "properties": {
-  "CustomerGatewayId": {
-   "type": "string"
-  },
-  "EnableAcceleration": {
-   "type": "boolean"
-  },
-  "LocalIpv4NetworkCidr": {
-   "type": "string"
-  },
-  "LocalIpv6NetworkCidr": {
-   "type": "string"
-  },
-  "OutsideIpAddressType": {
-   "type": "string"
-  },
-  "RemoteIpv4NetworkCidr": {
-   "type": "string"
-  },
-  "RemoteIpv6NetworkCidr": {
-   "type": "string"
-  },
-  "StaticRoutesOnly": {
-   "type": "boolean"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "TransitGatewayId": {
-   "type": "string"
-  },
-  "TransportTransitGatewayAttachmentId": {
-   "type": "string"
-  },
-  "TunnelInsideIpVersion": {
-   "type": "string"
-  },
-  "Type": {
-   "type": "string"
-  },
-  "VpnConnectionId": {
-   "type": "string"
-  },
-  "VpnGatewayId": {
-   "type": "string"
-  },
-  "VpnTunnelOptionsSpecifications": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/VpnTunnelOptionsSpecification"
-   },
-   "type": "array",
-   "uniqueItems": false
-  }
- },
- "readOnlyProperties": [
-  "/properties/VpnConnectionId"
- ],
- "required": [
-  "Type",
-  "CustomerGatewayId"
- ],
- "tagging": {
-  "cloudFormationSystemTags": false,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::EC2::VPNConnection"
-}
diff --git a/src/cfnlint/data/schemas/providers/eu_south_2/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/eu_south_2/aws-fms-policy.json
deleted file mode 100644
index 8422693828..0000000000
--- a/src/cfnlint/data/schemas/providers/eu_south_2/aws-fms-policy.json
+++ /dev/null
@@ -1,416 +0,0 @@
-{
- "additionalProperties": false,
- "definitions": {
-  "AccountId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^([0-9]*)$",
-   "type": "string"
-  },
-  "Base62Id": {
-   "maxLength": 22,
-   "minLength": 22,
-   "pattern": "^[a-z0-9A-Z]{22}$",
-   "type": "string"
-  },
-  "FirewallDeploymentModel": {
-   "enum": [
-    "DISTRIBUTED",
-    "CENTRALIZED"
-   ],
-   "type": "string"
-  },
-  "IEMap": {
-   "additionalProperties": false,
-   "properties": {
-    "ACCOUNT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/AccountId"
-     },
-     "type": "array"
-    },
-    "ORGUNIT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/OrganizationalUnitId"
-     },
-     "type": "array"
-    }
-   },
-   "type": "object"
-  },
-  "ManagedServiceData": {
-   "maxLength": 30000,
-   "minLength": 1,
-   "type": "string"
-  },
-  "NetworkAclCommonPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "NetworkAclEntrySet": {
-     "$ref": "#/definitions/NetworkAclEntrySet"
-    }
-   },
-   "required": [
-    "NetworkAclEntrySet"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntry": {
-   "additionalProperties": false,
-   "properties": {
-    "CidrBlock": {
-     "pattern": "^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(\\/([0-9]|[1-2][0-9]|3[0-2]))$",
-     "type": "string"
-    },
-    "Egress": {
-     "type": "boolean"
-    },
-    "IcmpTypeCode": {
-     "additionalProperties": false,
-     "properties": {
-      "Code": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "Type": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "Code",
-      "Type"
-     ],
-     "type": "object"
-    },
-    "Ipv6CidrBlock": {
-     "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))(/(1[0-2]|[0-9]))?$",
-     "type": "string"
-    },
-    "PortRange": {
-     "additionalProperties": false,
-     "properties": {
-      "From": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "To": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "From",
-      "To"
-     ],
-     "type": "object"
-    },
-    "Protocol": {
-     "pattern": "^(tcp|udp|icmp|-1|([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))$",
-     "type": "string"
-    },
-    "RuleAction": {
-     "enum": [
-      "allow",
-      "deny"
-     ],
-     "type": "string"
-    }
-   },
-   "required": [
-    "Egress",
-    "Protocol",
-    "RuleAction"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntryList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/NetworkAclEntry"
-   },
-   "type": "array"
-  },
-  "NetworkAclEntrySet": {
-   "additionalProperties": false,
-   "anyOf": [
-    {
-     "required": [
-      "FirstEntries"
-     ]
-    },
-    {
-     "required": [
-      "LastEntries"
-     ]
-    }
-   ],
-   "properties": {
-    "FirstEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    },
-    "ForceRemediateForFirstEntries": {
-     "type": "boolean"
-    },
-    "ForceRemediateForLastEntries": {
-     "type": "boolean"
-    },
-    "LastEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    }
-   },
-   "required": [
-    "ForceRemediateForFirstEntries",
-    "ForceRemediateForLastEntries"
-   ],
-   "type": "object"
-  },
-  "NetworkFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  },
-  "OrganizationalUnitId": {
-   "maxLength": 68,
-   "minLength": 16,
-   "pattern": "^(ou-[0-9a-z]{4,32}-[a-z0-9]{8,32})$",
-   "type": "string"
-  },
-  "PolicyOption": {
-   "additionalProperties": false,
-   "oneOf": [
-    {
-     "required": [
-      "NetworkFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "ThirdPartyFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "NetworkAclCommonPolicy"
-     ]
-    }
-   ],
-   "properties": {
-    "NetworkAclCommonPolicy": {
-     "$ref": "#/definitions/NetworkAclCommonPolicy"
-    },
-    "NetworkFirewallPolicy": {
-     "$ref": "#/definitions/NetworkFirewallPolicy"
-    },
-    "ThirdPartyFirewallPolicy": {
-     "$ref": "#/definitions/ThirdPartyFirewallPolicy"
-    }
-   },
-   "type": "object"
-  },
-  "PolicyTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "PolicyType": {
-   "enum": [
-    "WAF",
-    "WAFV2",
-    "SHIELD_ADVANCED",
-    "SECURITY_GROUPS_COMMON",
-    "SECURITY_GROUPS_CONTENT_AUDIT",
-    "SECURITY_GROUPS_USAGE_AUDIT",
-    "NETWORK_FIREWALL",
-    "THIRD_PARTY_FIREWALL",
-    "DNS_FIREWALL",
-    "IMPORT_NETWORK_FIREWALL",
-    "NETWORK_ACL_COMMON"
-   ],
-   "type": "string"
-  },
-  "ResourceArn": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "ResourceTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key"
-   ],
-   "type": "object"
-  },
-  "ResourceType": {
-   "maxLength": 128,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "SecurityServicePolicyData": {
-   "additionalProperties": false,
-   "properties": {
-    "ManagedServiceData": {
-     "$ref": "#/definitions/ManagedServiceData"
-    },
-    "PolicyOption": {
-     "$ref": "#/definitions/PolicyOption"
-    },
-    "Type": {
-     "$ref": "#/definitions/PolicyType"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "ThirdPartyFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "Arn": {
-   "$ref": "#/definitions/ResourceArn"
-  },
-  "DeleteAllPolicyResources": {
-   "type": "boolean"
-  },
-  "ExcludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "ExcludeResourceTags": {
-   "type": "boolean"
-  },
-  "Id": {
-   "maxLength": 36,
-   "minLength": 36,
-   "pattern": "^[a-z0-9A-Z-]{36}$",
-   "type": "string"
-  },
-  "IncludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "PolicyDescription": {
-   "maxLength": 256,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "PolicyName": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "RemediationEnabled": {
-   "type": "boolean"
-  },
-  "ResourceSetIds": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/Base62Id"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "ResourceTags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceTag"
-   },
-   "maxItems": 8,
-   "type": "array"
-  },
-  "ResourceType": {
-   "$ref": "#/definitions/ResourceType"
-  },
-  "ResourceTypeList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceType"
-   },
-   "type": "array"
-  },
-  "ResourcesCleanUp": {
-   "type": "boolean"
-  },
-  "SecurityServicePolicyData": {
-   "$ref": "#/definitions/SecurityServicePolicyData"
-  },
-  "Tags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/PolicyTag"
-   },
-   "type": "array"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/Id"
- ],
- "required": [
-  "ExcludeResourceTags",
-  "PolicyName",
-  "RemediationEnabled",
-  "SecurityServicePolicyData"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-fms.git",
- "typeName": "AWS::FMS::Policy",
- "writeOnlyProperties": [
-  "/properties/DeleteAllPolicyResources"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/eu_south_2/aws-sagemaker-domain.json b/src/cfnlint/data/schemas/providers/eu_south_2/aws-sagemaker-domain.json
deleted file mode 100644
index 69e42e460e..0000000000
--- a/src/cfnlint/data/schemas/providers/eu_south_2/aws-sagemaker-domain.json
+++ /dev/null
@@ -1,905 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/AuthMode",
-  "/properties/DomainName",
-  "/properties/DomainSettings/RStudioServerProDomainSettings/DefaultResourceSpec",
-  "/properties/KmsKeyId",
-  "/properties/VpcId",
-  "/properties/Tags"
- ],
- "definitions": {
-  "AppLifecycleManagement": {
-   "additionalProperties": false,
-   "properties": {
-    "IdleSettings": {
-     "$ref": "#/definitions/IdleSettings"
-    }
-   },
-   "type": "object"
-  },
-  "AppType": {
-   "enum": [
-    "JupyterServer",
-    "TensorBoard",
-    "RStudioServerPro",
-    "JupyterLab",
-    "CodeEditor",
-    "DetailedProfiler",
-    "Canvas"
-   ],
-   "type": "string"
-  },
-  "CodeEditorAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "AppLifecycleManagement": {
-     "$ref": "#/definitions/AppLifecycleManagement"
-    },
-    "CustomImages": {
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 200,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "CodeRepository": {
-   "additionalProperties": false,
-   "properties": {
-    "RepositoryUrl": {
-     "maxLength": 256,
-     "pattern": "^https://([.\\-_a-zA-Z0-9]+/?){3,1016}$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "RepositoryUrl"
-   ],
-   "type": "object"
-  },
-  "CustomFileSystemConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "EFSFileSystemConfig": {
-     "$ref": "#/definitions/EFSFileSystemConfig"
-    },
-    "FSxLustreFileSystemConfig": {
-     "$ref": "#/definitions/FSxLustreFileSystemConfig"
-    }
-   },
-   "type": "object"
-  },
-  "CustomImage": {
-   "additionalProperties": false,
-   "properties": {
-    "AppImageConfigName": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}",
-     "type": "string"
-    },
-    "ImageName": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9]([-.]?[a-zA-Z0-9]){0,62}$",
-     "type": "string"
-    },
-    "ImageVersionNumber": {
-     "minimum": 0,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "AppImageConfigName",
-    "ImageName"
-   ],
-   "type": "object"
-  },
-  "CustomPosixUserConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "Gid": {
-     "maximum": 4000000,
-     "minimum": 1001,
-     "type": "integer"
-    },
-    "Uid": {
-     "maximum": 4000000,
-     "minimum": 10000,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "Uid",
-    "Gid"
-   ],
-   "type": "object"
-  },
-  "DefaultEbsStorageSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultEbsVolumeSizeInGb": {
-     "$ref": "#/definitions/SpaceEbsVolumeSizeInGb"
-    },
-    "MaximumEbsVolumeSizeInGb": {
-     "$ref": "#/definitions/SpaceEbsVolumeSizeInGb"
-    }
-   },
-   "required": [
-    "DefaultEbsVolumeSizeInGb",
-    "MaximumEbsVolumeSizeInGb"
-   ],
-   "type": "object"
-  },
-  "DefaultSpaceSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomFileSystemConfigs": {
-     "items": {
-      "$ref": "#/definitions/CustomFileSystemConfig"
-     },
-     "maxItems": 2,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "CustomPosixUserConfig": {
-     "$ref": "#/definitions/CustomPosixUserConfig"
-    },
-    "ExecutionRole": {
-     "maxLength": 2048,
-     "minLength": 20,
-     "pattern": "^arn:aws[a-z\\-]*:iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+$",
-     "type": "string"
-    },
-    "JupyterLabAppSettings": {
-     "$ref": "#/definitions/JupyterLabAppSettings"
-    },
-    "JupyterServerAppSettings": {
-     "$ref": "#/definitions/JupyterServerAppSettings"
-    },
-    "KernelGatewayAppSettings": {
-     "$ref": "#/definitions/KernelGatewayAppSettings"
-    },
-    "SecurityGroups": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "insertionOrder": false,
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.Id",
-      "maxLength": 32,
-      "pattern": "[-0-9a-zA-Z]+",
-      "type": "string"
-     },
-     "maxItems": 5,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "SpaceStorageSettings": {
-     "$ref": "#/definitions/DefaultSpaceStorageSettings"
-    }
-   },
-   "required": [
-    "ExecutionRole"
-   ],
-   "type": "object"
-  },
-  "DefaultSpaceStorageSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultEbsStorageSettings": {
-     "$ref": "#/definitions/DefaultEbsStorageSettings"
-    }
-   },
-   "type": "object"
-  },
-  "DockerSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "EnableDockerAccess": {
-     "enum": [
-      "ENABLED",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "VpcOnlyTrustedAccounts": {
-     "insertionOrder": false,
-     "items": {
-      "maxLength": 12,
-      "minLength": 12,
-      "pattern": "^\\d+$",
-      "type": "string"
-     },
-     "maxItems": 20,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "DomainSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DockerSettings": {
-     "$ref": "#/definitions/DockerSettings"
-    },
-    "ExecutionRoleIdentityConfig": {
-     "enum": [
-      "USER_PROFILE_NAME",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "RStudioServerProDomainSettings": {
-     "$ref": "#/definitions/RStudioServerProDomainSettings"
-    },
-    "SecurityGroupIds": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "insertionOrder": false,
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.Id",
-      "maxLength": 32,
-      "pattern": "[-0-9a-zA-Z]+",
-      "type": "string"
-     },
-     "maxItems": 3,
-     "minItems": 1,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "EFSFileSystemConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "FileSystemId": {
-     "maxLength": 21,
-     "minLength": 11,
-     "pattern": "^(fs-[0-9a-f]{8,})$",
-     "type": "string"
-    },
-    "FileSystemPath": {
-     "maxLength": 256,
-     "minLength": 1,
-     "pattern": "^\\/\\S*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "FileSystemId"
-   ],
-   "type": "object"
-  },
-  "FSxLustreFileSystemConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "FileSystemId": {
-     "maxLength": 21,
-     "minLength": 11,
-     "pattern": "^(fs-[0-9a-f]{8,})$",
-     "type": "string"
-    },
-    "FileSystemPath": {
-     "maxLength": 256,
-     "minLength": 1,
-     "pattern": "^\\/\\S*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "FileSystemId"
-   ],
-   "type": "object"
-  },
-  "IdleSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "IdleTimeoutInMinutes": {
-     "$ref": "#/definitions/IdleTimeoutInMinutes"
-    },
-    "LifecycleManagement": {
-     "$ref": "#/definitions/LifecycleManagement"
-    },
-    "MaxIdleTimeoutInMinutes": {
-     "$ref": "#/definitions/MaxIdleTimeoutInMinutes"
-    },
-    "MinIdleTimeoutInMinutes": {
-     "$ref": "#/definitions/MinIdleTimeoutInMinutes"
-    }
-   },
-   "type": "object"
-  },
-  "IdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "JupyterLabAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "AppLifecycleManagement": {
-     "$ref": "#/definitions/AppLifecycleManagement"
-    },
-    "CodeRepositories": {
-     "items": {
-      "$ref": "#/definitions/CodeRepository"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "CustomImages": {
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 200,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "JupyterServerAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "KernelGatewayAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomImages": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 200,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "LifecycleManagement": {
-   "enum": [
-    "ENABLED",
-    "DISABLED"
-   ],
-   "type": "string"
-  },
-  "MaxIdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "MinIdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "MlTools": {
-   "enum": [
-    "DataWrangler",
-    "FeatureStore",
-    "EmrClusters",
-    "AutoMl",
-    "Experiments",
-    "Training",
-    "ModelEvaluation",
-    "Pipelines",
-    "Models",
-    "JumpStart",
-    "InferenceRecommender",
-    "Endpoints",
-    "Projects",
-    "InferenceOptimization",
-    "HyperPodClusters",
-    "Comet",
-    "DeepchecksLLMEvaluation",
-    "Fiddler",
-    "LakeraGuard"
-   ],
-   "type": "string"
-  },
-  "RSessionAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomImages": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 200,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    }
-   },
-   "type": "object"
-  },
-  "RStudioServerProAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "AccessStatus": {
-     "enum": [
-      "ENABLED",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "UserGroup": {
-     "enum": [
-      "R_STUDIO_ADMIN",
-      "R_STUDIO_USER"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "RStudioServerProDomainSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "DomainExecutionRoleArn": {
-     "maxLength": 2048,
-     "minLength": 20,
-     "pattern": "^arn:aws[a-z\\-]*:iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+$",
-     "type": "string"
-    },
-    "RStudioConnectUrl": {
-     "pattern": "^(https:|http:|www\\.)\\S*",
-     "type": "string"
-    },
-    "RStudioPackageManagerUrl": {
-     "pattern": "^(https:|http:|www\\.)\\S*",
-     "type": "string"
-    }
-   },
-   "required": [
-    "DomainExecutionRoleArn"
-   ],
-   "type": "object"
-  },
-  "ResourceSpec": {
-   "additionalProperties": false,
-   "properties": {
-    "InstanceType": {
-     "enum": [
-      "system",
-      "ml.t3.micro",
-      "ml.t3.small",
-      "ml.t3.medium",
-      "ml.t3.large",
-      "ml.t3.xlarge",
-      "ml.t3.2xlarge",
-      "ml.m5.large",
-      "ml.m5.xlarge",
-      "ml.m5.2xlarge",
-      "ml.m5.4xlarge",
-      "ml.m5.8xlarge",
-      "ml.m5.12xlarge",
-      "ml.m5.16xlarge",
-      "ml.m5.24xlarge",
-      "ml.c5.large",
-      "ml.c5.xlarge",
-      "ml.c5.2xlarge",
-      "ml.c5.4xlarge",
-      "ml.c5.9xlarge",
-      "ml.c5.12xlarge",
-      "ml.c5.18xlarge",
-      "ml.c5.24xlarge",
-      "ml.p3.2xlarge",
-      "ml.p3.8xlarge",
-      "ml.p3.16xlarge",
-      "ml.g4dn.xlarge",
-      "ml.g4dn.2xlarge",
-      "ml.g4dn.4xlarge",
-      "ml.g4dn.8xlarge",
-      "ml.g4dn.12xlarge",
-      "ml.g4dn.16xlarge",
-      "ml.r5.large",
-      "ml.r5.xlarge",
-      "ml.r5.2xlarge",
-      "ml.r5.4xlarge",
-      "ml.r5.8xlarge",
-      "ml.r5.12xlarge",
-      "ml.r5.16xlarge",
-      "ml.r5.24xlarge",
-      "ml.p3dn.24xlarge",
-      "ml.m5d.large",
-      "ml.m5d.xlarge",
-      "ml.m5d.2xlarge",
-      "ml.m5d.4xlarge",
-      "ml.m5d.8xlarge",
-      "ml.m5d.12xlarge",
-      "ml.m5d.16xlarge",
-      "ml.m5d.24xlarge",
-      "ml.g5.xlarge",
-      "ml.g5.2xlarge",
-      "ml.g5.4xlarge",
-      "ml.g5.8xlarge",
-      "ml.g5.12xlarge",
-      "ml.g5.16xlarge",
-      "ml.g5.24xlarge",
-      "ml.g5.48xlarge",
-      "ml.p4d.24xlarge",
-      "ml.p4de.24xlarge",
-      "ml.geospatial.interactive",
-      "ml.trn1.2xlarge",
-      "ml.trn1.32xlarge",
-      "ml.trn1n.32xlarge"
-     ],
-     "type": "string"
-    },
-    "LifecycleConfigArn": {
-     "maxLength": 256,
-     "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:studio-lifecycle-config/.*",
-     "type": "string"
-    },
-    "SageMakerImageArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws(-[\\w]+)*:sagemaker:.+:[0-9]{12}:image/[a-z0-9]([-.]?[a-z0-9])*$",
-     "type": "string"
-    },
-    "SageMakerImageVersionArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws(-[\\w]+)*:sagemaker:.+:[0-9]{12}:image-version/[a-z0-9]([-.]?[a-z0-9])*/[0-9]+$",
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SharingSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "NotebookOutputOption": {
-     "enum": [
-      "Allowed",
-      "Disabled"
-     ],
-     "type": "string"
-    },
-    "S3KmsKeyId": {
-     "maxLength": 2048,
-     "pattern": ".*",
-     "type": "string"
-    },
-    "S3OutputPath": {
-     "maxLength": 1024,
-     "pattern": "^(https|s3)://([^/]+)/?(.*)$",
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SpaceEbsVolumeSizeInGb": {
-   "maximum": 16384,
-   "minimum": 5,
-   "type": "integer"
-  },
-  "StudioLifecycleConfigArn": {
-   "maxLength": 256,
-   "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:studio-lifecycle-config/.*",
-   "type": "string"
-  },
-  "StudioWebPortalSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "HiddenAppTypes": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/AppType"
-     },
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "HiddenMlTools": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/MlTools"
-     },
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$",
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "UserSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CodeEditorAppSettings": {
-     "$ref": "#/definitions/CodeEditorAppSettings"
-    },
-    "CustomFileSystemConfigs": {
-     "items": {
-      "$ref": "#/definitions/CustomFileSystemConfig"
-     },
-     "maxItems": 2,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "CustomPosixUserConfig": {
-     "$ref": "#/definitions/CustomPosixUserConfig"
-    },
-    "DefaultLandingUri": {
-     "maxLength": 1023,
-     "type": "string"
-    },
-    "ExecutionRole": {
-     "maxLength": 2048,
-     "minLength": 20,
-     "pattern": "^arn:aws[a-z\\-]*:iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+$",
-     "type": "string"
-    },
-    "JupyterLabAppSettings": {
-     "$ref": "#/definitions/JupyterLabAppSettings"
-    },
-    "JupyterServerAppSettings": {
-     "$ref": "#/definitions/JupyterServerAppSettings"
-    },
-    "KernelGatewayAppSettings": {
-     "$ref": "#/definitions/KernelGatewayAppSettings"
-    },
-    "RSessionAppSettings": {
-     "$ref": "#/definitions/RSessionAppSettings"
-    },
-    "RStudioServerProAppSettings": {
-     "$ref": "#/definitions/RStudioServerProAppSettings"
-    },
-    "SecurityGroups": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "insertionOrder": false,
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.Id",
-      "maxLength": 32,
-      "pattern": "[-0-9a-zA-Z]+",
-      "type": "string"
-     },
-     "maxItems": 5,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "SharingSettings": {
-     "$ref": "#/definitions/SharingSettings"
-    },
-    "SpaceStorageSettings": {
-     "$ref": "#/definitions/DefaultSpaceStorageSettings"
-    },
-    "StudioWebPortal": {
-     "enum": [
-      "ENABLED",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "StudioWebPortalSettings": {
-     "$ref": "#/definitions/StudioWebPortalSettings"
-    }
-   },
-   "required": [
-    "ExecutionRole"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/DomainId"
- ],
- "properties": {
-  "AppNetworkAccessType": {
-   "enum": [
-    "PublicInternetOnly",
-    "VpcOnly"
-   ],
-   "type": "string"
-  },
-  "AppSecurityGroupManagement": {
-   "enum": [
-    "Service",
-    "Customer"
-   ],
-   "type": "string"
-  },
-  "AuthMode": {
-   "enum": [
-    "SSO",
-    "IAM"
-   ],
-   "type": "string"
-  },
-  "DefaultSpaceSettings": {
-   "$ref": "#/definitions/DefaultSpaceSettings"
-  },
-  "DefaultUserSettings": {
-   "$ref": "#/definitions/UserSettings"
-  },
-  "DomainArn": {
-   "maxLength": 256,
-   "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:domain/.*",
-   "type": "string"
-  },
-  "DomainId": {
-   "maxLength": 63,
-   "pattern": "^d-(-*[a-z0-9])+",
-   "type": "string"
-  },
-  "DomainName": {
-   "maxLength": 63,
-   "pattern": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}",
-   "type": "string"
-  },
-  "DomainSettings": {
-   "$ref": "#/definitions/DomainSettings"
-  },
-  "HomeEfsFileSystemId": {
-   "maxLength": 32,
-   "type": "string"
-  },
-  "KmsKeyId": {
-   "maxLength": 2048,
-   "pattern": ".*",
-   "type": "string"
-  },
-  "SecurityGroupIdForDomainBoundary": {
-   "maxLength": 32,
-   "pattern": "[-0-9a-zA-Z]+",
-   "type": "string"
-  },
-  "SingleSignOnApplicationArn": {
-   "pattern": "^arn:(aws|aws-us-gov|aws-cn|aws-iso|aws-iso-b):sso::[0-9]+:application/[a-zA-Z0-9-_.]+/apl-[a-zA-Z0-9]+$",
-   "type": "string"
-  },
-  "SingleSignOnManagedApplicationInstanceId": {
-   "maxLength": 256,
-   "type": "string"
-  },
-  "SubnetIds": {
-   "insertionOrder": false,
-   "items": {
-    "maxLength": 32,
-    "pattern": "[-0-9a-zA-Z]+",
-    "type": "string"
-   },
-   "maxItems": 16,
-   "minItems": 1,
-   "type": "array",
-   "uniqueItems": false
-  },
-  "TagPropagation": {
-   "enum": [
-    "ENABLED",
-    "DISABLED"
-   ],
-   "type": "string"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 50,
-   "minItems": 0,
-   "type": "array",
-   "uniqueItems": false
-  },
-  "Url": {
-   "maxLength": 1024,
-   "type": "string"
-  },
-  "VpcId": {
-   "format": "AWS::EC2::VPC.Id",
-   "maxLength": 32,
-   "pattern": "[-0-9a-zA-Z]+",
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/DomainArn",
-  "/properties/Url",
-  "/properties/DomainId",
-  "/properties/HomeEfsFileSystemId",
-  "/properties/SecurityGroupIdForDomainBoundary",
-  "/properties/SingleSignOnManagedApplicationInstanceId",
-  "/properties/SingleSignOnApplicationArn"
- ],
- "required": [
-  "AuthMode",
-  "DefaultUserSettings",
-  "DomainName",
-  "SubnetIds",
-  "VpcId"
- ],
- "typeName": "AWS::SageMaker::Domain",
- "writeOnlyProperties": [
-  "/properties/Tags"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/eu_south_2/aws-sagemaker-userprofile.json b/src/cfnlint/data/schemas/providers/eu_south_2/aws-sagemaker-userprofile.json
deleted file mode 100644
index a21ea9e798..0000000000
--- a/src/cfnlint/data/schemas/providers/eu_south_2/aws-sagemaker-userprofile.json
+++ /dev/null
@@ -1,662 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/DomainId",
-  "/properties/UserProfileName",
-  "/properties/SingleSignOnUserIdentifier",
-  "/properties/SingleSignOnUserValue",
-  "/properties/UserSettings/RStudioServerProAppSettings/AccessStatus",
-  "/properties/UserSettings/RStudioServerProAppSettings/UserGroup",
-  "/properties/Tags"
- ],
- "definitions": {
-  "AppLifecycleManagement": {
-   "additionalProperties": false,
-   "properties": {
-    "IdleSettings": {
-     "$ref": "#/definitions/IdleSettings"
-    }
-   },
-   "type": "object"
-  },
-  "AppType": {
-   "enum": [
-    "JupyterServer",
-    "TensorBoard",
-    "RStudioServerPro",
-    "JupyterLab",
-    "CodeEditor",
-    "DetailedProfiler",
-    "Canvas"
-   ],
-   "type": "string"
-  },
-  "CodeEditorAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomImages": {
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "CodeRepository": {
-   "additionalProperties": false,
-   "properties": {
-    "RepositoryUrl": {
-     "maxLength": 256,
-     "pattern": "^https://([.\\-_a-zA-Z0-9]+/?){3,1016}$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "RepositoryUrl"
-   ],
-   "type": "object"
-  },
-  "CustomFileSystemConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "EFSFileSystemConfig": {
-     "$ref": "#/definitions/EFSFileSystemConfig"
-    },
-    "FSxLustreFileSystemConfig": {
-     "$ref": "#/definitions/FSxLustreFileSystemConfig"
-    }
-   },
-   "type": "object"
-  },
-  "CustomImage": {
-   "additionalProperties": false,
-   "properties": {
-    "AppImageConfigName": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}",
-     "type": "string"
-    },
-    "ImageName": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9]([-.]?[a-zA-Z0-9]){0,62}$",
-     "type": "string"
-    },
-    "ImageVersionNumber": {
-     "minimum": 0,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "AppImageConfigName",
-    "ImageName"
-   ],
-   "type": "object"
-  },
-  "CustomPosixUserConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "Gid": {
-     "maximum": 4000000,
-     "minimum": 1001,
-     "type": "integer"
-    },
-    "Uid": {
-     "maximum": 4000000,
-     "minimum": 10000,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "Uid",
-    "Gid"
-   ],
-   "type": "object"
-  },
-  "DefaultEbsStorageSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultEbsVolumeSizeInGb": {
-     "$ref": "#/definitions/SpaceEbsVolumeSizeInGb"
-    },
-    "MaximumEbsVolumeSizeInGb": {
-     "$ref": "#/definitions/SpaceEbsVolumeSizeInGb"
-    }
-   },
-   "required": [
-    "DefaultEbsVolumeSizeInGb",
-    "MaximumEbsVolumeSizeInGb"
-   ],
-   "type": "object"
-  },
-  "DefaultSpaceStorageSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultEbsStorageSettings": {
-     "$ref": "#/definitions/DefaultEbsStorageSettings"
-    }
-   },
-   "type": "object"
-  },
-  "EFSFileSystemConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "FileSystemId": {
-     "maxLength": 21,
-     "minLength": 11,
-     "pattern": "^(fs-[0-9a-f]{8,})$",
-     "type": "string"
-    },
-    "FileSystemPath": {
-     "maxLength": 256,
-     "minLength": 1,
-     "pattern": "^\\/\\S*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "FileSystemId"
-   ],
-   "type": "object"
-  },
-  "FSxLustreFileSystemConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "FileSystemId": {
-     "maxLength": 21,
-     "minLength": 11,
-     "pattern": "^(fs-[0-9a-f]{8,})$",
-     "type": "string"
-    },
-    "FileSystemPath": {
-     "maxLength": 256,
-     "minLength": 1,
-     "pattern": "^\\/\\S*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "FileSystemId"
-   ],
-   "type": "object"
-  },
-  "IdleSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "IdleTimeoutInMinutes": {
-     "$ref": "#/definitions/IdleTimeoutInMinutes"
-    },
-    "LifecycleManagement": {
-     "$ref": "#/definitions/LifecycleManagement"
-    },
-    "MaxIdleTimeoutInMinutes": {
-     "$ref": "#/definitions/MaxIdleTimeoutInMinutes"
-    },
-    "MinIdleTimeoutInMinutes": {
-     "$ref": "#/definitions/MinIdleTimeoutInMinutes"
-    }
-   },
-   "type": "object"
-  },
-  "IdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "JupyterLabAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CodeRepositories": {
-     "items": {
-      "$ref": "#/definitions/CodeRepository"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "CustomImages": {
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "JupyterServerAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "KernelGatewayAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomImages": {
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "LifecycleManagement": {
-   "enum": [
-    "ENABLED",
-    "DISABLED"
-   ],
-   "type": "string"
-  },
-  "MaxIdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "MinIdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "MlTools": {
-   "enum": [
-    "DataWrangler",
-    "FeatureStore",
-    "EmrClusters",
-    "AutoMl",
-    "Experiments",
-    "Training",
-    "ModelEvaluation",
-    "Pipelines",
-    "Models",
-    "JumpStart",
-    "InferenceRecommender",
-    "Endpoints",
-    "Projects",
-    "InferenceOptimization",
-    "HyperPodClusters",
-    "Comet",
-    "DeepchecksLLMEvaluation",
-    "Fiddler",
-    "LakeraGuard"
-   ],
-   "type": "string"
-  },
-  "RStudioServerProAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "AccessStatus": {
-     "enum": [
-      "ENABLED",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "UserGroup": {
-     "enum": [
-      "R_STUDIO_ADMIN",
-      "R_STUDIO_USER"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ResourceSpec": {
-   "additionalProperties": false,
-   "properties": {
-    "InstanceType": {
-     "enum": [
-      "system",
-      "ml.t3.micro",
-      "ml.t3.small",
-      "ml.t3.medium",
-      "ml.t3.large",
-      "ml.t3.xlarge",
-      "ml.t3.2xlarge",
-      "ml.m5.large",
-      "ml.m5.xlarge",
-      "ml.m5.2xlarge",
-      "ml.m5.4xlarge",
-      "ml.m5.8xlarge",
-      "ml.m5.12xlarge",
-      "ml.m5.16xlarge",
-      "ml.m5.24xlarge",
-      "ml.c5.large",
-      "ml.c5.xlarge",
-      "ml.c5.2xlarge",
-      "ml.c5.4xlarge",
-      "ml.c5.9xlarge",
-      "ml.c5.12xlarge",
-      "ml.c5.18xlarge",
-      "ml.c5.24xlarge",
-      "ml.p3.2xlarge",
-      "ml.p3.8xlarge",
-      "ml.p3.16xlarge",
-      "ml.g4dn.xlarge",
-      "ml.g4dn.2xlarge",
-      "ml.g4dn.4xlarge",
-      "ml.g4dn.8xlarge",
-      "ml.g4dn.12xlarge",
-      "ml.g4dn.16xlarge",
-      "ml.r5.large",
-      "ml.r5.xlarge",
-      "ml.r5.2xlarge",
-      "ml.r5.4xlarge",
-      "ml.r5.8xlarge",
-      "ml.r5.12xlarge",
-      "ml.r5.16xlarge",
-      "ml.r5.24xlarge",
-      "ml.p3dn.24xlarge",
-      "ml.m5d.large",
-      "ml.m5d.xlarge",
-      "ml.m5d.2xlarge",
-      "ml.m5d.4xlarge",
-      "ml.m5d.8xlarge",
-      "ml.m5d.12xlarge",
-      "ml.m5d.16xlarge",
-      "ml.m5d.24xlarge",
-      "ml.g5.xlarge",
-      "ml.g5.2xlarge",
-      "ml.g5.4xlarge",
-      "ml.g5.8xlarge",
-      "ml.g5.12xlarge",
-      "ml.g5.16xlarge",
-      "ml.g5.24xlarge",
-      "ml.g5.48xlarge",
-      "ml.p4d.24xlarge",
-      "ml.p4de.24xlarge",
-      "ml.geospatial.interactive",
-      "ml.trn1.2xlarge",
-      "ml.trn1.32xlarge",
-      "ml.trn1n.32xlarge"
-     ],
-     "type": "string"
-    },
-    "LifecycleConfigArn": {
-     "maxLength": 256,
-     "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:studio-lifecycle-config/.*",
-     "type": "string"
-    },
-    "SageMakerImageArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws(-[\\w]+)*:sagemaker:.+:[0-9]{12}:image/[a-z0-9]([-.]?[a-z0-9])*$",
-     "type": "string"
-    },
-    "SageMakerImageVersionArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws(-[\\w]+)*:sagemaker:.+:[0-9]{12}:image-version/[a-z0-9]([-.]?[a-z0-9])*/[0-9]+$",
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SharingSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "NotebookOutputOption": {
-     "enum": [
-      "Allowed",
-      "Disabled"
-     ],
-     "type": "string"
-    },
-    "S3KmsKeyId": {
-     "maxLength": 2048,
-     "pattern": ".*",
-     "type": "string"
-    },
-    "S3OutputPath": {
-     "maxLength": 1024,
-     "pattern": "^(https|s3)://([^/]+)/?(.*)$",
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SpaceEbsVolumeSizeInGb": {
-   "maximum": 16384,
-   "minimum": 5,
-   "type": "integer"
-  },
-  "StudioLifecycleConfigArn": {
-   "maxLength": 256,
-   "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:studio-lifecycle-config/.*",
-   "type": "string"
-  },
-  "StudioWebPortalSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "HiddenAppTypes": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/AppType"
-     },
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "HiddenMlTools": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/MlTools"
-     },
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$",
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "UserSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CodeEditorAppSettings": {
-     "$ref": "#/definitions/CodeEditorAppSettings"
-    },
-    "CustomFileSystemConfigs": {
-     "items": {
-      "$ref": "#/definitions/CustomFileSystemConfig"
-     },
-     "maxItems": 2,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "CustomPosixUserConfig": {
-     "$ref": "#/definitions/CustomPosixUserConfig"
-    },
-    "DefaultLandingUri": {
-     "maxLength": 1023,
-     "type": "string"
-    },
-    "ExecutionRole": {
-     "maxLength": 2048,
-     "minLength": 20,
-     "pattern": "^arn:aws[a-z\\-]*:iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+$",
-     "type": "string"
-    },
-    "JupyterLabAppSettings": {
-     "$ref": "#/definitions/JupyterLabAppSettings"
-    },
-    "JupyterServerAppSettings": {
-     "$ref": "#/definitions/JupyterServerAppSettings"
-    },
-    "KernelGatewayAppSettings": {
-     "$ref": "#/definitions/KernelGatewayAppSettings"
-    },
-    "RStudioServerProAppSettings": {
-     "$ref": "#/definitions/RStudioServerProAppSettings"
-    },
-    "SecurityGroups": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.Id",
-      "maxLength": 32,
-      "pattern": "[-0-9a-zA-Z]+",
-      "type": "string"
-     },
-     "maxItems": 5,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "SharingSettings": {
-     "$ref": "#/definitions/SharingSettings"
-    },
-    "SpaceStorageSettings": {
-     "$ref": "#/definitions/DefaultSpaceStorageSettings"
-    },
-    "StudioWebPortal": {
-     "enum": [
-      "ENABLED",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "StudioWebPortalSettings": {
-     "$ref": "#/definitions/StudioWebPortalSettings"
-    }
-   },
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/UserProfileName",
-  "/properties/DomainId"
- ],
- "properties": {
-  "DomainId": {
-   "maxLength": 63,
-   "minLength": 1,
-   "pattern": "^d-(-*[a-z0-9]){1,61}",
-   "type": "string"
-  },
-  "SingleSignOnUserIdentifier": {
-   "pattern": "UserName",
-   "type": "string"
-  },
-  "SingleSignOnUserValue": {
-   "maxLength": 256,
-   "minLength": 1,
-   "type": "string"
-  },
-  "Tags": {
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 50,
-   "minItems": 0,
-   "type": "array",
-   "uniqueItems": false
-  },
-  "UserProfileArn": {
-   "maxLength": 256,
-   "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:user-profile/.*",
-   "type": "string"
-  },
-  "UserProfileName": {
-   "maxLength": 63,
-   "minLength": 1,
-   "pattern": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}",
-   "type": "string"
-  },
-  "UserSettings": {
-   "$ref": "#/definitions/UserSettings",
-   "maxItems": 50,
-   "minItems": 0,
-   "uniqueItems": false
-  }
- },
- "readOnlyProperties": [
-  "/properties/UserProfileArn"
- ],
- "required": [
-  "DomainId",
-  "UserProfileName"
- ],
- "typeName": "AWS::SageMaker::UserProfile",
- "writeOnlyProperties": [
-  "/properties/Tags"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/eu_west_1/__init__.py b/src/cfnlint/data/schemas/providers/eu_west_1/__init__.py
index 93ce1b6488..45d443d749 100644
--- a/src/cfnlint/data/schemas/providers/eu_west_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/eu_west_1/__init__.py
@@ -1568,6 +1568,7 @@
     "aws-datasync-locationsmb.json",
     "aws-datasync-storagesystem.json",
     "aws-datasync-task.json",
+    "aws-datazone-datasource.json",
     "aws-datazone-domain.json",
     "aws-datazone-environment.json",
     "aws-datazone-environmentactions.json",
@@ -2187,7 +2188,6 @@
     "aws-organizations-policy.json",
     "aws-organizations-resourcepolicy.json",
     "aws-osis-pipeline.json",
-    "aws-panorama-applicationinstance.json",
     "aws-panorama-package.json",
     "aws-panorama-packageversion.json",
     "aws-paymentcryptography-alias.json",
diff --git a/src/cfnlint/data/schemas/providers/eu_west_1/aws-datazone-datasource.json b/src/cfnlint/data/schemas/providers/eu_west_1/aws-datazone-datasource.json
deleted file mode 100644
index 1f1745b36e..0000000000
--- a/src/cfnlint/data/schemas/providers/eu_west_1/aws-datazone-datasource.json
+++ /dev/null
@@ -1,552 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/ConnectionIdentifier",
-  "/properties/EnvironmentIdentifier",
-  "/properties/DomainIdentifier",
-  "/properties/ProjectIdentifier",
-  "/properties/Type"
- ],
- "definitions": {
-  "AccountId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^\\d{12}$",
-   "type": "string"
-  },
-  "DataAccessRole": {
-   "pattern": "^arn:aws[^:]*:iam::\\d{12}:(role|role/service-role)/[\\w+=,.@-]{1,128}$",
-   "type": "string"
-  },
-  "DataSourceConfigurationInput": {
-   "oneOf": [
-    {
-     "additionalProperties": false,
-     "properties": {
-      "GlueRunConfiguration": {
-       "$ref": "#/definitions/GlueRunConfigurationInput"
-      }
-     },
-     "title": "GlueRunConfiguration",
-     "type": "object"
-    },
-    {
-     "additionalProperties": false,
-     "properties": {
-      "RedshiftRunConfiguration": {
-       "$ref": "#/definitions/RedshiftRunConfigurationInput"
-      }
-     },
-     "title": "RedshiftRunConfiguration",
-     "type": "object"
-    },
-    {
-     "additionalProperties": false,
-     "properties": {
-      "SageMakerRunConfiguration": {
-       "$ref": "#/definitions/SageMakerRunConfigurationInput"
-      }
-     },
-     "title": "SageMakerRunConfiguration",
-     "type": "object"
-    }
-   ]
-  },
-  "DataSourceStatus": {
-   "enum": [
-    "CREATING",
-    "FAILED_CREATION",
-    "READY",
-    "UPDATING",
-    "FAILED_UPDATE",
-    "RUNNING",
-    "DELETING",
-    "FAILED_DELETION"
-   ],
-   "type": "string"
-  },
-  "EnableSetting": {
-   "enum": [
-    "ENABLED",
-    "DISABLED"
-   ],
-   "type": "string"
-  },
-  "FilterExpression": {
-   "additionalProperties": false,
-   "properties": {
-    "Expression": {
-     "maxLength": 2048,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Type": {
-     "$ref": "#/definitions/FilterExpressionType"
-    }
-   },
-   "required": [
-    "Expression",
-    "Type"
-   ],
-   "type": "object"
-  },
-  "FilterExpressionType": {
-   "enum": [
-    "INCLUDE",
-    "EXCLUDE"
-   ],
-   "type": "string"
-  },
-  "FormInput": {
-   "additionalProperties": false,
-   "properties": {
-    "Content": {
-     "maxLength": 75000,
-     "type": "string"
-    },
-    "FormName": {
-     "$ref": "#/definitions/FormName"
-    },
-    "TypeIdentifier": {
-     "maxLength": 385,
-     "minLength": 1,
-     "pattern": "^(?!\\.)[\\w\\.]*\\w$",
-     "type": "string"
-    },
-    "TypeRevision": {
-     "$ref": "#/definitions/TypeRevision"
-    }
-   },
-   "required": [
-    "FormName"
-   ],
-   "type": "object"
-  },
-  "FormName": {
-   "maxLength": 128,
-   "minLength": 1,
-   "pattern": "^(?![0-9_])\\w+$|^_\\w*[a-zA-Z0-9]\\w*$",
-   "type": "string"
-  },
-  "GlueRunConfigurationInput": {
-   "additionalProperties": false,
-   "properties": {
-    "AutoImportDataQualityResult": {
-     "type": "boolean"
-    },
-    "CatalogName": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "DataAccessRole": {
-     "$ref": "#/definitions/DataAccessRole"
-    },
-    "RelationalFilterConfigurations": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/RelationalFilterConfiguration"
-     },
-     "type": "array"
-    }
-   },
-   "required": [
-    "RelationalFilterConfigurations"
-   ],
-   "type": "object"
-  },
-  "RecommendationConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "EnableBusinessNameGeneration": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "RedshiftClusterStorage": {
-   "additionalProperties": false,
-   "properties": {
-    "ClusterName": {
-     "maxLength": 63,
-     "minLength": 1,
-     "pattern": "^[0-9a-z].[a-z0-9\\-]*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "ClusterName"
-   ],
-   "type": "object"
-  },
-  "RedshiftCredentialConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "SecretManagerArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws[^:]*:secretsmanager:[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]:\\d{12}:secret:.*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "SecretManagerArn"
-   ],
-   "type": "object"
-  },
-  "RedshiftRunConfigurationInput": {
-   "additionalProperties": false,
-   "properties": {
-    "DataAccessRole": {
-     "$ref": "#/definitions/DataAccessRole"
-    },
-    "RedshiftCredentialConfiguration": {
-     "$ref": "#/definitions/RedshiftCredentialConfiguration"
-    },
-    "RedshiftStorage": {
-     "$ref": "#/definitions/RedshiftStorage"
-    },
-    "RelationalFilterConfigurations": {
-     "$ref": "#/definitions/RelationalFilterConfigurations"
-    }
-   },
-   "required": [
-    "RelationalFilterConfigurations"
-   ],
-   "type": "object"
-  },
-  "RedshiftServerlessStorage": {
-   "additionalProperties": false,
-   "properties": {
-    "WorkgroupName": {
-     "maxLength": 64,
-     "minLength": 3,
-     "pattern": "^[a-z0-9-]+$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "WorkgroupName"
-   ],
-   "type": "object"
-  },
-  "RedshiftStorage": {
-   "oneOf": [
-    {
-     "additionalProperties": false,
-     "properties": {
-      "RedshiftClusterSource": {
-       "$ref": "#/definitions/RedshiftClusterStorage"
-      }
-     },
-     "required": [
-      "RedshiftClusterSource"
-     ],
-     "title": "RedshiftClusterSource",
-     "type": "object"
-    },
-    {
-     "additionalProperties": false,
-     "properties": {
-      "RedshiftServerlessSource": {
-       "$ref": "#/definitions/RedshiftServerlessStorage"
-      }
-     },
-     "required": [
-      "RedshiftServerlessSource"
-     ],
-     "title": "RedshiftServerlessSource",
-     "type": "object"
-    }
-   ]
-  },
-  "Region": {
-   "maxLength": 16,
-   "minLength": 4,
-   "pattern": "[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]",
-   "type": "string"
-  },
-  "RelationalFilterConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "DatabaseName": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "FilterExpressions": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/FilterExpression"
-     },
-     "type": "array"
-    },
-    "SchemaName": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "DatabaseName"
-   ],
-   "type": "object"
-  },
-  "RelationalFilterConfigurations": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/RelationalFilterConfiguration"
-   },
-   "type": "array"
-  },
-  "SageMakerRunConfigurationInput": {
-   "additionalProperties": false,
-   "properties": {
-    "TrackingAssets": {
-     "$ref": "#/definitions/TrackingAssets"
-    }
-   },
-   "required": [
-    "TrackingAssets"
-   ],
-   "type": "object"
-  },
-  "ScheduleConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "Schedule": {
-     "maxLength": 256,
-     "minLength": 1,
-     "pattern": "cron\\((\\b[0-5]?[0-9]\\b) (\\b2[0-3]\\b|\\b[0-1]?[0-9]\\b) (.*){1,5} (.*){1,5} (.*){1,5} (.*){1,5}\\)",
-     "type": "string"
-    },
-    "Timezone": {
-     "$ref": "#/definitions/Timezone"
-    }
-   },
-   "type": "object"
-  },
-  "Timezone": {
-   "enum": [
-    "AFRICA_JOHANNESBURG",
-    "AMERICA_MONTREAL",
-    "AMERICA_SAO_PAULO",
-    "ASIA_BAHRAIN",
-    "ASIA_BANGKOK",
-    "ASIA_CALCUTTA",
-    "ASIA_DUBAI",
-    "ASIA_HONG_KONG",
-    "ASIA_JAKARTA",
-    "ASIA_KUALA_LUMPUR",
-    "ASIA_SEOUL",
-    "ASIA_SHANGHAI",
-    "ASIA_SINGAPORE",
-    "ASIA_TAIPEI",
-    "ASIA_TOKYO",
-    "AUSTRALIA_MELBOURNE",
-    "AUSTRALIA_SYDNEY",
-    "CANADA_CENTRAL",
-    "CET",
-    "CST6CDT",
-    "ETC_GMT",
-    "ETC_GMT0",
-    "ETC_GMT_ADD_0",
-    "ETC_GMT_ADD_1",
-    "ETC_GMT_ADD_10",
-    "ETC_GMT_ADD_11",
-    "ETC_GMT_ADD_12",
-    "ETC_GMT_ADD_2",
-    "ETC_GMT_ADD_3",
-    "ETC_GMT_ADD_4",
-    "ETC_GMT_ADD_5",
-    "ETC_GMT_ADD_6",
-    "ETC_GMT_ADD_7",
-    "ETC_GMT_ADD_8",
-    "ETC_GMT_ADD_9",
-    "ETC_GMT_NEG_0",
-    "ETC_GMT_NEG_1",
-    "ETC_GMT_NEG_10",
-    "ETC_GMT_NEG_11",
-    "ETC_GMT_NEG_12",
-    "ETC_GMT_NEG_13",
-    "ETC_GMT_NEG_14",
-    "ETC_GMT_NEG_2",
-    "ETC_GMT_NEG_3",
-    "ETC_GMT_NEG_4",
-    "ETC_GMT_NEG_5",
-    "ETC_GMT_NEG_6",
-    "ETC_GMT_NEG_7",
-    "ETC_GMT_NEG_8",
-    "ETC_GMT_NEG_9",
-    "EUROPE_DUBLIN",
-    "EUROPE_LONDON",
-    "EUROPE_PARIS",
-    "EUROPE_STOCKHOLM",
-    "EUROPE_ZURICH",
-    "ISRAEL",
-    "MEXICO_GENERAL",
-    "MST7MDT",
-    "PACIFIC_AUCKLAND",
-    "US_CENTRAL",
-    "US_EASTERN",
-    "US_MOUNTAIN",
-    "US_PACIFIC",
-    "UTC"
-   ],
-   "type": "string"
-  },
-  "TrackingAssets": {
-   "additionalProperties": false,
-   "maxProperties": 1,
-   "patternProperties": {
-    "^.{1,64}$": {
-     "items": {
-      "pattern": "^arn:aws[^:]*:sagemaker:[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]:\\d{12}:[\\w+=,.@-]{1,128}/[\\w+=,.@-]{1,256}$",
-      "type": "string"
-     },
-     "maxItems": 500,
-     "minItems": 0,
-     "type": "array"
-    }
-   },
-   "type": "object"
-  },
-  "TypeRevision": {
-   "maxLength": 64,
-   "minLength": 1,
-   "pattern": "^[a-zA-Z0-9_-]+$",
-   "type": "string"
-  }
- },
- "primaryIdentifier": [
-  "/properties/DomainId",
-  "/properties/Id"
- ],
- "properties": {
-  "AssetFormsInput": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/FormInput"
-   },
-   "maxItems": 10,
-   "minItems": 0,
-   "type": "array"
-  },
-  "Configuration": {
-   "$ref": "#/definitions/DataSourceConfigurationInput"
-  },
-  "ConnectionId": {
-   "type": "string"
-  },
-  "ConnectionIdentifier": {
-   "type": "string"
-  },
-  "CreatedAt": {
-   "format": "date-time",
-   "type": "string"
-  },
-  "Description": {
-   "maxLength": 2048,
-   "type": "string"
-  },
-  "DomainId": {
-   "pattern": "^dzd[-_][a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "DomainIdentifier": {
-   "pattern": "^dzd[-_][a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "EnableSetting": {
-   "$ref": "#/definitions/EnableSetting"
-  },
-  "EnvironmentId": {
-   "type": "string"
-  },
-  "EnvironmentIdentifier": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "Id": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "LastRunAssetCount": {
-   "type": "number"
-  },
-  "LastRunAt": {
-   "type": "string"
-  },
-  "LastRunStatus": {
-   "type": "string"
-  },
-  "Name": {
-   "maxLength": 256,
-   "minLength": 1,
-   "type": "string"
-  },
-  "ProjectId": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "ProjectIdentifier": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "PublishOnImport": {
-   "type": "boolean"
-  },
-  "Recommendation": {
-   "$ref": "#/definitions/RecommendationConfiguration"
-  },
-  "Schedule": {
-   "$ref": "#/definitions/ScheduleConfiguration"
-  },
-  "Status": {
-   "$ref": "#/definitions/DataSourceStatus"
-  },
-  "Type": {
-   "maxLength": 256,
-   "minLength": 1,
-   "type": "string"
-  },
-  "UpdatedAt": {
-   "format": "date-time",
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/ConnectionId",
-  "/properties/CreatedAt",
-  "/properties/DomainId",
-  "/properties/EnvironmentId",
-  "/properties/Id",
-  "/properties/LastRunAssetCount",
-  "/properties/LastRunAt",
-  "/properties/LastRunStatus",
-  "/properties/ProjectId",
-  "/properties/Status",
-  "/properties/UpdatedAt"
- ],
- "required": [
-  "Name",
-  "DomainIdentifier",
-  "ProjectIdentifier",
-  "Type"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-datazone",
- "tagging": {
-  "cloudFormationSystemTags": false,
-  "tagOnCreate": false,
-  "tagUpdatable": false,
-  "taggable": false
- },
- "typeName": "AWS::DataZone::DataSource",
- "writeOnlyProperties": [
-  "/properties/AssetFormsInput",
-  "/properties/ConnectionIdentifier",
-  "/properties/EnvironmentIdentifier",
-  "/properties/DomainIdentifier",
-  "/properties/Configuration",
-  "/properties/ProjectIdentifier"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ca_central_1/aws-panorama-applicationinstance.json b/src/cfnlint/data/schemas/providers/eu_west_1/aws-panorama-applicationinstance.json
similarity index 97%
rename from src/cfnlint/data/schemas/providers/ca_central_1/aws-panorama-applicationinstance.json
rename to src/cfnlint/data/schemas/providers/eu_west_1/aws-panorama-applicationinstance.json
index 4c01df56b1..093451f44d 100644
--- a/src/cfnlint/data/schemas/providers/ca_central_1/aws-panorama-applicationinstance.json
+++ b/src/cfnlint/data/schemas/providers/eu_west_1/aws-panorama-applicationinstance.json
@@ -228,13 +228,7 @@
   "DefaultRuntimeContextDevice"
  ],
  "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git",
- "tagging": {
-  "cloudFormationSystemTags": true,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
+ "taggable": true,
  "typeName": "AWS::Panorama::ApplicationInstance",
  "writeOnlyProperties": [
   "/properties/ApplicationInstanceIdToReplace"
diff --git a/src/cfnlint/data/schemas/providers/eu_west_2/__init__.py b/src/cfnlint/data/schemas/providers/eu_west_2/__init__.py
index 165a6181ad..504f749c9c 100644
--- a/src/cfnlint/data/schemas/providers/eu_west_2/__init__.py
+++ b/src/cfnlint/data/schemas/providers/eu_west_2/__init__.py
@@ -1661,6 +1661,7 @@
     "aws-ec2-vpcendpointservicepermissions.json",
     "aws-ec2-vpcgatewayattachment.json",
     "aws-ec2-vpcpeeringconnection.json",
+    "aws-ec2-vpnconnection.json",
     "aws-ec2-vpnconnectionroute.json",
     "aws-ec2-vpngateway.json",
     "aws-ec2-vpngatewayroutepropagation.json",
@@ -1737,6 +1738,7 @@
     "aws-fis-experimenttemplate.json",
     "aws-fis-targetaccountconfiguration.json",
     "aws-fms-notificationchannel.json",
+    "aws-fms-policy.json",
     "aws-fms-resourceset.json",
     "aws-fsx-datarepositoryassociation.json",
     "aws-fsx-filesystem.json",
@@ -1747,7 +1749,6 @@
     "aws-gamelift-build.json",
     "aws-gamelift-fleet.json",
     "aws-gamelift-gameservergroup.json",
-    "aws-gamelift-gamesessionqueue.json",
     "aws-gamelift-location.json",
     "aws-gamelift-script.json",
     "aws-globalaccelerator-accelerator.json",
diff --git a/src/cfnlint/data/schemas/providers/eu_west_2/aws-ec2-vpnconnection.json b/src/cfnlint/data/schemas/providers/eu_west_2/aws-ec2-vpnconnection.json
deleted file mode 100644
index 5f9a8ac704..0000000000
--- a/src/cfnlint/data/schemas/providers/eu_west_2/aws-ec2-vpnconnection.json
+++ /dev/null
@@ -1,384 +0,0 @@
-{
- "$schema": "https://raw.githubusercontent.com/aws-cloudformation/cloudformation-resource-schema/blob/master/src/main/resources/schema/provider.definition.schema.v1.json",
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/Type",
-  "/properties/CustomerGatewayId",
-  "/properties/VpnGatewayId",
-  "/properties/TransitGatewayId",
-  "/properties/EnableAcceleration",
-  "/properties/LocalIpv4NetworkCidr",
-  "/properties/LocalIpv6NetworkCidr",
-  "/properties/OutsideIpAddressType",
-  "/properties/RemoteIpv4NetworkCidr",
-  "/properties/RemoteIpv6NetworkCidr",
-  "/properties/StaticRoutesOnly",
-  "/properties/TransportTransitGatewayAttachmentId",
-  "/properties/TunnelInsideIpVersion",
-  "/properties/VpnTunnelOptionsSpecifications"
- ],
- "definitions": {
-  "CloudwatchLogOptionsSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "LogEnabled": {
-     "type": "boolean"
-    },
-    "LogGroupArn": {
-     "type": "string"
-    },
-    "LogOutputFormat": {
-     "enum": [
-      "json",
-      "text"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "IKEVersionsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "ikev1",
-      "ikev2"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Phase1DHGroupNumbersRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      2,
-      14,
-      15,
-      16,
-      17,
-      18,
-      19,
-      20,
-      21,
-      22,
-      23,
-      24
-     ],
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "Phase1EncryptionAlgorithmsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "AES128",
-      "AES256",
-      "AES128-GCM-16",
-      "AES256-GCM-16"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Phase1IntegrityAlgorithmsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "SHA1",
-      "SHA2-256",
-      "SHA2-384",
-      "SHA2-512"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Phase2DHGroupNumbersRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      2,
-      5,
-      14,
-      15,
-      16,
-      17,
-      18,
-      19,
-      20,
-      21,
-      22,
-      23,
-      24
-     ],
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "Phase2EncryptionAlgorithmsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "AES128",
-      "AES256",
-      "AES128-GCM-16",
-      "AES256-GCM-16"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Phase2IntegrityAlgorithmsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "SHA1",
-      "SHA2-256",
-      "SHA2-384",
-      "SHA2-512"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "type": "string"
-    },
-    "Value": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "VpnTunnelLogOptionsSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "CloudwatchLogOptions": {
-     "$ref": "#/definitions/CloudwatchLogOptionsSpecification"
-    }
-   },
-   "type": "object"
-  },
-  "VpnTunnelOptionsSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "DPDTimeoutAction": {
-     "enum": [
-      "clear",
-      "none",
-      "restart"
-     ],
-     "type": "string"
-    },
-    "DPDTimeoutSeconds": {
-     "minimum": 30,
-     "type": "integer"
-    },
-    "EnableTunnelLifecycleControl": {
-     "type": "boolean"
-    },
-    "IKEVersions": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/IKEVersionsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "LogOptions": {
-     "$ref": "#/definitions/VpnTunnelLogOptionsSpecification"
-    },
-    "Phase1DHGroupNumbers": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase1DHGroupNumbersRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase1EncryptionAlgorithms": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase1EncryptionAlgorithmsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase1IntegrityAlgorithms": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase1IntegrityAlgorithmsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase1LifetimeSeconds": {
-     "maximum": 28800,
-     "minimum": 900,
-     "type": "integer"
-    },
-    "Phase2DHGroupNumbers": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase2DHGroupNumbersRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase2EncryptionAlgorithms": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase2EncryptionAlgorithmsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase2IntegrityAlgorithms": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase2IntegrityAlgorithmsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase2LifetimeSeconds": {
-     "maximum": 3600,
-     "minimum": 900,
-     "type": "integer"
-    },
-    "PreSharedKey": {
-     "type": "string"
-    },
-    "RekeyFuzzPercentage": {
-     "maximum": 100,
-     "minimum": 0,
-     "type": "integer"
-    },
-    "RekeyMarginTimeSeconds": {
-     "minimum": 60,
-     "type": "integer"
-    },
-    "ReplayWindowSize": {
-     "maximum": 2048,
-     "minimum": 64,
-     "type": "integer"
-    },
-    "StartupAction": {
-     "enum": [
-      "add",
-      "start"
-     ],
-     "type": "string"
-    },
-    "TunnelInsideCidr": {
-     "type": "string"
-    },
-    "TunnelInsideIpv6Cidr": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/VpnConnectionId"
- ],
- "properties": {
-  "CustomerGatewayId": {
-   "type": "string"
-  },
-  "EnableAcceleration": {
-   "type": "boolean"
-  },
-  "LocalIpv4NetworkCidr": {
-   "type": "string"
-  },
-  "LocalIpv6NetworkCidr": {
-   "type": "string"
-  },
-  "OutsideIpAddressType": {
-   "type": "string"
-  },
-  "RemoteIpv4NetworkCidr": {
-   "type": "string"
-  },
-  "RemoteIpv6NetworkCidr": {
-   "type": "string"
-  },
-  "StaticRoutesOnly": {
-   "type": "boolean"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "TransitGatewayId": {
-   "type": "string"
-  },
-  "TransportTransitGatewayAttachmentId": {
-   "type": "string"
-  },
-  "TunnelInsideIpVersion": {
-   "type": "string"
-  },
-  "Type": {
-   "type": "string"
-  },
-  "VpnConnectionId": {
-   "type": "string"
-  },
-  "VpnGatewayId": {
-   "type": "string"
-  },
-  "VpnTunnelOptionsSpecifications": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/VpnTunnelOptionsSpecification"
-   },
-   "type": "array",
-   "uniqueItems": false
-  }
- },
- "readOnlyProperties": [
-  "/properties/VpnConnectionId"
- ],
- "required": [
-  "Type",
-  "CustomerGatewayId"
- ],
- "tagging": {
-  "cloudFormationSystemTags": false,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::EC2::VPNConnection"
-}
diff --git a/src/cfnlint/data/schemas/providers/eu_west_2/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/eu_west_2/aws-fms-policy.json
deleted file mode 100644
index 8422693828..0000000000
--- a/src/cfnlint/data/schemas/providers/eu_west_2/aws-fms-policy.json
+++ /dev/null
@@ -1,416 +0,0 @@
-{
- "additionalProperties": false,
- "definitions": {
-  "AccountId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^([0-9]*)$",
-   "type": "string"
-  },
-  "Base62Id": {
-   "maxLength": 22,
-   "minLength": 22,
-   "pattern": "^[a-z0-9A-Z]{22}$",
-   "type": "string"
-  },
-  "FirewallDeploymentModel": {
-   "enum": [
-    "DISTRIBUTED",
-    "CENTRALIZED"
-   ],
-   "type": "string"
-  },
-  "IEMap": {
-   "additionalProperties": false,
-   "properties": {
-    "ACCOUNT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/AccountId"
-     },
-     "type": "array"
-    },
-    "ORGUNIT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/OrganizationalUnitId"
-     },
-     "type": "array"
-    }
-   },
-   "type": "object"
-  },
-  "ManagedServiceData": {
-   "maxLength": 30000,
-   "minLength": 1,
-   "type": "string"
-  },
-  "NetworkAclCommonPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "NetworkAclEntrySet": {
-     "$ref": "#/definitions/NetworkAclEntrySet"
-    }
-   },
-   "required": [
-    "NetworkAclEntrySet"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntry": {
-   "additionalProperties": false,
-   "properties": {
-    "CidrBlock": {
-     "pattern": "^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(\\/([0-9]|[1-2][0-9]|3[0-2]))$",
-     "type": "string"
-    },
-    "Egress": {
-     "type": "boolean"
-    },
-    "IcmpTypeCode": {
-     "additionalProperties": false,
-     "properties": {
-      "Code": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "Type": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "Code",
-      "Type"
-     ],
-     "type": "object"
-    },
-    "Ipv6CidrBlock": {
-     "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))(/(1[0-2]|[0-9]))?$",
-     "type": "string"
-    },
-    "PortRange": {
-     "additionalProperties": false,
-     "properties": {
-      "From": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "To": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "From",
-      "To"
-     ],
-     "type": "object"
-    },
-    "Protocol": {
-     "pattern": "^(tcp|udp|icmp|-1|([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))$",
-     "type": "string"
-    },
-    "RuleAction": {
-     "enum": [
-      "allow",
-      "deny"
-     ],
-     "type": "string"
-    }
-   },
-   "required": [
-    "Egress",
-    "Protocol",
-    "RuleAction"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntryList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/NetworkAclEntry"
-   },
-   "type": "array"
-  },
-  "NetworkAclEntrySet": {
-   "additionalProperties": false,
-   "anyOf": [
-    {
-     "required": [
-      "FirstEntries"
-     ]
-    },
-    {
-     "required": [
-      "LastEntries"
-     ]
-    }
-   ],
-   "properties": {
-    "FirstEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    },
-    "ForceRemediateForFirstEntries": {
-     "type": "boolean"
-    },
-    "ForceRemediateForLastEntries": {
-     "type": "boolean"
-    },
-    "LastEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    }
-   },
-   "required": [
-    "ForceRemediateForFirstEntries",
-    "ForceRemediateForLastEntries"
-   ],
-   "type": "object"
-  },
-  "NetworkFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  },
-  "OrganizationalUnitId": {
-   "maxLength": 68,
-   "minLength": 16,
-   "pattern": "^(ou-[0-9a-z]{4,32}-[a-z0-9]{8,32})$",
-   "type": "string"
-  },
-  "PolicyOption": {
-   "additionalProperties": false,
-   "oneOf": [
-    {
-     "required": [
-      "NetworkFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "ThirdPartyFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "NetworkAclCommonPolicy"
-     ]
-    }
-   ],
-   "properties": {
-    "NetworkAclCommonPolicy": {
-     "$ref": "#/definitions/NetworkAclCommonPolicy"
-    },
-    "NetworkFirewallPolicy": {
-     "$ref": "#/definitions/NetworkFirewallPolicy"
-    },
-    "ThirdPartyFirewallPolicy": {
-     "$ref": "#/definitions/ThirdPartyFirewallPolicy"
-    }
-   },
-   "type": "object"
-  },
-  "PolicyTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "PolicyType": {
-   "enum": [
-    "WAF",
-    "WAFV2",
-    "SHIELD_ADVANCED",
-    "SECURITY_GROUPS_COMMON",
-    "SECURITY_GROUPS_CONTENT_AUDIT",
-    "SECURITY_GROUPS_USAGE_AUDIT",
-    "NETWORK_FIREWALL",
-    "THIRD_PARTY_FIREWALL",
-    "DNS_FIREWALL",
-    "IMPORT_NETWORK_FIREWALL",
-    "NETWORK_ACL_COMMON"
-   ],
-   "type": "string"
-  },
-  "ResourceArn": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "ResourceTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key"
-   ],
-   "type": "object"
-  },
-  "ResourceType": {
-   "maxLength": 128,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "SecurityServicePolicyData": {
-   "additionalProperties": false,
-   "properties": {
-    "ManagedServiceData": {
-     "$ref": "#/definitions/ManagedServiceData"
-    },
-    "PolicyOption": {
-     "$ref": "#/definitions/PolicyOption"
-    },
-    "Type": {
-     "$ref": "#/definitions/PolicyType"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "ThirdPartyFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "Arn": {
-   "$ref": "#/definitions/ResourceArn"
-  },
-  "DeleteAllPolicyResources": {
-   "type": "boolean"
-  },
-  "ExcludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "ExcludeResourceTags": {
-   "type": "boolean"
-  },
-  "Id": {
-   "maxLength": 36,
-   "minLength": 36,
-   "pattern": "^[a-z0-9A-Z-]{36}$",
-   "type": "string"
-  },
-  "IncludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "PolicyDescription": {
-   "maxLength": 256,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "PolicyName": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "RemediationEnabled": {
-   "type": "boolean"
-  },
-  "ResourceSetIds": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/Base62Id"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "ResourceTags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceTag"
-   },
-   "maxItems": 8,
-   "type": "array"
-  },
-  "ResourceType": {
-   "$ref": "#/definitions/ResourceType"
-  },
-  "ResourceTypeList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceType"
-   },
-   "type": "array"
-  },
-  "ResourcesCleanUp": {
-   "type": "boolean"
-  },
-  "SecurityServicePolicyData": {
-   "$ref": "#/definitions/SecurityServicePolicyData"
-  },
-  "Tags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/PolicyTag"
-   },
-   "type": "array"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/Id"
- ],
- "required": [
-  "ExcludeResourceTags",
-  "PolicyName",
-  "RemediationEnabled",
-  "SecurityServicePolicyData"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-fms.git",
- "typeName": "AWS::FMS::Policy",
- "writeOnlyProperties": [
-  "/properties/DeleteAllPolicyResources"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/eu_west_2/aws-gamelift-gamesessionqueue.json b/src/cfnlint/data/schemas/providers/eu_west_2/aws-gamelift-gamesessionqueue.json
new file mode 100644
index 0000000000..9bb1478d98
--- /dev/null
+++ b/src/cfnlint/data/schemas/providers/eu_west_2/aws-gamelift-gamesessionqueue.json
@@ -0,0 +1,194 @@
+{
+ "$schema": "https://schema.cloudformation.us-east-1.amazonaws.com/provider.definition.schema.v1.json",
+ "additionalProperties": false,
+ "createOnlyProperties": [
+  "/properties/Name"
+ ],
+ "definitions": {
+  "AllowedLocations": {
+   "insertionOrder": false,
+   "items": {
+    "maxLength": 64,
+    "minLength": 1,
+    "pattern": "^[A-Za-z0-9\\-]+",
+    "type": "string"
+   },
+   "maxItems": 100,
+   "minItems": 1,
+   "type": "array"
+  },
+  "FilterConfiguration": {
+   "additionalProperties": false,
+   "properties": {
+    "AllowedLocations": {
+     "$ref": "#/definitions/AllowedLocations"
+    }
+   },
+   "type": "object"
+  },
+  "GameSessionQueueDestination": {
+   "additionalProperties": false,
+   "properties": {
+    "DestinationArn": {
+     "maxLength": 256,
+     "minLength": 1,
+     "pattern": "[a-zA-Z0-9:/-]+",
+     "type": "string"
+    }
+   },
+   "type": "object"
+  },
+  "LocationOrder": {
+   "insertionOrder": true,
+   "items": {
+    "maxLength": 64,
+    "minLength": 1,
+    "pattern": "^[A-Za-z0-9\\-]+",
+    "type": "string"
+   },
+   "maxItems": 100,
+   "minItems": 1,
+   "type": "array"
+  },
+  "PlayerLatencyPolicy": {
+   "additionalProperties": false,
+   "properties": {
+    "MaximumIndividualPlayerLatencyMilliseconds": {
+     "minimum": 0,
+     "type": "integer"
+    },
+    "PolicyDurationSeconds": {
+     "minimum": 0,
+     "type": "integer"
+    }
+   },
+   "type": "object"
+  },
+  "PriorityConfiguration": {
+   "additionalProperties": false,
+   "properties": {
+    "LocationOrder": {
+     "$ref": "#/definitions/LocationOrder"
+    },
+    "PriorityOrder": {
+     "$ref": "#/definitions/PriorityOrder"
+    }
+   },
+   "type": "object"
+  },
+  "PriorityOrder": {
+   "insertionOrder": true,
+   "items": {
+    "enum": [
+     "COST",
+     "DESTINATION",
+     "LATENCY",
+     "LOCATION"
+    ],
+    "type": "string"
+   },
+   "maxItems": 4,
+   "minItems": 1,
+   "type": "array"
+  },
+  "Tag": {
+   "additionalProperties": false,
+   "properties": {
+    "Key": {
+     "maxLength": 128,
+     "minLength": 1,
+     "type": "string"
+    },
+    "Value": {
+     "maxLength": 256,
+     "minLength": 1,
+     "type": "string"
+    }
+   },
+   "required": [
+    "Key",
+    "Value"
+   ],
+   "type": "object"
+  }
+ },
+ "primaryIdentifier": [
+  "/properties/Name"
+ ],
+ "properties": {
+  "Arn": {
+   "maxLength": 256,
+   "minLength": 1,
+   "pattern": "^arn:.*:gamesessionqueue\\/[a-zA-Z0-9-]+",
+   "type": "string"
+  },
+  "CustomEventData": {
+   "maxLength": 256,
+   "minLength": 1,
+   "pattern": "[\\s\\S]*",
+   "type": "string"
+  },
+  "Destinations": {
+   "insertionOrder": true,
+   "items": {
+    "$ref": "#/definitions/GameSessionQueueDestination"
+   },
+   "type": "array"
+  },
+  "FilterConfiguration": {
+   "$ref": "#/definitions/FilterConfiguration",
+   "type": "object"
+  },
+  "Name": {
+   "maxLength": 128,
+   "minLength": 1,
+   "pattern": "[a-zA-Z0-9-]+",
+   "type": "string"
+  },
+  "NotificationTarget": {
+   "maxLength": 300,
+   "minLength": 1,
+   "pattern": "[a-zA-Z0-9:_-]*(\\.fifo)?",
+   "type": "string"
+  },
+  "PlayerLatencyPolicies": {
+   "insertionOrder": false,
+   "items": {
+    "$ref": "#/definitions/PlayerLatencyPolicy"
+   },
+   "type": "array"
+  },
+  "PriorityConfiguration": {
+   "$ref": "#/definitions/PriorityConfiguration",
+   "type": "object"
+  },
+  "Tags": {
+   "insertionOrder": false,
+   "items": {
+    "$ref": "#/definitions/Tag"
+   },
+   "maxItems": 200,
+   "type": "array",
+   "uniqueItems": true
+  },
+  "TimeoutInSeconds": {
+   "minimum": 0,
+   "type": "integer"
+  }
+ },
+ "readOnlyProperties": [
+  "/properties/Arn"
+ ],
+ "required": [
+  "Name"
+ ],
+ "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-gamelift.git",
+ "tagging": {
+  "cloudFormationSystemTags": false,
+  "tagOnCreate": true,
+  "tagProperty": "/properties/Tags",
+  "tagUpdatable": true,
+  "taggable": true
+ },
+ "typeName": "AWS::GameLift::GameSessionQueue"
+}
diff --git a/src/cfnlint/data/schemas/providers/eu_west_3/__init__.py b/src/cfnlint/data/schemas/providers/eu_west_3/__init__.py
index 391060cc03..eff35b7b7a 100644
--- a/src/cfnlint/data/schemas/providers/eu_west_3/__init__.py
+++ b/src/cfnlint/data/schemas/providers/eu_west_3/__init__.py
@@ -1369,6 +1369,7 @@
     "aws-ec2-vpcendpointservicepermissions.json",
     "aws-ec2-vpcgatewayattachment.json",
     "aws-ec2-vpcpeeringconnection.json",
+    "aws-ec2-vpnconnection.json",
     "aws-ec2-vpnconnectionroute.json",
     "aws-ec2-vpngateway.json",
     "aws-ec2-vpngatewayroutepropagation.json",
@@ -1440,6 +1441,7 @@
     "aws-fis-experimenttemplate.json",
     "aws-fis-targetaccountconfiguration.json",
     "aws-fms-notificationchannel.json",
+    "aws-fms-policy.json",
     "aws-fms-resourceset.json",
     "aws-fsx-datarepositoryassociation.json",
     "aws-fsx-filesystem.json",
diff --git a/src/cfnlint/data/schemas/providers/eu_west_3/aws-ec2-vpnconnection.json b/src/cfnlint/data/schemas/providers/eu_west_3/aws-ec2-vpnconnection.json
deleted file mode 100644
index 5f9a8ac704..0000000000
--- a/src/cfnlint/data/schemas/providers/eu_west_3/aws-ec2-vpnconnection.json
+++ /dev/null
@@ -1,384 +0,0 @@
-{
- "$schema": "https://raw.githubusercontent.com/aws-cloudformation/cloudformation-resource-schema/blob/master/src/main/resources/schema/provider.definition.schema.v1.json",
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/Type",
-  "/properties/CustomerGatewayId",
-  "/properties/VpnGatewayId",
-  "/properties/TransitGatewayId",
-  "/properties/EnableAcceleration",
-  "/properties/LocalIpv4NetworkCidr",
-  "/properties/LocalIpv6NetworkCidr",
-  "/properties/OutsideIpAddressType",
-  "/properties/RemoteIpv4NetworkCidr",
-  "/properties/RemoteIpv6NetworkCidr",
-  "/properties/StaticRoutesOnly",
-  "/properties/TransportTransitGatewayAttachmentId",
-  "/properties/TunnelInsideIpVersion",
-  "/properties/VpnTunnelOptionsSpecifications"
- ],
- "definitions": {
-  "CloudwatchLogOptionsSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "LogEnabled": {
-     "type": "boolean"
-    },
-    "LogGroupArn": {
-     "type": "string"
-    },
-    "LogOutputFormat": {
-     "enum": [
-      "json",
-      "text"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "IKEVersionsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "ikev1",
-      "ikev2"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Phase1DHGroupNumbersRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      2,
-      14,
-      15,
-      16,
-      17,
-      18,
-      19,
-      20,
-      21,
-      22,
-      23,
-      24
-     ],
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "Phase1EncryptionAlgorithmsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "AES128",
-      "AES256",
-      "AES128-GCM-16",
-      "AES256-GCM-16"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Phase1IntegrityAlgorithmsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "SHA1",
-      "SHA2-256",
-      "SHA2-384",
-      "SHA2-512"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Phase2DHGroupNumbersRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      2,
-      5,
-      14,
-      15,
-      16,
-      17,
-      18,
-      19,
-      20,
-      21,
-      22,
-      23,
-      24
-     ],
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "Phase2EncryptionAlgorithmsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "AES128",
-      "AES256",
-      "AES128-GCM-16",
-      "AES256-GCM-16"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Phase2IntegrityAlgorithmsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "SHA1",
-      "SHA2-256",
-      "SHA2-384",
-      "SHA2-512"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "type": "string"
-    },
-    "Value": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "VpnTunnelLogOptionsSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "CloudwatchLogOptions": {
-     "$ref": "#/definitions/CloudwatchLogOptionsSpecification"
-    }
-   },
-   "type": "object"
-  },
-  "VpnTunnelOptionsSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "DPDTimeoutAction": {
-     "enum": [
-      "clear",
-      "none",
-      "restart"
-     ],
-     "type": "string"
-    },
-    "DPDTimeoutSeconds": {
-     "minimum": 30,
-     "type": "integer"
-    },
-    "EnableTunnelLifecycleControl": {
-     "type": "boolean"
-    },
-    "IKEVersions": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/IKEVersionsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "LogOptions": {
-     "$ref": "#/definitions/VpnTunnelLogOptionsSpecification"
-    },
-    "Phase1DHGroupNumbers": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase1DHGroupNumbersRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase1EncryptionAlgorithms": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase1EncryptionAlgorithmsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase1IntegrityAlgorithms": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase1IntegrityAlgorithmsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase1LifetimeSeconds": {
-     "maximum": 28800,
-     "minimum": 900,
-     "type": "integer"
-    },
-    "Phase2DHGroupNumbers": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase2DHGroupNumbersRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase2EncryptionAlgorithms": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase2EncryptionAlgorithmsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase2IntegrityAlgorithms": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase2IntegrityAlgorithmsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase2LifetimeSeconds": {
-     "maximum": 3600,
-     "minimum": 900,
-     "type": "integer"
-    },
-    "PreSharedKey": {
-     "type": "string"
-    },
-    "RekeyFuzzPercentage": {
-     "maximum": 100,
-     "minimum": 0,
-     "type": "integer"
-    },
-    "RekeyMarginTimeSeconds": {
-     "minimum": 60,
-     "type": "integer"
-    },
-    "ReplayWindowSize": {
-     "maximum": 2048,
-     "minimum": 64,
-     "type": "integer"
-    },
-    "StartupAction": {
-     "enum": [
-      "add",
-      "start"
-     ],
-     "type": "string"
-    },
-    "TunnelInsideCidr": {
-     "type": "string"
-    },
-    "TunnelInsideIpv6Cidr": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/VpnConnectionId"
- ],
- "properties": {
-  "CustomerGatewayId": {
-   "type": "string"
-  },
-  "EnableAcceleration": {
-   "type": "boolean"
-  },
-  "LocalIpv4NetworkCidr": {
-   "type": "string"
-  },
-  "LocalIpv6NetworkCidr": {
-   "type": "string"
-  },
-  "OutsideIpAddressType": {
-   "type": "string"
-  },
-  "RemoteIpv4NetworkCidr": {
-   "type": "string"
-  },
-  "RemoteIpv6NetworkCidr": {
-   "type": "string"
-  },
-  "StaticRoutesOnly": {
-   "type": "boolean"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "TransitGatewayId": {
-   "type": "string"
-  },
-  "TransportTransitGatewayAttachmentId": {
-   "type": "string"
-  },
-  "TunnelInsideIpVersion": {
-   "type": "string"
-  },
-  "Type": {
-   "type": "string"
-  },
-  "VpnConnectionId": {
-   "type": "string"
-  },
-  "VpnGatewayId": {
-   "type": "string"
-  },
-  "VpnTunnelOptionsSpecifications": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/VpnTunnelOptionsSpecification"
-   },
-   "type": "array",
-   "uniqueItems": false
-  }
- },
- "readOnlyProperties": [
-  "/properties/VpnConnectionId"
- ],
- "required": [
-  "Type",
-  "CustomerGatewayId"
- ],
- "tagging": {
-  "cloudFormationSystemTags": false,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::EC2::VPNConnection"
-}
diff --git a/src/cfnlint/data/schemas/providers/eu_west_3/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/eu_west_3/aws-fms-policy.json
deleted file mode 100644
index 8422693828..0000000000
--- a/src/cfnlint/data/schemas/providers/eu_west_3/aws-fms-policy.json
+++ /dev/null
@@ -1,416 +0,0 @@
-{
- "additionalProperties": false,
- "definitions": {
-  "AccountId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^([0-9]*)$",
-   "type": "string"
-  },
-  "Base62Id": {
-   "maxLength": 22,
-   "minLength": 22,
-   "pattern": "^[a-z0-9A-Z]{22}$",
-   "type": "string"
-  },
-  "FirewallDeploymentModel": {
-   "enum": [
-    "DISTRIBUTED",
-    "CENTRALIZED"
-   ],
-   "type": "string"
-  },
-  "IEMap": {
-   "additionalProperties": false,
-   "properties": {
-    "ACCOUNT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/AccountId"
-     },
-     "type": "array"
-    },
-    "ORGUNIT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/OrganizationalUnitId"
-     },
-     "type": "array"
-    }
-   },
-   "type": "object"
-  },
-  "ManagedServiceData": {
-   "maxLength": 30000,
-   "minLength": 1,
-   "type": "string"
-  },
-  "NetworkAclCommonPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "NetworkAclEntrySet": {
-     "$ref": "#/definitions/NetworkAclEntrySet"
-    }
-   },
-   "required": [
-    "NetworkAclEntrySet"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntry": {
-   "additionalProperties": false,
-   "properties": {
-    "CidrBlock": {
-     "pattern": "^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(\\/([0-9]|[1-2][0-9]|3[0-2]))$",
-     "type": "string"
-    },
-    "Egress": {
-     "type": "boolean"
-    },
-    "IcmpTypeCode": {
-     "additionalProperties": false,
-     "properties": {
-      "Code": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "Type": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "Code",
-      "Type"
-     ],
-     "type": "object"
-    },
-    "Ipv6CidrBlock": {
-     "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))(/(1[0-2]|[0-9]))?$",
-     "type": "string"
-    },
-    "PortRange": {
-     "additionalProperties": false,
-     "properties": {
-      "From": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "To": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "From",
-      "To"
-     ],
-     "type": "object"
-    },
-    "Protocol": {
-     "pattern": "^(tcp|udp|icmp|-1|([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))$",
-     "type": "string"
-    },
-    "RuleAction": {
-     "enum": [
-      "allow",
-      "deny"
-     ],
-     "type": "string"
-    }
-   },
-   "required": [
-    "Egress",
-    "Protocol",
-    "RuleAction"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntryList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/NetworkAclEntry"
-   },
-   "type": "array"
-  },
-  "NetworkAclEntrySet": {
-   "additionalProperties": false,
-   "anyOf": [
-    {
-     "required": [
-      "FirstEntries"
-     ]
-    },
-    {
-     "required": [
-      "LastEntries"
-     ]
-    }
-   ],
-   "properties": {
-    "FirstEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    },
-    "ForceRemediateForFirstEntries": {
-     "type": "boolean"
-    },
-    "ForceRemediateForLastEntries": {
-     "type": "boolean"
-    },
-    "LastEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    }
-   },
-   "required": [
-    "ForceRemediateForFirstEntries",
-    "ForceRemediateForLastEntries"
-   ],
-   "type": "object"
-  },
-  "NetworkFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  },
-  "OrganizationalUnitId": {
-   "maxLength": 68,
-   "minLength": 16,
-   "pattern": "^(ou-[0-9a-z]{4,32}-[a-z0-9]{8,32})$",
-   "type": "string"
-  },
-  "PolicyOption": {
-   "additionalProperties": false,
-   "oneOf": [
-    {
-     "required": [
-      "NetworkFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "ThirdPartyFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "NetworkAclCommonPolicy"
-     ]
-    }
-   ],
-   "properties": {
-    "NetworkAclCommonPolicy": {
-     "$ref": "#/definitions/NetworkAclCommonPolicy"
-    },
-    "NetworkFirewallPolicy": {
-     "$ref": "#/definitions/NetworkFirewallPolicy"
-    },
-    "ThirdPartyFirewallPolicy": {
-     "$ref": "#/definitions/ThirdPartyFirewallPolicy"
-    }
-   },
-   "type": "object"
-  },
-  "PolicyTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "PolicyType": {
-   "enum": [
-    "WAF",
-    "WAFV2",
-    "SHIELD_ADVANCED",
-    "SECURITY_GROUPS_COMMON",
-    "SECURITY_GROUPS_CONTENT_AUDIT",
-    "SECURITY_GROUPS_USAGE_AUDIT",
-    "NETWORK_FIREWALL",
-    "THIRD_PARTY_FIREWALL",
-    "DNS_FIREWALL",
-    "IMPORT_NETWORK_FIREWALL",
-    "NETWORK_ACL_COMMON"
-   ],
-   "type": "string"
-  },
-  "ResourceArn": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "ResourceTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key"
-   ],
-   "type": "object"
-  },
-  "ResourceType": {
-   "maxLength": 128,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "SecurityServicePolicyData": {
-   "additionalProperties": false,
-   "properties": {
-    "ManagedServiceData": {
-     "$ref": "#/definitions/ManagedServiceData"
-    },
-    "PolicyOption": {
-     "$ref": "#/definitions/PolicyOption"
-    },
-    "Type": {
-     "$ref": "#/definitions/PolicyType"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "ThirdPartyFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "Arn": {
-   "$ref": "#/definitions/ResourceArn"
-  },
-  "DeleteAllPolicyResources": {
-   "type": "boolean"
-  },
-  "ExcludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "ExcludeResourceTags": {
-   "type": "boolean"
-  },
-  "Id": {
-   "maxLength": 36,
-   "minLength": 36,
-   "pattern": "^[a-z0-9A-Z-]{36}$",
-   "type": "string"
-  },
-  "IncludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "PolicyDescription": {
-   "maxLength": 256,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "PolicyName": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "RemediationEnabled": {
-   "type": "boolean"
-  },
-  "ResourceSetIds": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/Base62Id"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "ResourceTags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceTag"
-   },
-   "maxItems": 8,
-   "type": "array"
-  },
-  "ResourceType": {
-   "$ref": "#/definitions/ResourceType"
-  },
-  "ResourceTypeList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceType"
-   },
-   "type": "array"
-  },
-  "ResourcesCleanUp": {
-   "type": "boolean"
-  },
-  "SecurityServicePolicyData": {
-   "$ref": "#/definitions/SecurityServicePolicyData"
-  },
-  "Tags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/PolicyTag"
-   },
-   "type": "array"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/Id"
- ],
- "required": [
-  "ExcludeResourceTags",
-  "PolicyName",
-  "RemediationEnabled",
-  "SecurityServicePolicyData"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-fms.git",
- "typeName": "AWS::FMS::Policy",
- "writeOnlyProperties": [
-  "/properties/DeleteAllPolicyResources"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/il_central_1/__init__.py b/src/cfnlint/data/schemas/providers/il_central_1/__init__.py
index 44efd3445e..805c80b6b8 100644
--- a/src/cfnlint/data/schemas/providers/il_central_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/il_central_1/__init__.py
@@ -848,6 +848,7 @@
     "aws-cloudwatch-compositealarm.json",
     "aws-cloudwatch-dashboard.json",
     "aws-cloudwatch-insightrule.json",
+    "aws-cloudwatch-metricstream.json",
     "aws-codebuild-project.json",
     "aws-codebuild-reportgroup.json",
     "aws-codebuild-sourcecredential.json",
@@ -906,6 +907,7 @@
     "aws-dms-replicationconfig.json",
     "aws-dynamodb-globaltable.json",
     "aws-dynamodb-table.json",
+    "aws-ec2-capacityreservation.json",
     "aws-ec2-capacityreservationfleet.json",
     "aws-ec2-clientvpnroute.json",
     "aws-ec2-clientvpntargetnetworkassociation.json",
@@ -1035,6 +1037,7 @@
     "aws-events-eventbuspolicy.json",
     "aws-events-rule.json",
     "aws-fms-notificationchannel.json",
+    "aws-fms-policy.json",
     "aws-fsx-datarepositoryassociation.json",
     "aws-fsx-filesystem.json",
     "aws-fsx-snapshot.json",
@@ -1293,6 +1296,7 @@
     "aws-servicediscovery-privatednsnamespace.json",
     "aws-servicediscovery-publicdnsnamespace.json",
     "aws-servicediscovery-service.json",
+    "aws-ses-configurationset.json",
     "aws-ses-configurationseteventdestination.json",
     "aws-ses-contactlist.json",
     "aws-ses-dedicatedippool.json",
diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-cloudwatch-metricstream.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-cloudwatch-metricstream.json
deleted file mode 100644
index 89ca2654d5..0000000000
--- a/src/cfnlint/data/schemas/providers/il_central_1/aws-cloudwatch-metricstream.json
+++ /dev/null
@@ -1,228 +0,0 @@
-{
- "additionalProperties": false,
- "allOf": [
-  {
-   "required": [
-    "FirehoseArn",
-    "RoleArn",
-    "OutputFormat"
-   ]
-  },
-  {
-   "oneOf": [
-    {},
-    {
-     "required": [
-      "IncludeFilters",
-      "ExcludeFilters"
-     ]
-    }
-   ]
-  }
- ],
- "createOnlyProperties": [
-  "/properties/Name"
- ],
- "definitions": {
-  "MetricStreamFilter": {
-   "additionalProperties": false,
-   "properties": {
-    "MetricNames": {
-     "items": {
-      "maxLength": 255,
-      "minLength": 1,
-      "type": "string"
-     },
-     "maxItems": 999,
-     "type": "array"
-    },
-    "Namespace": {
-     "maxLength": 255,
-     "minLength": 1,
-     "pattern": "[^:].*",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Namespace"
-   ],
-   "type": "object"
-  },
-  "MetricStreamStatisticsConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "AdditionalStatistics": {
-     "items": {
-      "type": "string"
-     },
-     "maxItems": 20,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "IncludeMetrics": {
-     "items": {
-      "$ref": "#/definitions/MetricStreamStatisticsMetric"
-     },
-     "maxItems": 100,
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "required": [
-    "AdditionalStatistics",
-    "IncludeMetrics"
-   ],
-   "type": "object"
-  },
-  "MetricStreamStatisticsMetric": {
-   "additionalProperties": false,
-   "properties": {
-    "MetricName": {
-     "maxLength": 255,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Namespace": {
-     "maxLength": 255,
-     "minLength": 1,
-     "pattern": "[^:].*",
-     "type": "string"
-    }
-   },
-   "required": [
-    "MetricName",
-    "Namespace"
-   ],
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "minLength": 0,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Name"
- ],
- "properties": {
-  "Arn": {
-   "maxLength": 2048,
-   "minLength": 20,
-   "type": "string"
-  },
-  "CreationDate": {
-   "anyOf": [
-    {
-     "format": "date-time"
-    },
-    {
-     "format": "timestamp"
-    }
-   ],
-   "type": "string"
-  },
-  "ExcludeFilters": {
-   "items": {
-    "$ref": "#/definitions/MetricStreamFilter"
-   },
-   "maxItems": 1000,
-   "type": "array",
-   "uniqueItems": true
-  },
-  "FirehoseArn": {
-   "maxLength": 2048,
-   "minLength": 20,
-   "type": "string"
-  },
-  "IncludeFilters": {
-   "items": {
-    "$ref": "#/definitions/MetricStreamFilter"
-   },
-   "maxItems": 1000,
-   "type": "array",
-   "uniqueItems": true
-  },
-  "IncludeLinkedAccountsMetrics": {
-   "type": "boolean"
-  },
-  "LastUpdateDate": {
-   "anyOf": [
-    {
-     "format": "date-time"
-    },
-    {
-     "format": "timestamp"
-    }
-   ],
-   "type": "string"
-  },
-  "Name": {
-   "maxLength": 255,
-   "minLength": 1,
-   "type": "string"
-  },
-  "OutputFormat": {
-   "enum": [
-    "json",
-    "opentelemetry0.7",
-    "opentelemetry1.0"
-   ],
-   "maxLength": 255,
-   "minLength": 1,
-   "type": "string"
-  },
-  "RoleArn": {
-   "maxLength": 2048,
-   "minLength": 20,
-   "type": "string"
-  },
-  "State": {
-   "maxLength": 255,
-   "minLength": 1,
-   "type": "string"
-  },
-  "StatisticsConfigurations": {
-   "items": {
-    "$ref": "#/definitions/MetricStreamStatisticsConfiguration"
-   },
-   "maxItems": 100,
-   "type": "array",
-   "uniqueItems": true
-  },
-  "Tags": {
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 50,
-   "type": "array",
-   "uniqueItems": true
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/CreationDate",
-  "/properties/LastUpdateDate",
-  "/properties/State"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-cloudwatch.git",
- "taggable": true,
- "typeName": "AWS::CloudWatch::MetricStream",
- "writeOnlyProperties": [
-  "/properties/Tags"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-ec2-capacityreservation.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-ec2-capacityreservation.json
deleted file mode 100644
index 5a10969ce5..0000000000
--- a/src/cfnlint/data/schemas/providers/il_central_1/aws-ec2-capacityreservation.json
+++ /dev/null
@@ -1,250 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/Tenancy",
-  "/properties/InstancePlatform",
-  "/properties/InstanceType",
-  "/properties/AvailabilityZone",
-  "/properties/TagSpecifications",
-  "/properties/OutPostArn",
-  "/properties/EphemeralStorage",
-  "/properties/EbsOptimized",
-  "/properties/PlacementGroupArn"
- ],
- "definitions": {
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "type": "string"
-    },
-    "Value": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "TagSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "ResourceType": {
-     "enum": [
-      "capacity-reservation",
-      "capacity-reservation-fleet",
-      "carrier-gateway",
-      "client-vpn-endpoint",
-      "coip-pool",
-      "customer-gateway",
-      "declarative-policies-report",
-      "dedicated-host",
-      "dhcp-options",
-      "egress-only-internet-gateway",
-      "elastic-gpu",
-      "elastic-ip",
-      "export-image-task",
-      "export-instance-task",
-      "fleet",
-      "fpga-image",
-      "host-reservation",
-      "image",
-      "import-image-task",
-      "import-snapshot-task",
-      "instance",
-      "instance-connect-endpoint",
-      "instance-event-window",
-      "internet-gateway",
-      "ipam",
-      "ipam-external-resource-verification-token",
-      "ipam-pool",
-      "ipam-resource-discovery",
-      "ipam-resource-discovery-association",
-      "ipam-scope",
-      "ipv4pool-ec2",
-      "ipv6pool-ec2",
-      "key-pair",
-      "launch-template",
-      "local-gateway",
-      "local-gateway-route-table",
-      "local-gateway-route-table-virtual-interface-group-association",
-      "local-gateway-route-table-vpc-association",
-      "local-gateway-virtual-interface",
-      "local-gateway-virtual-interface-group",
-      "natgateway",
-      "network-acl",
-      "network-insights-access-scope",
-      "network-insights-access-scope-analysis",
-      "network-insights-analysis",
-      "network-insights-path",
-      "network-interface",
-      "placement-group",
-      "prefix-list",
-      "replace-root-volume-task",
-      "reserved-instances",
-      "route-table",
-      "security-group",
-      "security-group-rule",
-      "snapshot",
-      "spot-fleet-request",
-      "spot-instances-request",
-      "subnet",
-      "subnet-cidr-reservation",
-      "traffic-mirror-filter",
-      "traffic-mirror-filter-rule",
-      "traffic-mirror-session",
-      "traffic-mirror-target",
-      "transit-gateway",
-      "transit-gateway-attachment",
-      "transit-gateway-connect-peer",
-      "transit-gateway-multicast-domain",
-      "transit-gateway-policy-table",
-      "transit-gateway-route-table",
-      "transit-gateway-route-table-announcement",
-      "verified-access-endpoint",
-      "verified-access-endpoint-target",
-      "verified-access-group",
-      "verified-access-instance",
-      "verified-access-policy",
-      "verified-access-trust-provider",
-      "volume",
-      "vpc",
-      "vpc-block-public-access-exclusion",
-      "vpc-endpoint",
-      "vpc-endpoint-connection",
-      "vpc-endpoint-connection-device-type",
-      "vpc-endpoint-service",
-      "vpc-endpoint-service-permission",
-      "vpc-flow-log",
-      "vpc-peering-connection",
-      "vpn-connection",
-      "vpn-connection-device-type",
-      "vpn-gateway"
-     ],
-     "type": "string"
-    },
-    "Tags": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Tag"
-     },
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "AvailabilityZone": {
-   "type": "string"
-  },
-  "AvailableInstanceCount": {
-   "type": "integer"
-  },
-  "EbsOptimized": {
-   "type": "boolean"
-  },
-  "EndDate": {
-   "type": "string"
-  },
-  "EndDateType": {
-   "enum": [
-    "limited",
-    "unlimited"
-   ],
-   "type": "string"
-  },
-  "EphemeralStorage": {
-   "type": "boolean"
-  },
-  "Id": {
-   "type": "string"
-  },
-  "InstanceCount": {
-   "type": "integer"
-  },
-  "InstanceMatchCriteria": {
-   "enum": [
-    "open",
-    "targeted"
-   ],
-   "type": "string"
-  },
-  "InstancePlatform": {
-   "enum": [
-    "Linux with SQL Server Enterprise",
-    "Linux with SQL Server Standard",
-    "Linux with SQL Server Web",
-    "Linux/UNIX",
-    "RHEL with HA",
-    "RHEL with HA and SQL Server Enterprise",
-    "RHEL with HA and SQL Server Standard",
-    "RHEL with SQL Server Enterprise",
-    "RHEL with SQL Server Standard",
-    "RHEL with SQL Server Web",
-    "Red Hat Enterprise Linux",
-    "SUSE Linux",
-    "Ubuntu Pro",
-    "Windows",
-    "Windows with SQL Server",
-    "Windows with SQL Server Enterprise",
-    "Windows with SQL Server Standard",
-    "Windows with SQL Server Web"
-   ],
-   "type": "string"
-  },
-  "InstanceType": {
-   "type": "string"
-  },
-  "OutPostArn": {
-   "pattern": "^arn:aws([a-z-]+)?:outposts:[a-z\\d-]+:\\d{12}:outpost/op-[a-f0-9]{17}$",
-   "type": "string"
-  },
-  "PlacementGroupArn": {
-   "pattern": "^arn:aws([a-z-]+)?:ec2:[a-z\\d-]+:\\d{12}:placement-group/^.{1,255}$",
-   "type": "string"
-  },
-  "TagSpecifications": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/TagSpecification"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "Tenancy": {
-   "enum": [
-    "dedicated",
-    "default"
-   ],
-   "type": "string"
-  },
-  "TotalInstanceCount": {
-   "type": "integer"
-  },
-  "UnusedReservationBillingOwnerId": {
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id",
-  "/properties/AvailableInstanceCount",
-  "/properties/TotalInstanceCount"
- ],
- "required": [
-  "InstanceCount",
-  "AvailabilityZone",
-  "InstancePlatform",
-  "InstanceType"
- ],
- "typeName": "AWS::EC2::CapacityReservation",
- "writeOnlyProperties": [
-  "/properties/UnusedReservationBillingOwnerId"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-fms-policy.json
deleted file mode 100644
index 8422693828..0000000000
--- a/src/cfnlint/data/schemas/providers/il_central_1/aws-fms-policy.json
+++ /dev/null
@@ -1,416 +0,0 @@
-{
- "additionalProperties": false,
- "definitions": {
-  "AccountId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^([0-9]*)$",
-   "type": "string"
-  },
-  "Base62Id": {
-   "maxLength": 22,
-   "minLength": 22,
-   "pattern": "^[a-z0-9A-Z]{22}$",
-   "type": "string"
-  },
-  "FirewallDeploymentModel": {
-   "enum": [
-    "DISTRIBUTED",
-    "CENTRALIZED"
-   ],
-   "type": "string"
-  },
-  "IEMap": {
-   "additionalProperties": false,
-   "properties": {
-    "ACCOUNT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/AccountId"
-     },
-     "type": "array"
-    },
-    "ORGUNIT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/OrganizationalUnitId"
-     },
-     "type": "array"
-    }
-   },
-   "type": "object"
-  },
-  "ManagedServiceData": {
-   "maxLength": 30000,
-   "minLength": 1,
-   "type": "string"
-  },
-  "NetworkAclCommonPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "NetworkAclEntrySet": {
-     "$ref": "#/definitions/NetworkAclEntrySet"
-    }
-   },
-   "required": [
-    "NetworkAclEntrySet"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntry": {
-   "additionalProperties": false,
-   "properties": {
-    "CidrBlock": {
-     "pattern": "^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(\\/([0-9]|[1-2][0-9]|3[0-2]))$",
-     "type": "string"
-    },
-    "Egress": {
-     "type": "boolean"
-    },
-    "IcmpTypeCode": {
-     "additionalProperties": false,
-     "properties": {
-      "Code": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "Type": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "Code",
-      "Type"
-     ],
-     "type": "object"
-    },
-    "Ipv6CidrBlock": {
-     "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))(/(1[0-2]|[0-9]))?$",
-     "type": "string"
-    },
-    "PortRange": {
-     "additionalProperties": false,
-     "properties": {
-      "From": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "To": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "From",
-      "To"
-     ],
-     "type": "object"
-    },
-    "Protocol": {
-     "pattern": "^(tcp|udp|icmp|-1|([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))$",
-     "type": "string"
-    },
-    "RuleAction": {
-     "enum": [
-      "allow",
-      "deny"
-     ],
-     "type": "string"
-    }
-   },
-   "required": [
-    "Egress",
-    "Protocol",
-    "RuleAction"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntryList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/NetworkAclEntry"
-   },
-   "type": "array"
-  },
-  "NetworkAclEntrySet": {
-   "additionalProperties": false,
-   "anyOf": [
-    {
-     "required": [
-      "FirstEntries"
-     ]
-    },
-    {
-     "required": [
-      "LastEntries"
-     ]
-    }
-   ],
-   "properties": {
-    "FirstEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    },
-    "ForceRemediateForFirstEntries": {
-     "type": "boolean"
-    },
-    "ForceRemediateForLastEntries": {
-     "type": "boolean"
-    },
-    "LastEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    }
-   },
-   "required": [
-    "ForceRemediateForFirstEntries",
-    "ForceRemediateForLastEntries"
-   ],
-   "type": "object"
-  },
-  "NetworkFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  },
-  "OrganizationalUnitId": {
-   "maxLength": 68,
-   "minLength": 16,
-   "pattern": "^(ou-[0-9a-z]{4,32}-[a-z0-9]{8,32})$",
-   "type": "string"
-  },
-  "PolicyOption": {
-   "additionalProperties": false,
-   "oneOf": [
-    {
-     "required": [
-      "NetworkFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "ThirdPartyFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "NetworkAclCommonPolicy"
-     ]
-    }
-   ],
-   "properties": {
-    "NetworkAclCommonPolicy": {
-     "$ref": "#/definitions/NetworkAclCommonPolicy"
-    },
-    "NetworkFirewallPolicy": {
-     "$ref": "#/definitions/NetworkFirewallPolicy"
-    },
-    "ThirdPartyFirewallPolicy": {
-     "$ref": "#/definitions/ThirdPartyFirewallPolicy"
-    }
-   },
-   "type": "object"
-  },
-  "PolicyTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "PolicyType": {
-   "enum": [
-    "WAF",
-    "WAFV2",
-    "SHIELD_ADVANCED",
-    "SECURITY_GROUPS_COMMON",
-    "SECURITY_GROUPS_CONTENT_AUDIT",
-    "SECURITY_GROUPS_USAGE_AUDIT",
-    "NETWORK_FIREWALL",
-    "THIRD_PARTY_FIREWALL",
-    "DNS_FIREWALL",
-    "IMPORT_NETWORK_FIREWALL",
-    "NETWORK_ACL_COMMON"
-   ],
-   "type": "string"
-  },
-  "ResourceArn": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "ResourceTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key"
-   ],
-   "type": "object"
-  },
-  "ResourceType": {
-   "maxLength": 128,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "SecurityServicePolicyData": {
-   "additionalProperties": false,
-   "properties": {
-    "ManagedServiceData": {
-     "$ref": "#/definitions/ManagedServiceData"
-    },
-    "PolicyOption": {
-     "$ref": "#/definitions/PolicyOption"
-    },
-    "Type": {
-     "$ref": "#/definitions/PolicyType"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "ThirdPartyFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "Arn": {
-   "$ref": "#/definitions/ResourceArn"
-  },
-  "DeleteAllPolicyResources": {
-   "type": "boolean"
-  },
-  "ExcludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "ExcludeResourceTags": {
-   "type": "boolean"
-  },
-  "Id": {
-   "maxLength": 36,
-   "minLength": 36,
-   "pattern": "^[a-z0-9A-Z-]{36}$",
-   "type": "string"
-  },
-  "IncludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "PolicyDescription": {
-   "maxLength": 256,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "PolicyName": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "RemediationEnabled": {
-   "type": "boolean"
-  },
-  "ResourceSetIds": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/Base62Id"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "ResourceTags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceTag"
-   },
-   "maxItems": 8,
-   "type": "array"
-  },
-  "ResourceType": {
-   "$ref": "#/definitions/ResourceType"
-  },
-  "ResourceTypeList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceType"
-   },
-   "type": "array"
-  },
-  "ResourcesCleanUp": {
-   "type": "boolean"
-  },
-  "SecurityServicePolicyData": {
-   "$ref": "#/definitions/SecurityServicePolicyData"
-  },
-  "Tags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/PolicyTag"
-   },
-   "type": "array"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/Id"
- ],
- "required": [
-  "ExcludeResourceTags",
-  "PolicyName",
-  "RemediationEnabled",
-  "SecurityServicePolicyData"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-fms.git",
- "typeName": "AWS::FMS::Policy",
- "writeOnlyProperties": [
-  "/properties/DeleteAllPolicyResources"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/il_central_1/aws-ses-configurationset.json b/src/cfnlint/data/schemas/providers/il_central_1/aws-ses-configurationset.json
deleted file mode 100644
index 548640372c..0000000000
--- a/src/cfnlint/data/schemas/providers/il_central_1/aws-ses-configurationset.json
+++ /dev/null
@@ -1,138 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/Name"
- ],
- "definitions": {
-  "DashboardOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "EngagementMetrics": {
-     "pattern": "ENABLED|DISABLED",
-     "type": "string"
-    }
-   },
-   "required": [
-    "EngagementMetrics"
-   ],
-   "type": "object"
-  },
-  "DeliveryOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "MaxDeliverySeconds": {
-     "maximum": 50400,
-     "minimum": 300,
-     "type": "number"
-    },
-    "SendingPoolName": {
-     "type": "string"
-    },
-    "TlsPolicy": {
-     "pattern": "REQUIRE|OPTIONAL",
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "GuardianOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "OptimizedSharedDelivery": {
-     "pattern": "ENABLED|DISABLED",
-     "type": "string"
-    }
-   },
-   "required": [
-    "OptimizedSharedDelivery"
-   ],
-   "type": "object"
-  },
-  "ReputationOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "ReputationMetricsEnabled": {
-     "pattern": "true|false",
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "SendingOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "SendingEnabled": {
-     "pattern": "true|false",
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "SuppressionOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "SuppressedReasons": {
-     "insertionOrder": false,
-     "items": {
-      "pattern": "BOUNCE|COMPLAINT",
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "TrackingOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomRedirectDomain": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "VdmOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "DashboardOptions": {
-     "$ref": "#/definitions/DashboardOptions"
-    },
-    "GuardianOptions": {
-     "$ref": "#/definitions/GuardianOptions"
-    }
-   },
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Name"
- ],
- "properties": {
-  "DeliveryOptions": {
-   "$ref": "#/definitions/DeliveryOptions"
-  },
-  "Name": {
-   "pattern": "^[a-zA-Z0-9_-]{1,64}$",
-   "type": "string"
-  },
-  "ReputationOptions": {
-   "$ref": "#/definitions/ReputationOptions"
-  },
-  "SendingOptions": {
-   "$ref": "#/definitions/SendingOptions"
-  },
-  "SuppressionOptions": {
-   "$ref": "#/definitions/SuppressionOptions"
-  },
-  "TrackingOptions": {
-   "$ref": "#/definitions/TrackingOptions"
-  },
-  "VdmOptions": {
-   "$ref": "#/definitions/VdmOptions"
-  }
- },
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-ses.git",
- "taggable": false,
- "typeName": "AWS::SES::ConfigurationSet"
-}
diff --git a/src/cfnlint/data/schemas/providers/me_central_1/__init__.py b/src/cfnlint/data/schemas/providers/me_central_1/__init__.py
index 4b1afd1c96..dff17b1d8f 100644
--- a/src/cfnlint/data/schemas/providers/me_central_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/me_central_1/__init__.py
@@ -1083,6 +1083,7 @@
     "aws-eventschemas-registrypolicy.json",
     "aws-eventschemas-schema.json",
     "aws-fms-notificationchannel.json",
+    "aws-fms-policy.json",
     "aws-fms-resourceset.json",
     "aws-fsx-datarepositoryassociation.json",
     "aws-fsx-snapshot.json",
@@ -1339,6 +1340,7 @@
     "aws-s3objectlambda-accesspointpolicy.json",
     "aws-sagemaker-app.json",
     "aws-sagemaker-appimageconfig.json",
+    "aws-sagemaker-domain.json",
     "aws-sagemaker-image.json",
     "aws-sagemaker-imageversion.json",
     "aws-sagemaker-inferencecomponent.json",
@@ -1349,6 +1351,7 @@
     "aws-sagemaker-project.json",
     "aws-sagemaker-space.json",
     "aws-sagemaker-studiolifecycleconfig.json",
+    "aws-sagemaker-userprofile.json",
     "aws-scheduler-schedule.json",
     "aws-scheduler-schedulegroup.json",
     "aws-sdb-domain.json",
diff --git a/src/cfnlint/data/schemas/providers/me_central_1/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/me_central_1/aws-fms-policy.json
deleted file mode 100644
index 8422693828..0000000000
--- a/src/cfnlint/data/schemas/providers/me_central_1/aws-fms-policy.json
+++ /dev/null
@@ -1,416 +0,0 @@
-{
- "additionalProperties": false,
- "definitions": {
-  "AccountId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^([0-9]*)$",
-   "type": "string"
-  },
-  "Base62Id": {
-   "maxLength": 22,
-   "minLength": 22,
-   "pattern": "^[a-z0-9A-Z]{22}$",
-   "type": "string"
-  },
-  "FirewallDeploymentModel": {
-   "enum": [
-    "DISTRIBUTED",
-    "CENTRALIZED"
-   ],
-   "type": "string"
-  },
-  "IEMap": {
-   "additionalProperties": false,
-   "properties": {
-    "ACCOUNT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/AccountId"
-     },
-     "type": "array"
-    },
-    "ORGUNIT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/OrganizationalUnitId"
-     },
-     "type": "array"
-    }
-   },
-   "type": "object"
-  },
-  "ManagedServiceData": {
-   "maxLength": 30000,
-   "minLength": 1,
-   "type": "string"
-  },
-  "NetworkAclCommonPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "NetworkAclEntrySet": {
-     "$ref": "#/definitions/NetworkAclEntrySet"
-    }
-   },
-   "required": [
-    "NetworkAclEntrySet"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntry": {
-   "additionalProperties": false,
-   "properties": {
-    "CidrBlock": {
-     "pattern": "^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(\\/([0-9]|[1-2][0-9]|3[0-2]))$",
-     "type": "string"
-    },
-    "Egress": {
-     "type": "boolean"
-    },
-    "IcmpTypeCode": {
-     "additionalProperties": false,
-     "properties": {
-      "Code": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "Type": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "Code",
-      "Type"
-     ],
-     "type": "object"
-    },
-    "Ipv6CidrBlock": {
-     "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))(/(1[0-2]|[0-9]))?$",
-     "type": "string"
-    },
-    "PortRange": {
-     "additionalProperties": false,
-     "properties": {
-      "From": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "To": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "From",
-      "To"
-     ],
-     "type": "object"
-    },
-    "Protocol": {
-     "pattern": "^(tcp|udp|icmp|-1|([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))$",
-     "type": "string"
-    },
-    "RuleAction": {
-     "enum": [
-      "allow",
-      "deny"
-     ],
-     "type": "string"
-    }
-   },
-   "required": [
-    "Egress",
-    "Protocol",
-    "RuleAction"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntryList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/NetworkAclEntry"
-   },
-   "type": "array"
-  },
-  "NetworkAclEntrySet": {
-   "additionalProperties": false,
-   "anyOf": [
-    {
-     "required": [
-      "FirstEntries"
-     ]
-    },
-    {
-     "required": [
-      "LastEntries"
-     ]
-    }
-   ],
-   "properties": {
-    "FirstEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    },
-    "ForceRemediateForFirstEntries": {
-     "type": "boolean"
-    },
-    "ForceRemediateForLastEntries": {
-     "type": "boolean"
-    },
-    "LastEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    }
-   },
-   "required": [
-    "ForceRemediateForFirstEntries",
-    "ForceRemediateForLastEntries"
-   ],
-   "type": "object"
-  },
-  "NetworkFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  },
-  "OrganizationalUnitId": {
-   "maxLength": 68,
-   "minLength": 16,
-   "pattern": "^(ou-[0-9a-z]{4,32}-[a-z0-9]{8,32})$",
-   "type": "string"
-  },
-  "PolicyOption": {
-   "additionalProperties": false,
-   "oneOf": [
-    {
-     "required": [
-      "NetworkFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "ThirdPartyFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "NetworkAclCommonPolicy"
-     ]
-    }
-   ],
-   "properties": {
-    "NetworkAclCommonPolicy": {
-     "$ref": "#/definitions/NetworkAclCommonPolicy"
-    },
-    "NetworkFirewallPolicy": {
-     "$ref": "#/definitions/NetworkFirewallPolicy"
-    },
-    "ThirdPartyFirewallPolicy": {
-     "$ref": "#/definitions/ThirdPartyFirewallPolicy"
-    }
-   },
-   "type": "object"
-  },
-  "PolicyTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "PolicyType": {
-   "enum": [
-    "WAF",
-    "WAFV2",
-    "SHIELD_ADVANCED",
-    "SECURITY_GROUPS_COMMON",
-    "SECURITY_GROUPS_CONTENT_AUDIT",
-    "SECURITY_GROUPS_USAGE_AUDIT",
-    "NETWORK_FIREWALL",
-    "THIRD_PARTY_FIREWALL",
-    "DNS_FIREWALL",
-    "IMPORT_NETWORK_FIREWALL",
-    "NETWORK_ACL_COMMON"
-   ],
-   "type": "string"
-  },
-  "ResourceArn": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "ResourceTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key"
-   ],
-   "type": "object"
-  },
-  "ResourceType": {
-   "maxLength": 128,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "SecurityServicePolicyData": {
-   "additionalProperties": false,
-   "properties": {
-    "ManagedServiceData": {
-     "$ref": "#/definitions/ManagedServiceData"
-    },
-    "PolicyOption": {
-     "$ref": "#/definitions/PolicyOption"
-    },
-    "Type": {
-     "$ref": "#/definitions/PolicyType"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "ThirdPartyFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "Arn": {
-   "$ref": "#/definitions/ResourceArn"
-  },
-  "DeleteAllPolicyResources": {
-   "type": "boolean"
-  },
-  "ExcludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "ExcludeResourceTags": {
-   "type": "boolean"
-  },
-  "Id": {
-   "maxLength": 36,
-   "minLength": 36,
-   "pattern": "^[a-z0-9A-Z-]{36}$",
-   "type": "string"
-  },
-  "IncludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "PolicyDescription": {
-   "maxLength": 256,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "PolicyName": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "RemediationEnabled": {
-   "type": "boolean"
-  },
-  "ResourceSetIds": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/Base62Id"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "ResourceTags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceTag"
-   },
-   "maxItems": 8,
-   "type": "array"
-  },
-  "ResourceType": {
-   "$ref": "#/definitions/ResourceType"
-  },
-  "ResourceTypeList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceType"
-   },
-   "type": "array"
-  },
-  "ResourcesCleanUp": {
-   "type": "boolean"
-  },
-  "SecurityServicePolicyData": {
-   "$ref": "#/definitions/SecurityServicePolicyData"
-  },
-  "Tags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/PolicyTag"
-   },
-   "type": "array"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/Id"
- ],
- "required": [
-  "ExcludeResourceTags",
-  "PolicyName",
-  "RemediationEnabled",
-  "SecurityServicePolicyData"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-fms.git",
- "typeName": "AWS::FMS::Policy",
- "writeOnlyProperties": [
-  "/properties/DeleteAllPolicyResources"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/me_central_1/aws-sagemaker-domain.json b/src/cfnlint/data/schemas/providers/me_central_1/aws-sagemaker-domain.json
deleted file mode 100644
index 69e42e460e..0000000000
--- a/src/cfnlint/data/schemas/providers/me_central_1/aws-sagemaker-domain.json
+++ /dev/null
@@ -1,905 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/AuthMode",
-  "/properties/DomainName",
-  "/properties/DomainSettings/RStudioServerProDomainSettings/DefaultResourceSpec",
-  "/properties/KmsKeyId",
-  "/properties/VpcId",
-  "/properties/Tags"
- ],
- "definitions": {
-  "AppLifecycleManagement": {
-   "additionalProperties": false,
-   "properties": {
-    "IdleSettings": {
-     "$ref": "#/definitions/IdleSettings"
-    }
-   },
-   "type": "object"
-  },
-  "AppType": {
-   "enum": [
-    "JupyterServer",
-    "TensorBoard",
-    "RStudioServerPro",
-    "JupyterLab",
-    "CodeEditor",
-    "DetailedProfiler",
-    "Canvas"
-   ],
-   "type": "string"
-  },
-  "CodeEditorAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "AppLifecycleManagement": {
-     "$ref": "#/definitions/AppLifecycleManagement"
-    },
-    "CustomImages": {
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 200,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "CodeRepository": {
-   "additionalProperties": false,
-   "properties": {
-    "RepositoryUrl": {
-     "maxLength": 256,
-     "pattern": "^https://([.\\-_a-zA-Z0-9]+/?){3,1016}$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "RepositoryUrl"
-   ],
-   "type": "object"
-  },
-  "CustomFileSystemConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "EFSFileSystemConfig": {
-     "$ref": "#/definitions/EFSFileSystemConfig"
-    },
-    "FSxLustreFileSystemConfig": {
-     "$ref": "#/definitions/FSxLustreFileSystemConfig"
-    }
-   },
-   "type": "object"
-  },
-  "CustomImage": {
-   "additionalProperties": false,
-   "properties": {
-    "AppImageConfigName": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}",
-     "type": "string"
-    },
-    "ImageName": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9]([-.]?[a-zA-Z0-9]){0,62}$",
-     "type": "string"
-    },
-    "ImageVersionNumber": {
-     "minimum": 0,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "AppImageConfigName",
-    "ImageName"
-   ],
-   "type": "object"
-  },
-  "CustomPosixUserConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "Gid": {
-     "maximum": 4000000,
-     "minimum": 1001,
-     "type": "integer"
-    },
-    "Uid": {
-     "maximum": 4000000,
-     "minimum": 10000,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "Uid",
-    "Gid"
-   ],
-   "type": "object"
-  },
-  "DefaultEbsStorageSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultEbsVolumeSizeInGb": {
-     "$ref": "#/definitions/SpaceEbsVolumeSizeInGb"
-    },
-    "MaximumEbsVolumeSizeInGb": {
-     "$ref": "#/definitions/SpaceEbsVolumeSizeInGb"
-    }
-   },
-   "required": [
-    "DefaultEbsVolumeSizeInGb",
-    "MaximumEbsVolumeSizeInGb"
-   ],
-   "type": "object"
-  },
-  "DefaultSpaceSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomFileSystemConfigs": {
-     "items": {
-      "$ref": "#/definitions/CustomFileSystemConfig"
-     },
-     "maxItems": 2,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "CustomPosixUserConfig": {
-     "$ref": "#/definitions/CustomPosixUserConfig"
-    },
-    "ExecutionRole": {
-     "maxLength": 2048,
-     "minLength": 20,
-     "pattern": "^arn:aws[a-z\\-]*:iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+$",
-     "type": "string"
-    },
-    "JupyterLabAppSettings": {
-     "$ref": "#/definitions/JupyterLabAppSettings"
-    },
-    "JupyterServerAppSettings": {
-     "$ref": "#/definitions/JupyterServerAppSettings"
-    },
-    "KernelGatewayAppSettings": {
-     "$ref": "#/definitions/KernelGatewayAppSettings"
-    },
-    "SecurityGroups": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "insertionOrder": false,
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.Id",
-      "maxLength": 32,
-      "pattern": "[-0-9a-zA-Z]+",
-      "type": "string"
-     },
-     "maxItems": 5,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "SpaceStorageSettings": {
-     "$ref": "#/definitions/DefaultSpaceStorageSettings"
-    }
-   },
-   "required": [
-    "ExecutionRole"
-   ],
-   "type": "object"
-  },
-  "DefaultSpaceStorageSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultEbsStorageSettings": {
-     "$ref": "#/definitions/DefaultEbsStorageSettings"
-    }
-   },
-   "type": "object"
-  },
-  "DockerSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "EnableDockerAccess": {
-     "enum": [
-      "ENABLED",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "VpcOnlyTrustedAccounts": {
-     "insertionOrder": false,
-     "items": {
-      "maxLength": 12,
-      "minLength": 12,
-      "pattern": "^\\d+$",
-      "type": "string"
-     },
-     "maxItems": 20,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "DomainSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DockerSettings": {
-     "$ref": "#/definitions/DockerSettings"
-    },
-    "ExecutionRoleIdentityConfig": {
-     "enum": [
-      "USER_PROFILE_NAME",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "RStudioServerProDomainSettings": {
-     "$ref": "#/definitions/RStudioServerProDomainSettings"
-    },
-    "SecurityGroupIds": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "insertionOrder": false,
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.Id",
-      "maxLength": 32,
-      "pattern": "[-0-9a-zA-Z]+",
-      "type": "string"
-     },
-     "maxItems": 3,
-     "minItems": 1,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "EFSFileSystemConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "FileSystemId": {
-     "maxLength": 21,
-     "minLength": 11,
-     "pattern": "^(fs-[0-9a-f]{8,})$",
-     "type": "string"
-    },
-    "FileSystemPath": {
-     "maxLength": 256,
-     "minLength": 1,
-     "pattern": "^\\/\\S*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "FileSystemId"
-   ],
-   "type": "object"
-  },
-  "FSxLustreFileSystemConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "FileSystemId": {
-     "maxLength": 21,
-     "minLength": 11,
-     "pattern": "^(fs-[0-9a-f]{8,})$",
-     "type": "string"
-    },
-    "FileSystemPath": {
-     "maxLength": 256,
-     "minLength": 1,
-     "pattern": "^\\/\\S*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "FileSystemId"
-   ],
-   "type": "object"
-  },
-  "IdleSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "IdleTimeoutInMinutes": {
-     "$ref": "#/definitions/IdleTimeoutInMinutes"
-    },
-    "LifecycleManagement": {
-     "$ref": "#/definitions/LifecycleManagement"
-    },
-    "MaxIdleTimeoutInMinutes": {
-     "$ref": "#/definitions/MaxIdleTimeoutInMinutes"
-    },
-    "MinIdleTimeoutInMinutes": {
-     "$ref": "#/definitions/MinIdleTimeoutInMinutes"
-    }
-   },
-   "type": "object"
-  },
-  "IdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "JupyterLabAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "AppLifecycleManagement": {
-     "$ref": "#/definitions/AppLifecycleManagement"
-    },
-    "CodeRepositories": {
-     "items": {
-      "$ref": "#/definitions/CodeRepository"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "CustomImages": {
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 200,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "JupyterServerAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "KernelGatewayAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomImages": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 200,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "LifecycleManagement": {
-   "enum": [
-    "ENABLED",
-    "DISABLED"
-   ],
-   "type": "string"
-  },
-  "MaxIdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "MinIdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "MlTools": {
-   "enum": [
-    "DataWrangler",
-    "FeatureStore",
-    "EmrClusters",
-    "AutoMl",
-    "Experiments",
-    "Training",
-    "ModelEvaluation",
-    "Pipelines",
-    "Models",
-    "JumpStart",
-    "InferenceRecommender",
-    "Endpoints",
-    "Projects",
-    "InferenceOptimization",
-    "HyperPodClusters",
-    "Comet",
-    "DeepchecksLLMEvaluation",
-    "Fiddler",
-    "LakeraGuard"
-   ],
-   "type": "string"
-  },
-  "RSessionAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomImages": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 200,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    }
-   },
-   "type": "object"
-  },
-  "RStudioServerProAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "AccessStatus": {
-     "enum": [
-      "ENABLED",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "UserGroup": {
-     "enum": [
-      "R_STUDIO_ADMIN",
-      "R_STUDIO_USER"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "RStudioServerProDomainSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "DomainExecutionRoleArn": {
-     "maxLength": 2048,
-     "minLength": 20,
-     "pattern": "^arn:aws[a-z\\-]*:iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+$",
-     "type": "string"
-    },
-    "RStudioConnectUrl": {
-     "pattern": "^(https:|http:|www\\.)\\S*",
-     "type": "string"
-    },
-    "RStudioPackageManagerUrl": {
-     "pattern": "^(https:|http:|www\\.)\\S*",
-     "type": "string"
-    }
-   },
-   "required": [
-    "DomainExecutionRoleArn"
-   ],
-   "type": "object"
-  },
-  "ResourceSpec": {
-   "additionalProperties": false,
-   "properties": {
-    "InstanceType": {
-     "enum": [
-      "system",
-      "ml.t3.micro",
-      "ml.t3.small",
-      "ml.t3.medium",
-      "ml.t3.large",
-      "ml.t3.xlarge",
-      "ml.t3.2xlarge",
-      "ml.m5.large",
-      "ml.m5.xlarge",
-      "ml.m5.2xlarge",
-      "ml.m5.4xlarge",
-      "ml.m5.8xlarge",
-      "ml.m5.12xlarge",
-      "ml.m5.16xlarge",
-      "ml.m5.24xlarge",
-      "ml.c5.large",
-      "ml.c5.xlarge",
-      "ml.c5.2xlarge",
-      "ml.c5.4xlarge",
-      "ml.c5.9xlarge",
-      "ml.c5.12xlarge",
-      "ml.c5.18xlarge",
-      "ml.c5.24xlarge",
-      "ml.p3.2xlarge",
-      "ml.p3.8xlarge",
-      "ml.p3.16xlarge",
-      "ml.g4dn.xlarge",
-      "ml.g4dn.2xlarge",
-      "ml.g4dn.4xlarge",
-      "ml.g4dn.8xlarge",
-      "ml.g4dn.12xlarge",
-      "ml.g4dn.16xlarge",
-      "ml.r5.large",
-      "ml.r5.xlarge",
-      "ml.r5.2xlarge",
-      "ml.r5.4xlarge",
-      "ml.r5.8xlarge",
-      "ml.r5.12xlarge",
-      "ml.r5.16xlarge",
-      "ml.r5.24xlarge",
-      "ml.p3dn.24xlarge",
-      "ml.m5d.large",
-      "ml.m5d.xlarge",
-      "ml.m5d.2xlarge",
-      "ml.m5d.4xlarge",
-      "ml.m5d.8xlarge",
-      "ml.m5d.12xlarge",
-      "ml.m5d.16xlarge",
-      "ml.m5d.24xlarge",
-      "ml.g5.xlarge",
-      "ml.g5.2xlarge",
-      "ml.g5.4xlarge",
-      "ml.g5.8xlarge",
-      "ml.g5.12xlarge",
-      "ml.g5.16xlarge",
-      "ml.g5.24xlarge",
-      "ml.g5.48xlarge",
-      "ml.p4d.24xlarge",
-      "ml.p4de.24xlarge",
-      "ml.geospatial.interactive",
-      "ml.trn1.2xlarge",
-      "ml.trn1.32xlarge",
-      "ml.trn1n.32xlarge"
-     ],
-     "type": "string"
-    },
-    "LifecycleConfigArn": {
-     "maxLength": 256,
-     "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:studio-lifecycle-config/.*",
-     "type": "string"
-    },
-    "SageMakerImageArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws(-[\\w]+)*:sagemaker:.+:[0-9]{12}:image/[a-z0-9]([-.]?[a-z0-9])*$",
-     "type": "string"
-    },
-    "SageMakerImageVersionArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws(-[\\w]+)*:sagemaker:.+:[0-9]{12}:image-version/[a-z0-9]([-.]?[a-z0-9])*/[0-9]+$",
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SharingSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "NotebookOutputOption": {
-     "enum": [
-      "Allowed",
-      "Disabled"
-     ],
-     "type": "string"
-    },
-    "S3KmsKeyId": {
-     "maxLength": 2048,
-     "pattern": ".*",
-     "type": "string"
-    },
-    "S3OutputPath": {
-     "maxLength": 1024,
-     "pattern": "^(https|s3)://([^/]+)/?(.*)$",
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SpaceEbsVolumeSizeInGb": {
-   "maximum": 16384,
-   "minimum": 5,
-   "type": "integer"
-  },
-  "StudioLifecycleConfigArn": {
-   "maxLength": 256,
-   "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:studio-lifecycle-config/.*",
-   "type": "string"
-  },
-  "StudioWebPortalSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "HiddenAppTypes": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/AppType"
-     },
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "HiddenMlTools": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/MlTools"
-     },
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$",
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "UserSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CodeEditorAppSettings": {
-     "$ref": "#/definitions/CodeEditorAppSettings"
-    },
-    "CustomFileSystemConfigs": {
-     "items": {
-      "$ref": "#/definitions/CustomFileSystemConfig"
-     },
-     "maxItems": 2,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "CustomPosixUserConfig": {
-     "$ref": "#/definitions/CustomPosixUserConfig"
-    },
-    "DefaultLandingUri": {
-     "maxLength": 1023,
-     "type": "string"
-    },
-    "ExecutionRole": {
-     "maxLength": 2048,
-     "minLength": 20,
-     "pattern": "^arn:aws[a-z\\-]*:iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+$",
-     "type": "string"
-    },
-    "JupyterLabAppSettings": {
-     "$ref": "#/definitions/JupyterLabAppSettings"
-    },
-    "JupyterServerAppSettings": {
-     "$ref": "#/definitions/JupyterServerAppSettings"
-    },
-    "KernelGatewayAppSettings": {
-     "$ref": "#/definitions/KernelGatewayAppSettings"
-    },
-    "RSessionAppSettings": {
-     "$ref": "#/definitions/RSessionAppSettings"
-    },
-    "RStudioServerProAppSettings": {
-     "$ref": "#/definitions/RStudioServerProAppSettings"
-    },
-    "SecurityGroups": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "insertionOrder": false,
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.Id",
-      "maxLength": 32,
-      "pattern": "[-0-9a-zA-Z]+",
-      "type": "string"
-     },
-     "maxItems": 5,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "SharingSettings": {
-     "$ref": "#/definitions/SharingSettings"
-    },
-    "SpaceStorageSettings": {
-     "$ref": "#/definitions/DefaultSpaceStorageSettings"
-    },
-    "StudioWebPortal": {
-     "enum": [
-      "ENABLED",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "StudioWebPortalSettings": {
-     "$ref": "#/definitions/StudioWebPortalSettings"
-    }
-   },
-   "required": [
-    "ExecutionRole"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/DomainId"
- ],
- "properties": {
-  "AppNetworkAccessType": {
-   "enum": [
-    "PublicInternetOnly",
-    "VpcOnly"
-   ],
-   "type": "string"
-  },
-  "AppSecurityGroupManagement": {
-   "enum": [
-    "Service",
-    "Customer"
-   ],
-   "type": "string"
-  },
-  "AuthMode": {
-   "enum": [
-    "SSO",
-    "IAM"
-   ],
-   "type": "string"
-  },
-  "DefaultSpaceSettings": {
-   "$ref": "#/definitions/DefaultSpaceSettings"
-  },
-  "DefaultUserSettings": {
-   "$ref": "#/definitions/UserSettings"
-  },
-  "DomainArn": {
-   "maxLength": 256,
-   "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:domain/.*",
-   "type": "string"
-  },
-  "DomainId": {
-   "maxLength": 63,
-   "pattern": "^d-(-*[a-z0-9])+",
-   "type": "string"
-  },
-  "DomainName": {
-   "maxLength": 63,
-   "pattern": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}",
-   "type": "string"
-  },
-  "DomainSettings": {
-   "$ref": "#/definitions/DomainSettings"
-  },
-  "HomeEfsFileSystemId": {
-   "maxLength": 32,
-   "type": "string"
-  },
-  "KmsKeyId": {
-   "maxLength": 2048,
-   "pattern": ".*",
-   "type": "string"
-  },
-  "SecurityGroupIdForDomainBoundary": {
-   "maxLength": 32,
-   "pattern": "[-0-9a-zA-Z]+",
-   "type": "string"
-  },
-  "SingleSignOnApplicationArn": {
-   "pattern": "^arn:(aws|aws-us-gov|aws-cn|aws-iso|aws-iso-b):sso::[0-9]+:application/[a-zA-Z0-9-_.]+/apl-[a-zA-Z0-9]+$",
-   "type": "string"
-  },
-  "SingleSignOnManagedApplicationInstanceId": {
-   "maxLength": 256,
-   "type": "string"
-  },
-  "SubnetIds": {
-   "insertionOrder": false,
-   "items": {
-    "maxLength": 32,
-    "pattern": "[-0-9a-zA-Z]+",
-    "type": "string"
-   },
-   "maxItems": 16,
-   "minItems": 1,
-   "type": "array",
-   "uniqueItems": false
-  },
-  "TagPropagation": {
-   "enum": [
-    "ENABLED",
-    "DISABLED"
-   ],
-   "type": "string"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 50,
-   "minItems": 0,
-   "type": "array",
-   "uniqueItems": false
-  },
-  "Url": {
-   "maxLength": 1024,
-   "type": "string"
-  },
-  "VpcId": {
-   "format": "AWS::EC2::VPC.Id",
-   "maxLength": 32,
-   "pattern": "[-0-9a-zA-Z]+",
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/DomainArn",
-  "/properties/Url",
-  "/properties/DomainId",
-  "/properties/HomeEfsFileSystemId",
-  "/properties/SecurityGroupIdForDomainBoundary",
-  "/properties/SingleSignOnManagedApplicationInstanceId",
-  "/properties/SingleSignOnApplicationArn"
- ],
- "required": [
-  "AuthMode",
-  "DefaultUserSettings",
-  "DomainName",
-  "SubnetIds",
-  "VpcId"
- ],
- "typeName": "AWS::SageMaker::Domain",
- "writeOnlyProperties": [
-  "/properties/Tags"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/me_central_1/aws-sagemaker-userprofile.json b/src/cfnlint/data/schemas/providers/me_central_1/aws-sagemaker-userprofile.json
deleted file mode 100644
index a21ea9e798..0000000000
--- a/src/cfnlint/data/schemas/providers/me_central_1/aws-sagemaker-userprofile.json
+++ /dev/null
@@ -1,662 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/DomainId",
-  "/properties/UserProfileName",
-  "/properties/SingleSignOnUserIdentifier",
-  "/properties/SingleSignOnUserValue",
-  "/properties/UserSettings/RStudioServerProAppSettings/AccessStatus",
-  "/properties/UserSettings/RStudioServerProAppSettings/UserGroup",
-  "/properties/Tags"
- ],
- "definitions": {
-  "AppLifecycleManagement": {
-   "additionalProperties": false,
-   "properties": {
-    "IdleSettings": {
-     "$ref": "#/definitions/IdleSettings"
-    }
-   },
-   "type": "object"
-  },
-  "AppType": {
-   "enum": [
-    "JupyterServer",
-    "TensorBoard",
-    "RStudioServerPro",
-    "JupyterLab",
-    "CodeEditor",
-    "DetailedProfiler",
-    "Canvas"
-   ],
-   "type": "string"
-  },
-  "CodeEditorAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomImages": {
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "CodeRepository": {
-   "additionalProperties": false,
-   "properties": {
-    "RepositoryUrl": {
-     "maxLength": 256,
-     "pattern": "^https://([.\\-_a-zA-Z0-9]+/?){3,1016}$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "RepositoryUrl"
-   ],
-   "type": "object"
-  },
-  "CustomFileSystemConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "EFSFileSystemConfig": {
-     "$ref": "#/definitions/EFSFileSystemConfig"
-    },
-    "FSxLustreFileSystemConfig": {
-     "$ref": "#/definitions/FSxLustreFileSystemConfig"
-    }
-   },
-   "type": "object"
-  },
-  "CustomImage": {
-   "additionalProperties": false,
-   "properties": {
-    "AppImageConfigName": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}",
-     "type": "string"
-    },
-    "ImageName": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9]([-.]?[a-zA-Z0-9]){0,62}$",
-     "type": "string"
-    },
-    "ImageVersionNumber": {
-     "minimum": 0,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "AppImageConfigName",
-    "ImageName"
-   ],
-   "type": "object"
-  },
-  "CustomPosixUserConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "Gid": {
-     "maximum": 4000000,
-     "minimum": 1001,
-     "type": "integer"
-    },
-    "Uid": {
-     "maximum": 4000000,
-     "minimum": 10000,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "Uid",
-    "Gid"
-   ],
-   "type": "object"
-  },
-  "DefaultEbsStorageSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultEbsVolumeSizeInGb": {
-     "$ref": "#/definitions/SpaceEbsVolumeSizeInGb"
-    },
-    "MaximumEbsVolumeSizeInGb": {
-     "$ref": "#/definitions/SpaceEbsVolumeSizeInGb"
-    }
-   },
-   "required": [
-    "DefaultEbsVolumeSizeInGb",
-    "MaximumEbsVolumeSizeInGb"
-   ],
-   "type": "object"
-  },
-  "DefaultSpaceStorageSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultEbsStorageSettings": {
-     "$ref": "#/definitions/DefaultEbsStorageSettings"
-    }
-   },
-   "type": "object"
-  },
-  "EFSFileSystemConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "FileSystemId": {
-     "maxLength": 21,
-     "minLength": 11,
-     "pattern": "^(fs-[0-9a-f]{8,})$",
-     "type": "string"
-    },
-    "FileSystemPath": {
-     "maxLength": 256,
-     "minLength": 1,
-     "pattern": "^\\/\\S*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "FileSystemId"
-   ],
-   "type": "object"
-  },
-  "FSxLustreFileSystemConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "FileSystemId": {
-     "maxLength": 21,
-     "minLength": 11,
-     "pattern": "^(fs-[0-9a-f]{8,})$",
-     "type": "string"
-    },
-    "FileSystemPath": {
-     "maxLength": 256,
-     "minLength": 1,
-     "pattern": "^\\/\\S*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "FileSystemId"
-   ],
-   "type": "object"
-  },
-  "IdleSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "IdleTimeoutInMinutes": {
-     "$ref": "#/definitions/IdleTimeoutInMinutes"
-    },
-    "LifecycleManagement": {
-     "$ref": "#/definitions/LifecycleManagement"
-    },
-    "MaxIdleTimeoutInMinutes": {
-     "$ref": "#/definitions/MaxIdleTimeoutInMinutes"
-    },
-    "MinIdleTimeoutInMinutes": {
-     "$ref": "#/definitions/MinIdleTimeoutInMinutes"
-    }
-   },
-   "type": "object"
-  },
-  "IdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "JupyterLabAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CodeRepositories": {
-     "items": {
-      "$ref": "#/definitions/CodeRepository"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "CustomImages": {
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "JupyterServerAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "KernelGatewayAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomImages": {
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "LifecycleManagement": {
-   "enum": [
-    "ENABLED",
-    "DISABLED"
-   ],
-   "type": "string"
-  },
-  "MaxIdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "MinIdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "MlTools": {
-   "enum": [
-    "DataWrangler",
-    "FeatureStore",
-    "EmrClusters",
-    "AutoMl",
-    "Experiments",
-    "Training",
-    "ModelEvaluation",
-    "Pipelines",
-    "Models",
-    "JumpStart",
-    "InferenceRecommender",
-    "Endpoints",
-    "Projects",
-    "InferenceOptimization",
-    "HyperPodClusters",
-    "Comet",
-    "DeepchecksLLMEvaluation",
-    "Fiddler",
-    "LakeraGuard"
-   ],
-   "type": "string"
-  },
-  "RStudioServerProAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "AccessStatus": {
-     "enum": [
-      "ENABLED",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "UserGroup": {
-     "enum": [
-      "R_STUDIO_ADMIN",
-      "R_STUDIO_USER"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ResourceSpec": {
-   "additionalProperties": false,
-   "properties": {
-    "InstanceType": {
-     "enum": [
-      "system",
-      "ml.t3.micro",
-      "ml.t3.small",
-      "ml.t3.medium",
-      "ml.t3.large",
-      "ml.t3.xlarge",
-      "ml.t3.2xlarge",
-      "ml.m5.large",
-      "ml.m5.xlarge",
-      "ml.m5.2xlarge",
-      "ml.m5.4xlarge",
-      "ml.m5.8xlarge",
-      "ml.m5.12xlarge",
-      "ml.m5.16xlarge",
-      "ml.m5.24xlarge",
-      "ml.c5.large",
-      "ml.c5.xlarge",
-      "ml.c5.2xlarge",
-      "ml.c5.4xlarge",
-      "ml.c5.9xlarge",
-      "ml.c5.12xlarge",
-      "ml.c5.18xlarge",
-      "ml.c5.24xlarge",
-      "ml.p3.2xlarge",
-      "ml.p3.8xlarge",
-      "ml.p3.16xlarge",
-      "ml.g4dn.xlarge",
-      "ml.g4dn.2xlarge",
-      "ml.g4dn.4xlarge",
-      "ml.g4dn.8xlarge",
-      "ml.g4dn.12xlarge",
-      "ml.g4dn.16xlarge",
-      "ml.r5.large",
-      "ml.r5.xlarge",
-      "ml.r5.2xlarge",
-      "ml.r5.4xlarge",
-      "ml.r5.8xlarge",
-      "ml.r5.12xlarge",
-      "ml.r5.16xlarge",
-      "ml.r5.24xlarge",
-      "ml.p3dn.24xlarge",
-      "ml.m5d.large",
-      "ml.m5d.xlarge",
-      "ml.m5d.2xlarge",
-      "ml.m5d.4xlarge",
-      "ml.m5d.8xlarge",
-      "ml.m5d.12xlarge",
-      "ml.m5d.16xlarge",
-      "ml.m5d.24xlarge",
-      "ml.g5.xlarge",
-      "ml.g5.2xlarge",
-      "ml.g5.4xlarge",
-      "ml.g5.8xlarge",
-      "ml.g5.12xlarge",
-      "ml.g5.16xlarge",
-      "ml.g5.24xlarge",
-      "ml.g5.48xlarge",
-      "ml.p4d.24xlarge",
-      "ml.p4de.24xlarge",
-      "ml.geospatial.interactive",
-      "ml.trn1.2xlarge",
-      "ml.trn1.32xlarge",
-      "ml.trn1n.32xlarge"
-     ],
-     "type": "string"
-    },
-    "LifecycleConfigArn": {
-     "maxLength": 256,
-     "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:studio-lifecycle-config/.*",
-     "type": "string"
-    },
-    "SageMakerImageArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws(-[\\w]+)*:sagemaker:.+:[0-9]{12}:image/[a-z0-9]([-.]?[a-z0-9])*$",
-     "type": "string"
-    },
-    "SageMakerImageVersionArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws(-[\\w]+)*:sagemaker:.+:[0-9]{12}:image-version/[a-z0-9]([-.]?[a-z0-9])*/[0-9]+$",
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SharingSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "NotebookOutputOption": {
-     "enum": [
-      "Allowed",
-      "Disabled"
-     ],
-     "type": "string"
-    },
-    "S3KmsKeyId": {
-     "maxLength": 2048,
-     "pattern": ".*",
-     "type": "string"
-    },
-    "S3OutputPath": {
-     "maxLength": 1024,
-     "pattern": "^(https|s3)://([^/]+)/?(.*)$",
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SpaceEbsVolumeSizeInGb": {
-   "maximum": 16384,
-   "minimum": 5,
-   "type": "integer"
-  },
-  "StudioLifecycleConfigArn": {
-   "maxLength": 256,
-   "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:studio-lifecycle-config/.*",
-   "type": "string"
-  },
-  "StudioWebPortalSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "HiddenAppTypes": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/AppType"
-     },
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "HiddenMlTools": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/MlTools"
-     },
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$",
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "UserSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CodeEditorAppSettings": {
-     "$ref": "#/definitions/CodeEditorAppSettings"
-    },
-    "CustomFileSystemConfigs": {
-     "items": {
-      "$ref": "#/definitions/CustomFileSystemConfig"
-     },
-     "maxItems": 2,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "CustomPosixUserConfig": {
-     "$ref": "#/definitions/CustomPosixUserConfig"
-    },
-    "DefaultLandingUri": {
-     "maxLength": 1023,
-     "type": "string"
-    },
-    "ExecutionRole": {
-     "maxLength": 2048,
-     "minLength": 20,
-     "pattern": "^arn:aws[a-z\\-]*:iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+$",
-     "type": "string"
-    },
-    "JupyterLabAppSettings": {
-     "$ref": "#/definitions/JupyterLabAppSettings"
-    },
-    "JupyterServerAppSettings": {
-     "$ref": "#/definitions/JupyterServerAppSettings"
-    },
-    "KernelGatewayAppSettings": {
-     "$ref": "#/definitions/KernelGatewayAppSettings"
-    },
-    "RStudioServerProAppSettings": {
-     "$ref": "#/definitions/RStudioServerProAppSettings"
-    },
-    "SecurityGroups": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.Id",
-      "maxLength": 32,
-      "pattern": "[-0-9a-zA-Z]+",
-      "type": "string"
-     },
-     "maxItems": 5,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "SharingSettings": {
-     "$ref": "#/definitions/SharingSettings"
-    },
-    "SpaceStorageSettings": {
-     "$ref": "#/definitions/DefaultSpaceStorageSettings"
-    },
-    "StudioWebPortal": {
-     "enum": [
-      "ENABLED",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "StudioWebPortalSettings": {
-     "$ref": "#/definitions/StudioWebPortalSettings"
-    }
-   },
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/UserProfileName",
-  "/properties/DomainId"
- ],
- "properties": {
-  "DomainId": {
-   "maxLength": 63,
-   "minLength": 1,
-   "pattern": "^d-(-*[a-z0-9]){1,61}",
-   "type": "string"
-  },
-  "SingleSignOnUserIdentifier": {
-   "pattern": "UserName",
-   "type": "string"
-  },
-  "SingleSignOnUserValue": {
-   "maxLength": 256,
-   "minLength": 1,
-   "type": "string"
-  },
-  "Tags": {
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 50,
-   "minItems": 0,
-   "type": "array",
-   "uniqueItems": false
-  },
-  "UserProfileArn": {
-   "maxLength": 256,
-   "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:user-profile/.*",
-   "type": "string"
-  },
-  "UserProfileName": {
-   "maxLength": 63,
-   "minLength": 1,
-   "pattern": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}",
-   "type": "string"
-  },
-  "UserSettings": {
-   "$ref": "#/definitions/UserSettings",
-   "maxItems": 50,
-   "minItems": 0,
-   "uniqueItems": false
-  }
- },
- "readOnlyProperties": [
-  "/properties/UserProfileArn"
- ],
- "required": [
-  "DomainId",
-  "UserProfileName"
- ],
- "typeName": "AWS::SageMaker::UserProfile",
- "writeOnlyProperties": [
-  "/properties/Tags"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/me_south_1/__init__.py b/src/cfnlint/data/schemas/providers/me_south_1/__init__.py
index cc3504b91f..fed439a81b 100644
--- a/src/cfnlint/data/schemas/providers/me_south_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/me_south_1/__init__.py
@@ -1062,6 +1062,7 @@
     "aws-dms-replicationtask.json",
     "aws-dynamodb-globaltable.json",
     "aws-dynamodb-table.json",
+    "aws-ec2-capacityreservation.json",
     "aws-ec2-capacityreservationfleet.json",
     "aws-ec2-clientvpnendpoint.json",
     "aws-ec2-clientvpnroute.json",
@@ -1215,6 +1216,7 @@
     "aws-fis-experimenttemplate.json",
     "aws-fis-targetaccountconfiguration.json",
     "aws-fms-notificationchannel.json",
+    "aws-fms-policy.json",
     "aws-fms-resourceset.json",
     "aws-fsx-datarepositoryassociation.json",
     "aws-fsx-filesystem.json",
@@ -1436,6 +1438,7 @@
     "aws-redshift-eventsubscription.json",
     "aws-redshift-integration.json",
     "aws-redshift-scheduledaction.json",
+    "aws-resiliencehub-app.json",
     "aws-resiliencehub-resiliencypolicy.json",
     "aws-resourceexplorer2-defaultviewassociation.json",
     "aws-resourceexplorer2-index.json",
diff --git a/src/cfnlint/data/schemas/providers/me_south_1/aws-ec2-capacityreservation.json b/src/cfnlint/data/schemas/providers/me_south_1/aws-ec2-capacityreservation.json
deleted file mode 100644
index 5a10969ce5..0000000000
--- a/src/cfnlint/data/schemas/providers/me_south_1/aws-ec2-capacityreservation.json
+++ /dev/null
@@ -1,250 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/Tenancy",
-  "/properties/InstancePlatform",
-  "/properties/InstanceType",
-  "/properties/AvailabilityZone",
-  "/properties/TagSpecifications",
-  "/properties/OutPostArn",
-  "/properties/EphemeralStorage",
-  "/properties/EbsOptimized",
-  "/properties/PlacementGroupArn"
- ],
- "definitions": {
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "type": "string"
-    },
-    "Value": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "TagSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "ResourceType": {
-     "enum": [
-      "capacity-reservation",
-      "capacity-reservation-fleet",
-      "carrier-gateway",
-      "client-vpn-endpoint",
-      "coip-pool",
-      "customer-gateway",
-      "declarative-policies-report",
-      "dedicated-host",
-      "dhcp-options",
-      "egress-only-internet-gateway",
-      "elastic-gpu",
-      "elastic-ip",
-      "export-image-task",
-      "export-instance-task",
-      "fleet",
-      "fpga-image",
-      "host-reservation",
-      "image",
-      "import-image-task",
-      "import-snapshot-task",
-      "instance",
-      "instance-connect-endpoint",
-      "instance-event-window",
-      "internet-gateway",
-      "ipam",
-      "ipam-external-resource-verification-token",
-      "ipam-pool",
-      "ipam-resource-discovery",
-      "ipam-resource-discovery-association",
-      "ipam-scope",
-      "ipv4pool-ec2",
-      "ipv6pool-ec2",
-      "key-pair",
-      "launch-template",
-      "local-gateway",
-      "local-gateway-route-table",
-      "local-gateway-route-table-virtual-interface-group-association",
-      "local-gateway-route-table-vpc-association",
-      "local-gateway-virtual-interface",
-      "local-gateway-virtual-interface-group",
-      "natgateway",
-      "network-acl",
-      "network-insights-access-scope",
-      "network-insights-access-scope-analysis",
-      "network-insights-analysis",
-      "network-insights-path",
-      "network-interface",
-      "placement-group",
-      "prefix-list",
-      "replace-root-volume-task",
-      "reserved-instances",
-      "route-table",
-      "security-group",
-      "security-group-rule",
-      "snapshot",
-      "spot-fleet-request",
-      "spot-instances-request",
-      "subnet",
-      "subnet-cidr-reservation",
-      "traffic-mirror-filter",
-      "traffic-mirror-filter-rule",
-      "traffic-mirror-session",
-      "traffic-mirror-target",
-      "transit-gateway",
-      "transit-gateway-attachment",
-      "transit-gateway-connect-peer",
-      "transit-gateway-multicast-domain",
-      "transit-gateway-policy-table",
-      "transit-gateway-route-table",
-      "transit-gateway-route-table-announcement",
-      "verified-access-endpoint",
-      "verified-access-endpoint-target",
-      "verified-access-group",
-      "verified-access-instance",
-      "verified-access-policy",
-      "verified-access-trust-provider",
-      "volume",
-      "vpc",
-      "vpc-block-public-access-exclusion",
-      "vpc-endpoint",
-      "vpc-endpoint-connection",
-      "vpc-endpoint-connection-device-type",
-      "vpc-endpoint-service",
-      "vpc-endpoint-service-permission",
-      "vpc-flow-log",
-      "vpc-peering-connection",
-      "vpn-connection",
-      "vpn-connection-device-type",
-      "vpn-gateway"
-     ],
-     "type": "string"
-    },
-    "Tags": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Tag"
-     },
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "AvailabilityZone": {
-   "type": "string"
-  },
-  "AvailableInstanceCount": {
-   "type": "integer"
-  },
-  "EbsOptimized": {
-   "type": "boolean"
-  },
-  "EndDate": {
-   "type": "string"
-  },
-  "EndDateType": {
-   "enum": [
-    "limited",
-    "unlimited"
-   ],
-   "type": "string"
-  },
-  "EphemeralStorage": {
-   "type": "boolean"
-  },
-  "Id": {
-   "type": "string"
-  },
-  "InstanceCount": {
-   "type": "integer"
-  },
-  "InstanceMatchCriteria": {
-   "enum": [
-    "open",
-    "targeted"
-   ],
-   "type": "string"
-  },
-  "InstancePlatform": {
-   "enum": [
-    "Linux with SQL Server Enterprise",
-    "Linux with SQL Server Standard",
-    "Linux with SQL Server Web",
-    "Linux/UNIX",
-    "RHEL with HA",
-    "RHEL with HA and SQL Server Enterprise",
-    "RHEL with HA and SQL Server Standard",
-    "RHEL with SQL Server Enterprise",
-    "RHEL with SQL Server Standard",
-    "RHEL with SQL Server Web",
-    "Red Hat Enterprise Linux",
-    "SUSE Linux",
-    "Ubuntu Pro",
-    "Windows",
-    "Windows with SQL Server",
-    "Windows with SQL Server Enterprise",
-    "Windows with SQL Server Standard",
-    "Windows with SQL Server Web"
-   ],
-   "type": "string"
-  },
-  "InstanceType": {
-   "type": "string"
-  },
-  "OutPostArn": {
-   "pattern": "^arn:aws([a-z-]+)?:outposts:[a-z\\d-]+:\\d{12}:outpost/op-[a-f0-9]{17}$",
-   "type": "string"
-  },
-  "PlacementGroupArn": {
-   "pattern": "^arn:aws([a-z-]+)?:ec2:[a-z\\d-]+:\\d{12}:placement-group/^.{1,255}$",
-   "type": "string"
-  },
-  "TagSpecifications": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/TagSpecification"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "Tenancy": {
-   "enum": [
-    "dedicated",
-    "default"
-   ],
-   "type": "string"
-  },
-  "TotalInstanceCount": {
-   "type": "integer"
-  },
-  "UnusedReservationBillingOwnerId": {
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id",
-  "/properties/AvailableInstanceCount",
-  "/properties/TotalInstanceCount"
- ],
- "required": [
-  "InstanceCount",
-  "AvailabilityZone",
-  "InstancePlatform",
-  "InstanceType"
- ],
- "typeName": "AWS::EC2::CapacityReservation",
- "writeOnlyProperties": [
-  "/properties/UnusedReservationBillingOwnerId"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/me_south_1/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/me_south_1/aws-fms-policy.json
deleted file mode 100644
index 8422693828..0000000000
--- a/src/cfnlint/data/schemas/providers/me_south_1/aws-fms-policy.json
+++ /dev/null
@@ -1,416 +0,0 @@
-{
- "additionalProperties": false,
- "definitions": {
-  "AccountId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^([0-9]*)$",
-   "type": "string"
-  },
-  "Base62Id": {
-   "maxLength": 22,
-   "minLength": 22,
-   "pattern": "^[a-z0-9A-Z]{22}$",
-   "type": "string"
-  },
-  "FirewallDeploymentModel": {
-   "enum": [
-    "DISTRIBUTED",
-    "CENTRALIZED"
-   ],
-   "type": "string"
-  },
-  "IEMap": {
-   "additionalProperties": false,
-   "properties": {
-    "ACCOUNT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/AccountId"
-     },
-     "type": "array"
-    },
-    "ORGUNIT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/OrganizationalUnitId"
-     },
-     "type": "array"
-    }
-   },
-   "type": "object"
-  },
-  "ManagedServiceData": {
-   "maxLength": 30000,
-   "minLength": 1,
-   "type": "string"
-  },
-  "NetworkAclCommonPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "NetworkAclEntrySet": {
-     "$ref": "#/definitions/NetworkAclEntrySet"
-    }
-   },
-   "required": [
-    "NetworkAclEntrySet"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntry": {
-   "additionalProperties": false,
-   "properties": {
-    "CidrBlock": {
-     "pattern": "^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(\\/([0-9]|[1-2][0-9]|3[0-2]))$",
-     "type": "string"
-    },
-    "Egress": {
-     "type": "boolean"
-    },
-    "IcmpTypeCode": {
-     "additionalProperties": false,
-     "properties": {
-      "Code": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "Type": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "Code",
-      "Type"
-     ],
-     "type": "object"
-    },
-    "Ipv6CidrBlock": {
-     "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))(/(1[0-2]|[0-9]))?$",
-     "type": "string"
-    },
-    "PortRange": {
-     "additionalProperties": false,
-     "properties": {
-      "From": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "To": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "From",
-      "To"
-     ],
-     "type": "object"
-    },
-    "Protocol": {
-     "pattern": "^(tcp|udp|icmp|-1|([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))$",
-     "type": "string"
-    },
-    "RuleAction": {
-     "enum": [
-      "allow",
-      "deny"
-     ],
-     "type": "string"
-    }
-   },
-   "required": [
-    "Egress",
-    "Protocol",
-    "RuleAction"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntryList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/NetworkAclEntry"
-   },
-   "type": "array"
-  },
-  "NetworkAclEntrySet": {
-   "additionalProperties": false,
-   "anyOf": [
-    {
-     "required": [
-      "FirstEntries"
-     ]
-    },
-    {
-     "required": [
-      "LastEntries"
-     ]
-    }
-   ],
-   "properties": {
-    "FirstEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    },
-    "ForceRemediateForFirstEntries": {
-     "type": "boolean"
-    },
-    "ForceRemediateForLastEntries": {
-     "type": "boolean"
-    },
-    "LastEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    }
-   },
-   "required": [
-    "ForceRemediateForFirstEntries",
-    "ForceRemediateForLastEntries"
-   ],
-   "type": "object"
-  },
-  "NetworkFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  },
-  "OrganizationalUnitId": {
-   "maxLength": 68,
-   "minLength": 16,
-   "pattern": "^(ou-[0-9a-z]{4,32}-[a-z0-9]{8,32})$",
-   "type": "string"
-  },
-  "PolicyOption": {
-   "additionalProperties": false,
-   "oneOf": [
-    {
-     "required": [
-      "NetworkFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "ThirdPartyFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "NetworkAclCommonPolicy"
-     ]
-    }
-   ],
-   "properties": {
-    "NetworkAclCommonPolicy": {
-     "$ref": "#/definitions/NetworkAclCommonPolicy"
-    },
-    "NetworkFirewallPolicy": {
-     "$ref": "#/definitions/NetworkFirewallPolicy"
-    },
-    "ThirdPartyFirewallPolicy": {
-     "$ref": "#/definitions/ThirdPartyFirewallPolicy"
-    }
-   },
-   "type": "object"
-  },
-  "PolicyTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "PolicyType": {
-   "enum": [
-    "WAF",
-    "WAFV2",
-    "SHIELD_ADVANCED",
-    "SECURITY_GROUPS_COMMON",
-    "SECURITY_GROUPS_CONTENT_AUDIT",
-    "SECURITY_GROUPS_USAGE_AUDIT",
-    "NETWORK_FIREWALL",
-    "THIRD_PARTY_FIREWALL",
-    "DNS_FIREWALL",
-    "IMPORT_NETWORK_FIREWALL",
-    "NETWORK_ACL_COMMON"
-   ],
-   "type": "string"
-  },
-  "ResourceArn": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "ResourceTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key"
-   ],
-   "type": "object"
-  },
-  "ResourceType": {
-   "maxLength": 128,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "SecurityServicePolicyData": {
-   "additionalProperties": false,
-   "properties": {
-    "ManagedServiceData": {
-     "$ref": "#/definitions/ManagedServiceData"
-    },
-    "PolicyOption": {
-     "$ref": "#/definitions/PolicyOption"
-    },
-    "Type": {
-     "$ref": "#/definitions/PolicyType"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "ThirdPartyFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "Arn": {
-   "$ref": "#/definitions/ResourceArn"
-  },
-  "DeleteAllPolicyResources": {
-   "type": "boolean"
-  },
-  "ExcludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "ExcludeResourceTags": {
-   "type": "boolean"
-  },
-  "Id": {
-   "maxLength": 36,
-   "minLength": 36,
-   "pattern": "^[a-z0-9A-Z-]{36}$",
-   "type": "string"
-  },
-  "IncludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "PolicyDescription": {
-   "maxLength": 256,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "PolicyName": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "RemediationEnabled": {
-   "type": "boolean"
-  },
-  "ResourceSetIds": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/Base62Id"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "ResourceTags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceTag"
-   },
-   "maxItems": 8,
-   "type": "array"
-  },
-  "ResourceType": {
-   "$ref": "#/definitions/ResourceType"
-  },
-  "ResourceTypeList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceType"
-   },
-   "type": "array"
-  },
-  "ResourcesCleanUp": {
-   "type": "boolean"
-  },
-  "SecurityServicePolicyData": {
-   "$ref": "#/definitions/SecurityServicePolicyData"
-  },
-  "Tags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/PolicyTag"
-   },
-   "type": "array"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/Id"
- ],
- "required": [
-  "ExcludeResourceTags",
-  "PolicyName",
-  "RemediationEnabled",
-  "SecurityServicePolicyData"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-fms.git",
- "typeName": "AWS::FMS::Policy",
- "writeOnlyProperties": [
-  "/properties/DeleteAllPolicyResources"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/me_south_1/aws-resiliencehub-app.json b/src/cfnlint/data/schemas/providers/me_south_1/aws-resiliencehub-app.json
deleted file mode 100644
index 40b055a88b..0000000000
--- a/src/cfnlint/data/schemas/providers/me_south_1/aws-resiliencehub-app.json
+++ /dev/null
@@ -1,222 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/Name"
- ],
- "definitions": {
-  "EventSubscription": {
-   "additionalProperties": false,
-   "properties": {
-    "EventType": {
-     "enum": [
-      "ScheduledAssessmentFailure",
-      "DriftDetected"
-     ],
-     "type": "string"
-    },
-    "Name": {
-     "maxLength": 256,
-     "type": "string"
-    },
-    "SnsTopicArn": {
-     "pattern": "^arn:(aws|aws-cn|aws-iso|aws-iso-[a-z]{1}|aws-us-gov):[A-Za-z0-9][A-Za-z0-9_/.-]{0,62}:([a-z]{2}-((iso[a-z]{0,1}-)|(gov-)){0,1}[a-z]+-[0-9]):[0-9]{12}:[A-Za-z0-9/][A-Za-z0-9:_/+.-]{0,1023}$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Name",
-    "EventType"
-   ],
-   "type": "object"
-  },
-  "IamRoleArn": {
-   "pattern": "arn:(aws|aws-cn|aws-iso|aws-iso-[a-z]{1}|aws-us-gov):iam::[0-9]{12}:role\\/(([\\u0021-\\u007E]+\\u002F){1,511})?[A-Za-z0-9+=,.@_/-]{1,64}$",
-   "type": "string"
-  },
-  "PermissionModel": {
-   "additionalProperties": false,
-   "properties": {
-    "CrossAccountRoleArns": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/IamRoleArn"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "InvokerRoleName": {
-     "pattern": "((\\u002F[\\u0021-\\u007E]+\\u002F){1,511})?[A-Za-z0-9+=,.@_/-]{1,64}",
-     "type": "string"
-    },
-    "Type": {
-     "enum": [
-      "LegacyIAMUser",
-      "RoleBased"
-     ],
-     "type": "string"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "PhysicalResourceId": {
-   "additionalProperties": false,
-   "properties": {
-    "AwsAccountId": {
-     "pattern": "^[0-9]{12}$",
-     "type": "string"
-    },
-    "AwsRegion": {
-     "pattern": "^[a-z]{2}-((iso[a-z]{0,1}-)|(gov-)){0,1}[a-z]+-[0-9]$",
-     "type": "string"
-    },
-    "Identifier": {
-     "maxLength": 255,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Type": {
-     "pattern": "Arn|Native",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Identifier",
-    "Type"
-   ],
-   "type": "object"
-  },
-  "ResourceMapping": {
-   "additionalProperties": false,
-   "properties": {
-    "EksSourceName": {
-     "type": "string"
-    },
-    "LogicalStackName": {
-     "type": "string"
-    },
-    "MappingType": {
-     "pattern": "CfnStack|Resource|Terraform|EKS",
-     "type": "string"
-    },
-    "PhysicalResourceId": {
-     "$ref": "#/definitions/PhysicalResourceId"
-    },
-    "ResourceName": {
-     "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$",
-     "type": "string"
-    },
-    "TerraformSourceName": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "MappingType",
-    "PhysicalResourceId"
-   ],
-   "type": "object"
-  },
-  "TagMap": {
-   "additionalProperties": false,
-   "patternProperties": {
-    ".{1,128}": {
-     "$ref": "#/definitions/TagValue"
-    }
-   },
-   "type": "object"
-  },
-  "TagValue": {
-   "maxLength": 256,
-   "type": "string"
-  }
- },
- "primaryIdentifier": [
-  "/properties/AppArn"
- ],
- "properties": {
-  "AppArn": {
-   "pattern": "^arn:(aws|aws-cn|aws-iso|aws-iso-[a-z]{1}|aws-us-gov):[A-Za-z0-9][A-Za-z0-9_/.-]{0,62}:([a-z]{2}-((iso[a-z]{0,1}-)|(gov-)){0,1}[a-z]+-[0-9]):[0-9]{12}:[A-Za-z0-9][A-Za-z0-9:_/+=,@.-]{0,1023}$",
-   "type": "string"
-  },
-  "AppAssessmentSchedule": {
-   "enum": [
-    "Disabled",
-    "Daily"
-   ],
-   "type": "string"
-  },
-  "AppTemplateBody": {
-   "maxLength": 409600,
-   "minLength": 0,
-   "pattern": "^[\\w\\s:,-\\.'\\/{}\\[\\]:\"]+$",
-   "type": "string"
-  },
-  "Description": {
-   "maxLength": 500,
-   "minLength": 0,
-   "type": "string"
-  },
-  "DriftStatus": {
-   "enum": [
-    "NotChecked",
-    "NotDetected",
-    "Detected"
-   ],
-   "type": "string"
-  },
-  "EventSubscriptions": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/EventSubscription"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "Name": {
-   "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$",
-   "type": "string"
-  },
-  "PermissionModel": {
-   "$ref": "#/definitions/PermissionModel"
-  },
-  "RegulatoryPolicyArn": {
-   "pattern": "^arn:(aws|aws-cn|aws-iso|aws-iso-[a-z]{1}|aws-us-gov):[A-Za-z0-9][A-Za-z0-9_/.-]{0,62}:([a-z]{2}-((iso[a-z]{0,1}-)|(gov-)){0,1}[a-z]+-[0-9]):[0-9]{12}:[A-Za-z0-9][A-Za-z0-9:_/+=,@.-]{0,1023}$",
-   "type": "string"
-  },
-  "ResiliencyPolicyArn": {
-   "pattern": "^arn:(aws|aws-cn|aws-iso|aws-iso-[a-z]{1}|aws-us-gov):[A-Za-z0-9][A-Za-z0-9_/.-]{0,62}:([a-z]{2}-((iso[a-z]{0,1}-)|(gov-)){0,1}[a-z]+-[0-9]):[0-9]{12}:[A-Za-z0-9][A-Za-z0-9:_/+=,@.-]{0,1023}$",
-   "type": "string"
-  },
-  "ResourceMappings": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/ResourceMapping"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "Tags": {
-   "$ref": "#/definitions/TagMap"
-  }
- },
- "readOnlyProperties": [
-  "/properties/AppArn",
-  "/properties/DriftStatus"
- ],
- "required": [
-  "Name",
-  "AppTemplateBody",
-  "ResourceMappings"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-resiliencehub",
- "tagging": {
-  "cloudFormationSystemTags": true,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::ResilienceHub::App"
-}
diff --git a/src/cfnlint/data/schemas/providers/sa_east_1/__init__.py b/src/cfnlint/data/schemas/providers/sa_east_1/__init__.py
index 21122a347f..49dfc7f7b0 100644
--- a/src/cfnlint/data/schemas/providers/sa_east_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/sa_east_1/__init__.py
@@ -1292,6 +1292,7 @@
     "aws-datasync-locationsmb.json",
     "aws-datasync-storagesystem.json",
     "aws-datasync-task.json",
+    "aws-datazone-datasource.json",
     "aws-datazone-domain.json",
     "aws-datazone-environment.json",
     "aws-datazone-environmentactions.json",
diff --git a/src/cfnlint/data/schemas/providers/sa_east_1/aws-datazone-datasource.json b/src/cfnlint/data/schemas/providers/sa_east_1/aws-datazone-datasource.json
deleted file mode 100644
index 1f1745b36e..0000000000
--- a/src/cfnlint/data/schemas/providers/sa_east_1/aws-datazone-datasource.json
+++ /dev/null
@@ -1,552 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/ConnectionIdentifier",
-  "/properties/EnvironmentIdentifier",
-  "/properties/DomainIdentifier",
-  "/properties/ProjectIdentifier",
-  "/properties/Type"
- ],
- "definitions": {
-  "AccountId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^\\d{12}$",
-   "type": "string"
-  },
-  "DataAccessRole": {
-   "pattern": "^arn:aws[^:]*:iam::\\d{12}:(role|role/service-role)/[\\w+=,.@-]{1,128}$",
-   "type": "string"
-  },
-  "DataSourceConfigurationInput": {
-   "oneOf": [
-    {
-     "additionalProperties": false,
-     "properties": {
-      "GlueRunConfiguration": {
-       "$ref": "#/definitions/GlueRunConfigurationInput"
-      }
-     },
-     "title": "GlueRunConfiguration",
-     "type": "object"
-    },
-    {
-     "additionalProperties": false,
-     "properties": {
-      "RedshiftRunConfiguration": {
-       "$ref": "#/definitions/RedshiftRunConfigurationInput"
-      }
-     },
-     "title": "RedshiftRunConfiguration",
-     "type": "object"
-    },
-    {
-     "additionalProperties": false,
-     "properties": {
-      "SageMakerRunConfiguration": {
-       "$ref": "#/definitions/SageMakerRunConfigurationInput"
-      }
-     },
-     "title": "SageMakerRunConfiguration",
-     "type": "object"
-    }
-   ]
-  },
-  "DataSourceStatus": {
-   "enum": [
-    "CREATING",
-    "FAILED_CREATION",
-    "READY",
-    "UPDATING",
-    "FAILED_UPDATE",
-    "RUNNING",
-    "DELETING",
-    "FAILED_DELETION"
-   ],
-   "type": "string"
-  },
-  "EnableSetting": {
-   "enum": [
-    "ENABLED",
-    "DISABLED"
-   ],
-   "type": "string"
-  },
-  "FilterExpression": {
-   "additionalProperties": false,
-   "properties": {
-    "Expression": {
-     "maxLength": 2048,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Type": {
-     "$ref": "#/definitions/FilterExpressionType"
-    }
-   },
-   "required": [
-    "Expression",
-    "Type"
-   ],
-   "type": "object"
-  },
-  "FilterExpressionType": {
-   "enum": [
-    "INCLUDE",
-    "EXCLUDE"
-   ],
-   "type": "string"
-  },
-  "FormInput": {
-   "additionalProperties": false,
-   "properties": {
-    "Content": {
-     "maxLength": 75000,
-     "type": "string"
-    },
-    "FormName": {
-     "$ref": "#/definitions/FormName"
-    },
-    "TypeIdentifier": {
-     "maxLength": 385,
-     "minLength": 1,
-     "pattern": "^(?!\\.)[\\w\\.]*\\w$",
-     "type": "string"
-    },
-    "TypeRevision": {
-     "$ref": "#/definitions/TypeRevision"
-    }
-   },
-   "required": [
-    "FormName"
-   ],
-   "type": "object"
-  },
-  "FormName": {
-   "maxLength": 128,
-   "minLength": 1,
-   "pattern": "^(?![0-9_])\\w+$|^_\\w*[a-zA-Z0-9]\\w*$",
-   "type": "string"
-  },
-  "GlueRunConfigurationInput": {
-   "additionalProperties": false,
-   "properties": {
-    "AutoImportDataQualityResult": {
-     "type": "boolean"
-    },
-    "CatalogName": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "DataAccessRole": {
-     "$ref": "#/definitions/DataAccessRole"
-    },
-    "RelationalFilterConfigurations": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/RelationalFilterConfiguration"
-     },
-     "type": "array"
-    }
-   },
-   "required": [
-    "RelationalFilterConfigurations"
-   ],
-   "type": "object"
-  },
-  "RecommendationConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "EnableBusinessNameGeneration": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "RedshiftClusterStorage": {
-   "additionalProperties": false,
-   "properties": {
-    "ClusterName": {
-     "maxLength": 63,
-     "minLength": 1,
-     "pattern": "^[0-9a-z].[a-z0-9\\-]*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "ClusterName"
-   ],
-   "type": "object"
-  },
-  "RedshiftCredentialConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "SecretManagerArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws[^:]*:secretsmanager:[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]:\\d{12}:secret:.*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "SecretManagerArn"
-   ],
-   "type": "object"
-  },
-  "RedshiftRunConfigurationInput": {
-   "additionalProperties": false,
-   "properties": {
-    "DataAccessRole": {
-     "$ref": "#/definitions/DataAccessRole"
-    },
-    "RedshiftCredentialConfiguration": {
-     "$ref": "#/definitions/RedshiftCredentialConfiguration"
-    },
-    "RedshiftStorage": {
-     "$ref": "#/definitions/RedshiftStorage"
-    },
-    "RelationalFilterConfigurations": {
-     "$ref": "#/definitions/RelationalFilterConfigurations"
-    }
-   },
-   "required": [
-    "RelationalFilterConfigurations"
-   ],
-   "type": "object"
-  },
-  "RedshiftServerlessStorage": {
-   "additionalProperties": false,
-   "properties": {
-    "WorkgroupName": {
-     "maxLength": 64,
-     "minLength": 3,
-     "pattern": "^[a-z0-9-]+$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "WorkgroupName"
-   ],
-   "type": "object"
-  },
-  "RedshiftStorage": {
-   "oneOf": [
-    {
-     "additionalProperties": false,
-     "properties": {
-      "RedshiftClusterSource": {
-       "$ref": "#/definitions/RedshiftClusterStorage"
-      }
-     },
-     "required": [
-      "RedshiftClusterSource"
-     ],
-     "title": "RedshiftClusterSource",
-     "type": "object"
-    },
-    {
-     "additionalProperties": false,
-     "properties": {
-      "RedshiftServerlessSource": {
-       "$ref": "#/definitions/RedshiftServerlessStorage"
-      }
-     },
-     "required": [
-      "RedshiftServerlessSource"
-     ],
-     "title": "RedshiftServerlessSource",
-     "type": "object"
-    }
-   ]
-  },
-  "Region": {
-   "maxLength": 16,
-   "minLength": 4,
-   "pattern": "[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]",
-   "type": "string"
-  },
-  "RelationalFilterConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "DatabaseName": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "FilterExpressions": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/FilterExpression"
-     },
-     "type": "array"
-    },
-    "SchemaName": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "DatabaseName"
-   ],
-   "type": "object"
-  },
-  "RelationalFilterConfigurations": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/RelationalFilterConfiguration"
-   },
-   "type": "array"
-  },
-  "SageMakerRunConfigurationInput": {
-   "additionalProperties": false,
-   "properties": {
-    "TrackingAssets": {
-     "$ref": "#/definitions/TrackingAssets"
-    }
-   },
-   "required": [
-    "TrackingAssets"
-   ],
-   "type": "object"
-  },
-  "ScheduleConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "Schedule": {
-     "maxLength": 256,
-     "minLength": 1,
-     "pattern": "cron\\((\\b[0-5]?[0-9]\\b) (\\b2[0-3]\\b|\\b[0-1]?[0-9]\\b) (.*){1,5} (.*){1,5} (.*){1,5} (.*){1,5}\\)",
-     "type": "string"
-    },
-    "Timezone": {
-     "$ref": "#/definitions/Timezone"
-    }
-   },
-   "type": "object"
-  },
-  "Timezone": {
-   "enum": [
-    "AFRICA_JOHANNESBURG",
-    "AMERICA_MONTREAL",
-    "AMERICA_SAO_PAULO",
-    "ASIA_BAHRAIN",
-    "ASIA_BANGKOK",
-    "ASIA_CALCUTTA",
-    "ASIA_DUBAI",
-    "ASIA_HONG_KONG",
-    "ASIA_JAKARTA",
-    "ASIA_KUALA_LUMPUR",
-    "ASIA_SEOUL",
-    "ASIA_SHANGHAI",
-    "ASIA_SINGAPORE",
-    "ASIA_TAIPEI",
-    "ASIA_TOKYO",
-    "AUSTRALIA_MELBOURNE",
-    "AUSTRALIA_SYDNEY",
-    "CANADA_CENTRAL",
-    "CET",
-    "CST6CDT",
-    "ETC_GMT",
-    "ETC_GMT0",
-    "ETC_GMT_ADD_0",
-    "ETC_GMT_ADD_1",
-    "ETC_GMT_ADD_10",
-    "ETC_GMT_ADD_11",
-    "ETC_GMT_ADD_12",
-    "ETC_GMT_ADD_2",
-    "ETC_GMT_ADD_3",
-    "ETC_GMT_ADD_4",
-    "ETC_GMT_ADD_5",
-    "ETC_GMT_ADD_6",
-    "ETC_GMT_ADD_7",
-    "ETC_GMT_ADD_8",
-    "ETC_GMT_ADD_9",
-    "ETC_GMT_NEG_0",
-    "ETC_GMT_NEG_1",
-    "ETC_GMT_NEG_10",
-    "ETC_GMT_NEG_11",
-    "ETC_GMT_NEG_12",
-    "ETC_GMT_NEG_13",
-    "ETC_GMT_NEG_14",
-    "ETC_GMT_NEG_2",
-    "ETC_GMT_NEG_3",
-    "ETC_GMT_NEG_4",
-    "ETC_GMT_NEG_5",
-    "ETC_GMT_NEG_6",
-    "ETC_GMT_NEG_7",
-    "ETC_GMT_NEG_8",
-    "ETC_GMT_NEG_9",
-    "EUROPE_DUBLIN",
-    "EUROPE_LONDON",
-    "EUROPE_PARIS",
-    "EUROPE_STOCKHOLM",
-    "EUROPE_ZURICH",
-    "ISRAEL",
-    "MEXICO_GENERAL",
-    "MST7MDT",
-    "PACIFIC_AUCKLAND",
-    "US_CENTRAL",
-    "US_EASTERN",
-    "US_MOUNTAIN",
-    "US_PACIFIC",
-    "UTC"
-   ],
-   "type": "string"
-  },
-  "TrackingAssets": {
-   "additionalProperties": false,
-   "maxProperties": 1,
-   "patternProperties": {
-    "^.{1,64}$": {
-     "items": {
-      "pattern": "^arn:aws[^:]*:sagemaker:[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]:\\d{12}:[\\w+=,.@-]{1,128}/[\\w+=,.@-]{1,256}$",
-      "type": "string"
-     },
-     "maxItems": 500,
-     "minItems": 0,
-     "type": "array"
-    }
-   },
-   "type": "object"
-  },
-  "TypeRevision": {
-   "maxLength": 64,
-   "minLength": 1,
-   "pattern": "^[a-zA-Z0-9_-]+$",
-   "type": "string"
-  }
- },
- "primaryIdentifier": [
-  "/properties/DomainId",
-  "/properties/Id"
- ],
- "properties": {
-  "AssetFormsInput": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/FormInput"
-   },
-   "maxItems": 10,
-   "minItems": 0,
-   "type": "array"
-  },
-  "Configuration": {
-   "$ref": "#/definitions/DataSourceConfigurationInput"
-  },
-  "ConnectionId": {
-   "type": "string"
-  },
-  "ConnectionIdentifier": {
-   "type": "string"
-  },
-  "CreatedAt": {
-   "format": "date-time",
-   "type": "string"
-  },
-  "Description": {
-   "maxLength": 2048,
-   "type": "string"
-  },
-  "DomainId": {
-   "pattern": "^dzd[-_][a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "DomainIdentifier": {
-   "pattern": "^dzd[-_][a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "EnableSetting": {
-   "$ref": "#/definitions/EnableSetting"
-  },
-  "EnvironmentId": {
-   "type": "string"
-  },
-  "EnvironmentIdentifier": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "Id": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "LastRunAssetCount": {
-   "type": "number"
-  },
-  "LastRunAt": {
-   "type": "string"
-  },
-  "LastRunStatus": {
-   "type": "string"
-  },
-  "Name": {
-   "maxLength": 256,
-   "minLength": 1,
-   "type": "string"
-  },
-  "ProjectId": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "ProjectIdentifier": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "PublishOnImport": {
-   "type": "boolean"
-  },
-  "Recommendation": {
-   "$ref": "#/definitions/RecommendationConfiguration"
-  },
-  "Schedule": {
-   "$ref": "#/definitions/ScheduleConfiguration"
-  },
-  "Status": {
-   "$ref": "#/definitions/DataSourceStatus"
-  },
-  "Type": {
-   "maxLength": 256,
-   "minLength": 1,
-   "type": "string"
-  },
-  "UpdatedAt": {
-   "format": "date-time",
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/ConnectionId",
-  "/properties/CreatedAt",
-  "/properties/DomainId",
-  "/properties/EnvironmentId",
-  "/properties/Id",
-  "/properties/LastRunAssetCount",
-  "/properties/LastRunAt",
-  "/properties/LastRunStatus",
-  "/properties/ProjectId",
-  "/properties/Status",
-  "/properties/UpdatedAt"
- ],
- "required": [
-  "Name",
-  "DomainIdentifier",
-  "ProjectIdentifier",
-  "Type"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-datazone",
- "tagging": {
-  "cloudFormationSystemTags": false,
-  "tagOnCreate": false,
-  "tagUpdatable": false,
-  "taggable": false
- },
- "typeName": "AWS::DataZone::DataSource",
- "writeOnlyProperties": [
-  "/properties/AssetFormsInput",
-  "/properties/ConnectionIdentifier",
-  "/properties/EnvironmentIdentifier",
-  "/properties/DomainIdentifier",
-  "/properties/Configuration",
-  "/properties/ProjectIdentifier"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/__init__.py b/src/cfnlint/data/schemas/providers/us_east_1/__init__.py
index 756ef49e60..b79adb3f74 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/us_east_1/__init__.py
@@ -217,6 +217,7 @@
     "AWS::CloudFront::RealtimeLogConfig",
     "AWS::CloudFront::ResponseHeadersPolicy",
     "AWS::CloudFront::StreamingDistribution",
+    "AWS::CloudFront::VpcOrigin",
     "AWS::CloudTrail::Channel",
     "AWS::CloudTrail::Dashboard",
     "AWS::CloudTrail::EventDataStore",
diff --git a/src/cfnlint/data/schemas/providers/eu_central_1/aws-cloudfront-vpcorigin.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-cloudfront-vpcorigin.json
similarity index 95%
rename from src/cfnlint/data/schemas/providers/eu_central_1/aws-cloudfront-vpcorigin.json
rename to src/cfnlint/data/schemas/providers/us_east_1/aws-cloudfront-vpcorigin.json
index 80909b40c9..43bf0acea4 100644
--- a/src/cfnlint/data/schemas/providers/eu_central_1/aws-cloudfront-vpcorigin.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-cloudfront-vpcorigin.json
@@ -36,6 +36,11 @@
     },
     "OriginProtocolPolicy": {
      "default": "match-viewer",
+     "enum": [
+      "http-only",
+      "https-only",
+      "match-viewer"
+     ],
      "type": "string"
     },
     "OriginSSLProtocols": {
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-datazone-datasource.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-datazone-datasource.json
index ec66adcc4a..18ddc67ae4 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-datazone-datasource.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-datazone-datasource.json
@@ -1,6 +1,7 @@
 {
  "additionalProperties": false,
  "createOnlyProperties": [
+  "/properties/ConnectionIdentifier",
   "/properties/EnvironmentIdentifier",
   "/properties/DomainIdentifier",
   "/properties/ProjectIdentifier",
@@ -133,6 +134,11 @@
     "AutoImportDataQualityResult": {
      "type": "boolean"
     },
+    "CatalogName": {
+     "maxLength": 128,
+     "minLength": 1,
+     "type": "string"
+    },
     "DataAccessRole": {
      "$ref": "#/definitions/DataAccessRole"
     },
@@ -204,8 +210,6 @@
     }
    },
    "required": [
-    "RedshiftCredentialConfiguration",
-    "RedshiftStorage",
     "RelationalFilterConfigurations"
    ],
    "type": "object"
@@ -430,6 +434,13 @@
   "Configuration": {
    "$ref": "#/definitions/DataSourceConfigurationInput"
   },
+  "ConnectionId": {
+   "type": "string"
+  },
+  "ConnectionIdentifier": {
+   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
+   "type": "string"
+  },
   "CreatedAt": {
    "format": "date-time",
    "type": "string"
@@ -450,7 +461,6 @@
    "$ref": "#/definitions/EnableSetting"
   },
   "EnvironmentId": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
    "type": "string"
   },
   "EnvironmentIdentifier": {
@@ -506,6 +516,7 @@
   }
  },
  "readOnlyProperties": [
+  "/properties/ConnectionId",
   "/properties/CreatedAt",
   "/properties/DomainId",
   "/properties/EnvironmentId",
@@ -521,7 +532,6 @@
   "Name",
   "DomainIdentifier",
   "ProjectIdentifier",
-  "EnvironmentIdentifier",
   "Type"
  ],
  "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-datazone",
@@ -534,6 +544,7 @@
  "typeName": "AWS::DataZone::DataSource",
  "writeOnlyProperties": [
   "/properties/AssetFormsInput",
+  "/properties/ConnectionIdentifier",
   "/properties/EnvironmentIdentifier",
   "/properties/DomainIdentifier",
   "/properties/Configuration",
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-iotfleetwise-statetemplate.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-iotfleetwise-statetemplate.json
index ba4c630118..3b8963aa3d 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-iotfleetwise-statetemplate.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-iotfleetwise-statetemplate.json
@@ -59,6 +59,12 @@
    "pattern": "^[^\\u0000-\\u001F\\u007F]+$",
    "type": "string"
   },
+  "Id": {
+   "maxLength": 26,
+   "minLength": 26,
+   "pattern": "^[A-Z0-9]+$",
+   "type": "string"
+  },
   "LastModificationTime": {
    "format": "date-time",
    "type": "string"
@@ -109,6 +115,7 @@
  },
  "readOnlyProperties": [
   "/properties/Arn",
+  "/properties/Id",
   "/properties/CreationTime",
   "/properties/LastModificationTime"
  ],
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-panorama-applicationinstance.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-panorama-applicationinstance.json
index 093451f44d..4c01df56b1 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-panorama-applicationinstance.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-panorama-applicationinstance.json
@@ -228,7 +228,13 @@
   "DefaultRuntimeContextDevice"
  ],
  "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git",
- "taggable": true,
+ "tagging": {
+  "cloudFormationSystemTags": true,
+  "tagOnCreate": true,
+  "tagProperty": "/properties/Tags",
+  "tagUpdatable": true,
+  "taggable": true
+ },
  "typeName": "AWS::Panorama::ApplicationInstance",
  "writeOnlyProperties": [
   "/properties/ApplicationInstanceIdToReplace"
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-panorama-package.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-panorama-package.json
index 77027193b3..a8ea1b7b3e 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-panorama-package.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-panorama-package.json
@@ -113,6 +113,12 @@
   "PackageName"
  ],
  "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git",
- "taggable": true,
+ "tagging": {
+  "cloudFormationSystemTags": true,
+  "tagOnCreate": true,
+  "tagProperty": "/properties/Tags",
+  "tagUpdatable": true,
+  "taggable": true
+ },
  "typeName": "AWS::Panorama::Package"
 }
diff --git a/src/cfnlint/data/schemas/providers/us_east_1/aws-panorama-packageversion.json b/src/cfnlint/data/schemas/providers/us_east_1/aws-panorama-packageversion.json
index e6c30311f9..4e1669e777 100644
--- a/src/cfnlint/data/schemas/providers/us_east_1/aws-panorama-packageversion.json
+++ b/src/cfnlint/data/schemas/providers/us_east_1/aws-panorama-packageversion.json
@@ -117,7 +117,6 @@
   "PatchVersion"
  ],
  "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-panorama.git",
- "taggable": false,
  "typeName": "AWS::Panorama::PackageVersion",
  "writeOnlyProperties": [
   "/properties/UpdatedLatestPatchVersion"
diff --git a/src/cfnlint/data/schemas/providers/us_east_2/__init__.py b/src/cfnlint/data/schemas/providers/us_east_2/__init__.py
index 1dc615c513..db10928092 100644
--- a/src/cfnlint/data/schemas/providers/us_east_2/__init__.py
+++ b/src/cfnlint/data/schemas/providers/us_east_2/__init__.py
@@ -1298,7 +1298,6 @@
     "aws-appsync-resolver.json",
     "aws-appsync-sourceapiassociation.json",
     "aws-aps-rulegroupsnamespace.json",
-    "aws-aps-scraper.json",
     "aws-aps-workspace.json",
     "aws-arczonalshift-autoshiftobservernotificationstatus.json",
     "aws-arczonalshift-zonalautoshiftconfiguration.json",
@@ -1483,6 +1482,7 @@
     "aws-datasync-locationsmb.json",
     "aws-datasync-storagesystem.json",
     "aws-datasync-task.json",
+    "aws-datazone-datasource.json",
     "aws-datazone-domain.json",
     "aws-datazone-environment.json",
     "aws-datazone-environmentactions.json",
@@ -1624,6 +1624,7 @@
     "aws-ec2-vpcendpointservicepermissions.json",
     "aws-ec2-vpcgatewayattachment.json",
     "aws-ec2-vpcpeeringconnection.json",
+    "aws-ec2-vpnconnection.json",
     "aws-ec2-vpnconnectionroute.json",
     "aws-ec2-vpngateway.json",
     "aws-ec2-vpngatewayroutepropagation.json",
@@ -1707,6 +1708,7 @@
     "aws-fis-experimenttemplate.json",
     "aws-fis-targetaccountconfiguration.json",
     "aws-fms-notificationchannel.json",
+    "aws-fms-policy.json",
     "aws-fms-resourceset.json",
     "aws-forecast-dataset.json",
     "aws-forecast-datasetgroup.json",
diff --git a/src/cfnlint/data/schemas/providers/us_east_2/aws-aps-scraper.json b/src/cfnlint/data/schemas/providers/us_east_2/aws-aps-scraper.json
new file mode 100644
index 0000000000..60063c84b2
--- /dev/null
+++ b/src/cfnlint/data/schemas/providers/us_east_2/aws-aps-scraper.json
@@ -0,0 +1,199 @@
+{
+ "additionalProperties": false,
+ "createOnlyProperties": [
+  "/properties/Source"
+ ],
+ "definitions": {
+  "Destination": {
+   "additionalProperties": false,
+   "oneOf": [
+    {
+     "required": [
+      "AmpConfiguration"
+     ]
+    }
+   ],
+   "properties": {
+    "AmpConfiguration": {
+     "additionalProperties": false,
+     "properties": {
+      "WorkspaceArn": {
+       "pattern": "^arn:aws[-a-z]*:aps:[-a-z0-9]+:[0-9]{12}:workspace/.+$",
+       "type": "string"
+      }
+     },
+     "required": [
+      "WorkspaceArn"
+     ],
+     "type": "object"
+    }
+   },
+   "type": "object"
+  },
+  "RoleConfiguration": {
+   "additionalProperties": false,
+   "properties": {
+    "SourceRoleArn": {
+     "type": "string"
+    },
+    "TargetRoleArn": {
+     "type": "string"
+    }
+   },
+   "type": "object"
+  },
+  "ScrapeConfiguration": {
+   "additionalProperties": false,
+   "oneOf": [
+    {
+     "required": [
+      "ConfigurationBlob"
+     ]
+    }
+   ],
+   "properties": {
+    "ConfigurationBlob": {
+     "type": "string"
+    }
+   },
+   "type": "object"
+  },
+  "SecurityGroupId": {
+   "format": "AWS::EC2::SecurityGroup.Id",
+   "pattern": "^sg-[0-9a-z]+$",
+   "type": "string"
+  },
+  "Source": {
+   "additionalProperties": false,
+   "oneOf": [
+    {
+     "required": [
+      "EksConfiguration"
+     ]
+    }
+   ],
+   "properties": {
+    "EksConfiguration": {
+     "additionalProperties": false,
+     "properties": {
+      "ClusterArn": {
+       "pattern": "^arn:aws[-a-z]*:eks:[-a-z0-9]+:[0-9]{12}:cluster/.+$",
+       "type": "string"
+      },
+      "SecurityGroupIds": {
+       "format": "AWS::EC2::SecurityGroup.Ids",
+       "insertionOrder": false,
+       "items": {
+        "$ref": "#/definitions/SecurityGroupId"
+       },
+       "type": "array"
+      },
+      "SubnetIds": {
+       "insertionOrder": false,
+       "items": {
+        "$ref": "#/definitions/SubnetId"
+       },
+       "type": "array"
+      }
+     },
+     "required": [
+      "ClusterArn",
+      "SubnetIds"
+     ],
+     "type": "object"
+    }
+   },
+   "type": "object"
+  },
+  "SubnetId": {
+   "pattern": "^subnet-[0-9a-z]+$",
+   "type": "string"
+  },
+  "Tag": {
+   "additionalProperties": false,
+   "properties": {
+    "Key": {
+     "maxLength": 128,
+     "minLength": 1,
+     "type": "string"
+    },
+    "Value": {
+     "maxLength": 256,
+     "minLength": 0,
+     "type": "string"
+    }
+   },
+   "required": [
+    "Key",
+    "Value"
+   ],
+   "type": "object"
+  }
+ },
+ "primaryIdentifier": [
+  "/properties/Arn"
+ ],
+ "properties": {
+  "Alias": {
+   "maxLength": 100,
+   "minLength": 1,
+   "pattern": "^[0-9A-Za-z][-.0-9A-Z_a-z]*$",
+   "type": "string"
+  },
+  "Arn": {
+   "pattern": "^arn:(aws|aws-us-gov|aws-cn):aps:(af|ap|ca|eu|me|sa|us)-(central|north|(north(?:east|west))|south|south(?:east|west)|east|west)-[0-9]+:[0-9]+:scraper/s-[a-z0-9]{8}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{12}$",
+   "type": "string"
+  },
+  "Destination": {
+   "$ref": "#/definitions/Destination"
+  },
+  "RoleArn": {
+   "maxLength": 2048,
+   "minLength": 20,
+   "pattern": "^arn:(aws|aws-us-gov|aws-cn):iam::[0-9]{12}:role/[a-zA-Z0-9-]+$",
+   "type": "string"
+  },
+  "RoleConfiguration": {
+   "$ref": "#/definitions/RoleConfiguration"
+  },
+  "ScrapeConfiguration": {
+   "$ref": "#/definitions/ScrapeConfiguration"
+  },
+  "ScraperId": {
+   "maxLength": 64,
+   "minLength": 1,
+   "pattern": "^s-[a-z0-9]{8}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{12}$",
+   "type": "string"
+  },
+  "Source": {
+   "$ref": "#/definitions/Source"
+  },
+  "Tags": {
+   "insertionOrder": false,
+   "items": {
+    "$ref": "#/definitions/Tag"
+   },
+   "type": "array",
+   "uniqueItems": true
+  }
+ },
+ "readOnlyProperties": [
+  "/properties/ScraperId",
+  "/properties/Arn",
+  "/properties/RoleArn"
+ ],
+ "required": [
+  "ScrapeConfiguration",
+  "Source",
+  "Destination"
+ ],
+ "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-aps",
+ "tagging": {
+  "cloudFormationSystemTags": true,
+  "tagOnCreate": true,
+  "tagProperty": "/properties/Tags",
+  "tagUpdatable": true,
+  "taggable": true
+ },
+ "typeName": "AWS::APS::Scraper"
+}
diff --git a/src/cfnlint/data/schemas/providers/us_east_2/aws-datazone-datasource.json b/src/cfnlint/data/schemas/providers/us_east_2/aws-datazone-datasource.json
deleted file mode 100644
index 1f1745b36e..0000000000
--- a/src/cfnlint/data/schemas/providers/us_east_2/aws-datazone-datasource.json
+++ /dev/null
@@ -1,552 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/ConnectionIdentifier",
-  "/properties/EnvironmentIdentifier",
-  "/properties/DomainIdentifier",
-  "/properties/ProjectIdentifier",
-  "/properties/Type"
- ],
- "definitions": {
-  "AccountId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^\\d{12}$",
-   "type": "string"
-  },
-  "DataAccessRole": {
-   "pattern": "^arn:aws[^:]*:iam::\\d{12}:(role|role/service-role)/[\\w+=,.@-]{1,128}$",
-   "type": "string"
-  },
-  "DataSourceConfigurationInput": {
-   "oneOf": [
-    {
-     "additionalProperties": false,
-     "properties": {
-      "GlueRunConfiguration": {
-       "$ref": "#/definitions/GlueRunConfigurationInput"
-      }
-     },
-     "title": "GlueRunConfiguration",
-     "type": "object"
-    },
-    {
-     "additionalProperties": false,
-     "properties": {
-      "RedshiftRunConfiguration": {
-       "$ref": "#/definitions/RedshiftRunConfigurationInput"
-      }
-     },
-     "title": "RedshiftRunConfiguration",
-     "type": "object"
-    },
-    {
-     "additionalProperties": false,
-     "properties": {
-      "SageMakerRunConfiguration": {
-       "$ref": "#/definitions/SageMakerRunConfigurationInput"
-      }
-     },
-     "title": "SageMakerRunConfiguration",
-     "type": "object"
-    }
-   ]
-  },
-  "DataSourceStatus": {
-   "enum": [
-    "CREATING",
-    "FAILED_CREATION",
-    "READY",
-    "UPDATING",
-    "FAILED_UPDATE",
-    "RUNNING",
-    "DELETING",
-    "FAILED_DELETION"
-   ],
-   "type": "string"
-  },
-  "EnableSetting": {
-   "enum": [
-    "ENABLED",
-    "DISABLED"
-   ],
-   "type": "string"
-  },
-  "FilterExpression": {
-   "additionalProperties": false,
-   "properties": {
-    "Expression": {
-     "maxLength": 2048,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Type": {
-     "$ref": "#/definitions/FilterExpressionType"
-    }
-   },
-   "required": [
-    "Expression",
-    "Type"
-   ],
-   "type": "object"
-  },
-  "FilterExpressionType": {
-   "enum": [
-    "INCLUDE",
-    "EXCLUDE"
-   ],
-   "type": "string"
-  },
-  "FormInput": {
-   "additionalProperties": false,
-   "properties": {
-    "Content": {
-     "maxLength": 75000,
-     "type": "string"
-    },
-    "FormName": {
-     "$ref": "#/definitions/FormName"
-    },
-    "TypeIdentifier": {
-     "maxLength": 385,
-     "minLength": 1,
-     "pattern": "^(?!\\.)[\\w\\.]*\\w$",
-     "type": "string"
-    },
-    "TypeRevision": {
-     "$ref": "#/definitions/TypeRevision"
-    }
-   },
-   "required": [
-    "FormName"
-   ],
-   "type": "object"
-  },
-  "FormName": {
-   "maxLength": 128,
-   "minLength": 1,
-   "pattern": "^(?![0-9_])\\w+$|^_\\w*[a-zA-Z0-9]\\w*$",
-   "type": "string"
-  },
-  "GlueRunConfigurationInput": {
-   "additionalProperties": false,
-   "properties": {
-    "AutoImportDataQualityResult": {
-     "type": "boolean"
-    },
-    "CatalogName": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "DataAccessRole": {
-     "$ref": "#/definitions/DataAccessRole"
-    },
-    "RelationalFilterConfigurations": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/RelationalFilterConfiguration"
-     },
-     "type": "array"
-    }
-   },
-   "required": [
-    "RelationalFilterConfigurations"
-   ],
-   "type": "object"
-  },
-  "RecommendationConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "EnableBusinessNameGeneration": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "RedshiftClusterStorage": {
-   "additionalProperties": false,
-   "properties": {
-    "ClusterName": {
-     "maxLength": 63,
-     "minLength": 1,
-     "pattern": "^[0-9a-z].[a-z0-9\\-]*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "ClusterName"
-   ],
-   "type": "object"
-  },
-  "RedshiftCredentialConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "SecretManagerArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws[^:]*:secretsmanager:[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]:\\d{12}:secret:.*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "SecretManagerArn"
-   ],
-   "type": "object"
-  },
-  "RedshiftRunConfigurationInput": {
-   "additionalProperties": false,
-   "properties": {
-    "DataAccessRole": {
-     "$ref": "#/definitions/DataAccessRole"
-    },
-    "RedshiftCredentialConfiguration": {
-     "$ref": "#/definitions/RedshiftCredentialConfiguration"
-    },
-    "RedshiftStorage": {
-     "$ref": "#/definitions/RedshiftStorage"
-    },
-    "RelationalFilterConfigurations": {
-     "$ref": "#/definitions/RelationalFilterConfigurations"
-    }
-   },
-   "required": [
-    "RelationalFilterConfigurations"
-   ],
-   "type": "object"
-  },
-  "RedshiftServerlessStorage": {
-   "additionalProperties": false,
-   "properties": {
-    "WorkgroupName": {
-     "maxLength": 64,
-     "minLength": 3,
-     "pattern": "^[a-z0-9-]+$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "WorkgroupName"
-   ],
-   "type": "object"
-  },
-  "RedshiftStorage": {
-   "oneOf": [
-    {
-     "additionalProperties": false,
-     "properties": {
-      "RedshiftClusterSource": {
-       "$ref": "#/definitions/RedshiftClusterStorage"
-      }
-     },
-     "required": [
-      "RedshiftClusterSource"
-     ],
-     "title": "RedshiftClusterSource",
-     "type": "object"
-    },
-    {
-     "additionalProperties": false,
-     "properties": {
-      "RedshiftServerlessSource": {
-       "$ref": "#/definitions/RedshiftServerlessStorage"
-      }
-     },
-     "required": [
-      "RedshiftServerlessSource"
-     ],
-     "title": "RedshiftServerlessSource",
-     "type": "object"
-    }
-   ]
-  },
-  "Region": {
-   "maxLength": 16,
-   "minLength": 4,
-   "pattern": "[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]",
-   "type": "string"
-  },
-  "RelationalFilterConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "DatabaseName": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "FilterExpressions": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/FilterExpression"
-     },
-     "type": "array"
-    },
-    "SchemaName": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "DatabaseName"
-   ],
-   "type": "object"
-  },
-  "RelationalFilterConfigurations": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/RelationalFilterConfiguration"
-   },
-   "type": "array"
-  },
-  "SageMakerRunConfigurationInput": {
-   "additionalProperties": false,
-   "properties": {
-    "TrackingAssets": {
-     "$ref": "#/definitions/TrackingAssets"
-    }
-   },
-   "required": [
-    "TrackingAssets"
-   ],
-   "type": "object"
-  },
-  "ScheduleConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "Schedule": {
-     "maxLength": 256,
-     "minLength": 1,
-     "pattern": "cron\\((\\b[0-5]?[0-9]\\b) (\\b2[0-3]\\b|\\b[0-1]?[0-9]\\b) (.*){1,5} (.*){1,5} (.*){1,5} (.*){1,5}\\)",
-     "type": "string"
-    },
-    "Timezone": {
-     "$ref": "#/definitions/Timezone"
-    }
-   },
-   "type": "object"
-  },
-  "Timezone": {
-   "enum": [
-    "AFRICA_JOHANNESBURG",
-    "AMERICA_MONTREAL",
-    "AMERICA_SAO_PAULO",
-    "ASIA_BAHRAIN",
-    "ASIA_BANGKOK",
-    "ASIA_CALCUTTA",
-    "ASIA_DUBAI",
-    "ASIA_HONG_KONG",
-    "ASIA_JAKARTA",
-    "ASIA_KUALA_LUMPUR",
-    "ASIA_SEOUL",
-    "ASIA_SHANGHAI",
-    "ASIA_SINGAPORE",
-    "ASIA_TAIPEI",
-    "ASIA_TOKYO",
-    "AUSTRALIA_MELBOURNE",
-    "AUSTRALIA_SYDNEY",
-    "CANADA_CENTRAL",
-    "CET",
-    "CST6CDT",
-    "ETC_GMT",
-    "ETC_GMT0",
-    "ETC_GMT_ADD_0",
-    "ETC_GMT_ADD_1",
-    "ETC_GMT_ADD_10",
-    "ETC_GMT_ADD_11",
-    "ETC_GMT_ADD_12",
-    "ETC_GMT_ADD_2",
-    "ETC_GMT_ADD_3",
-    "ETC_GMT_ADD_4",
-    "ETC_GMT_ADD_5",
-    "ETC_GMT_ADD_6",
-    "ETC_GMT_ADD_7",
-    "ETC_GMT_ADD_8",
-    "ETC_GMT_ADD_9",
-    "ETC_GMT_NEG_0",
-    "ETC_GMT_NEG_1",
-    "ETC_GMT_NEG_10",
-    "ETC_GMT_NEG_11",
-    "ETC_GMT_NEG_12",
-    "ETC_GMT_NEG_13",
-    "ETC_GMT_NEG_14",
-    "ETC_GMT_NEG_2",
-    "ETC_GMT_NEG_3",
-    "ETC_GMT_NEG_4",
-    "ETC_GMT_NEG_5",
-    "ETC_GMT_NEG_6",
-    "ETC_GMT_NEG_7",
-    "ETC_GMT_NEG_8",
-    "ETC_GMT_NEG_9",
-    "EUROPE_DUBLIN",
-    "EUROPE_LONDON",
-    "EUROPE_PARIS",
-    "EUROPE_STOCKHOLM",
-    "EUROPE_ZURICH",
-    "ISRAEL",
-    "MEXICO_GENERAL",
-    "MST7MDT",
-    "PACIFIC_AUCKLAND",
-    "US_CENTRAL",
-    "US_EASTERN",
-    "US_MOUNTAIN",
-    "US_PACIFIC",
-    "UTC"
-   ],
-   "type": "string"
-  },
-  "TrackingAssets": {
-   "additionalProperties": false,
-   "maxProperties": 1,
-   "patternProperties": {
-    "^.{1,64}$": {
-     "items": {
-      "pattern": "^arn:aws[^:]*:sagemaker:[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]:\\d{12}:[\\w+=,.@-]{1,128}/[\\w+=,.@-]{1,256}$",
-      "type": "string"
-     },
-     "maxItems": 500,
-     "minItems": 0,
-     "type": "array"
-    }
-   },
-   "type": "object"
-  },
-  "TypeRevision": {
-   "maxLength": 64,
-   "minLength": 1,
-   "pattern": "^[a-zA-Z0-9_-]+$",
-   "type": "string"
-  }
- },
- "primaryIdentifier": [
-  "/properties/DomainId",
-  "/properties/Id"
- ],
- "properties": {
-  "AssetFormsInput": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/FormInput"
-   },
-   "maxItems": 10,
-   "minItems": 0,
-   "type": "array"
-  },
-  "Configuration": {
-   "$ref": "#/definitions/DataSourceConfigurationInput"
-  },
-  "ConnectionId": {
-   "type": "string"
-  },
-  "ConnectionIdentifier": {
-   "type": "string"
-  },
-  "CreatedAt": {
-   "format": "date-time",
-   "type": "string"
-  },
-  "Description": {
-   "maxLength": 2048,
-   "type": "string"
-  },
-  "DomainId": {
-   "pattern": "^dzd[-_][a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "DomainIdentifier": {
-   "pattern": "^dzd[-_][a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "EnableSetting": {
-   "$ref": "#/definitions/EnableSetting"
-  },
-  "EnvironmentId": {
-   "type": "string"
-  },
-  "EnvironmentIdentifier": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "Id": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "LastRunAssetCount": {
-   "type": "number"
-  },
-  "LastRunAt": {
-   "type": "string"
-  },
-  "LastRunStatus": {
-   "type": "string"
-  },
-  "Name": {
-   "maxLength": 256,
-   "minLength": 1,
-   "type": "string"
-  },
-  "ProjectId": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "ProjectIdentifier": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "PublishOnImport": {
-   "type": "boolean"
-  },
-  "Recommendation": {
-   "$ref": "#/definitions/RecommendationConfiguration"
-  },
-  "Schedule": {
-   "$ref": "#/definitions/ScheduleConfiguration"
-  },
-  "Status": {
-   "$ref": "#/definitions/DataSourceStatus"
-  },
-  "Type": {
-   "maxLength": 256,
-   "minLength": 1,
-   "type": "string"
-  },
-  "UpdatedAt": {
-   "format": "date-time",
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/ConnectionId",
-  "/properties/CreatedAt",
-  "/properties/DomainId",
-  "/properties/EnvironmentId",
-  "/properties/Id",
-  "/properties/LastRunAssetCount",
-  "/properties/LastRunAt",
-  "/properties/LastRunStatus",
-  "/properties/ProjectId",
-  "/properties/Status",
-  "/properties/UpdatedAt"
- ],
- "required": [
-  "Name",
-  "DomainIdentifier",
-  "ProjectIdentifier",
-  "Type"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-datazone",
- "tagging": {
-  "cloudFormationSystemTags": false,
-  "tagOnCreate": false,
-  "tagUpdatable": false,
-  "taggable": false
- },
- "typeName": "AWS::DataZone::DataSource",
- "writeOnlyProperties": [
-  "/properties/AssetFormsInput",
-  "/properties/ConnectionIdentifier",
-  "/properties/EnvironmentIdentifier",
-  "/properties/DomainIdentifier",
-  "/properties/Configuration",
-  "/properties/ProjectIdentifier"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/us_east_2/aws-ec2-vpnconnection.json b/src/cfnlint/data/schemas/providers/us_east_2/aws-ec2-vpnconnection.json
deleted file mode 100644
index 5f9a8ac704..0000000000
--- a/src/cfnlint/data/schemas/providers/us_east_2/aws-ec2-vpnconnection.json
+++ /dev/null
@@ -1,384 +0,0 @@
-{
- "$schema": "https://raw.githubusercontent.com/aws-cloudformation/cloudformation-resource-schema/blob/master/src/main/resources/schema/provider.definition.schema.v1.json",
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/Type",
-  "/properties/CustomerGatewayId",
-  "/properties/VpnGatewayId",
-  "/properties/TransitGatewayId",
-  "/properties/EnableAcceleration",
-  "/properties/LocalIpv4NetworkCidr",
-  "/properties/LocalIpv6NetworkCidr",
-  "/properties/OutsideIpAddressType",
-  "/properties/RemoteIpv4NetworkCidr",
-  "/properties/RemoteIpv6NetworkCidr",
-  "/properties/StaticRoutesOnly",
-  "/properties/TransportTransitGatewayAttachmentId",
-  "/properties/TunnelInsideIpVersion",
-  "/properties/VpnTunnelOptionsSpecifications"
- ],
- "definitions": {
-  "CloudwatchLogOptionsSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "LogEnabled": {
-     "type": "boolean"
-    },
-    "LogGroupArn": {
-     "type": "string"
-    },
-    "LogOutputFormat": {
-     "enum": [
-      "json",
-      "text"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "IKEVersionsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "ikev1",
-      "ikev2"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Phase1DHGroupNumbersRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      2,
-      14,
-      15,
-      16,
-      17,
-      18,
-      19,
-      20,
-      21,
-      22,
-      23,
-      24
-     ],
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "Phase1EncryptionAlgorithmsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "AES128",
-      "AES256",
-      "AES128-GCM-16",
-      "AES256-GCM-16"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Phase1IntegrityAlgorithmsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "SHA1",
-      "SHA2-256",
-      "SHA2-384",
-      "SHA2-512"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Phase2DHGroupNumbersRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      2,
-      5,
-      14,
-      15,
-      16,
-      17,
-      18,
-      19,
-      20,
-      21,
-      22,
-      23,
-      24
-     ],
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "Phase2EncryptionAlgorithmsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "AES128",
-      "AES256",
-      "AES128-GCM-16",
-      "AES256-GCM-16"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Phase2IntegrityAlgorithmsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "SHA1",
-      "SHA2-256",
-      "SHA2-384",
-      "SHA2-512"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "type": "string"
-    },
-    "Value": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "VpnTunnelLogOptionsSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "CloudwatchLogOptions": {
-     "$ref": "#/definitions/CloudwatchLogOptionsSpecification"
-    }
-   },
-   "type": "object"
-  },
-  "VpnTunnelOptionsSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "DPDTimeoutAction": {
-     "enum": [
-      "clear",
-      "none",
-      "restart"
-     ],
-     "type": "string"
-    },
-    "DPDTimeoutSeconds": {
-     "minimum": 30,
-     "type": "integer"
-    },
-    "EnableTunnelLifecycleControl": {
-     "type": "boolean"
-    },
-    "IKEVersions": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/IKEVersionsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "LogOptions": {
-     "$ref": "#/definitions/VpnTunnelLogOptionsSpecification"
-    },
-    "Phase1DHGroupNumbers": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase1DHGroupNumbersRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase1EncryptionAlgorithms": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase1EncryptionAlgorithmsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase1IntegrityAlgorithms": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase1IntegrityAlgorithmsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase1LifetimeSeconds": {
-     "maximum": 28800,
-     "minimum": 900,
-     "type": "integer"
-    },
-    "Phase2DHGroupNumbers": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase2DHGroupNumbersRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase2EncryptionAlgorithms": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase2EncryptionAlgorithmsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase2IntegrityAlgorithms": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase2IntegrityAlgorithmsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase2LifetimeSeconds": {
-     "maximum": 3600,
-     "minimum": 900,
-     "type": "integer"
-    },
-    "PreSharedKey": {
-     "type": "string"
-    },
-    "RekeyFuzzPercentage": {
-     "maximum": 100,
-     "minimum": 0,
-     "type": "integer"
-    },
-    "RekeyMarginTimeSeconds": {
-     "minimum": 60,
-     "type": "integer"
-    },
-    "ReplayWindowSize": {
-     "maximum": 2048,
-     "minimum": 64,
-     "type": "integer"
-    },
-    "StartupAction": {
-     "enum": [
-      "add",
-      "start"
-     ],
-     "type": "string"
-    },
-    "TunnelInsideCidr": {
-     "type": "string"
-    },
-    "TunnelInsideIpv6Cidr": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/VpnConnectionId"
- ],
- "properties": {
-  "CustomerGatewayId": {
-   "type": "string"
-  },
-  "EnableAcceleration": {
-   "type": "boolean"
-  },
-  "LocalIpv4NetworkCidr": {
-   "type": "string"
-  },
-  "LocalIpv6NetworkCidr": {
-   "type": "string"
-  },
-  "OutsideIpAddressType": {
-   "type": "string"
-  },
-  "RemoteIpv4NetworkCidr": {
-   "type": "string"
-  },
-  "RemoteIpv6NetworkCidr": {
-   "type": "string"
-  },
-  "StaticRoutesOnly": {
-   "type": "boolean"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "TransitGatewayId": {
-   "type": "string"
-  },
-  "TransportTransitGatewayAttachmentId": {
-   "type": "string"
-  },
-  "TunnelInsideIpVersion": {
-   "type": "string"
-  },
-  "Type": {
-   "type": "string"
-  },
-  "VpnConnectionId": {
-   "type": "string"
-  },
-  "VpnGatewayId": {
-   "type": "string"
-  },
-  "VpnTunnelOptionsSpecifications": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/VpnTunnelOptionsSpecification"
-   },
-   "type": "array",
-   "uniqueItems": false
-  }
- },
- "readOnlyProperties": [
-  "/properties/VpnConnectionId"
- ],
- "required": [
-  "Type",
-  "CustomerGatewayId"
- ],
- "tagging": {
-  "cloudFormationSystemTags": false,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::EC2::VPNConnection"
-}
diff --git a/src/cfnlint/data/schemas/providers/us_east_2/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/us_east_2/aws-fms-policy.json
deleted file mode 100644
index 8422693828..0000000000
--- a/src/cfnlint/data/schemas/providers/us_east_2/aws-fms-policy.json
+++ /dev/null
@@ -1,416 +0,0 @@
-{
- "additionalProperties": false,
- "definitions": {
-  "AccountId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^([0-9]*)$",
-   "type": "string"
-  },
-  "Base62Id": {
-   "maxLength": 22,
-   "minLength": 22,
-   "pattern": "^[a-z0-9A-Z]{22}$",
-   "type": "string"
-  },
-  "FirewallDeploymentModel": {
-   "enum": [
-    "DISTRIBUTED",
-    "CENTRALIZED"
-   ],
-   "type": "string"
-  },
-  "IEMap": {
-   "additionalProperties": false,
-   "properties": {
-    "ACCOUNT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/AccountId"
-     },
-     "type": "array"
-    },
-    "ORGUNIT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/OrganizationalUnitId"
-     },
-     "type": "array"
-    }
-   },
-   "type": "object"
-  },
-  "ManagedServiceData": {
-   "maxLength": 30000,
-   "minLength": 1,
-   "type": "string"
-  },
-  "NetworkAclCommonPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "NetworkAclEntrySet": {
-     "$ref": "#/definitions/NetworkAclEntrySet"
-    }
-   },
-   "required": [
-    "NetworkAclEntrySet"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntry": {
-   "additionalProperties": false,
-   "properties": {
-    "CidrBlock": {
-     "pattern": "^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(\\/([0-9]|[1-2][0-9]|3[0-2]))$",
-     "type": "string"
-    },
-    "Egress": {
-     "type": "boolean"
-    },
-    "IcmpTypeCode": {
-     "additionalProperties": false,
-     "properties": {
-      "Code": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "Type": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "Code",
-      "Type"
-     ],
-     "type": "object"
-    },
-    "Ipv6CidrBlock": {
-     "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))(/(1[0-2]|[0-9]))?$",
-     "type": "string"
-    },
-    "PortRange": {
-     "additionalProperties": false,
-     "properties": {
-      "From": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "To": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "From",
-      "To"
-     ],
-     "type": "object"
-    },
-    "Protocol": {
-     "pattern": "^(tcp|udp|icmp|-1|([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))$",
-     "type": "string"
-    },
-    "RuleAction": {
-     "enum": [
-      "allow",
-      "deny"
-     ],
-     "type": "string"
-    }
-   },
-   "required": [
-    "Egress",
-    "Protocol",
-    "RuleAction"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntryList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/NetworkAclEntry"
-   },
-   "type": "array"
-  },
-  "NetworkAclEntrySet": {
-   "additionalProperties": false,
-   "anyOf": [
-    {
-     "required": [
-      "FirstEntries"
-     ]
-    },
-    {
-     "required": [
-      "LastEntries"
-     ]
-    }
-   ],
-   "properties": {
-    "FirstEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    },
-    "ForceRemediateForFirstEntries": {
-     "type": "boolean"
-    },
-    "ForceRemediateForLastEntries": {
-     "type": "boolean"
-    },
-    "LastEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    }
-   },
-   "required": [
-    "ForceRemediateForFirstEntries",
-    "ForceRemediateForLastEntries"
-   ],
-   "type": "object"
-  },
-  "NetworkFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  },
-  "OrganizationalUnitId": {
-   "maxLength": 68,
-   "minLength": 16,
-   "pattern": "^(ou-[0-9a-z]{4,32}-[a-z0-9]{8,32})$",
-   "type": "string"
-  },
-  "PolicyOption": {
-   "additionalProperties": false,
-   "oneOf": [
-    {
-     "required": [
-      "NetworkFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "ThirdPartyFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "NetworkAclCommonPolicy"
-     ]
-    }
-   ],
-   "properties": {
-    "NetworkAclCommonPolicy": {
-     "$ref": "#/definitions/NetworkAclCommonPolicy"
-    },
-    "NetworkFirewallPolicy": {
-     "$ref": "#/definitions/NetworkFirewallPolicy"
-    },
-    "ThirdPartyFirewallPolicy": {
-     "$ref": "#/definitions/ThirdPartyFirewallPolicy"
-    }
-   },
-   "type": "object"
-  },
-  "PolicyTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "PolicyType": {
-   "enum": [
-    "WAF",
-    "WAFV2",
-    "SHIELD_ADVANCED",
-    "SECURITY_GROUPS_COMMON",
-    "SECURITY_GROUPS_CONTENT_AUDIT",
-    "SECURITY_GROUPS_USAGE_AUDIT",
-    "NETWORK_FIREWALL",
-    "THIRD_PARTY_FIREWALL",
-    "DNS_FIREWALL",
-    "IMPORT_NETWORK_FIREWALL",
-    "NETWORK_ACL_COMMON"
-   ],
-   "type": "string"
-  },
-  "ResourceArn": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "ResourceTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key"
-   ],
-   "type": "object"
-  },
-  "ResourceType": {
-   "maxLength": 128,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "SecurityServicePolicyData": {
-   "additionalProperties": false,
-   "properties": {
-    "ManagedServiceData": {
-     "$ref": "#/definitions/ManagedServiceData"
-    },
-    "PolicyOption": {
-     "$ref": "#/definitions/PolicyOption"
-    },
-    "Type": {
-     "$ref": "#/definitions/PolicyType"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "ThirdPartyFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "Arn": {
-   "$ref": "#/definitions/ResourceArn"
-  },
-  "DeleteAllPolicyResources": {
-   "type": "boolean"
-  },
-  "ExcludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "ExcludeResourceTags": {
-   "type": "boolean"
-  },
-  "Id": {
-   "maxLength": 36,
-   "minLength": 36,
-   "pattern": "^[a-z0-9A-Z-]{36}$",
-   "type": "string"
-  },
-  "IncludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "PolicyDescription": {
-   "maxLength": 256,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "PolicyName": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "RemediationEnabled": {
-   "type": "boolean"
-  },
-  "ResourceSetIds": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/Base62Id"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "ResourceTags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceTag"
-   },
-   "maxItems": 8,
-   "type": "array"
-  },
-  "ResourceType": {
-   "$ref": "#/definitions/ResourceType"
-  },
-  "ResourceTypeList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceType"
-   },
-   "type": "array"
-  },
-  "ResourcesCleanUp": {
-   "type": "boolean"
-  },
-  "SecurityServicePolicyData": {
-   "$ref": "#/definitions/SecurityServicePolicyData"
-  },
-  "Tags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/PolicyTag"
-   },
-   "type": "array"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/Id"
- ],
- "required": [
-  "ExcludeResourceTags",
-  "PolicyName",
-  "RemediationEnabled",
-  "SecurityServicePolicyData"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-fms.git",
- "typeName": "AWS::FMS::Policy",
- "writeOnlyProperties": [
-  "/properties/DeleteAllPolicyResources"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/__init__.py b/src/cfnlint/data/schemas/providers/us_gov_east_1/__init__.py
index 346cda2e4c..a0cb93f158 100644
--- a/src/cfnlint/data/schemas/providers/us_gov_east_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/us_gov_east_1/__init__.py
@@ -801,6 +801,7 @@
     "aws-bedrock-flowversion.json",
     "aws-bedrock-guardrail.json",
     "aws-bedrock-guardrailversion.json",
+    "aws-bedrock-knowledgebase.json",
     "aws-bedrock-prompt.json",
     "aws-bedrock-promptversion.json",
     "aws-cassandra-keyspace.json",
@@ -829,6 +830,7 @@
     "aws-cloudwatch-compositealarm.json",
     "aws-cloudwatch-dashboard.json",
     "aws-cloudwatch-insightrule.json",
+    "aws-cloudwatch-metricstream.json",
     "aws-codebuild-reportgroup.json",
     "aws-codebuild-sourcecredential.json",
     "aws-codecommit-repository.json",
@@ -879,6 +881,7 @@
     "aws-docdb-eventsubscription.json",
     "aws-dynamodb-globaltable.json",
     "aws-dynamodb-table.json",
+    "aws-ec2-capacityreservation.json",
     "aws-ec2-capacityreservationfleet.json",
     "aws-ec2-clientvpnendpoint.json",
     "aws-ec2-clientvpnroute.json",
@@ -1177,6 +1180,7 @@
     "aws-redshift-eventsubscription.json",
     "aws-redshift-scheduledaction.json",
     "aws-redshiftserverless-namespace.json",
+    "aws-resiliencehub-app.json",
     "aws-resiliencehub-resiliencypolicy.json",
     "aws-resourcegroups-group.json",
     "aws-rolesanywhere-crl.json",
@@ -1211,10 +1215,12 @@
     "aws-s3outposts-endpoint.json",
     "aws-sagemaker-app.json",
     "aws-sagemaker-appimageconfig.json",
+    "aws-sagemaker-domain.json",
     "aws-sagemaker-image.json",
     "aws-sagemaker-imageversion.json",
     "aws-sagemaker-modelcard.json",
     "aws-sagemaker-studiolifecycleconfig.json",
+    "aws-sagemaker-userprofile.json",
     "aws-sdb-domain.json",
     "aws-secretsmanager-resourcepolicy.json",
     "aws-secretsmanager-rotationschedule.json",
@@ -1255,6 +1261,7 @@
     "aws-servicediscovery-privatednsnamespace.json",
     "aws-servicediscovery-publicdnsnamespace.json",
     "aws-servicediscovery-service.json",
+    "aws-ses-configurationset.json",
     "aws-ses-configurationseteventdestination.json",
     "aws-ses-contactlist.json",
     "aws-ses-dedicatedippool.json",
diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-bedrock-knowledgebase.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-bedrock-knowledgebase.json
deleted file mode 100644
index 75bbdf1578..0000000000
--- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-bedrock-knowledgebase.json
+++ /dev/null
@@ -1,974 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/StorageConfiguration",
-  "/properties/KnowledgeBaseConfiguration/Type",
-  "/properties/KnowledgeBaseConfiguration/VectorKnowledgeBaseConfiguration",
-  "/properties/KnowledgeBaseConfiguration/KendraKnowledgeBaseConfiguration",
-  "/properties/KnowledgeBaseConfiguration/SqlKnowledgeBaseConfiguration/Type",
-  "/properties/KnowledgeBaseConfiguration/SqlKnowledgeBaseConfiguration/RedshiftConfiguration/StorageConfigurations",
-  "/properties/KnowledgeBaseConfiguration/SqlKnowledgeBaseConfiguration/RedshiftConfiguration/QueryEngineConfiguration"
- ],
- "definitions": {
-  "AwsDataCatalogTableName": {
-   "maxLength": 200,
-   "minLength": 1,
-   "pattern": "^.*\\.*$",
-   "type": "string"
-  },
-  "AwsDataCatalogTableNames": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/AwsDataCatalogTableName"
-   },
-   "maxItems": 1000,
-   "minItems": 1,
-   "type": "array"
-  },
-  "BedrockEmbeddingModelConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "Dimensions": {
-     "maximum": 4096,
-     "minimum": 0,
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "CuratedQueries": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/CuratedQuery"
-   },
-   "maxItems": 10,
-   "type": "array"
-  },
-  "CuratedQuery": {
-   "additionalProperties": false,
-   "properties": {
-    "NaturalLanguage": {
-     "$ref": "#/definitions/NaturalLanguageString"
-    },
-    "Sql": {
-     "$ref": "#/definitions/SqlString"
-    }
-   },
-   "required": [
-    "NaturalLanguage",
-    "Sql"
-   ],
-   "type": "object"
-  },
-  "DescriptionString": {
-   "maxLength": 200,
-   "minLength": 1,
-   "type": "string"
-  },
-  "EmbeddingModelConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "BedrockEmbeddingModelConfiguration": {
-     "$ref": "#/definitions/BedrockEmbeddingModelConfiguration"
-    }
-   },
-   "type": "object"
-  },
-  "InclusionType": {
-   "enum": [
-    "INCLUDE",
-    "EXCLUDE"
-   ],
-   "type": "string"
-  },
-  "KendraIndexArn": {
-   "pattern": "^arn:aws(|-cn|-us-gov):kendra:[a-z0-9-]{1,20}:([0-9]{12}|):index/([a-zA-Z0-9][a-zA-Z0-9-]{35}|[a-zA-Z0-9][a-zA-Z0-9-]{35}-[a-zA-Z0-9][a-zA-Z0-9-]{35})$",
-   "type": "string"
-  },
-  "KendraKnowledgeBaseConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "KendraIndexArn": {
-     "$ref": "#/definitions/KendraIndexArn"
-    }
-   },
-   "required": [
-    "KendraIndexArn"
-   ],
-   "type": "object"
-  },
-  "KnowledgeBaseConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "KendraKnowledgeBaseConfiguration": {
-     "$ref": "#/definitions/KendraKnowledgeBaseConfiguration"
-    },
-    "SqlKnowledgeBaseConfiguration": {
-     "$ref": "#/definitions/SqlKnowledgeBaseConfiguration"
-    },
-    "Type": {
-     "$ref": "#/definitions/KnowledgeBaseType"
-    },
-    "VectorKnowledgeBaseConfiguration": {
-     "$ref": "#/definitions/VectorKnowledgeBaseConfiguration"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "KnowledgeBaseStatus": {
-   "enum": [
-    "CREATING",
-    "ACTIVE",
-    "DELETING",
-    "UPDATING",
-    "FAILED",
-    "DELETE_UNSUCCESSFUL"
-   ],
-   "type": "string"
-  },
-  "KnowledgeBaseStorageType": {
-   "enum": [
-    "OPENSEARCH_SERVERLESS",
-    "PINECONE",
-    "RDS",
-    "MONGO_DB_ATLAS"
-   ],
-   "type": "string"
-  },
-  "KnowledgeBaseType": {
-   "enum": [
-    "VECTOR",
-    "KENDRA",
-    "SQL"
-   ],
-   "type": "string"
-  },
-  "MongoDbAtlasConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "CollectionName": {
-     "maxLength": 63,
-     "pattern": "^.*$",
-     "type": "string"
-    },
-    "CredentialsSecretArn": {
-     "pattern": "^arn:aws(|-cn|-us-gov):secretsmanager:[a-z0-9-]{1,20}:([0-9]{12}|):secret:[a-zA-Z0-9!/_+=.@-]{1,512}$",
-     "type": "string"
-    },
-    "DatabaseName": {
-     "maxLength": 63,
-     "pattern": "^.*$",
-     "type": "string"
-    },
-    "Endpoint": {
-     "maxLength": 2048,
-     "pattern": "^[a-zA-Z0-9_-]+\\.[a-zA-Z0-9_-]+\\.mongodb\\.net$",
-     "type": "string"
-    },
-    "EndpointServiceName": {
-     "maxLength": 255,
-     "pattern": "^(?:arn:aws(?:-us-gov|-cn|-iso|-iso-[a-z])*:.+:.*:\\d+:.+/.+$|[a-zA-Z0-9*]+[a-zA-Z0-9._-]*)$",
-     "type": "string"
-    },
-    "FieldMapping": {
-     "$ref": "#/definitions/MongoDbAtlasFieldMapping"
-    },
-    "VectorIndexName": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Endpoint",
-    "CredentialsSecretArn",
-    "DatabaseName",
-    "CollectionName",
-    "VectorIndexName",
-    "FieldMapping"
-   ],
-   "type": "object"
-  },
-  "MongoDbAtlasFieldMapping": {
-   "additionalProperties": false,
-   "properties": {
-    "MetadataField": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    },
-    "TextField": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    },
-    "VectorField": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "VectorField",
-    "MetadataField",
-    "TextField"
-   ],
-   "type": "object"
-  },
-  "NaturalLanguageString": {
-   "maxLength": 1000,
-   "minLength": 1,
-   "type": "string"
-  },
-  "OpenSearchServerlessConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "CollectionArn": {
-     "maxLength": 2048,
-     "pattern": "^arn:aws(|-cn|-us-gov|-iso):aoss:[a-z]{2}(-gov)?-[a-z]+-\\d{1}:\\d{12}:collection/[a-z0-9-]{3,32}$",
-     "type": "string"
-    },
-    "FieldMapping": {
-     "$ref": "#/definitions/OpenSearchServerlessFieldMapping"
-    },
-    "VectorIndexName": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "CollectionArn",
-    "FieldMapping",
-    "VectorIndexName"
-   ],
-   "type": "object"
-  },
-  "OpenSearchServerlessFieldMapping": {
-   "additionalProperties": false,
-   "properties": {
-    "MetadataField": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    },
-    "TextField": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    },
-    "VectorField": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "MetadataField",
-    "TextField",
-    "VectorField"
-   ],
-   "type": "object"
-  },
-  "PineconeConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "ConnectionString": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    },
-    "CredentialsSecretArn": {
-     "pattern": "^arn:aws(|-cn|-us-gov):secretsmanager:[a-z0-9-]{1,20}:([0-9]{12}|):secret:[a-zA-Z0-9!/_+=.@-]{1,512}$",
-     "type": "string"
-    },
-    "FieldMapping": {
-     "$ref": "#/definitions/PineconeFieldMapping"
-    },
-    "Namespace": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "ConnectionString",
-    "CredentialsSecretArn",
-    "FieldMapping"
-   ],
-   "type": "object"
-  },
-  "PineconeFieldMapping": {
-   "additionalProperties": false,
-   "properties": {
-    "MetadataField": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    },
-    "TextField": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "MetadataField",
-    "TextField"
-   ],
-   "type": "object"
-  },
-  "QueryEngineType": {
-   "enum": [
-    "REDSHIFT"
-   ],
-   "type": "string"
-  },
-  "QueryExecutionTimeoutSeconds": {
-   "maximum": 200,
-   "minimum": 1,
-   "type": "integer"
-  },
-  "QueryGenerationColumn": {
-   "additionalProperties": false,
-   "properties": {
-    "Description": {
-     "$ref": "#/definitions/DescriptionString"
-    },
-    "Inclusion": {
-     "$ref": "#/definitions/InclusionType"
-    },
-    "Name": {
-     "$ref": "#/definitions/QueryGenerationColumnName"
-    }
-   },
-   "type": "object"
-  },
-  "QueryGenerationColumnName": {
-   "maxLength": 127,
-   "minLength": 1,
-   "type": "string"
-  },
-  "QueryGenerationColumns": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/QueryGenerationColumn"
-   },
-   "type": "array"
-  },
-  "QueryGenerationConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "ExecutionTimeoutSeconds": {
-     "$ref": "#/definitions/QueryExecutionTimeoutSeconds"
-    },
-    "GenerationContext": {
-     "$ref": "#/definitions/QueryGenerationContext"
-    }
-   },
-   "type": "object"
-  },
-  "QueryGenerationContext": {
-   "additionalProperties": false,
-   "properties": {
-    "CuratedQueries": {
-     "$ref": "#/definitions/CuratedQueries"
-    },
-    "Tables": {
-     "$ref": "#/definitions/QueryGenerationTables"
-    }
-   },
-   "type": "object"
-  },
-  "QueryGenerationTable": {
-   "additionalProperties": false,
-   "properties": {
-    "Columns": {
-     "$ref": "#/definitions/QueryGenerationColumns"
-    },
-    "Description": {
-     "$ref": "#/definitions/DescriptionString"
-    },
-    "Inclusion": {
-     "$ref": "#/definitions/InclusionType"
-    },
-    "Name": {
-     "$ref": "#/definitions/QueryGenerationTableName"
-    }
-   },
-   "required": [
-    "Name"
-   ],
-   "type": "object"
-  },
-  "QueryGenerationTableName": {
-   "pattern": "^.*\\..*\\..*$",
-   "type": "string"
-  },
-  "QueryGenerationTables": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/QueryGenerationTable"
-   },
-   "maxItems": 50,
-   "type": "array"
-  },
-  "RdsConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "CredentialsSecretArn": {
-     "pattern": "^arn:aws(|-cn|-us-gov):secretsmanager:[a-z0-9-]{1,20}:([0-9]{12}|):secret:[a-zA-Z0-9!/_+=.@-]{1,512}$",
-     "type": "string"
-    },
-    "DatabaseName": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9_\\-]+$",
-     "type": "string"
-    },
-    "FieldMapping": {
-     "$ref": "#/definitions/RdsFieldMapping"
-    },
-    "ResourceArn": {
-     "pattern": "^arn:aws(|-cn|-us-gov):rds:[a-zA-Z0-9-]*:[0-9]{12}:cluster:[a-zA-Z0-9-]{1,63}$",
-     "type": "string"
-    },
-    "TableName": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9_\\.\\-]+$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "CredentialsSecretArn",
-    "DatabaseName",
-    "FieldMapping",
-    "ResourceArn",
-    "TableName"
-   ],
-   "type": "object"
-  },
-  "RdsFieldMapping": {
-   "additionalProperties": false,
-   "properties": {
-    "MetadataField": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9_\\-]+$",
-     "type": "string"
-    },
-    "PrimaryKeyField": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9_\\-]+$",
-     "type": "string"
-    },
-    "TextField": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9_\\-]+$",
-     "type": "string"
-    },
-    "VectorField": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9_\\-]+$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "MetadataField",
-    "PrimaryKeyField",
-    "TextField",
-    "VectorField"
-   ],
-   "type": "object"
-  },
-  "RedisEnterpriseCloudConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "CredentialsSecretArn": {
-     "pattern": "^arn:aws(|-cn|-us-gov):secretsmanager:[a-z0-9-]{1,20}:([0-9]{12}|):secret:[a-zA-Z0-9!/_+=.@-]{1,512}$",
-     "type": "string"
-    },
-    "Endpoint": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    },
-    "FieldMapping": {
-     "$ref": "#/definitions/RedisEnterpriseCloudFieldMapping"
-    },
-    "VectorIndexName": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "CredentialsSecretArn",
-    "Endpoint",
-    "FieldMapping",
-    "VectorIndexName"
-   ],
-   "type": "object"
-  },
-  "RedisEnterpriseCloudFieldMapping": {
-   "additionalProperties": false,
-   "properties": {
-    "MetadataField": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    },
-    "TextField": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    },
-    "VectorField": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "MetadataField",
-    "TextField",
-    "VectorField"
-   ],
-   "type": "object"
-  },
-  "RedshiftClusterIdentifier": {
-   "maxLength": 63,
-   "minLength": 1,
-   "type": "string"
-  },
-  "RedshiftConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "QueryEngineConfiguration": {
-     "$ref": "#/definitions/RedshiftQueryEngineConfiguration"
-    },
-    "QueryGenerationConfiguration": {
-     "$ref": "#/definitions/QueryGenerationConfiguration"
-    },
-    "StorageConfigurations": {
-     "$ref": "#/definitions/RedshiftQueryEngineStorageConfigurations"
-    }
-   },
-   "required": [
-    "StorageConfigurations",
-    "QueryEngineConfiguration"
-   ],
-   "type": "object"
-  },
-  "RedshiftDatabase": {
-   "maxLength": 200,
-   "minLength": 1,
-   "type": "string"
-  },
-  "RedshiftProvisionedAuthConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "DatabaseUser": {
-     "type": "string"
-    },
-    "Type": {
-     "$ref": "#/definitions/RedshiftProvisionedAuthType"
-    },
-    "UsernamePasswordSecretArn": {
-     "$ref": "#/definitions/SecretArn"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "RedshiftProvisionedAuthType": {
-   "enum": [
-    "IAM",
-    "USERNAME_PASSWORD",
-    "USERNAME"
-   ],
-   "type": "string"
-  },
-  "RedshiftProvisionedConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "AuthConfiguration": {
-     "$ref": "#/definitions/RedshiftProvisionedAuthConfiguration"
-    },
-    "ClusterIdentifier": {
-     "$ref": "#/definitions/RedshiftClusterIdentifier"
-    }
-   },
-   "required": [
-    "ClusterIdentifier",
-    "AuthConfiguration"
-   ],
-   "type": "object"
-  },
-  "RedshiftQueryEngineAwsDataCatalogStorageConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "TableNames": {
-     "$ref": "#/definitions/AwsDataCatalogTableNames"
-    }
-   },
-   "required": [
-    "TableNames"
-   ],
-   "type": "object"
-  },
-  "RedshiftQueryEngineConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "ProvisionedConfiguration": {
-     "$ref": "#/definitions/RedshiftProvisionedConfiguration"
-    },
-    "ServerlessConfiguration": {
-     "$ref": "#/definitions/RedshiftServerlessConfiguration"
-    },
-    "Type": {
-     "$ref": "#/definitions/RedshiftQueryEngineType"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "RedshiftQueryEngineRedshiftStorageConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "DatabaseName": {
-     "$ref": "#/definitions/RedshiftDatabase"
-    }
-   },
-   "required": [
-    "DatabaseName"
-   ],
-   "type": "object"
-  },
-  "RedshiftQueryEngineStorageConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "AwsDataCatalogConfiguration": {
-     "$ref": "#/definitions/RedshiftQueryEngineAwsDataCatalogStorageConfiguration"
-    },
-    "RedshiftConfiguration": {
-     "$ref": "#/definitions/RedshiftQueryEngineRedshiftStorageConfiguration"
-    },
-    "Type": {
-     "$ref": "#/definitions/RedshiftQueryEngineStorageType"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "RedshiftQueryEngineStorageConfigurations": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/RedshiftQueryEngineStorageConfiguration"
-   },
-   "maxItems": 1,
-   "minItems": 1,
-   "type": "array"
-  },
-  "RedshiftQueryEngineStorageType": {
-   "enum": [
-    "REDSHIFT",
-    "AWS_DATA_CATALOG"
-   ],
-   "type": "string"
-  },
-  "RedshiftQueryEngineType": {
-   "enum": [
-    "SERVERLESS",
-    "PROVISIONED"
-   ],
-   "type": "string"
-  },
-  "RedshiftServerlessAuthConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "Type": {
-     "$ref": "#/definitions/RedshiftServerlessAuthType"
-    },
-    "UsernamePasswordSecretArn": {
-     "$ref": "#/definitions/SecretArn"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "RedshiftServerlessAuthType": {
-   "enum": [
-    "IAM",
-    "USERNAME_PASSWORD"
-   ],
-   "type": "string"
-  },
-  "RedshiftServerlessConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "AuthConfiguration": {
-     "$ref": "#/definitions/RedshiftServerlessAuthConfiguration"
-    },
-    "WorkgroupArn": {
-     "$ref": "#/definitions/WorkgroupArn"
-    }
-   },
-   "required": [
-    "WorkgroupArn",
-    "AuthConfiguration"
-   ],
-   "type": "object"
-  },
-  "S3Location": {
-   "additionalProperties": false,
-   "properties": {
-    "URI": {
-     "maxLength": 2048,
-     "minLength": 1,
-     "pattern": "^s3://.{1,128}$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "URI"
-   ],
-   "type": "object"
-  },
-  "SecretArn": {
-   "pattern": "^arn:aws(|-cn|-us-gov):secretsmanager:[a-z0-9-]{1,20}:([0-9]{12}|):secret:[a-zA-Z0-9!/_+=.@-]{1,512}$",
-   "type": "string"
-  },
-  "SqlKnowledgeBaseConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "RedshiftConfiguration": {
-     "$ref": "#/definitions/RedshiftConfiguration"
-    },
-    "Type": {
-     "$ref": "#/definitions/QueryEngineType"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "SqlString": {
-   "maxLength": 1000,
-   "minLength": 1,
-   "type": "string"
-  },
-  "StorageConfiguration": {
-   "additionalProperties": false,
-   "oneOf": [
-    {
-     "required": [
-      "OpensearchServerlessConfiguration"
-     ]
-    },
-    {
-     "required": [
-      "PineconeConfiguration"
-     ]
-    },
-    {
-     "required": [
-      "RdsConfiguration"
-     ]
-    },
-    {
-     "required": [
-      "MongoDbAtlasConfiguration"
-     ]
-    }
-   ],
-   "properties": {
-    "MongoDbAtlasConfiguration": {
-     "$ref": "#/definitions/MongoDbAtlasConfiguration"
-    },
-    "OpensearchServerlessConfiguration": {
-     "$ref": "#/definitions/OpenSearchServerlessConfiguration"
-    },
-    "PineconeConfiguration": {
-     "$ref": "#/definitions/PineconeConfiguration"
-    },
-    "RdsConfiguration": {
-     "$ref": "#/definitions/RdsConfiguration"
-    },
-    "Type": {
-     "$ref": "#/definitions/KnowledgeBaseStorageType"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "SupplementalDataStorageConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "SupplementalDataStorageLocations": {
-     "$ref": "#/definitions/SupplementalDataStorageLocations"
-    }
-   },
-   "required": [
-    "SupplementalDataStorageLocations"
-   ],
-   "type": "object"
-  },
-  "SupplementalDataStorageLocation": {
-   "additionalProperties": false,
-   "properties": {
-    "S3Location": {
-     "$ref": "#/definitions/S3Location"
-    },
-    "SupplementalDataStorageLocationType": {
-     "$ref": "#/definitions/SupplementalDataStorageLocationType"
-    }
-   },
-   "required": [
-    "SupplementalDataStorageLocationType"
-   ],
-   "type": "object"
-  },
-  "SupplementalDataStorageLocationType": {
-   "enum": [
-    "S3"
-   ],
-   "type": "string"
-  },
-  "SupplementalDataStorageLocations": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/SupplementalDataStorageLocation"
-   },
-   "maxItems": 1,
-   "minItems": 1,
-   "type": "array"
-  },
-  "TagsMap": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "^[a-zA-Z0-9\\s._:/=+@-]*$": {
-     "maxLength": 256,
-     "minLength": 0,
-     "pattern": "^[a-zA-Z0-9\\s._:/=+@-]*$",
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "VectorKnowledgeBaseConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "EmbeddingModelArn": {
-     "maxLength": 2048,
-     "minLength": 20,
-     "pattern": "^(arn:aws(-[^:]+)?:[a-z0-9-]+:[a-z0-9-]{1,20}:[0-9]{0,12}:[a-zA-Z0-9-:/._+]+)$",
-     "type": "string"
-    },
-    "EmbeddingModelConfiguration": {
-     "$ref": "#/definitions/EmbeddingModelConfiguration"
-    },
-    "SupplementalDataStorageConfiguration": {
-     "$ref": "#/definitions/SupplementalDataStorageConfiguration"
-    }
-   },
-   "required": [
-    "EmbeddingModelArn"
-   ],
-   "type": "object"
-  },
-  "WorkgroupArn": {
-   "pattern": "^(arn:(aws(-[a-z]+)*):redshift-serverless:[a-z]{2}(-gov)?-[a-z]+-\\d{1}:\\d{12}:workgroup/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$",
-   "type": "string"
-  }
- },
- "primaryIdentifier": [
-  "/properties/KnowledgeBaseId"
- ],
- "properties": {
-  "CreatedAt": {
-   "type": "string"
-  },
-  "Description": {
-   "maxLength": 200,
-   "minLength": 1,
-   "type": "string"
-  },
-  "FailureReasons": {
-   "insertionOrder": false,
-   "items": {
-    "maxLength": 2048,
-    "type": "string"
-   },
-   "maxItems": 2048,
-   "type": "array"
-  },
-  "KnowledgeBaseArn": {
-   "maxLength": 128,
-   "minLength": 0,
-   "pattern": "^arn:aws(|-cn|-us-gov):bedrock:[a-zA-Z0-9-]*:[0-9]{12}:knowledge-base/[0-9a-zA-Z]+$",
-   "type": "string"
-  },
-  "KnowledgeBaseConfiguration": {
-   "$ref": "#/definitions/KnowledgeBaseConfiguration"
-  },
-  "KnowledgeBaseId": {
-   "pattern": "^[0-9a-zA-Z]{10}$",
-   "type": "string"
-  },
-  "Name": {
-   "pattern": "^([0-9a-zA-Z][_-]?){1,100}$",
-   "type": "string"
-  },
-  "RoleArn": {
-   "maxLength": 2048,
-   "pattern": "^arn:aws(-[^:]+)?:iam::([0-9]{12})?:role/.+$",
-   "type": "string"
-  },
-  "Status": {
-   "$ref": "#/definitions/KnowledgeBaseStatus"
-  },
-  "StorageConfiguration": {
-   "$ref": "#/definitions/StorageConfiguration"
-  },
-  "Tags": {
-   "$ref": "#/definitions/TagsMap"
-  },
-  "UpdatedAt": {
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/KnowledgeBaseId",
-  "/properties/KnowledgeBaseArn",
-  "/properties/CreatedAt",
-  "/properties/UpdatedAt",
-  "/properties/FailureReasons",
-  "/properties/Status"
- ],
- "required": [
-  "KnowledgeBaseConfiguration",
-  "Name",
-  "RoleArn"
- ],
- "tagging": {
-  "cloudFormationSystemTags": true,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::Bedrock::KnowledgeBase"
-}
diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-cloudwatch-metricstream.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-cloudwatch-metricstream.json
deleted file mode 100644
index 89ca2654d5..0000000000
--- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-cloudwatch-metricstream.json
+++ /dev/null
@@ -1,228 +0,0 @@
-{
- "additionalProperties": false,
- "allOf": [
-  {
-   "required": [
-    "FirehoseArn",
-    "RoleArn",
-    "OutputFormat"
-   ]
-  },
-  {
-   "oneOf": [
-    {},
-    {
-     "required": [
-      "IncludeFilters",
-      "ExcludeFilters"
-     ]
-    }
-   ]
-  }
- ],
- "createOnlyProperties": [
-  "/properties/Name"
- ],
- "definitions": {
-  "MetricStreamFilter": {
-   "additionalProperties": false,
-   "properties": {
-    "MetricNames": {
-     "items": {
-      "maxLength": 255,
-      "minLength": 1,
-      "type": "string"
-     },
-     "maxItems": 999,
-     "type": "array"
-    },
-    "Namespace": {
-     "maxLength": 255,
-     "minLength": 1,
-     "pattern": "[^:].*",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Namespace"
-   ],
-   "type": "object"
-  },
-  "MetricStreamStatisticsConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "AdditionalStatistics": {
-     "items": {
-      "type": "string"
-     },
-     "maxItems": 20,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "IncludeMetrics": {
-     "items": {
-      "$ref": "#/definitions/MetricStreamStatisticsMetric"
-     },
-     "maxItems": 100,
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "required": [
-    "AdditionalStatistics",
-    "IncludeMetrics"
-   ],
-   "type": "object"
-  },
-  "MetricStreamStatisticsMetric": {
-   "additionalProperties": false,
-   "properties": {
-    "MetricName": {
-     "maxLength": 255,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Namespace": {
-     "maxLength": 255,
-     "minLength": 1,
-     "pattern": "[^:].*",
-     "type": "string"
-    }
-   },
-   "required": [
-    "MetricName",
-    "Namespace"
-   ],
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "minLength": 0,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Name"
- ],
- "properties": {
-  "Arn": {
-   "maxLength": 2048,
-   "minLength": 20,
-   "type": "string"
-  },
-  "CreationDate": {
-   "anyOf": [
-    {
-     "format": "date-time"
-    },
-    {
-     "format": "timestamp"
-    }
-   ],
-   "type": "string"
-  },
-  "ExcludeFilters": {
-   "items": {
-    "$ref": "#/definitions/MetricStreamFilter"
-   },
-   "maxItems": 1000,
-   "type": "array",
-   "uniqueItems": true
-  },
-  "FirehoseArn": {
-   "maxLength": 2048,
-   "minLength": 20,
-   "type": "string"
-  },
-  "IncludeFilters": {
-   "items": {
-    "$ref": "#/definitions/MetricStreamFilter"
-   },
-   "maxItems": 1000,
-   "type": "array",
-   "uniqueItems": true
-  },
-  "IncludeLinkedAccountsMetrics": {
-   "type": "boolean"
-  },
-  "LastUpdateDate": {
-   "anyOf": [
-    {
-     "format": "date-time"
-    },
-    {
-     "format": "timestamp"
-    }
-   ],
-   "type": "string"
-  },
-  "Name": {
-   "maxLength": 255,
-   "minLength": 1,
-   "type": "string"
-  },
-  "OutputFormat": {
-   "enum": [
-    "json",
-    "opentelemetry0.7",
-    "opentelemetry1.0"
-   ],
-   "maxLength": 255,
-   "minLength": 1,
-   "type": "string"
-  },
-  "RoleArn": {
-   "maxLength": 2048,
-   "minLength": 20,
-   "type": "string"
-  },
-  "State": {
-   "maxLength": 255,
-   "minLength": 1,
-   "type": "string"
-  },
-  "StatisticsConfigurations": {
-   "items": {
-    "$ref": "#/definitions/MetricStreamStatisticsConfiguration"
-   },
-   "maxItems": 100,
-   "type": "array",
-   "uniqueItems": true
-  },
-  "Tags": {
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 50,
-   "type": "array",
-   "uniqueItems": true
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/CreationDate",
-  "/properties/LastUpdateDate",
-  "/properties/State"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-cloudwatch.git",
- "taggable": true,
- "typeName": "AWS::CloudWatch::MetricStream",
- "writeOnlyProperties": [
-  "/properties/Tags"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-ec2-capacityreservation.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-ec2-capacityreservation.json
deleted file mode 100644
index 5a10969ce5..0000000000
--- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-ec2-capacityreservation.json
+++ /dev/null
@@ -1,250 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/Tenancy",
-  "/properties/InstancePlatform",
-  "/properties/InstanceType",
-  "/properties/AvailabilityZone",
-  "/properties/TagSpecifications",
-  "/properties/OutPostArn",
-  "/properties/EphemeralStorage",
-  "/properties/EbsOptimized",
-  "/properties/PlacementGroupArn"
- ],
- "definitions": {
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "type": "string"
-    },
-    "Value": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "TagSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "ResourceType": {
-     "enum": [
-      "capacity-reservation",
-      "capacity-reservation-fleet",
-      "carrier-gateway",
-      "client-vpn-endpoint",
-      "coip-pool",
-      "customer-gateway",
-      "declarative-policies-report",
-      "dedicated-host",
-      "dhcp-options",
-      "egress-only-internet-gateway",
-      "elastic-gpu",
-      "elastic-ip",
-      "export-image-task",
-      "export-instance-task",
-      "fleet",
-      "fpga-image",
-      "host-reservation",
-      "image",
-      "import-image-task",
-      "import-snapshot-task",
-      "instance",
-      "instance-connect-endpoint",
-      "instance-event-window",
-      "internet-gateway",
-      "ipam",
-      "ipam-external-resource-verification-token",
-      "ipam-pool",
-      "ipam-resource-discovery",
-      "ipam-resource-discovery-association",
-      "ipam-scope",
-      "ipv4pool-ec2",
-      "ipv6pool-ec2",
-      "key-pair",
-      "launch-template",
-      "local-gateway",
-      "local-gateway-route-table",
-      "local-gateway-route-table-virtual-interface-group-association",
-      "local-gateway-route-table-vpc-association",
-      "local-gateway-virtual-interface",
-      "local-gateway-virtual-interface-group",
-      "natgateway",
-      "network-acl",
-      "network-insights-access-scope",
-      "network-insights-access-scope-analysis",
-      "network-insights-analysis",
-      "network-insights-path",
-      "network-interface",
-      "placement-group",
-      "prefix-list",
-      "replace-root-volume-task",
-      "reserved-instances",
-      "route-table",
-      "security-group",
-      "security-group-rule",
-      "snapshot",
-      "spot-fleet-request",
-      "spot-instances-request",
-      "subnet",
-      "subnet-cidr-reservation",
-      "traffic-mirror-filter",
-      "traffic-mirror-filter-rule",
-      "traffic-mirror-session",
-      "traffic-mirror-target",
-      "transit-gateway",
-      "transit-gateway-attachment",
-      "transit-gateway-connect-peer",
-      "transit-gateway-multicast-domain",
-      "transit-gateway-policy-table",
-      "transit-gateway-route-table",
-      "transit-gateway-route-table-announcement",
-      "verified-access-endpoint",
-      "verified-access-endpoint-target",
-      "verified-access-group",
-      "verified-access-instance",
-      "verified-access-policy",
-      "verified-access-trust-provider",
-      "volume",
-      "vpc",
-      "vpc-block-public-access-exclusion",
-      "vpc-endpoint",
-      "vpc-endpoint-connection",
-      "vpc-endpoint-connection-device-type",
-      "vpc-endpoint-service",
-      "vpc-endpoint-service-permission",
-      "vpc-flow-log",
-      "vpc-peering-connection",
-      "vpn-connection",
-      "vpn-connection-device-type",
-      "vpn-gateway"
-     ],
-     "type": "string"
-    },
-    "Tags": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Tag"
-     },
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "AvailabilityZone": {
-   "type": "string"
-  },
-  "AvailableInstanceCount": {
-   "type": "integer"
-  },
-  "EbsOptimized": {
-   "type": "boolean"
-  },
-  "EndDate": {
-   "type": "string"
-  },
-  "EndDateType": {
-   "enum": [
-    "limited",
-    "unlimited"
-   ],
-   "type": "string"
-  },
-  "EphemeralStorage": {
-   "type": "boolean"
-  },
-  "Id": {
-   "type": "string"
-  },
-  "InstanceCount": {
-   "type": "integer"
-  },
-  "InstanceMatchCriteria": {
-   "enum": [
-    "open",
-    "targeted"
-   ],
-   "type": "string"
-  },
-  "InstancePlatform": {
-   "enum": [
-    "Linux with SQL Server Enterprise",
-    "Linux with SQL Server Standard",
-    "Linux with SQL Server Web",
-    "Linux/UNIX",
-    "RHEL with HA",
-    "RHEL with HA and SQL Server Enterprise",
-    "RHEL with HA and SQL Server Standard",
-    "RHEL with SQL Server Enterprise",
-    "RHEL with SQL Server Standard",
-    "RHEL with SQL Server Web",
-    "Red Hat Enterprise Linux",
-    "SUSE Linux",
-    "Ubuntu Pro",
-    "Windows",
-    "Windows with SQL Server",
-    "Windows with SQL Server Enterprise",
-    "Windows with SQL Server Standard",
-    "Windows with SQL Server Web"
-   ],
-   "type": "string"
-  },
-  "InstanceType": {
-   "type": "string"
-  },
-  "OutPostArn": {
-   "pattern": "^arn:aws([a-z-]+)?:outposts:[a-z\\d-]+:\\d{12}:outpost/op-[a-f0-9]{17}$",
-   "type": "string"
-  },
-  "PlacementGroupArn": {
-   "pattern": "^arn:aws([a-z-]+)?:ec2:[a-z\\d-]+:\\d{12}:placement-group/^.{1,255}$",
-   "type": "string"
-  },
-  "TagSpecifications": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/TagSpecification"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "Tenancy": {
-   "enum": [
-    "dedicated",
-    "default"
-   ],
-   "type": "string"
-  },
-  "TotalInstanceCount": {
-   "type": "integer"
-  },
-  "UnusedReservationBillingOwnerId": {
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id",
-  "/properties/AvailableInstanceCount",
-  "/properties/TotalInstanceCount"
- ],
- "required": [
-  "InstanceCount",
-  "AvailabilityZone",
-  "InstancePlatform",
-  "InstanceType"
- ],
- "typeName": "AWS::EC2::CapacityReservation",
- "writeOnlyProperties": [
-  "/properties/UnusedReservationBillingOwnerId"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-resiliencehub-app.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-resiliencehub-app.json
deleted file mode 100644
index 40b055a88b..0000000000
--- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-resiliencehub-app.json
+++ /dev/null
@@ -1,222 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/Name"
- ],
- "definitions": {
-  "EventSubscription": {
-   "additionalProperties": false,
-   "properties": {
-    "EventType": {
-     "enum": [
-      "ScheduledAssessmentFailure",
-      "DriftDetected"
-     ],
-     "type": "string"
-    },
-    "Name": {
-     "maxLength": 256,
-     "type": "string"
-    },
-    "SnsTopicArn": {
-     "pattern": "^arn:(aws|aws-cn|aws-iso|aws-iso-[a-z]{1}|aws-us-gov):[A-Za-z0-9][A-Za-z0-9_/.-]{0,62}:([a-z]{2}-((iso[a-z]{0,1}-)|(gov-)){0,1}[a-z]+-[0-9]):[0-9]{12}:[A-Za-z0-9/][A-Za-z0-9:_/+.-]{0,1023}$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Name",
-    "EventType"
-   ],
-   "type": "object"
-  },
-  "IamRoleArn": {
-   "pattern": "arn:(aws|aws-cn|aws-iso|aws-iso-[a-z]{1}|aws-us-gov):iam::[0-9]{12}:role\\/(([\\u0021-\\u007E]+\\u002F){1,511})?[A-Za-z0-9+=,.@_/-]{1,64}$",
-   "type": "string"
-  },
-  "PermissionModel": {
-   "additionalProperties": false,
-   "properties": {
-    "CrossAccountRoleArns": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/IamRoleArn"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "InvokerRoleName": {
-     "pattern": "((\\u002F[\\u0021-\\u007E]+\\u002F){1,511})?[A-Za-z0-9+=,.@_/-]{1,64}",
-     "type": "string"
-    },
-    "Type": {
-     "enum": [
-      "LegacyIAMUser",
-      "RoleBased"
-     ],
-     "type": "string"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "PhysicalResourceId": {
-   "additionalProperties": false,
-   "properties": {
-    "AwsAccountId": {
-     "pattern": "^[0-9]{12}$",
-     "type": "string"
-    },
-    "AwsRegion": {
-     "pattern": "^[a-z]{2}-((iso[a-z]{0,1}-)|(gov-)){0,1}[a-z]+-[0-9]$",
-     "type": "string"
-    },
-    "Identifier": {
-     "maxLength": 255,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Type": {
-     "pattern": "Arn|Native",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Identifier",
-    "Type"
-   ],
-   "type": "object"
-  },
-  "ResourceMapping": {
-   "additionalProperties": false,
-   "properties": {
-    "EksSourceName": {
-     "type": "string"
-    },
-    "LogicalStackName": {
-     "type": "string"
-    },
-    "MappingType": {
-     "pattern": "CfnStack|Resource|Terraform|EKS",
-     "type": "string"
-    },
-    "PhysicalResourceId": {
-     "$ref": "#/definitions/PhysicalResourceId"
-    },
-    "ResourceName": {
-     "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$",
-     "type": "string"
-    },
-    "TerraformSourceName": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "MappingType",
-    "PhysicalResourceId"
-   ],
-   "type": "object"
-  },
-  "TagMap": {
-   "additionalProperties": false,
-   "patternProperties": {
-    ".{1,128}": {
-     "$ref": "#/definitions/TagValue"
-    }
-   },
-   "type": "object"
-  },
-  "TagValue": {
-   "maxLength": 256,
-   "type": "string"
-  }
- },
- "primaryIdentifier": [
-  "/properties/AppArn"
- ],
- "properties": {
-  "AppArn": {
-   "pattern": "^arn:(aws|aws-cn|aws-iso|aws-iso-[a-z]{1}|aws-us-gov):[A-Za-z0-9][A-Za-z0-9_/.-]{0,62}:([a-z]{2}-((iso[a-z]{0,1}-)|(gov-)){0,1}[a-z]+-[0-9]):[0-9]{12}:[A-Za-z0-9][A-Za-z0-9:_/+=,@.-]{0,1023}$",
-   "type": "string"
-  },
-  "AppAssessmentSchedule": {
-   "enum": [
-    "Disabled",
-    "Daily"
-   ],
-   "type": "string"
-  },
-  "AppTemplateBody": {
-   "maxLength": 409600,
-   "minLength": 0,
-   "pattern": "^[\\w\\s:,-\\.'\\/{}\\[\\]:\"]+$",
-   "type": "string"
-  },
-  "Description": {
-   "maxLength": 500,
-   "minLength": 0,
-   "type": "string"
-  },
-  "DriftStatus": {
-   "enum": [
-    "NotChecked",
-    "NotDetected",
-    "Detected"
-   ],
-   "type": "string"
-  },
-  "EventSubscriptions": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/EventSubscription"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "Name": {
-   "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$",
-   "type": "string"
-  },
-  "PermissionModel": {
-   "$ref": "#/definitions/PermissionModel"
-  },
-  "RegulatoryPolicyArn": {
-   "pattern": "^arn:(aws|aws-cn|aws-iso|aws-iso-[a-z]{1}|aws-us-gov):[A-Za-z0-9][A-Za-z0-9_/.-]{0,62}:([a-z]{2}-((iso[a-z]{0,1}-)|(gov-)){0,1}[a-z]+-[0-9]):[0-9]{12}:[A-Za-z0-9][A-Za-z0-9:_/+=,@.-]{0,1023}$",
-   "type": "string"
-  },
-  "ResiliencyPolicyArn": {
-   "pattern": "^arn:(aws|aws-cn|aws-iso|aws-iso-[a-z]{1}|aws-us-gov):[A-Za-z0-9][A-Za-z0-9_/.-]{0,62}:([a-z]{2}-((iso[a-z]{0,1}-)|(gov-)){0,1}[a-z]+-[0-9]):[0-9]{12}:[A-Za-z0-9][A-Za-z0-9:_/+=,@.-]{0,1023}$",
-   "type": "string"
-  },
-  "ResourceMappings": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/ResourceMapping"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "Tags": {
-   "$ref": "#/definitions/TagMap"
-  }
- },
- "readOnlyProperties": [
-  "/properties/AppArn",
-  "/properties/DriftStatus"
- ],
- "required": [
-  "Name",
-  "AppTemplateBody",
-  "ResourceMappings"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-resiliencehub",
- "tagging": {
-  "cloudFormationSystemTags": true,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::ResilienceHub::App"
-}
diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-sagemaker-domain.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-sagemaker-domain.json
deleted file mode 100644
index b79e2bbd95..0000000000
--- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-sagemaker-domain.json
+++ /dev/null
@@ -1,881 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/AuthMode",
-  "/properties/DomainName",
-  "/properties/DomainSettings/RStudioServerProDomainSettings/DefaultResourceSpec",
-  "/properties/KmsKeyId",
-  "/properties/VpcId",
-  "/properties/Tags"
- ],
- "definitions": {
-  "AppLifecycleManagement": {
-   "additionalProperties": false,
-   "properties": {
-    "IdleSettings": {
-     "$ref": "#/definitions/IdleSettings"
-    }
-   },
-   "type": "object"
-  },
-  "AppType": {
-   "enum": [
-    "JupyterServer",
-    "TensorBoard",
-    "RStudioServerPro",
-    "JupyterLab",
-    "CodeEditor",
-    "DetailedProfiler",
-    "Canvas"
-   ],
-   "type": "string"
-  },
-  "CodeEditorAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "AppLifecycleManagement": {
-     "$ref": "#/definitions/AppLifecycleManagement"
-    },
-    "CustomImages": {
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 200,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "CodeRepository": {
-   "additionalProperties": false,
-   "properties": {
-    "RepositoryUrl": {
-     "maxLength": 256,
-     "pattern": "^https://([.\\-_a-zA-Z0-9]+/?){3,1016}$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "RepositoryUrl"
-   ],
-   "type": "object"
-  },
-  "CustomFileSystemConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "EFSFileSystemConfig": {
-     "$ref": "#/definitions/EFSFileSystemConfig"
-    }
-   },
-   "type": "object"
-  },
-  "CustomImage": {
-   "additionalProperties": false,
-   "properties": {
-    "AppImageConfigName": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}",
-     "type": "string"
-    },
-    "ImageName": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9]([-.]?[a-zA-Z0-9]){0,62}$",
-     "type": "string"
-    },
-    "ImageVersionNumber": {
-     "minimum": 0,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "AppImageConfigName",
-    "ImageName"
-   ],
-   "type": "object"
-  },
-  "CustomPosixUserConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "Gid": {
-     "maximum": 4000000,
-     "minimum": 1001,
-     "type": "integer"
-    },
-    "Uid": {
-     "maximum": 4000000,
-     "minimum": 10000,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "Uid",
-    "Gid"
-   ],
-   "type": "object"
-  },
-  "DefaultEbsStorageSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultEbsVolumeSizeInGb": {
-     "$ref": "#/definitions/SpaceEbsVolumeSizeInGb"
-    },
-    "MaximumEbsVolumeSizeInGb": {
-     "$ref": "#/definitions/SpaceEbsVolumeSizeInGb"
-    }
-   },
-   "required": [
-    "DefaultEbsVolumeSizeInGb",
-    "MaximumEbsVolumeSizeInGb"
-   ],
-   "type": "object"
-  },
-  "DefaultSpaceSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomFileSystemConfigs": {
-     "items": {
-      "$ref": "#/definitions/CustomFileSystemConfig"
-     },
-     "maxItems": 2,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "CustomPosixUserConfig": {
-     "$ref": "#/definitions/CustomPosixUserConfig"
-    },
-    "ExecutionRole": {
-     "maxLength": 2048,
-     "minLength": 20,
-     "pattern": "^arn:aws[a-z\\-]*:iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+$",
-     "type": "string"
-    },
-    "JupyterLabAppSettings": {
-     "$ref": "#/definitions/JupyterLabAppSettings"
-    },
-    "JupyterServerAppSettings": {
-     "$ref": "#/definitions/JupyterServerAppSettings"
-    },
-    "KernelGatewayAppSettings": {
-     "$ref": "#/definitions/KernelGatewayAppSettings"
-    },
-    "SecurityGroups": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "insertionOrder": false,
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.Id",
-      "maxLength": 32,
-      "pattern": "[-0-9a-zA-Z]+",
-      "type": "string"
-     },
-     "maxItems": 5,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "SpaceStorageSettings": {
-     "$ref": "#/definitions/DefaultSpaceStorageSettings"
-    }
-   },
-   "required": [
-    "ExecutionRole"
-   ],
-   "type": "object"
-  },
-  "DefaultSpaceStorageSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultEbsStorageSettings": {
-     "$ref": "#/definitions/DefaultEbsStorageSettings"
-    }
-   },
-   "type": "object"
-  },
-  "DockerSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "EnableDockerAccess": {
-     "enum": [
-      "ENABLED",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "VpcOnlyTrustedAccounts": {
-     "insertionOrder": false,
-     "items": {
-      "maxLength": 12,
-      "minLength": 12,
-      "pattern": "^\\d+$",
-      "type": "string"
-     },
-     "maxItems": 20,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "DomainSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DockerSettings": {
-     "$ref": "#/definitions/DockerSettings"
-    },
-    "ExecutionRoleIdentityConfig": {
-     "enum": [
-      "USER_PROFILE_NAME",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "RStudioServerProDomainSettings": {
-     "$ref": "#/definitions/RStudioServerProDomainSettings"
-    },
-    "SecurityGroupIds": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "insertionOrder": false,
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.Id",
-      "maxLength": 32,
-      "pattern": "[-0-9a-zA-Z]+",
-      "type": "string"
-     },
-     "maxItems": 3,
-     "minItems": 1,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "EFSFileSystemConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "FileSystemId": {
-     "maxLength": 21,
-     "minLength": 11,
-     "pattern": "^(fs-[0-9a-f]{8,})$",
-     "type": "string"
-    },
-    "FileSystemPath": {
-     "maxLength": 256,
-     "minLength": 1,
-     "pattern": "^\\/\\S*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "FileSystemId"
-   ],
-   "type": "object"
-  },
-  "IdleSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "IdleTimeoutInMinutes": {
-     "$ref": "#/definitions/IdleTimeoutInMinutes"
-    },
-    "LifecycleManagement": {
-     "$ref": "#/definitions/LifecycleManagement"
-    },
-    "MaxIdleTimeoutInMinutes": {
-     "$ref": "#/definitions/MaxIdleTimeoutInMinutes"
-    },
-    "MinIdleTimeoutInMinutes": {
-     "$ref": "#/definitions/MinIdleTimeoutInMinutes"
-    }
-   },
-   "type": "object"
-  },
-  "IdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "JupyterLabAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "AppLifecycleManagement": {
-     "$ref": "#/definitions/AppLifecycleManagement"
-    },
-    "CodeRepositories": {
-     "items": {
-      "$ref": "#/definitions/CodeRepository"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "CustomImages": {
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 200,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "JupyterServerAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "KernelGatewayAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomImages": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 200,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "LifecycleManagement": {
-   "enum": [
-    "ENABLED",
-    "DISABLED"
-   ],
-   "type": "string"
-  },
-  "MaxIdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "MinIdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "MlTools": {
-   "enum": [
-    "DataWrangler",
-    "FeatureStore",
-    "EmrClusters",
-    "AutoMl",
-    "Experiments",
-    "Training",
-    "ModelEvaluation",
-    "Pipelines",
-    "Models",
-    "JumpStart",
-    "InferenceRecommender",
-    "Endpoints",
-    "Projects",
-    "InferenceOptimization",
-    "HyperPodClusters",
-    "Comet",
-    "DeepchecksLLMEvaluation",
-    "Fiddler",
-    "LakeraGuard"
-   ],
-   "type": "string"
-  },
-  "RSessionAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomImages": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 200,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    }
-   },
-   "type": "object"
-  },
-  "RStudioServerProAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "AccessStatus": {
-     "enum": [
-      "ENABLED",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "UserGroup": {
-     "enum": [
-      "R_STUDIO_ADMIN",
-      "R_STUDIO_USER"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "RStudioServerProDomainSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "DomainExecutionRoleArn": {
-     "maxLength": 2048,
-     "minLength": 20,
-     "pattern": "^arn:aws[a-z\\-]*:iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+$",
-     "type": "string"
-    },
-    "RStudioConnectUrl": {
-     "pattern": "^(https:|http:|www\\.)\\S*",
-     "type": "string"
-    },
-    "RStudioPackageManagerUrl": {
-     "pattern": "^(https:|http:|www\\.)\\S*",
-     "type": "string"
-    }
-   },
-   "required": [
-    "DomainExecutionRoleArn"
-   ],
-   "type": "object"
-  },
-  "ResourceSpec": {
-   "additionalProperties": false,
-   "properties": {
-    "InstanceType": {
-     "enum": [
-      "system",
-      "ml.t3.micro",
-      "ml.t3.small",
-      "ml.t3.medium",
-      "ml.t3.large",
-      "ml.t3.xlarge",
-      "ml.t3.2xlarge",
-      "ml.m5.large",
-      "ml.m5.xlarge",
-      "ml.m5.2xlarge",
-      "ml.m5.4xlarge",
-      "ml.m5.8xlarge",
-      "ml.m5.12xlarge",
-      "ml.m5.16xlarge",
-      "ml.m5.24xlarge",
-      "ml.c5.large",
-      "ml.c5.xlarge",
-      "ml.c5.2xlarge",
-      "ml.c5.4xlarge",
-      "ml.c5.9xlarge",
-      "ml.c5.12xlarge",
-      "ml.c5.18xlarge",
-      "ml.c5.24xlarge",
-      "ml.p3.2xlarge",
-      "ml.p3.8xlarge",
-      "ml.p3.16xlarge",
-      "ml.g4dn.xlarge",
-      "ml.g4dn.2xlarge",
-      "ml.g4dn.4xlarge",
-      "ml.g4dn.8xlarge",
-      "ml.g4dn.12xlarge",
-      "ml.g4dn.16xlarge",
-      "ml.r5.large",
-      "ml.r5.xlarge",
-      "ml.r5.2xlarge",
-      "ml.r5.4xlarge",
-      "ml.r5.8xlarge",
-      "ml.r5.12xlarge",
-      "ml.r5.16xlarge",
-      "ml.r5.24xlarge",
-      "ml.p3dn.24xlarge",
-      "ml.m5d.large",
-      "ml.m5d.xlarge",
-      "ml.m5d.2xlarge",
-      "ml.m5d.4xlarge",
-      "ml.m5d.8xlarge",
-      "ml.m5d.12xlarge",
-      "ml.m5d.16xlarge",
-      "ml.m5d.24xlarge",
-      "ml.g5.xlarge",
-      "ml.g5.2xlarge",
-      "ml.g5.4xlarge",
-      "ml.g5.8xlarge",
-      "ml.g5.12xlarge",
-      "ml.g5.16xlarge",
-      "ml.g5.24xlarge",
-      "ml.g5.48xlarge",
-      "ml.p4d.24xlarge",
-      "ml.p4de.24xlarge",
-      "ml.geospatial.interactive",
-      "ml.trn1.2xlarge",
-      "ml.trn1.32xlarge",
-      "ml.trn1n.32xlarge"
-     ],
-     "type": "string"
-    },
-    "LifecycleConfigArn": {
-     "maxLength": 256,
-     "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:studio-lifecycle-config/.*",
-     "type": "string"
-    },
-    "SageMakerImageArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws(-[\\w]+)*:sagemaker:.+:[0-9]{12}:image/[a-z0-9]([-.]?[a-z0-9])*$",
-     "type": "string"
-    },
-    "SageMakerImageVersionArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws(-[\\w]+)*:sagemaker:.+:[0-9]{12}:image-version/[a-z0-9]([-.]?[a-z0-9])*/[0-9]+$",
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SharingSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "NotebookOutputOption": {
-     "enum": [
-      "Allowed",
-      "Disabled"
-     ],
-     "type": "string"
-    },
-    "S3KmsKeyId": {
-     "maxLength": 2048,
-     "pattern": ".*",
-     "type": "string"
-    },
-    "S3OutputPath": {
-     "maxLength": 1024,
-     "pattern": "^(https|s3)://([^/]+)/?(.*)$",
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SpaceEbsVolumeSizeInGb": {
-   "maximum": 16384,
-   "minimum": 5,
-   "type": "integer"
-  },
-  "StudioLifecycleConfigArn": {
-   "maxLength": 256,
-   "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:studio-lifecycle-config/.*",
-   "type": "string"
-  },
-  "StudioWebPortalSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "HiddenAppTypes": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/AppType"
-     },
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "HiddenMlTools": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/MlTools"
-     },
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$",
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "UserSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CodeEditorAppSettings": {
-     "$ref": "#/definitions/CodeEditorAppSettings"
-    },
-    "CustomFileSystemConfigs": {
-     "items": {
-      "$ref": "#/definitions/CustomFileSystemConfig"
-     },
-     "maxItems": 2,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "CustomPosixUserConfig": {
-     "$ref": "#/definitions/CustomPosixUserConfig"
-    },
-    "DefaultLandingUri": {
-     "maxLength": 1023,
-     "type": "string"
-    },
-    "ExecutionRole": {
-     "maxLength": 2048,
-     "minLength": 20,
-     "pattern": "^arn:aws[a-z\\-]*:iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+$",
-     "type": "string"
-    },
-    "JupyterLabAppSettings": {
-     "$ref": "#/definitions/JupyterLabAppSettings"
-    },
-    "JupyterServerAppSettings": {
-     "$ref": "#/definitions/JupyterServerAppSettings"
-    },
-    "KernelGatewayAppSettings": {
-     "$ref": "#/definitions/KernelGatewayAppSettings"
-    },
-    "RSessionAppSettings": {
-     "$ref": "#/definitions/RSessionAppSettings"
-    },
-    "RStudioServerProAppSettings": {
-     "$ref": "#/definitions/RStudioServerProAppSettings"
-    },
-    "SecurityGroups": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "insertionOrder": false,
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.Id",
-      "maxLength": 32,
-      "pattern": "[-0-9a-zA-Z]+",
-      "type": "string"
-     },
-     "maxItems": 5,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "SharingSettings": {
-     "$ref": "#/definitions/SharingSettings"
-    },
-    "SpaceStorageSettings": {
-     "$ref": "#/definitions/DefaultSpaceStorageSettings"
-    },
-    "StudioWebPortal": {
-     "enum": [
-      "ENABLED",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "StudioWebPortalSettings": {
-     "$ref": "#/definitions/StudioWebPortalSettings"
-    }
-   },
-   "required": [
-    "ExecutionRole"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/DomainId"
- ],
- "properties": {
-  "AppNetworkAccessType": {
-   "enum": [
-    "PublicInternetOnly",
-    "VpcOnly"
-   ],
-   "type": "string"
-  },
-  "AppSecurityGroupManagement": {
-   "enum": [
-    "Service",
-    "Customer"
-   ],
-   "type": "string"
-  },
-  "AuthMode": {
-   "enum": [
-    "SSO",
-    "IAM"
-   ],
-   "type": "string"
-  },
-  "DefaultSpaceSettings": {
-   "$ref": "#/definitions/DefaultSpaceSettings"
-  },
-  "DefaultUserSettings": {
-   "$ref": "#/definitions/UserSettings"
-  },
-  "DomainArn": {
-   "maxLength": 256,
-   "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:domain/.*",
-   "type": "string"
-  },
-  "DomainId": {
-   "maxLength": 63,
-   "pattern": "^d-(-*[a-z0-9])+",
-   "type": "string"
-  },
-  "DomainName": {
-   "maxLength": 63,
-   "pattern": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}",
-   "type": "string"
-  },
-  "DomainSettings": {
-   "$ref": "#/definitions/DomainSettings"
-  },
-  "HomeEfsFileSystemId": {
-   "maxLength": 32,
-   "type": "string"
-  },
-  "KmsKeyId": {
-   "maxLength": 2048,
-   "pattern": ".*",
-   "type": "string"
-  },
-  "SecurityGroupIdForDomainBoundary": {
-   "maxLength": 32,
-   "pattern": "[-0-9a-zA-Z]+",
-   "type": "string"
-  },
-  "SingleSignOnApplicationArn": {
-   "pattern": "^arn:(aws|aws-us-gov|aws-cn|aws-iso|aws-iso-b):sso::[0-9]+:application/[a-zA-Z0-9-_.]+/apl-[a-zA-Z0-9]+$",
-   "type": "string"
-  },
-  "SingleSignOnManagedApplicationInstanceId": {
-   "maxLength": 256,
-   "type": "string"
-  },
-  "SubnetIds": {
-   "insertionOrder": false,
-   "items": {
-    "maxLength": 32,
-    "pattern": "[-0-9a-zA-Z]+",
-    "type": "string"
-   },
-   "maxItems": 16,
-   "minItems": 1,
-   "type": "array",
-   "uniqueItems": false
-  },
-  "TagPropagation": {
-   "enum": [
-    "ENABLED",
-    "DISABLED"
-   ],
-   "type": "string"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 50,
-   "minItems": 0,
-   "type": "array",
-   "uniqueItems": false
-  },
-  "Url": {
-   "maxLength": 1024,
-   "type": "string"
-  },
-  "VpcId": {
-   "format": "AWS::EC2::VPC.Id",
-   "maxLength": 32,
-   "pattern": "[-0-9a-zA-Z]+",
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/DomainArn",
-  "/properties/Url",
-  "/properties/DomainId",
-  "/properties/HomeEfsFileSystemId",
-  "/properties/SecurityGroupIdForDomainBoundary",
-  "/properties/SingleSignOnManagedApplicationInstanceId",
-  "/properties/SingleSignOnApplicationArn"
- ],
- "required": [
-  "AuthMode",
-  "DefaultUserSettings",
-  "DomainName",
-  "SubnetIds",
-  "VpcId"
- ],
- "typeName": "AWS::SageMaker::Domain",
- "writeOnlyProperties": [
-  "/properties/Tags"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-sagemaker-userprofile.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-sagemaker-userprofile.json
deleted file mode 100644
index 592fbea7ae..0000000000
--- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-sagemaker-userprofile.json
+++ /dev/null
@@ -1,638 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/DomainId",
-  "/properties/UserProfileName",
-  "/properties/SingleSignOnUserIdentifier",
-  "/properties/SingleSignOnUserValue",
-  "/properties/UserSettings/RStudioServerProAppSettings/AccessStatus",
-  "/properties/UserSettings/RStudioServerProAppSettings/UserGroup",
-  "/properties/Tags"
- ],
- "definitions": {
-  "AppLifecycleManagement": {
-   "additionalProperties": false,
-   "properties": {
-    "IdleSettings": {
-     "$ref": "#/definitions/IdleSettings"
-    }
-   },
-   "type": "object"
-  },
-  "AppType": {
-   "enum": [
-    "JupyterServer",
-    "TensorBoard",
-    "RStudioServerPro",
-    "JupyterLab",
-    "CodeEditor",
-    "DetailedProfiler",
-    "Canvas"
-   ],
-   "type": "string"
-  },
-  "CodeEditorAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomImages": {
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "CodeRepository": {
-   "additionalProperties": false,
-   "properties": {
-    "RepositoryUrl": {
-     "maxLength": 256,
-     "pattern": "^https://([.\\-_a-zA-Z0-9]+/?){3,1016}$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "RepositoryUrl"
-   ],
-   "type": "object"
-  },
-  "CustomFileSystemConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "EFSFileSystemConfig": {
-     "$ref": "#/definitions/EFSFileSystemConfig"
-    }
-   },
-   "type": "object"
-  },
-  "CustomImage": {
-   "additionalProperties": false,
-   "properties": {
-    "AppImageConfigName": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}",
-     "type": "string"
-    },
-    "ImageName": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9]([-.]?[a-zA-Z0-9]){0,62}$",
-     "type": "string"
-    },
-    "ImageVersionNumber": {
-     "minimum": 0,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "AppImageConfigName",
-    "ImageName"
-   ],
-   "type": "object"
-  },
-  "CustomPosixUserConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "Gid": {
-     "maximum": 4000000,
-     "minimum": 1001,
-     "type": "integer"
-    },
-    "Uid": {
-     "maximum": 4000000,
-     "minimum": 10000,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "Uid",
-    "Gid"
-   ],
-   "type": "object"
-  },
-  "DefaultEbsStorageSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultEbsVolumeSizeInGb": {
-     "$ref": "#/definitions/SpaceEbsVolumeSizeInGb"
-    },
-    "MaximumEbsVolumeSizeInGb": {
-     "$ref": "#/definitions/SpaceEbsVolumeSizeInGb"
-    }
-   },
-   "required": [
-    "DefaultEbsVolumeSizeInGb",
-    "MaximumEbsVolumeSizeInGb"
-   ],
-   "type": "object"
-  },
-  "DefaultSpaceStorageSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultEbsStorageSettings": {
-     "$ref": "#/definitions/DefaultEbsStorageSettings"
-    }
-   },
-   "type": "object"
-  },
-  "EFSFileSystemConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "FileSystemId": {
-     "maxLength": 21,
-     "minLength": 11,
-     "pattern": "^(fs-[0-9a-f]{8,})$",
-     "type": "string"
-    },
-    "FileSystemPath": {
-     "maxLength": 256,
-     "minLength": 1,
-     "pattern": "^\\/\\S*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "FileSystemId"
-   ],
-   "type": "object"
-  },
-  "IdleSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "IdleTimeoutInMinutes": {
-     "$ref": "#/definitions/IdleTimeoutInMinutes"
-    },
-    "LifecycleManagement": {
-     "$ref": "#/definitions/LifecycleManagement"
-    },
-    "MaxIdleTimeoutInMinutes": {
-     "$ref": "#/definitions/MaxIdleTimeoutInMinutes"
-    },
-    "MinIdleTimeoutInMinutes": {
-     "$ref": "#/definitions/MinIdleTimeoutInMinutes"
-    }
-   },
-   "type": "object"
-  },
-  "IdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "JupyterLabAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CodeRepositories": {
-     "items": {
-      "$ref": "#/definitions/CodeRepository"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "CustomImages": {
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "JupyterServerAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "KernelGatewayAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomImages": {
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "LifecycleManagement": {
-   "enum": [
-    "ENABLED",
-    "DISABLED"
-   ],
-   "type": "string"
-  },
-  "MaxIdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "MinIdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "MlTools": {
-   "enum": [
-    "DataWrangler",
-    "FeatureStore",
-    "EmrClusters",
-    "AutoMl",
-    "Experiments",
-    "Training",
-    "ModelEvaluation",
-    "Pipelines",
-    "Models",
-    "JumpStart",
-    "InferenceRecommender",
-    "Endpoints",
-    "Projects",
-    "InferenceOptimization",
-    "HyperPodClusters",
-    "Comet",
-    "DeepchecksLLMEvaluation",
-    "Fiddler",
-    "LakeraGuard"
-   ],
-   "type": "string"
-  },
-  "RStudioServerProAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "AccessStatus": {
-     "enum": [
-      "ENABLED",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "UserGroup": {
-     "enum": [
-      "R_STUDIO_ADMIN",
-      "R_STUDIO_USER"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ResourceSpec": {
-   "additionalProperties": false,
-   "properties": {
-    "InstanceType": {
-     "enum": [
-      "system",
-      "ml.t3.micro",
-      "ml.t3.small",
-      "ml.t3.medium",
-      "ml.t3.large",
-      "ml.t3.xlarge",
-      "ml.t3.2xlarge",
-      "ml.m5.large",
-      "ml.m5.xlarge",
-      "ml.m5.2xlarge",
-      "ml.m5.4xlarge",
-      "ml.m5.8xlarge",
-      "ml.m5.12xlarge",
-      "ml.m5.16xlarge",
-      "ml.m5.24xlarge",
-      "ml.c5.large",
-      "ml.c5.xlarge",
-      "ml.c5.2xlarge",
-      "ml.c5.4xlarge",
-      "ml.c5.9xlarge",
-      "ml.c5.12xlarge",
-      "ml.c5.18xlarge",
-      "ml.c5.24xlarge",
-      "ml.p3.2xlarge",
-      "ml.p3.8xlarge",
-      "ml.p3.16xlarge",
-      "ml.g4dn.xlarge",
-      "ml.g4dn.2xlarge",
-      "ml.g4dn.4xlarge",
-      "ml.g4dn.8xlarge",
-      "ml.g4dn.12xlarge",
-      "ml.g4dn.16xlarge",
-      "ml.r5.large",
-      "ml.r5.xlarge",
-      "ml.r5.2xlarge",
-      "ml.r5.4xlarge",
-      "ml.r5.8xlarge",
-      "ml.r5.12xlarge",
-      "ml.r5.16xlarge",
-      "ml.r5.24xlarge",
-      "ml.p3dn.24xlarge",
-      "ml.m5d.large",
-      "ml.m5d.xlarge",
-      "ml.m5d.2xlarge",
-      "ml.m5d.4xlarge",
-      "ml.m5d.8xlarge",
-      "ml.m5d.12xlarge",
-      "ml.m5d.16xlarge",
-      "ml.m5d.24xlarge",
-      "ml.g5.xlarge",
-      "ml.g5.2xlarge",
-      "ml.g5.4xlarge",
-      "ml.g5.8xlarge",
-      "ml.g5.12xlarge",
-      "ml.g5.16xlarge",
-      "ml.g5.24xlarge",
-      "ml.g5.48xlarge",
-      "ml.p4d.24xlarge",
-      "ml.p4de.24xlarge",
-      "ml.geospatial.interactive",
-      "ml.trn1.2xlarge",
-      "ml.trn1.32xlarge",
-      "ml.trn1n.32xlarge"
-     ],
-     "type": "string"
-    },
-    "LifecycleConfigArn": {
-     "maxLength": 256,
-     "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:studio-lifecycle-config/.*",
-     "type": "string"
-    },
-    "SageMakerImageArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws(-[\\w]+)*:sagemaker:.+:[0-9]{12}:image/[a-z0-9]([-.]?[a-z0-9])*$",
-     "type": "string"
-    },
-    "SageMakerImageVersionArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws(-[\\w]+)*:sagemaker:.+:[0-9]{12}:image-version/[a-z0-9]([-.]?[a-z0-9])*/[0-9]+$",
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SharingSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "NotebookOutputOption": {
-     "enum": [
-      "Allowed",
-      "Disabled"
-     ],
-     "type": "string"
-    },
-    "S3KmsKeyId": {
-     "maxLength": 2048,
-     "pattern": ".*",
-     "type": "string"
-    },
-    "S3OutputPath": {
-     "maxLength": 1024,
-     "pattern": "^(https|s3)://([^/]+)/?(.*)$",
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SpaceEbsVolumeSizeInGb": {
-   "maximum": 16384,
-   "minimum": 5,
-   "type": "integer"
-  },
-  "StudioLifecycleConfigArn": {
-   "maxLength": 256,
-   "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:studio-lifecycle-config/.*",
-   "type": "string"
-  },
-  "StudioWebPortalSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "HiddenAppTypes": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/AppType"
-     },
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "HiddenMlTools": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/MlTools"
-     },
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$",
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "UserSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CodeEditorAppSettings": {
-     "$ref": "#/definitions/CodeEditorAppSettings"
-    },
-    "CustomFileSystemConfigs": {
-     "items": {
-      "$ref": "#/definitions/CustomFileSystemConfig"
-     },
-     "maxItems": 2,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "CustomPosixUserConfig": {
-     "$ref": "#/definitions/CustomPosixUserConfig"
-    },
-    "DefaultLandingUri": {
-     "maxLength": 1023,
-     "type": "string"
-    },
-    "ExecutionRole": {
-     "maxLength": 2048,
-     "minLength": 20,
-     "pattern": "^arn:aws[a-z\\-]*:iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+$",
-     "type": "string"
-    },
-    "JupyterLabAppSettings": {
-     "$ref": "#/definitions/JupyterLabAppSettings"
-    },
-    "JupyterServerAppSettings": {
-     "$ref": "#/definitions/JupyterServerAppSettings"
-    },
-    "KernelGatewayAppSettings": {
-     "$ref": "#/definitions/KernelGatewayAppSettings"
-    },
-    "RStudioServerProAppSettings": {
-     "$ref": "#/definitions/RStudioServerProAppSettings"
-    },
-    "SecurityGroups": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.Id",
-      "maxLength": 32,
-      "pattern": "[-0-9a-zA-Z]+",
-      "type": "string"
-     },
-     "maxItems": 5,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "SharingSettings": {
-     "$ref": "#/definitions/SharingSettings"
-    },
-    "SpaceStorageSettings": {
-     "$ref": "#/definitions/DefaultSpaceStorageSettings"
-    },
-    "StudioWebPortal": {
-     "enum": [
-      "ENABLED",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "StudioWebPortalSettings": {
-     "$ref": "#/definitions/StudioWebPortalSettings"
-    }
-   },
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/UserProfileName",
-  "/properties/DomainId"
- ],
- "properties": {
-  "DomainId": {
-   "maxLength": 63,
-   "minLength": 1,
-   "pattern": "^d-(-*[a-z0-9]){1,61}",
-   "type": "string"
-  },
-  "SingleSignOnUserIdentifier": {
-   "pattern": "UserName",
-   "type": "string"
-  },
-  "SingleSignOnUserValue": {
-   "maxLength": 256,
-   "minLength": 1,
-   "type": "string"
-  },
-  "Tags": {
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 50,
-   "minItems": 0,
-   "type": "array",
-   "uniqueItems": false
-  },
-  "UserProfileArn": {
-   "maxLength": 256,
-   "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:user-profile/.*",
-   "type": "string"
-  },
-  "UserProfileName": {
-   "maxLength": 63,
-   "minLength": 1,
-   "pattern": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}",
-   "type": "string"
-  },
-  "UserSettings": {
-   "$ref": "#/definitions/UserSettings",
-   "maxItems": 50,
-   "minItems": 0,
-   "uniqueItems": false
-  }
- },
- "readOnlyProperties": [
-  "/properties/UserProfileArn"
- ],
- "required": [
-  "DomainId",
-  "UserProfileName"
- ],
- "typeName": "AWS::SageMaker::UserProfile",
- "writeOnlyProperties": [
-  "/properties/Tags"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-ses-configurationset.json b/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-ses-configurationset.json
deleted file mode 100644
index 548640372c..0000000000
--- a/src/cfnlint/data/schemas/providers/us_gov_east_1/aws-ses-configurationset.json
+++ /dev/null
@@ -1,138 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/Name"
- ],
- "definitions": {
-  "DashboardOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "EngagementMetrics": {
-     "pattern": "ENABLED|DISABLED",
-     "type": "string"
-    }
-   },
-   "required": [
-    "EngagementMetrics"
-   ],
-   "type": "object"
-  },
-  "DeliveryOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "MaxDeliverySeconds": {
-     "maximum": 50400,
-     "minimum": 300,
-     "type": "number"
-    },
-    "SendingPoolName": {
-     "type": "string"
-    },
-    "TlsPolicy": {
-     "pattern": "REQUIRE|OPTIONAL",
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "GuardianOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "OptimizedSharedDelivery": {
-     "pattern": "ENABLED|DISABLED",
-     "type": "string"
-    }
-   },
-   "required": [
-    "OptimizedSharedDelivery"
-   ],
-   "type": "object"
-  },
-  "ReputationOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "ReputationMetricsEnabled": {
-     "pattern": "true|false",
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "SendingOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "SendingEnabled": {
-     "pattern": "true|false",
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "SuppressionOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "SuppressedReasons": {
-     "insertionOrder": false,
-     "items": {
-      "pattern": "BOUNCE|COMPLAINT",
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "TrackingOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomRedirectDomain": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "VdmOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "DashboardOptions": {
-     "$ref": "#/definitions/DashboardOptions"
-    },
-    "GuardianOptions": {
-     "$ref": "#/definitions/GuardianOptions"
-    }
-   },
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Name"
- ],
- "properties": {
-  "DeliveryOptions": {
-   "$ref": "#/definitions/DeliveryOptions"
-  },
-  "Name": {
-   "pattern": "^[a-zA-Z0-9_-]{1,64}$",
-   "type": "string"
-  },
-  "ReputationOptions": {
-   "$ref": "#/definitions/ReputationOptions"
-  },
-  "SendingOptions": {
-   "$ref": "#/definitions/SendingOptions"
-  },
-  "SuppressionOptions": {
-   "$ref": "#/definitions/SuppressionOptions"
-  },
-  "TrackingOptions": {
-   "$ref": "#/definitions/TrackingOptions"
-  },
-  "VdmOptions": {
-   "$ref": "#/definitions/VdmOptions"
-  }
- },
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-ses.git",
- "taggable": false,
- "typeName": "AWS::SES::ConfigurationSet"
-}
diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/__init__.py b/src/cfnlint/data/schemas/providers/us_gov_west_1/__init__.py
index 854e92f6f6..f857cb13a8 100644
--- a/src/cfnlint/data/schemas/providers/us_gov_west_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/us_gov_west_1/__init__.py
@@ -923,6 +923,7 @@
     "aws-bedrock-flowversion.json",
     "aws-bedrock-guardrail.json",
     "aws-bedrock-guardrailversion.json",
+    "aws-bedrock-knowledgebase.json",
     "aws-bedrock-prompt.json",
     "aws-bedrock-promptversion.json",
     "aws-cassandra-keyspace.json",
@@ -951,6 +952,7 @@
     "aws-cloudwatch-compositealarm.json",
     "aws-cloudwatch-dashboard.json",
     "aws-cloudwatch-insightrule.json",
+    "aws-cloudwatch-metricstream.json",
     "aws-codebuild-reportgroup.json",
     "aws-codebuild-sourcecredential.json",
     "aws-codecommit-repository.json",
@@ -1037,6 +1039,7 @@
     "aws-docdb-dbsubnetgroup.json",
     "aws-docdb-eventsubscription.json",
     "aws-dynamodb-table.json",
+    "aws-ec2-capacityreservation.json",
     "aws-ec2-capacityreservationfleet.json",
     "aws-ec2-clientvpnendpoint.json",
     "aws-ec2-clientvpnroute.json",
@@ -1395,6 +1398,7 @@
     "aws-redshift-scheduledaction.json",
     "aws-redshiftserverless-namespace.json",
     "aws-rekognition-collection.json",
+    "aws-resiliencehub-app.json",
     "aws-resiliencehub-resiliencypolicy.json",
     "aws-resourcegroups-group.json",
     "aws-robomaker-robotapplication.json",
@@ -1434,6 +1438,7 @@
     "aws-sagemaker-app.json",
     "aws-sagemaker-appimageconfig.json",
     "aws-sagemaker-coderepository.json",
+    "aws-sagemaker-domain.json",
     "aws-sagemaker-endpointconfig.json",
     "aws-sagemaker-image.json",
     "aws-sagemaker-imageversion.json",
@@ -1445,6 +1450,7 @@
     "aws-sagemaker-notebookinstancelifecycleconfig.json",
     "aws-sagemaker-project.json",
     "aws-sagemaker-studiolifecycleconfig.json",
+    "aws-sagemaker-userprofile.json",
     "aws-sagemaker-workteam.json",
     "aws-sdb-domain.json",
     "aws-secretsmanager-resourcepolicy.json",
@@ -1486,6 +1492,7 @@
     "aws-servicediscovery-privatednsnamespace.json",
     "aws-servicediscovery-publicdnsnamespace.json",
     "aws-servicediscovery-service.json",
+    "aws-ses-configurationset.json",
     "aws-ses-configurationseteventdestination.json",
     "aws-ses-contactlist.json",
     "aws-ses-dedicatedippool.json",
diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-bedrock-knowledgebase.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-bedrock-knowledgebase.json
deleted file mode 100644
index 75bbdf1578..0000000000
--- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-bedrock-knowledgebase.json
+++ /dev/null
@@ -1,974 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/StorageConfiguration",
-  "/properties/KnowledgeBaseConfiguration/Type",
-  "/properties/KnowledgeBaseConfiguration/VectorKnowledgeBaseConfiguration",
-  "/properties/KnowledgeBaseConfiguration/KendraKnowledgeBaseConfiguration",
-  "/properties/KnowledgeBaseConfiguration/SqlKnowledgeBaseConfiguration/Type",
-  "/properties/KnowledgeBaseConfiguration/SqlKnowledgeBaseConfiguration/RedshiftConfiguration/StorageConfigurations",
-  "/properties/KnowledgeBaseConfiguration/SqlKnowledgeBaseConfiguration/RedshiftConfiguration/QueryEngineConfiguration"
- ],
- "definitions": {
-  "AwsDataCatalogTableName": {
-   "maxLength": 200,
-   "minLength": 1,
-   "pattern": "^.*\\.*$",
-   "type": "string"
-  },
-  "AwsDataCatalogTableNames": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/AwsDataCatalogTableName"
-   },
-   "maxItems": 1000,
-   "minItems": 1,
-   "type": "array"
-  },
-  "BedrockEmbeddingModelConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "Dimensions": {
-     "maximum": 4096,
-     "minimum": 0,
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "CuratedQueries": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/CuratedQuery"
-   },
-   "maxItems": 10,
-   "type": "array"
-  },
-  "CuratedQuery": {
-   "additionalProperties": false,
-   "properties": {
-    "NaturalLanguage": {
-     "$ref": "#/definitions/NaturalLanguageString"
-    },
-    "Sql": {
-     "$ref": "#/definitions/SqlString"
-    }
-   },
-   "required": [
-    "NaturalLanguage",
-    "Sql"
-   ],
-   "type": "object"
-  },
-  "DescriptionString": {
-   "maxLength": 200,
-   "minLength": 1,
-   "type": "string"
-  },
-  "EmbeddingModelConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "BedrockEmbeddingModelConfiguration": {
-     "$ref": "#/definitions/BedrockEmbeddingModelConfiguration"
-    }
-   },
-   "type": "object"
-  },
-  "InclusionType": {
-   "enum": [
-    "INCLUDE",
-    "EXCLUDE"
-   ],
-   "type": "string"
-  },
-  "KendraIndexArn": {
-   "pattern": "^arn:aws(|-cn|-us-gov):kendra:[a-z0-9-]{1,20}:([0-9]{12}|):index/([a-zA-Z0-9][a-zA-Z0-9-]{35}|[a-zA-Z0-9][a-zA-Z0-9-]{35}-[a-zA-Z0-9][a-zA-Z0-9-]{35})$",
-   "type": "string"
-  },
-  "KendraKnowledgeBaseConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "KendraIndexArn": {
-     "$ref": "#/definitions/KendraIndexArn"
-    }
-   },
-   "required": [
-    "KendraIndexArn"
-   ],
-   "type": "object"
-  },
-  "KnowledgeBaseConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "KendraKnowledgeBaseConfiguration": {
-     "$ref": "#/definitions/KendraKnowledgeBaseConfiguration"
-    },
-    "SqlKnowledgeBaseConfiguration": {
-     "$ref": "#/definitions/SqlKnowledgeBaseConfiguration"
-    },
-    "Type": {
-     "$ref": "#/definitions/KnowledgeBaseType"
-    },
-    "VectorKnowledgeBaseConfiguration": {
-     "$ref": "#/definitions/VectorKnowledgeBaseConfiguration"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "KnowledgeBaseStatus": {
-   "enum": [
-    "CREATING",
-    "ACTIVE",
-    "DELETING",
-    "UPDATING",
-    "FAILED",
-    "DELETE_UNSUCCESSFUL"
-   ],
-   "type": "string"
-  },
-  "KnowledgeBaseStorageType": {
-   "enum": [
-    "OPENSEARCH_SERVERLESS",
-    "PINECONE",
-    "RDS",
-    "MONGO_DB_ATLAS"
-   ],
-   "type": "string"
-  },
-  "KnowledgeBaseType": {
-   "enum": [
-    "VECTOR",
-    "KENDRA",
-    "SQL"
-   ],
-   "type": "string"
-  },
-  "MongoDbAtlasConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "CollectionName": {
-     "maxLength": 63,
-     "pattern": "^.*$",
-     "type": "string"
-    },
-    "CredentialsSecretArn": {
-     "pattern": "^arn:aws(|-cn|-us-gov):secretsmanager:[a-z0-9-]{1,20}:([0-9]{12}|):secret:[a-zA-Z0-9!/_+=.@-]{1,512}$",
-     "type": "string"
-    },
-    "DatabaseName": {
-     "maxLength": 63,
-     "pattern": "^.*$",
-     "type": "string"
-    },
-    "Endpoint": {
-     "maxLength": 2048,
-     "pattern": "^[a-zA-Z0-9_-]+\\.[a-zA-Z0-9_-]+\\.mongodb\\.net$",
-     "type": "string"
-    },
-    "EndpointServiceName": {
-     "maxLength": 255,
-     "pattern": "^(?:arn:aws(?:-us-gov|-cn|-iso|-iso-[a-z])*:.+:.*:\\d+:.+/.+$|[a-zA-Z0-9*]+[a-zA-Z0-9._-]*)$",
-     "type": "string"
-    },
-    "FieldMapping": {
-     "$ref": "#/definitions/MongoDbAtlasFieldMapping"
-    },
-    "VectorIndexName": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Endpoint",
-    "CredentialsSecretArn",
-    "DatabaseName",
-    "CollectionName",
-    "VectorIndexName",
-    "FieldMapping"
-   ],
-   "type": "object"
-  },
-  "MongoDbAtlasFieldMapping": {
-   "additionalProperties": false,
-   "properties": {
-    "MetadataField": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    },
-    "TextField": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    },
-    "VectorField": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "VectorField",
-    "MetadataField",
-    "TextField"
-   ],
-   "type": "object"
-  },
-  "NaturalLanguageString": {
-   "maxLength": 1000,
-   "minLength": 1,
-   "type": "string"
-  },
-  "OpenSearchServerlessConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "CollectionArn": {
-     "maxLength": 2048,
-     "pattern": "^arn:aws(|-cn|-us-gov|-iso):aoss:[a-z]{2}(-gov)?-[a-z]+-\\d{1}:\\d{12}:collection/[a-z0-9-]{3,32}$",
-     "type": "string"
-    },
-    "FieldMapping": {
-     "$ref": "#/definitions/OpenSearchServerlessFieldMapping"
-    },
-    "VectorIndexName": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "CollectionArn",
-    "FieldMapping",
-    "VectorIndexName"
-   ],
-   "type": "object"
-  },
-  "OpenSearchServerlessFieldMapping": {
-   "additionalProperties": false,
-   "properties": {
-    "MetadataField": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    },
-    "TextField": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    },
-    "VectorField": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "MetadataField",
-    "TextField",
-    "VectorField"
-   ],
-   "type": "object"
-  },
-  "PineconeConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "ConnectionString": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    },
-    "CredentialsSecretArn": {
-     "pattern": "^arn:aws(|-cn|-us-gov):secretsmanager:[a-z0-9-]{1,20}:([0-9]{12}|):secret:[a-zA-Z0-9!/_+=.@-]{1,512}$",
-     "type": "string"
-    },
-    "FieldMapping": {
-     "$ref": "#/definitions/PineconeFieldMapping"
-    },
-    "Namespace": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "ConnectionString",
-    "CredentialsSecretArn",
-    "FieldMapping"
-   ],
-   "type": "object"
-  },
-  "PineconeFieldMapping": {
-   "additionalProperties": false,
-   "properties": {
-    "MetadataField": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    },
-    "TextField": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "MetadataField",
-    "TextField"
-   ],
-   "type": "object"
-  },
-  "QueryEngineType": {
-   "enum": [
-    "REDSHIFT"
-   ],
-   "type": "string"
-  },
-  "QueryExecutionTimeoutSeconds": {
-   "maximum": 200,
-   "minimum": 1,
-   "type": "integer"
-  },
-  "QueryGenerationColumn": {
-   "additionalProperties": false,
-   "properties": {
-    "Description": {
-     "$ref": "#/definitions/DescriptionString"
-    },
-    "Inclusion": {
-     "$ref": "#/definitions/InclusionType"
-    },
-    "Name": {
-     "$ref": "#/definitions/QueryGenerationColumnName"
-    }
-   },
-   "type": "object"
-  },
-  "QueryGenerationColumnName": {
-   "maxLength": 127,
-   "minLength": 1,
-   "type": "string"
-  },
-  "QueryGenerationColumns": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/QueryGenerationColumn"
-   },
-   "type": "array"
-  },
-  "QueryGenerationConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "ExecutionTimeoutSeconds": {
-     "$ref": "#/definitions/QueryExecutionTimeoutSeconds"
-    },
-    "GenerationContext": {
-     "$ref": "#/definitions/QueryGenerationContext"
-    }
-   },
-   "type": "object"
-  },
-  "QueryGenerationContext": {
-   "additionalProperties": false,
-   "properties": {
-    "CuratedQueries": {
-     "$ref": "#/definitions/CuratedQueries"
-    },
-    "Tables": {
-     "$ref": "#/definitions/QueryGenerationTables"
-    }
-   },
-   "type": "object"
-  },
-  "QueryGenerationTable": {
-   "additionalProperties": false,
-   "properties": {
-    "Columns": {
-     "$ref": "#/definitions/QueryGenerationColumns"
-    },
-    "Description": {
-     "$ref": "#/definitions/DescriptionString"
-    },
-    "Inclusion": {
-     "$ref": "#/definitions/InclusionType"
-    },
-    "Name": {
-     "$ref": "#/definitions/QueryGenerationTableName"
-    }
-   },
-   "required": [
-    "Name"
-   ],
-   "type": "object"
-  },
-  "QueryGenerationTableName": {
-   "pattern": "^.*\\..*\\..*$",
-   "type": "string"
-  },
-  "QueryGenerationTables": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/QueryGenerationTable"
-   },
-   "maxItems": 50,
-   "type": "array"
-  },
-  "RdsConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "CredentialsSecretArn": {
-     "pattern": "^arn:aws(|-cn|-us-gov):secretsmanager:[a-z0-9-]{1,20}:([0-9]{12}|):secret:[a-zA-Z0-9!/_+=.@-]{1,512}$",
-     "type": "string"
-    },
-    "DatabaseName": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9_\\-]+$",
-     "type": "string"
-    },
-    "FieldMapping": {
-     "$ref": "#/definitions/RdsFieldMapping"
-    },
-    "ResourceArn": {
-     "pattern": "^arn:aws(|-cn|-us-gov):rds:[a-zA-Z0-9-]*:[0-9]{12}:cluster:[a-zA-Z0-9-]{1,63}$",
-     "type": "string"
-    },
-    "TableName": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9_\\.\\-]+$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "CredentialsSecretArn",
-    "DatabaseName",
-    "FieldMapping",
-    "ResourceArn",
-    "TableName"
-   ],
-   "type": "object"
-  },
-  "RdsFieldMapping": {
-   "additionalProperties": false,
-   "properties": {
-    "MetadataField": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9_\\-]+$",
-     "type": "string"
-    },
-    "PrimaryKeyField": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9_\\-]+$",
-     "type": "string"
-    },
-    "TextField": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9_\\-]+$",
-     "type": "string"
-    },
-    "VectorField": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9_\\-]+$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "MetadataField",
-    "PrimaryKeyField",
-    "TextField",
-    "VectorField"
-   ],
-   "type": "object"
-  },
-  "RedisEnterpriseCloudConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "CredentialsSecretArn": {
-     "pattern": "^arn:aws(|-cn|-us-gov):secretsmanager:[a-z0-9-]{1,20}:([0-9]{12}|):secret:[a-zA-Z0-9!/_+=.@-]{1,512}$",
-     "type": "string"
-    },
-    "Endpoint": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    },
-    "FieldMapping": {
-     "$ref": "#/definitions/RedisEnterpriseCloudFieldMapping"
-    },
-    "VectorIndexName": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "CredentialsSecretArn",
-    "Endpoint",
-    "FieldMapping",
-    "VectorIndexName"
-   ],
-   "type": "object"
-  },
-  "RedisEnterpriseCloudFieldMapping": {
-   "additionalProperties": false,
-   "properties": {
-    "MetadataField": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    },
-    "TextField": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    },
-    "VectorField": {
-     "maxLength": 2048,
-     "pattern": "^.*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "MetadataField",
-    "TextField",
-    "VectorField"
-   ],
-   "type": "object"
-  },
-  "RedshiftClusterIdentifier": {
-   "maxLength": 63,
-   "minLength": 1,
-   "type": "string"
-  },
-  "RedshiftConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "QueryEngineConfiguration": {
-     "$ref": "#/definitions/RedshiftQueryEngineConfiguration"
-    },
-    "QueryGenerationConfiguration": {
-     "$ref": "#/definitions/QueryGenerationConfiguration"
-    },
-    "StorageConfigurations": {
-     "$ref": "#/definitions/RedshiftQueryEngineStorageConfigurations"
-    }
-   },
-   "required": [
-    "StorageConfigurations",
-    "QueryEngineConfiguration"
-   ],
-   "type": "object"
-  },
-  "RedshiftDatabase": {
-   "maxLength": 200,
-   "minLength": 1,
-   "type": "string"
-  },
-  "RedshiftProvisionedAuthConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "DatabaseUser": {
-     "type": "string"
-    },
-    "Type": {
-     "$ref": "#/definitions/RedshiftProvisionedAuthType"
-    },
-    "UsernamePasswordSecretArn": {
-     "$ref": "#/definitions/SecretArn"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "RedshiftProvisionedAuthType": {
-   "enum": [
-    "IAM",
-    "USERNAME_PASSWORD",
-    "USERNAME"
-   ],
-   "type": "string"
-  },
-  "RedshiftProvisionedConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "AuthConfiguration": {
-     "$ref": "#/definitions/RedshiftProvisionedAuthConfiguration"
-    },
-    "ClusterIdentifier": {
-     "$ref": "#/definitions/RedshiftClusterIdentifier"
-    }
-   },
-   "required": [
-    "ClusterIdentifier",
-    "AuthConfiguration"
-   ],
-   "type": "object"
-  },
-  "RedshiftQueryEngineAwsDataCatalogStorageConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "TableNames": {
-     "$ref": "#/definitions/AwsDataCatalogTableNames"
-    }
-   },
-   "required": [
-    "TableNames"
-   ],
-   "type": "object"
-  },
-  "RedshiftQueryEngineConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "ProvisionedConfiguration": {
-     "$ref": "#/definitions/RedshiftProvisionedConfiguration"
-    },
-    "ServerlessConfiguration": {
-     "$ref": "#/definitions/RedshiftServerlessConfiguration"
-    },
-    "Type": {
-     "$ref": "#/definitions/RedshiftQueryEngineType"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "RedshiftQueryEngineRedshiftStorageConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "DatabaseName": {
-     "$ref": "#/definitions/RedshiftDatabase"
-    }
-   },
-   "required": [
-    "DatabaseName"
-   ],
-   "type": "object"
-  },
-  "RedshiftQueryEngineStorageConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "AwsDataCatalogConfiguration": {
-     "$ref": "#/definitions/RedshiftQueryEngineAwsDataCatalogStorageConfiguration"
-    },
-    "RedshiftConfiguration": {
-     "$ref": "#/definitions/RedshiftQueryEngineRedshiftStorageConfiguration"
-    },
-    "Type": {
-     "$ref": "#/definitions/RedshiftQueryEngineStorageType"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "RedshiftQueryEngineStorageConfigurations": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/RedshiftQueryEngineStorageConfiguration"
-   },
-   "maxItems": 1,
-   "minItems": 1,
-   "type": "array"
-  },
-  "RedshiftQueryEngineStorageType": {
-   "enum": [
-    "REDSHIFT",
-    "AWS_DATA_CATALOG"
-   ],
-   "type": "string"
-  },
-  "RedshiftQueryEngineType": {
-   "enum": [
-    "SERVERLESS",
-    "PROVISIONED"
-   ],
-   "type": "string"
-  },
-  "RedshiftServerlessAuthConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "Type": {
-     "$ref": "#/definitions/RedshiftServerlessAuthType"
-    },
-    "UsernamePasswordSecretArn": {
-     "$ref": "#/definitions/SecretArn"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "RedshiftServerlessAuthType": {
-   "enum": [
-    "IAM",
-    "USERNAME_PASSWORD"
-   ],
-   "type": "string"
-  },
-  "RedshiftServerlessConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "AuthConfiguration": {
-     "$ref": "#/definitions/RedshiftServerlessAuthConfiguration"
-    },
-    "WorkgroupArn": {
-     "$ref": "#/definitions/WorkgroupArn"
-    }
-   },
-   "required": [
-    "WorkgroupArn",
-    "AuthConfiguration"
-   ],
-   "type": "object"
-  },
-  "S3Location": {
-   "additionalProperties": false,
-   "properties": {
-    "URI": {
-     "maxLength": 2048,
-     "minLength": 1,
-     "pattern": "^s3://.{1,128}$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "URI"
-   ],
-   "type": "object"
-  },
-  "SecretArn": {
-   "pattern": "^arn:aws(|-cn|-us-gov):secretsmanager:[a-z0-9-]{1,20}:([0-9]{12}|):secret:[a-zA-Z0-9!/_+=.@-]{1,512}$",
-   "type": "string"
-  },
-  "SqlKnowledgeBaseConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "RedshiftConfiguration": {
-     "$ref": "#/definitions/RedshiftConfiguration"
-    },
-    "Type": {
-     "$ref": "#/definitions/QueryEngineType"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "SqlString": {
-   "maxLength": 1000,
-   "minLength": 1,
-   "type": "string"
-  },
-  "StorageConfiguration": {
-   "additionalProperties": false,
-   "oneOf": [
-    {
-     "required": [
-      "OpensearchServerlessConfiguration"
-     ]
-    },
-    {
-     "required": [
-      "PineconeConfiguration"
-     ]
-    },
-    {
-     "required": [
-      "RdsConfiguration"
-     ]
-    },
-    {
-     "required": [
-      "MongoDbAtlasConfiguration"
-     ]
-    }
-   ],
-   "properties": {
-    "MongoDbAtlasConfiguration": {
-     "$ref": "#/definitions/MongoDbAtlasConfiguration"
-    },
-    "OpensearchServerlessConfiguration": {
-     "$ref": "#/definitions/OpenSearchServerlessConfiguration"
-    },
-    "PineconeConfiguration": {
-     "$ref": "#/definitions/PineconeConfiguration"
-    },
-    "RdsConfiguration": {
-     "$ref": "#/definitions/RdsConfiguration"
-    },
-    "Type": {
-     "$ref": "#/definitions/KnowledgeBaseStorageType"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "SupplementalDataStorageConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "SupplementalDataStorageLocations": {
-     "$ref": "#/definitions/SupplementalDataStorageLocations"
-    }
-   },
-   "required": [
-    "SupplementalDataStorageLocations"
-   ],
-   "type": "object"
-  },
-  "SupplementalDataStorageLocation": {
-   "additionalProperties": false,
-   "properties": {
-    "S3Location": {
-     "$ref": "#/definitions/S3Location"
-    },
-    "SupplementalDataStorageLocationType": {
-     "$ref": "#/definitions/SupplementalDataStorageLocationType"
-    }
-   },
-   "required": [
-    "SupplementalDataStorageLocationType"
-   ],
-   "type": "object"
-  },
-  "SupplementalDataStorageLocationType": {
-   "enum": [
-    "S3"
-   ],
-   "type": "string"
-  },
-  "SupplementalDataStorageLocations": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/SupplementalDataStorageLocation"
-   },
-   "maxItems": 1,
-   "minItems": 1,
-   "type": "array"
-  },
-  "TagsMap": {
-   "additionalProperties": false,
-   "patternProperties": {
-    "^[a-zA-Z0-9\\s._:/=+@-]*$": {
-     "maxLength": 256,
-     "minLength": 0,
-     "pattern": "^[a-zA-Z0-9\\s._:/=+@-]*$",
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "VectorKnowledgeBaseConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "EmbeddingModelArn": {
-     "maxLength": 2048,
-     "minLength": 20,
-     "pattern": "^(arn:aws(-[^:]+)?:[a-z0-9-]+:[a-z0-9-]{1,20}:[0-9]{0,12}:[a-zA-Z0-9-:/._+]+)$",
-     "type": "string"
-    },
-    "EmbeddingModelConfiguration": {
-     "$ref": "#/definitions/EmbeddingModelConfiguration"
-    },
-    "SupplementalDataStorageConfiguration": {
-     "$ref": "#/definitions/SupplementalDataStorageConfiguration"
-    }
-   },
-   "required": [
-    "EmbeddingModelArn"
-   ],
-   "type": "object"
-  },
-  "WorkgroupArn": {
-   "pattern": "^(arn:(aws(-[a-z]+)*):redshift-serverless:[a-z]{2}(-gov)?-[a-z]+-\\d{1}:\\d{12}:workgroup/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$",
-   "type": "string"
-  }
- },
- "primaryIdentifier": [
-  "/properties/KnowledgeBaseId"
- ],
- "properties": {
-  "CreatedAt": {
-   "type": "string"
-  },
-  "Description": {
-   "maxLength": 200,
-   "minLength": 1,
-   "type": "string"
-  },
-  "FailureReasons": {
-   "insertionOrder": false,
-   "items": {
-    "maxLength": 2048,
-    "type": "string"
-   },
-   "maxItems": 2048,
-   "type": "array"
-  },
-  "KnowledgeBaseArn": {
-   "maxLength": 128,
-   "minLength": 0,
-   "pattern": "^arn:aws(|-cn|-us-gov):bedrock:[a-zA-Z0-9-]*:[0-9]{12}:knowledge-base/[0-9a-zA-Z]+$",
-   "type": "string"
-  },
-  "KnowledgeBaseConfiguration": {
-   "$ref": "#/definitions/KnowledgeBaseConfiguration"
-  },
-  "KnowledgeBaseId": {
-   "pattern": "^[0-9a-zA-Z]{10}$",
-   "type": "string"
-  },
-  "Name": {
-   "pattern": "^([0-9a-zA-Z][_-]?){1,100}$",
-   "type": "string"
-  },
-  "RoleArn": {
-   "maxLength": 2048,
-   "pattern": "^arn:aws(-[^:]+)?:iam::([0-9]{12})?:role/.+$",
-   "type": "string"
-  },
-  "Status": {
-   "$ref": "#/definitions/KnowledgeBaseStatus"
-  },
-  "StorageConfiguration": {
-   "$ref": "#/definitions/StorageConfiguration"
-  },
-  "Tags": {
-   "$ref": "#/definitions/TagsMap"
-  },
-  "UpdatedAt": {
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/KnowledgeBaseId",
-  "/properties/KnowledgeBaseArn",
-  "/properties/CreatedAt",
-  "/properties/UpdatedAt",
-  "/properties/FailureReasons",
-  "/properties/Status"
- ],
- "required": [
-  "KnowledgeBaseConfiguration",
-  "Name",
-  "RoleArn"
- ],
- "tagging": {
-  "cloudFormationSystemTags": true,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::Bedrock::KnowledgeBase"
-}
diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-cloudwatch-metricstream.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-cloudwatch-metricstream.json
deleted file mode 100644
index 89ca2654d5..0000000000
--- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-cloudwatch-metricstream.json
+++ /dev/null
@@ -1,228 +0,0 @@
-{
- "additionalProperties": false,
- "allOf": [
-  {
-   "required": [
-    "FirehoseArn",
-    "RoleArn",
-    "OutputFormat"
-   ]
-  },
-  {
-   "oneOf": [
-    {},
-    {
-     "required": [
-      "IncludeFilters",
-      "ExcludeFilters"
-     ]
-    }
-   ]
-  }
- ],
- "createOnlyProperties": [
-  "/properties/Name"
- ],
- "definitions": {
-  "MetricStreamFilter": {
-   "additionalProperties": false,
-   "properties": {
-    "MetricNames": {
-     "items": {
-      "maxLength": 255,
-      "minLength": 1,
-      "type": "string"
-     },
-     "maxItems": 999,
-     "type": "array"
-    },
-    "Namespace": {
-     "maxLength": 255,
-     "minLength": 1,
-     "pattern": "[^:].*",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Namespace"
-   ],
-   "type": "object"
-  },
-  "MetricStreamStatisticsConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "AdditionalStatistics": {
-     "items": {
-      "type": "string"
-     },
-     "maxItems": 20,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "IncludeMetrics": {
-     "items": {
-      "$ref": "#/definitions/MetricStreamStatisticsMetric"
-     },
-     "maxItems": 100,
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "required": [
-    "AdditionalStatistics",
-    "IncludeMetrics"
-   ],
-   "type": "object"
-  },
-  "MetricStreamStatisticsMetric": {
-   "additionalProperties": false,
-   "properties": {
-    "MetricName": {
-     "maxLength": 255,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Namespace": {
-     "maxLength": 255,
-     "minLength": 1,
-     "pattern": "[^:].*",
-     "type": "string"
-    }
-   },
-   "required": [
-    "MetricName",
-    "Namespace"
-   ],
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "minLength": 0,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Name"
- ],
- "properties": {
-  "Arn": {
-   "maxLength": 2048,
-   "minLength": 20,
-   "type": "string"
-  },
-  "CreationDate": {
-   "anyOf": [
-    {
-     "format": "date-time"
-    },
-    {
-     "format": "timestamp"
-    }
-   ],
-   "type": "string"
-  },
-  "ExcludeFilters": {
-   "items": {
-    "$ref": "#/definitions/MetricStreamFilter"
-   },
-   "maxItems": 1000,
-   "type": "array",
-   "uniqueItems": true
-  },
-  "FirehoseArn": {
-   "maxLength": 2048,
-   "minLength": 20,
-   "type": "string"
-  },
-  "IncludeFilters": {
-   "items": {
-    "$ref": "#/definitions/MetricStreamFilter"
-   },
-   "maxItems": 1000,
-   "type": "array",
-   "uniqueItems": true
-  },
-  "IncludeLinkedAccountsMetrics": {
-   "type": "boolean"
-  },
-  "LastUpdateDate": {
-   "anyOf": [
-    {
-     "format": "date-time"
-    },
-    {
-     "format": "timestamp"
-    }
-   ],
-   "type": "string"
-  },
-  "Name": {
-   "maxLength": 255,
-   "minLength": 1,
-   "type": "string"
-  },
-  "OutputFormat": {
-   "enum": [
-    "json",
-    "opentelemetry0.7",
-    "opentelemetry1.0"
-   ],
-   "maxLength": 255,
-   "minLength": 1,
-   "type": "string"
-  },
-  "RoleArn": {
-   "maxLength": 2048,
-   "minLength": 20,
-   "type": "string"
-  },
-  "State": {
-   "maxLength": 255,
-   "minLength": 1,
-   "type": "string"
-  },
-  "StatisticsConfigurations": {
-   "items": {
-    "$ref": "#/definitions/MetricStreamStatisticsConfiguration"
-   },
-   "maxItems": 100,
-   "type": "array",
-   "uniqueItems": true
-  },
-  "Tags": {
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 50,
-   "type": "array",
-   "uniqueItems": true
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/CreationDate",
-  "/properties/LastUpdateDate",
-  "/properties/State"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-cloudwatch.git",
- "taggable": true,
- "typeName": "AWS::CloudWatch::MetricStream",
- "writeOnlyProperties": [
-  "/properties/Tags"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ec2-capacityreservation.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ec2-capacityreservation.json
deleted file mode 100644
index 5a10969ce5..0000000000
--- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ec2-capacityreservation.json
+++ /dev/null
@@ -1,250 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/Tenancy",
-  "/properties/InstancePlatform",
-  "/properties/InstanceType",
-  "/properties/AvailabilityZone",
-  "/properties/TagSpecifications",
-  "/properties/OutPostArn",
-  "/properties/EphemeralStorage",
-  "/properties/EbsOptimized",
-  "/properties/PlacementGroupArn"
- ],
- "definitions": {
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "type": "string"
-    },
-    "Value": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "TagSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "ResourceType": {
-     "enum": [
-      "capacity-reservation",
-      "capacity-reservation-fleet",
-      "carrier-gateway",
-      "client-vpn-endpoint",
-      "coip-pool",
-      "customer-gateway",
-      "declarative-policies-report",
-      "dedicated-host",
-      "dhcp-options",
-      "egress-only-internet-gateway",
-      "elastic-gpu",
-      "elastic-ip",
-      "export-image-task",
-      "export-instance-task",
-      "fleet",
-      "fpga-image",
-      "host-reservation",
-      "image",
-      "import-image-task",
-      "import-snapshot-task",
-      "instance",
-      "instance-connect-endpoint",
-      "instance-event-window",
-      "internet-gateway",
-      "ipam",
-      "ipam-external-resource-verification-token",
-      "ipam-pool",
-      "ipam-resource-discovery",
-      "ipam-resource-discovery-association",
-      "ipam-scope",
-      "ipv4pool-ec2",
-      "ipv6pool-ec2",
-      "key-pair",
-      "launch-template",
-      "local-gateway",
-      "local-gateway-route-table",
-      "local-gateway-route-table-virtual-interface-group-association",
-      "local-gateway-route-table-vpc-association",
-      "local-gateway-virtual-interface",
-      "local-gateway-virtual-interface-group",
-      "natgateway",
-      "network-acl",
-      "network-insights-access-scope",
-      "network-insights-access-scope-analysis",
-      "network-insights-analysis",
-      "network-insights-path",
-      "network-interface",
-      "placement-group",
-      "prefix-list",
-      "replace-root-volume-task",
-      "reserved-instances",
-      "route-table",
-      "security-group",
-      "security-group-rule",
-      "snapshot",
-      "spot-fleet-request",
-      "spot-instances-request",
-      "subnet",
-      "subnet-cidr-reservation",
-      "traffic-mirror-filter",
-      "traffic-mirror-filter-rule",
-      "traffic-mirror-session",
-      "traffic-mirror-target",
-      "transit-gateway",
-      "transit-gateway-attachment",
-      "transit-gateway-connect-peer",
-      "transit-gateway-multicast-domain",
-      "transit-gateway-policy-table",
-      "transit-gateway-route-table",
-      "transit-gateway-route-table-announcement",
-      "verified-access-endpoint",
-      "verified-access-endpoint-target",
-      "verified-access-group",
-      "verified-access-instance",
-      "verified-access-policy",
-      "verified-access-trust-provider",
-      "volume",
-      "vpc",
-      "vpc-block-public-access-exclusion",
-      "vpc-endpoint",
-      "vpc-endpoint-connection",
-      "vpc-endpoint-connection-device-type",
-      "vpc-endpoint-service",
-      "vpc-endpoint-service-permission",
-      "vpc-flow-log",
-      "vpc-peering-connection",
-      "vpn-connection",
-      "vpn-connection-device-type",
-      "vpn-gateway"
-     ],
-     "type": "string"
-    },
-    "Tags": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Tag"
-     },
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "AvailabilityZone": {
-   "type": "string"
-  },
-  "AvailableInstanceCount": {
-   "type": "integer"
-  },
-  "EbsOptimized": {
-   "type": "boolean"
-  },
-  "EndDate": {
-   "type": "string"
-  },
-  "EndDateType": {
-   "enum": [
-    "limited",
-    "unlimited"
-   ],
-   "type": "string"
-  },
-  "EphemeralStorage": {
-   "type": "boolean"
-  },
-  "Id": {
-   "type": "string"
-  },
-  "InstanceCount": {
-   "type": "integer"
-  },
-  "InstanceMatchCriteria": {
-   "enum": [
-    "open",
-    "targeted"
-   ],
-   "type": "string"
-  },
-  "InstancePlatform": {
-   "enum": [
-    "Linux with SQL Server Enterprise",
-    "Linux with SQL Server Standard",
-    "Linux with SQL Server Web",
-    "Linux/UNIX",
-    "RHEL with HA",
-    "RHEL with HA and SQL Server Enterprise",
-    "RHEL with HA and SQL Server Standard",
-    "RHEL with SQL Server Enterprise",
-    "RHEL with SQL Server Standard",
-    "RHEL with SQL Server Web",
-    "Red Hat Enterprise Linux",
-    "SUSE Linux",
-    "Ubuntu Pro",
-    "Windows",
-    "Windows with SQL Server",
-    "Windows with SQL Server Enterprise",
-    "Windows with SQL Server Standard",
-    "Windows with SQL Server Web"
-   ],
-   "type": "string"
-  },
-  "InstanceType": {
-   "type": "string"
-  },
-  "OutPostArn": {
-   "pattern": "^arn:aws([a-z-]+)?:outposts:[a-z\\d-]+:\\d{12}:outpost/op-[a-f0-9]{17}$",
-   "type": "string"
-  },
-  "PlacementGroupArn": {
-   "pattern": "^arn:aws([a-z-]+)?:ec2:[a-z\\d-]+:\\d{12}:placement-group/^.{1,255}$",
-   "type": "string"
-  },
-  "TagSpecifications": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/TagSpecification"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "Tenancy": {
-   "enum": [
-    "dedicated",
-    "default"
-   ],
-   "type": "string"
-  },
-  "TotalInstanceCount": {
-   "type": "integer"
-  },
-  "UnusedReservationBillingOwnerId": {
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id",
-  "/properties/AvailableInstanceCount",
-  "/properties/TotalInstanceCount"
- ],
- "required": [
-  "InstanceCount",
-  "AvailabilityZone",
-  "InstancePlatform",
-  "InstanceType"
- ],
- "typeName": "AWS::EC2::CapacityReservation",
- "writeOnlyProperties": [
-  "/properties/UnusedReservationBillingOwnerId"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-resiliencehub-app.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-resiliencehub-app.json
deleted file mode 100644
index 40b055a88b..0000000000
--- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-resiliencehub-app.json
+++ /dev/null
@@ -1,222 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/Name"
- ],
- "definitions": {
-  "EventSubscription": {
-   "additionalProperties": false,
-   "properties": {
-    "EventType": {
-     "enum": [
-      "ScheduledAssessmentFailure",
-      "DriftDetected"
-     ],
-     "type": "string"
-    },
-    "Name": {
-     "maxLength": 256,
-     "type": "string"
-    },
-    "SnsTopicArn": {
-     "pattern": "^arn:(aws|aws-cn|aws-iso|aws-iso-[a-z]{1}|aws-us-gov):[A-Za-z0-9][A-Za-z0-9_/.-]{0,62}:([a-z]{2}-((iso[a-z]{0,1}-)|(gov-)){0,1}[a-z]+-[0-9]):[0-9]{12}:[A-Za-z0-9/][A-Za-z0-9:_/+.-]{0,1023}$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Name",
-    "EventType"
-   ],
-   "type": "object"
-  },
-  "IamRoleArn": {
-   "pattern": "arn:(aws|aws-cn|aws-iso|aws-iso-[a-z]{1}|aws-us-gov):iam::[0-9]{12}:role\\/(([\\u0021-\\u007E]+\\u002F){1,511})?[A-Za-z0-9+=,.@_/-]{1,64}$",
-   "type": "string"
-  },
-  "PermissionModel": {
-   "additionalProperties": false,
-   "properties": {
-    "CrossAccountRoleArns": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/IamRoleArn"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "InvokerRoleName": {
-     "pattern": "((\\u002F[\\u0021-\\u007E]+\\u002F){1,511})?[A-Za-z0-9+=,.@_/-]{1,64}",
-     "type": "string"
-    },
-    "Type": {
-     "enum": [
-      "LegacyIAMUser",
-      "RoleBased"
-     ],
-     "type": "string"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "PhysicalResourceId": {
-   "additionalProperties": false,
-   "properties": {
-    "AwsAccountId": {
-     "pattern": "^[0-9]{12}$",
-     "type": "string"
-    },
-    "AwsRegion": {
-     "pattern": "^[a-z]{2}-((iso[a-z]{0,1}-)|(gov-)){0,1}[a-z]+-[0-9]$",
-     "type": "string"
-    },
-    "Identifier": {
-     "maxLength": 255,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Type": {
-     "pattern": "Arn|Native",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Identifier",
-    "Type"
-   ],
-   "type": "object"
-  },
-  "ResourceMapping": {
-   "additionalProperties": false,
-   "properties": {
-    "EksSourceName": {
-     "type": "string"
-    },
-    "LogicalStackName": {
-     "type": "string"
-    },
-    "MappingType": {
-     "pattern": "CfnStack|Resource|Terraform|EKS",
-     "type": "string"
-    },
-    "PhysicalResourceId": {
-     "$ref": "#/definitions/PhysicalResourceId"
-    },
-    "ResourceName": {
-     "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$",
-     "type": "string"
-    },
-    "TerraformSourceName": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "MappingType",
-    "PhysicalResourceId"
-   ],
-   "type": "object"
-  },
-  "TagMap": {
-   "additionalProperties": false,
-   "patternProperties": {
-    ".{1,128}": {
-     "$ref": "#/definitions/TagValue"
-    }
-   },
-   "type": "object"
-  },
-  "TagValue": {
-   "maxLength": 256,
-   "type": "string"
-  }
- },
- "primaryIdentifier": [
-  "/properties/AppArn"
- ],
- "properties": {
-  "AppArn": {
-   "pattern": "^arn:(aws|aws-cn|aws-iso|aws-iso-[a-z]{1}|aws-us-gov):[A-Za-z0-9][A-Za-z0-9_/.-]{0,62}:([a-z]{2}-((iso[a-z]{0,1}-)|(gov-)){0,1}[a-z]+-[0-9]):[0-9]{12}:[A-Za-z0-9][A-Za-z0-9:_/+=,@.-]{0,1023}$",
-   "type": "string"
-  },
-  "AppAssessmentSchedule": {
-   "enum": [
-    "Disabled",
-    "Daily"
-   ],
-   "type": "string"
-  },
-  "AppTemplateBody": {
-   "maxLength": 409600,
-   "minLength": 0,
-   "pattern": "^[\\w\\s:,-\\.'\\/{}\\[\\]:\"]+$",
-   "type": "string"
-  },
-  "Description": {
-   "maxLength": 500,
-   "minLength": 0,
-   "type": "string"
-  },
-  "DriftStatus": {
-   "enum": [
-    "NotChecked",
-    "NotDetected",
-    "Detected"
-   ],
-   "type": "string"
-  },
-  "EventSubscriptions": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/EventSubscription"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "Name": {
-   "pattern": "^[A-Za-z0-9][A-Za-z0-9_\\-]{1,59}$",
-   "type": "string"
-  },
-  "PermissionModel": {
-   "$ref": "#/definitions/PermissionModel"
-  },
-  "RegulatoryPolicyArn": {
-   "pattern": "^arn:(aws|aws-cn|aws-iso|aws-iso-[a-z]{1}|aws-us-gov):[A-Za-z0-9][A-Za-z0-9_/.-]{0,62}:([a-z]{2}-((iso[a-z]{0,1}-)|(gov-)){0,1}[a-z]+-[0-9]):[0-9]{12}:[A-Za-z0-9][A-Za-z0-9:_/+=,@.-]{0,1023}$",
-   "type": "string"
-  },
-  "ResiliencyPolicyArn": {
-   "pattern": "^arn:(aws|aws-cn|aws-iso|aws-iso-[a-z]{1}|aws-us-gov):[A-Za-z0-9][A-Za-z0-9_/.-]{0,62}:([a-z]{2}-((iso[a-z]{0,1}-)|(gov-)){0,1}[a-z]+-[0-9]):[0-9]{12}:[A-Za-z0-9][A-Za-z0-9:_/+=,@.-]{0,1023}$",
-   "type": "string"
-  },
-  "ResourceMappings": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/ResourceMapping"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "Tags": {
-   "$ref": "#/definitions/TagMap"
-  }
- },
- "readOnlyProperties": [
-  "/properties/AppArn",
-  "/properties/DriftStatus"
- ],
- "required": [
-  "Name",
-  "AppTemplateBody",
-  "ResourceMappings"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-resiliencehub",
- "tagging": {
-  "cloudFormationSystemTags": true,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::ResilienceHub::App"
-}
diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-sagemaker-domain.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-sagemaker-domain.json
deleted file mode 100644
index b79e2bbd95..0000000000
--- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-sagemaker-domain.json
+++ /dev/null
@@ -1,881 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/AuthMode",
-  "/properties/DomainName",
-  "/properties/DomainSettings/RStudioServerProDomainSettings/DefaultResourceSpec",
-  "/properties/KmsKeyId",
-  "/properties/VpcId",
-  "/properties/Tags"
- ],
- "definitions": {
-  "AppLifecycleManagement": {
-   "additionalProperties": false,
-   "properties": {
-    "IdleSettings": {
-     "$ref": "#/definitions/IdleSettings"
-    }
-   },
-   "type": "object"
-  },
-  "AppType": {
-   "enum": [
-    "JupyterServer",
-    "TensorBoard",
-    "RStudioServerPro",
-    "JupyterLab",
-    "CodeEditor",
-    "DetailedProfiler",
-    "Canvas"
-   ],
-   "type": "string"
-  },
-  "CodeEditorAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "AppLifecycleManagement": {
-     "$ref": "#/definitions/AppLifecycleManagement"
-    },
-    "CustomImages": {
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 200,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "CodeRepository": {
-   "additionalProperties": false,
-   "properties": {
-    "RepositoryUrl": {
-     "maxLength": 256,
-     "pattern": "^https://([.\\-_a-zA-Z0-9]+/?){3,1016}$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "RepositoryUrl"
-   ],
-   "type": "object"
-  },
-  "CustomFileSystemConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "EFSFileSystemConfig": {
-     "$ref": "#/definitions/EFSFileSystemConfig"
-    }
-   },
-   "type": "object"
-  },
-  "CustomImage": {
-   "additionalProperties": false,
-   "properties": {
-    "AppImageConfigName": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}",
-     "type": "string"
-    },
-    "ImageName": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9]([-.]?[a-zA-Z0-9]){0,62}$",
-     "type": "string"
-    },
-    "ImageVersionNumber": {
-     "minimum": 0,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "AppImageConfigName",
-    "ImageName"
-   ],
-   "type": "object"
-  },
-  "CustomPosixUserConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "Gid": {
-     "maximum": 4000000,
-     "minimum": 1001,
-     "type": "integer"
-    },
-    "Uid": {
-     "maximum": 4000000,
-     "minimum": 10000,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "Uid",
-    "Gid"
-   ],
-   "type": "object"
-  },
-  "DefaultEbsStorageSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultEbsVolumeSizeInGb": {
-     "$ref": "#/definitions/SpaceEbsVolumeSizeInGb"
-    },
-    "MaximumEbsVolumeSizeInGb": {
-     "$ref": "#/definitions/SpaceEbsVolumeSizeInGb"
-    }
-   },
-   "required": [
-    "DefaultEbsVolumeSizeInGb",
-    "MaximumEbsVolumeSizeInGb"
-   ],
-   "type": "object"
-  },
-  "DefaultSpaceSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomFileSystemConfigs": {
-     "items": {
-      "$ref": "#/definitions/CustomFileSystemConfig"
-     },
-     "maxItems": 2,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "CustomPosixUserConfig": {
-     "$ref": "#/definitions/CustomPosixUserConfig"
-    },
-    "ExecutionRole": {
-     "maxLength": 2048,
-     "minLength": 20,
-     "pattern": "^arn:aws[a-z\\-]*:iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+$",
-     "type": "string"
-    },
-    "JupyterLabAppSettings": {
-     "$ref": "#/definitions/JupyterLabAppSettings"
-    },
-    "JupyterServerAppSettings": {
-     "$ref": "#/definitions/JupyterServerAppSettings"
-    },
-    "KernelGatewayAppSettings": {
-     "$ref": "#/definitions/KernelGatewayAppSettings"
-    },
-    "SecurityGroups": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "insertionOrder": false,
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.Id",
-      "maxLength": 32,
-      "pattern": "[-0-9a-zA-Z]+",
-      "type": "string"
-     },
-     "maxItems": 5,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "SpaceStorageSettings": {
-     "$ref": "#/definitions/DefaultSpaceStorageSettings"
-    }
-   },
-   "required": [
-    "ExecutionRole"
-   ],
-   "type": "object"
-  },
-  "DefaultSpaceStorageSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultEbsStorageSettings": {
-     "$ref": "#/definitions/DefaultEbsStorageSettings"
-    }
-   },
-   "type": "object"
-  },
-  "DockerSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "EnableDockerAccess": {
-     "enum": [
-      "ENABLED",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "VpcOnlyTrustedAccounts": {
-     "insertionOrder": false,
-     "items": {
-      "maxLength": 12,
-      "minLength": 12,
-      "pattern": "^\\d+$",
-      "type": "string"
-     },
-     "maxItems": 20,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "DomainSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DockerSettings": {
-     "$ref": "#/definitions/DockerSettings"
-    },
-    "ExecutionRoleIdentityConfig": {
-     "enum": [
-      "USER_PROFILE_NAME",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "RStudioServerProDomainSettings": {
-     "$ref": "#/definitions/RStudioServerProDomainSettings"
-    },
-    "SecurityGroupIds": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "insertionOrder": false,
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.Id",
-      "maxLength": 32,
-      "pattern": "[-0-9a-zA-Z]+",
-      "type": "string"
-     },
-     "maxItems": 3,
-     "minItems": 1,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "EFSFileSystemConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "FileSystemId": {
-     "maxLength": 21,
-     "minLength": 11,
-     "pattern": "^(fs-[0-9a-f]{8,})$",
-     "type": "string"
-    },
-    "FileSystemPath": {
-     "maxLength": 256,
-     "minLength": 1,
-     "pattern": "^\\/\\S*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "FileSystemId"
-   ],
-   "type": "object"
-  },
-  "IdleSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "IdleTimeoutInMinutes": {
-     "$ref": "#/definitions/IdleTimeoutInMinutes"
-    },
-    "LifecycleManagement": {
-     "$ref": "#/definitions/LifecycleManagement"
-    },
-    "MaxIdleTimeoutInMinutes": {
-     "$ref": "#/definitions/MaxIdleTimeoutInMinutes"
-    },
-    "MinIdleTimeoutInMinutes": {
-     "$ref": "#/definitions/MinIdleTimeoutInMinutes"
-    }
-   },
-   "type": "object"
-  },
-  "IdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "JupyterLabAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "AppLifecycleManagement": {
-     "$ref": "#/definitions/AppLifecycleManagement"
-    },
-    "CodeRepositories": {
-     "items": {
-      "$ref": "#/definitions/CodeRepository"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "CustomImages": {
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 200,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "JupyterServerAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "KernelGatewayAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomImages": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 200,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "LifecycleManagement": {
-   "enum": [
-    "ENABLED",
-    "DISABLED"
-   ],
-   "type": "string"
-  },
-  "MaxIdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "MinIdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "MlTools": {
-   "enum": [
-    "DataWrangler",
-    "FeatureStore",
-    "EmrClusters",
-    "AutoMl",
-    "Experiments",
-    "Training",
-    "ModelEvaluation",
-    "Pipelines",
-    "Models",
-    "JumpStart",
-    "InferenceRecommender",
-    "Endpoints",
-    "Projects",
-    "InferenceOptimization",
-    "HyperPodClusters",
-    "Comet",
-    "DeepchecksLLMEvaluation",
-    "Fiddler",
-    "LakeraGuard"
-   ],
-   "type": "string"
-  },
-  "RSessionAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomImages": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 200,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    }
-   },
-   "type": "object"
-  },
-  "RStudioServerProAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "AccessStatus": {
-     "enum": [
-      "ENABLED",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "UserGroup": {
-     "enum": [
-      "R_STUDIO_ADMIN",
-      "R_STUDIO_USER"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "RStudioServerProDomainSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "DomainExecutionRoleArn": {
-     "maxLength": 2048,
-     "minLength": 20,
-     "pattern": "^arn:aws[a-z\\-]*:iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+$",
-     "type": "string"
-    },
-    "RStudioConnectUrl": {
-     "pattern": "^(https:|http:|www\\.)\\S*",
-     "type": "string"
-    },
-    "RStudioPackageManagerUrl": {
-     "pattern": "^(https:|http:|www\\.)\\S*",
-     "type": "string"
-    }
-   },
-   "required": [
-    "DomainExecutionRoleArn"
-   ],
-   "type": "object"
-  },
-  "ResourceSpec": {
-   "additionalProperties": false,
-   "properties": {
-    "InstanceType": {
-     "enum": [
-      "system",
-      "ml.t3.micro",
-      "ml.t3.small",
-      "ml.t3.medium",
-      "ml.t3.large",
-      "ml.t3.xlarge",
-      "ml.t3.2xlarge",
-      "ml.m5.large",
-      "ml.m5.xlarge",
-      "ml.m5.2xlarge",
-      "ml.m5.4xlarge",
-      "ml.m5.8xlarge",
-      "ml.m5.12xlarge",
-      "ml.m5.16xlarge",
-      "ml.m5.24xlarge",
-      "ml.c5.large",
-      "ml.c5.xlarge",
-      "ml.c5.2xlarge",
-      "ml.c5.4xlarge",
-      "ml.c5.9xlarge",
-      "ml.c5.12xlarge",
-      "ml.c5.18xlarge",
-      "ml.c5.24xlarge",
-      "ml.p3.2xlarge",
-      "ml.p3.8xlarge",
-      "ml.p3.16xlarge",
-      "ml.g4dn.xlarge",
-      "ml.g4dn.2xlarge",
-      "ml.g4dn.4xlarge",
-      "ml.g4dn.8xlarge",
-      "ml.g4dn.12xlarge",
-      "ml.g4dn.16xlarge",
-      "ml.r5.large",
-      "ml.r5.xlarge",
-      "ml.r5.2xlarge",
-      "ml.r5.4xlarge",
-      "ml.r5.8xlarge",
-      "ml.r5.12xlarge",
-      "ml.r5.16xlarge",
-      "ml.r5.24xlarge",
-      "ml.p3dn.24xlarge",
-      "ml.m5d.large",
-      "ml.m5d.xlarge",
-      "ml.m5d.2xlarge",
-      "ml.m5d.4xlarge",
-      "ml.m5d.8xlarge",
-      "ml.m5d.12xlarge",
-      "ml.m5d.16xlarge",
-      "ml.m5d.24xlarge",
-      "ml.g5.xlarge",
-      "ml.g5.2xlarge",
-      "ml.g5.4xlarge",
-      "ml.g5.8xlarge",
-      "ml.g5.12xlarge",
-      "ml.g5.16xlarge",
-      "ml.g5.24xlarge",
-      "ml.g5.48xlarge",
-      "ml.p4d.24xlarge",
-      "ml.p4de.24xlarge",
-      "ml.geospatial.interactive",
-      "ml.trn1.2xlarge",
-      "ml.trn1.32xlarge",
-      "ml.trn1n.32xlarge"
-     ],
-     "type": "string"
-    },
-    "LifecycleConfigArn": {
-     "maxLength": 256,
-     "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:studio-lifecycle-config/.*",
-     "type": "string"
-    },
-    "SageMakerImageArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws(-[\\w]+)*:sagemaker:.+:[0-9]{12}:image/[a-z0-9]([-.]?[a-z0-9])*$",
-     "type": "string"
-    },
-    "SageMakerImageVersionArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws(-[\\w]+)*:sagemaker:.+:[0-9]{12}:image-version/[a-z0-9]([-.]?[a-z0-9])*/[0-9]+$",
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SharingSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "NotebookOutputOption": {
-     "enum": [
-      "Allowed",
-      "Disabled"
-     ],
-     "type": "string"
-    },
-    "S3KmsKeyId": {
-     "maxLength": 2048,
-     "pattern": ".*",
-     "type": "string"
-    },
-    "S3OutputPath": {
-     "maxLength": 1024,
-     "pattern": "^(https|s3)://([^/]+)/?(.*)$",
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SpaceEbsVolumeSizeInGb": {
-   "maximum": 16384,
-   "minimum": 5,
-   "type": "integer"
-  },
-  "StudioLifecycleConfigArn": {
-   "maxLength": 256,
-   "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:studio-lifecycle-config/.*",
-   "type": "string"
-  },
-  "StudioWebPortalSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "HiddenAppTypes": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/AppType"
-     },
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "HiddenMlTools": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/MlTools"
-     },
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$",
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "UserSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CodeEditorAppSettings": {
-     "$ref": "#/definitions/CodeEditorAppSettings"
-    },
-    "CustomFileSystemConfigs": {
-     "items": {
-      "$ref": "#/definitions/CustomFileSystemConfig"
-     },
-     "maxItems": 2,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "CustomPosixUserConfig": {
-     "$ref": "#/definitions/CustomPosixUserConfig"
-    },
-    "DefaultLandingUri": {
-     "maxLength": 1023,
-     "type": "string"
-    },
-    "ExecutionRole": {
-     "maxLength": 2048,
-     "minLength": 20,
-     "pattern": "^arn:aws[a-z\\-]*:iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+$",
-     "type": "string"
-    },
-    "JupyterLabAppSettings": {
-     "$ref": "#/definitions/JupyterLabAppSettings"
-    },
-    "JupyterServerAppSettings": {
-     "$ref": "#/definitions/JupyterServerAppSettings"
-    },
-    "KernelGatewayAppSettings": {
-     "$ref": "#/definitions/KernelGatewayAppSettings"
-    },
-    "RSessionAppSettings": {
-     "$ref": "#/definitions/RSessionAppSettings"
-    },
-    "RStudioServerProAppSettings": {
-     "$ref": "#/definitions/RStudioServerProAppSettings"
-    },
-    "SecurityGroups": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "insertionOrder": false,
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.Id",
-      "maxLength": 32,
-      "pattern": "[-0-9a-zA-Z]+",
-      "type": "string"
-     },
-     "maxItems": 5,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "SharingSettings": {
-     "$ref": "#/definitions/SharingSettings"
-    },
-    "SpaceStorageSettings": {
-     "$ref": "#/definitions/DefaultSpaceStorageSettings"
-    },
-    "StudioWebPortal": {
-     "enum": [
-      "ENABLED",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "StudioWebPortalSettings": {
-     "$ref": "#/definitions/StudioWebPortalSettings"
-    }
-   },
-   "required": [
-    "ExecutionRole"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/DomainId"
- ],
- "properties": {
-  "AppNetworkAccessType": {
-   "enum": [
-    "PublicInternetOnly",
-    "VpcOnly"
-   ],
-   "type": "string"
-  },
-  "AppSecurityGroupManagement": {
-   "enum": [
-    "Service",
-    "Customer"
-   ],
-   "type": "string"
-  },
-  "AuthMode": {
-   "enum": [
-    "SSO",
-    "IAM"
-   ],
-   "type": "string"
-  },
-  "DefaultSpaceSettings": {
-   "$ref": "#/definitions/DefaultSpaceSettings"
-  },
-  "DefaultUserSettings": {
-   "$ref": "#/definitions/UserSettings"
-  },
-  "DomainArn": {
-   "maxLength": 256,
-   "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:domain/.*",
-   "type": "string"
-  },
-  "DomainId": {
-   "maxLength": 63,
-   "pattern": "^d-(-*[a-z0-9])+",
-   "type": "string"
-  },
-  "DomainName": {
-   "maxLength": 63,
-   "pattern": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}",
-   "type": "string"
-  },
-  "DomainSettings": {
-   "$ref": "#/definitions/DomainSettings"
-  },
-  "HomeEfsFileSystemId": {
-   "maxLength": 32,
-   "type": "string"
-  },
-  "KmsKeyId": {
-   "maxLength": 2048,
-   "pattern": ".*",
-   "type": "string"
-  },
-  "SecurityGroupIdForDomainBoundary": {
-   "maxLength": 32,
-   "pattern": "[-0-9a-zA-Z]+",
-   "type": "string"
-  },
-  "SingleSignOnApplicationArn": {
-   "pattern": "^arn:(aws|aws-us-gov|aws-cn|aws-iso|aws-iso-b):sso::[0-9]+:application/[a-zA-Z0-9-_.]+/apl-[a-zA-Z0-9]+$",
-   "type": "string"
-  },
-  "SingleSignOnManagedApplicationInstanceId": {
-   "maxLength": 256,
-   "type": "string"
-  },
-  "SubnetIds": {
-   "insertionOrder": false,
-   "items": {
-    "maxLength": 32,
-    "pattern": "[-0-9a-zA-Z]+",
-    "type": "string"
-   },
-   "maxItems": 16,
-   "minItems": 1,
-   "type": "array",
-   "uniqueItems": false
-  },
-  "TagPropagation": {
-   "enum": [
-    "ENABLED",
-    "DISABLED"
-   ],
-   "type": "string"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 50,
-   "minItems": 0,
-   "type": "array",
-   "uniqueItems": false
-  },
-  "Url": {
-   "maxLength": 1024,
-   "type": "string"
-  },
-  "VpcId": {
-   "format": "AWS::EC2::VPC.Id",
-   "maxLength": 32,
-   "pattern": "[-0-9a-zA-Z]+",
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/DomainArn",
-  "/properties/Url",
-  "/properties/DomainId",
-  "/properties/HomeEfsFileSystemId",
-  "/properties/SecurityGroupIdForDomainBoundary",
-  "/properties/SingleSignOnManagedApplicationInstanceId",
-  "/properties/SingleSignOnApplicationArn"
- ],
- "required": [
-  "AuthMode",
-  "DefaultUserSettings",
-  "DomainName",
-  "SubnetIds",
-  "VpcId"
- ],
- "typeName": "AWS::SageMaker::Domain",
- "writeOnlyProperties": [
-  "/properties/Tags"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-sagemaker-userprofile.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-sagemaker-userprofile.json
deleted file mode 100644
index 592fbea7ae..0000000000
--- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-sagemaker-userprofile.json
+++ /dev/null
@@ -1,638 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/DomainId",
-  "/properties/UserProfileName",
-  "/properties/SingleSignOnUserIdentifier",
-  "/properties/SingleSignOnUserValue",
-  "/properties/UserSettings/RStudioServerProAppSettings/AccessStatus",
-  "/properties/UserSettings/RStudioServerProAppSettings/UserGroup",
-  "/properties/Tags"
- ],
- "definitions": {
-  "AppLifecycleManagement": {
-   "additionalProperties": false,
-   "properties": {
-    "IdleSettings": {
-     "$ref": "#/definitions/IdleSettings"
-    }
-   },
-   "type": "object"
-  },
-  "AppType": {
-   "enum": [
-    "JupyterServer",
-    "TensorBoard",
-    "RStudioServerPro",
-    "JupyterLab",
-    "CodeEditor",
-    "DetailedProfiler",
-    "Canvas"
-   ],
-   "type": "string"
-  },
-  "CodeEditorAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomImages": {
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "CodeRepository": {
-   "additionalProperties": false,
-   "properties": {
-    "RepositoryUrl": {
-     "maxLength": 256,
-     "pattern": "^https://([.\\-_a-zA-Z0-9]+/?){3,1016}$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "RepositoryUrl"
-   ],
-   "type": "object"
-  },
-  "CustomFileSystemConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "EFSFileSystemConfig": {
-     "$ref": "#/definitions/EFSFileSystemConfig"
-    }
-   },
-   "type": "object"
-  },
-  "CustomImage": {
-   "additionalProperties": false,
-   "properties": {
-    "AppImageConfigName": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}",
-     "type": "string"
-    },
-    "ImageName": {
-     "maxLength": 63,
-     "pattern": "^[a-zA-Z0-9]([-.]?[a-zA-Z0-9]){0,62}$",
-     "type": "string"
-    },
-    "ImageVersionNumber": {
-     "minimum": 0,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "AppImageConfigName",
-    "ImageName"
-   ],
-   "type": "object"
-  },
-  "CustomPosixUserConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "Gid": {
-     "maximum": 4000000,
-     "minimum": 1001,
-     "type": "integer"
-    },
-    "Uid": {
-     "maximum": 4000000,
-     "minimum": 10000,
-     "type": "integer"
-    }
-   },
-   "required": [
-    "Uid",
-    "Gid"
-   ],
-   "type": "object"
-  },
-  "DefaultEbsStorageSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultEbsVolumeSizeInGb": {
-     "$ref": "#/definitions/SpaceEbsVolumeSizeInGb"
-    },
-    "MaximumEbsVolumeSizeInGb": {
-     "$ref": "#/definitions/SpaceEbsVolumeSizeInGb"
-    }
-   },
-   "required": [
-    "DefaultEbsVolumeSizeInGb",
-    "MaximumEbsVolumeSizeInGb"
-   ],
-   "type": "object"
-  },
-  "DefaultSpaceStorageSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultEbsStorageSettings": {
-     "$ref": "#/definitions/DefaultEbsStorageSettings"
-    }
-   },
-   "type": "object"
-  },
-  "EFSFileSystemConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "FileSystemId": {
-     "maxLength": 21,
-     "minLength": 11,
-     "pattern": "^(fs-[0-9a-f]{8,})$",
-     "type": "string"
-    },
-    "FileSystemPath": {
-     "maxLength": 256,
-     "minLength": 1,
-     "pattern": "^\\/\\S*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "FileSystemId"
-   ],
-   "type": "object"
-  },
-  "IdleSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "IdleTimeoutInMinutes": {
-     "$ref": "#/definitions/IdleTimeoutInMinutes"
-    },
-    "LifecycleManagement": {
-     "$ref": "#/definitions/LifecycleManagement"
-    },
-    "MaxIdleTimeoutInMinutes": {
-     "$ref": "#/definitions/MaxIdleTimeoutInMinutes"
-    },
-    "MinIdleTimeoutInMinutes": {
-     "$ref": "#/definitions/MinIdleTimeoutInMinutes"
-    }
-   },
-   "type": "object"
-  },
-  "IdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "JupyterLabAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CodeRepositories": {
-     "items": {
-      "$ref": "#/definitions/CodeRepository"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "CustomImages": {
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "JupyterServerAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "KernelGatewayAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomImages": {
-     "items": {
-      "$ref": "#/definitions/CustomImage"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "DefaultResourceSpec": {
-     "$ref": "#/definitions/ResourceSpec"
-    },
-    "LifecycleConfigArns": {
-     "items": {
-      "$ref": "#/definitions/StudioLifecycleConfigArn"
-     },
-     "maxItems": 30,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "LifecycleManagement": {
-   "enum": [
-    "ENABLED",
-    "DISABLED"
-   ],
-   "type": "string"
-  },
-  "MaxIdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "MinIdleTimeoutInMinutes": {
-   "maximum": 525600,
-   "minimum": 60,
-   "type": "integer"
-  },
-  "MlTools": {
-   "enum": [
-    "DataWrangler",
-    "FeatureStore",
-    "EmrClusters",
-    "AutoMl",
-    "Experiments",
-    "Training",
-    "ModelEvaluation",
-    "Pipelines",
-    "Models",
-    "JumpStart",
-    "InferenceRecommender",
-    "Endpoints",
-    "Projects",
-    "InferenceOptimization",
-    "HyperPodClusters",
-    "Comet",
-    "DeepchecksLLMEvaluation",
-    "Fiddler",
-    "LakeraGuard"
-   ],
-   "type": "string"
-  },
-  "RStudioServerProAppSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "AccessStatus": {
-     "enum": [
-      "ENABLED",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "UserGroup": {
-     "enum": [
-      "R_STUDIO_ADMIN",
-      "R_STUDIO_USER"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "ResourceSpec": {
-   "additionalProperties": false,
-   "properties": {
-    "InstanceType": {
-     "enum": [
-      "system",
-      "ml.t3.micro",
-      "ml.t3.small",
-      "ml.t3.medium",
-      "ml.t3.large",
-      "ml.t3.xlarge",
-      "ml.t3.2xlarge",
-      "ml.m5.large",
-      "ml.m5.xlarge",
-      "ml.m5.2xlarge",
-      "ml.m5.4xlarge",
-      "ml.m5.8xlarge",
-      "ml.m5.12xlarge",
-      "ml.m5.16xlarge",
-      "ml.m5.24xlarge",
-      "ml.c5.large",
-      "ml.c5.xlarge",
-      "ml.c5.2xlarge",
-      "ml.c5.4xlarge",
-      "ml.c5.9xlarge",
-      "ml.c5.12xlarge",
-      "ml.c5.18xlarge",
-      "ml.c5.24xlarge",
-      "ml.p3.2xlarge",
-      "ml.p3.8xlarge",
-      "ml.p3.16xlarge",
-      "ml.g4dn.xlarge",
-      "ml.g4dn.2xlarge",
-      "ml.g4dn.4xlarge",
-      "ml.g4dn.8xlarge",
-      "ml.g4dn.12xlarge",
-      "ml.g4dn.16xlarge",
-      "ml.r5.large",
-      "ml.r5.xlarge",
-      "ml.r5.2xlarge",
-      "ml.r5.4xlarge",
-      "ml.r5.8xlarge",
-      "ml.r5.12xlarge",
-      "ml.r5.16xlarge",
-      "ml.r5.24xlarge",
-      "ml.p3dn.24xlarge",
-      "ml.m5d.large",
-      "ml.m5d.xlarge",
-      "ml.m5d.2xlarge",
-      "ml.m5d.4xlarge",
-      "ml.m5d.8xlarge",
-      "ml.m5d.12xlarge",
-      "ml.m5d.16xlarge",
-      "ml.m5d.24xlarge",
-      "ml.g5.xlarge",
-      "ml.g5.2xlarge",
-      "ml.g5.4xlarge",
-      "ml.g5.8xlarge",
-      "ml.g5.12xlarge",
-      "ml.g5.16xlarge",
-      "ml.g5.24xlarge",
-      "ml.g5.48xlarge",
-      "ml.p4d.24xlarge",
-      "ml.p4de.24xlarge",
-      "ml.geospatial.interactive",
-      "ml.trn1.2xlarge",
-      "ml.trn1.32xlarge",
-      "ml.trn1n.32xlarge"
-     ],
-     "type": "string"
-    },
-    "LifecycleConfigArn": {
-     "maxLength": 256,
-     "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:studio-lifecycle-config/.*",
-     "type": "string"
-    },
-    "SageMakerImageArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws(-[\\w]+)*:sagemaker:.+:[0-9]{12}:image/[a-z0-9]([-.]?[a-z0-9])*$",
-     "type": "string"
-    },
-    "SageMakerImageVersionArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws(-[\\w]+)*:sagemaker:.+:[0-9]{12}:image-version/[a-z0-9]([-.]?[a-z0-9])*/[0-9]+$",
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SharingSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "NotebookOutputOption": {
-     "enum": [
-      "Allowed",
-      "Disabled"
-     ],
-     "type": "string"
-    },
-    "S3KmsKeyId": {
-     "maxLength": 2048,
-     "pattern": ".*",
-     "type": "string"
-    },
-    "S3OutputPath": {
-     "maxLength": 1024,
-     "pattern": "^(https|s3)://([^/]+)/?(.*)$",
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "SpaceEbsVolumeSizeInGb": {
-   "maximum": 16384,
-   "minimum": 5,
-   "type": "integer"
-  },
-  "StudioLifecycleConfigArn": {
-   "maxLength": 256,
-   "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:studio-lifecycle-config/.*",
-   "type": "string"
-  },
-  "StudioWebPortalSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "HiddenAppTypes": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/AppType"
-     },
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "HiddenMlTools": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/MlTools"
-     },
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$",
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "UserSettings": {
-   "additionalProperties": false,
-   "properties": {
-    "CodeEditorAppSettings": {
-     "$ref": "#/definitions/CodeEditorAppSettings"
-    },
-    "CustomFileSystemConfigs": {
-     "items": {
-      "$ref": "#/definitions/CustomFileSystemConfig"
-     },
-     "maxItems": 2,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": true
-    },
-    "CustomPosixUserConfig": {
-     "$ref": "#/definitions/CustomPosixUserConfig"
-    },
-    "DefaultLandingUri": {
-     "maxLength": 1023,
-     "type": "string"
-    },
-    "ExecutionRole": {
-     "maxLength": 2048,
-     "minLength": 20,
-     "pattern": "^arn:aws[a-z\\-]*:iam::\\d{12}:role/?[a-zA-Z_0-9+=,.@\\-_/]+$",
-     "type": "string"
-    },
-    "JupyterLabAppSettings": {
-     "$ref": "#/definitions/JupyterLabAppSettings"
-    },
-    "JupyterServerAppSettings": {
-     "$ref": "#/definitions/JupyterServerAppSettings"
-    },
-    "KernelGatewayAppSettings": {
-     "$ref": "#/definitions/KernelGatewayAppSettings"
-    },
-    "RStudioServerProAppSettings": {
-     "$ref": "#/definitions/RStudioServerProAppSettings"
-    },
-    "SecurityGroups": {
-     "format": "AWS::EC2::SecurityGroup.Ids",
-     "items": {
-      "format": "AWS::EC2::SecurityGroup.Id",
-      "maxLength": 32,
-      "pattern": "[-0-9a-zA-Z]+",
-      "type": "string"
-     },
-     "maxItems": 5,
-     "minItems": 0,
-     "type": "array",
-     "uniqueItems": false
-    },
-    "SharingSettings": {
-     "$ref": "#/definitions/SharingSettings"
-    },
-    "SpaceStorageSettings": {
-     "$ref": "#/definitions/DefaultSpaceStorageSettings"
-    },
-    "StudioWebPortal": {
-     "enum": [
-      "ENABLED",
-      "DISABLED"
-     ],
-     "type": "string"
-    },
-    "StudioWebPortalSettings": {
-     "$ref": "#/definitions/StudioWebPortalSettings"
-    }
-   },
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/UserProfileName",
-  "/properties/DomainId"
- ],
- "properties": {
-  "DomainId": {
-   "maxLength": 63,
-   "minLength": 1,
-   "pattern": "^d-(-*[a-z0-9]){1,61}",
-   "type": "string"
-  },
-  "SingleSignOnUserIdentifier": {
-   "pattern": "UserName",
-   "type": "string"
-  },
-  "SingleSignOnUserValue": {
-   "maxLength": 256,
-   "minLength": 1,
-   "type": "string"
-  },
-  "Tags": {
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "maxItems": 50,
-   "minItems": 0,
-   "type": "array",
-   "uniqueItems": false
-  },
-  "UserProfileArn": {
-   "maxLength": 256,
-   "pattern": "arn:aws[a-z\\-]*:sagemaker:[a-z0-9\\-]*:[0-9]{12}:user-profile/.*",
-   "type": "string"
-  },
-  "UserProfileName": {
-   "maxLength": 63,
-   "minLength": 1,
-   "pattern": "^[a-zA-Z0-9](-*[a-zA-Z0-9]){0,62}",
-   "type": "string"
-  },
-  "UserSettings": {
-   "$ref": "#/definitions/UserSettings",
-   "maxItems": 50,
-   "minItems": 0,
-   "uniqueItems": false
-  }
- },
- "readOnlyProperties": [
-  "/properties/UserProfileArn"
- ],
- "required": [
-  "DomainId",
-  "UserProfileName"
- ],
- "typeName": "AWS::SageMaker::UserProfile",
- "writeOnlyProperties": [
-  "/properties/Tags"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ses-configurationset.json b/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ses-configurationset.json
deleted file mode 100644
index 548640372c..0000000000
--- a/src/cfnlint/data/schemas/providers/us_gov_west_1/aws-ses-configurationset.json
+++ /dev/null
@@ -1,138 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/Name"
- ],
- "definitions": {
-  "DashboardOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "EngagementMetrics": {
-     "pattern": "ENABLED|DISABLED",
-     "type": "string"
-    }
-   },
-   "required": [
-    "EngagementMetrics"
-   ],
-   "type": "object"
-  },
-  "DeliveryOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "MaxDeliverySeconds": {
-     "maximum": 50400,
-     "minimum": 300,
-     "type": "number"
-    },
-    "SendingPoolName": {
-     "type": "string"
-    },
-    "TlsPolicy": {
-     "pattern": "REQUIRE|OPTIONAL",
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "GuardianOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "OptimizedSharedDelivery": {
-     "pattern": "ENABLED|DISABLED",
-     "type": "string"
-    }
-   },
-   "required": [
-    "OptimizedSharedDelivery"
-   ],
-   "type": "object"
-  },
-  "ReputationOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "ReputationMetricsEnabled": {
-     "pattern": "true|false",
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "SendingOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "SendingEnabled": {
-     "pattern": "true|false",
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "SuppressionOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "SuppressedReasons": {
-     "insertionOrder": false,
-     "items": {
-      "pattern": "BOUNCE|COMPLAINT",
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "type": "object"
-  },
-  "TrackingOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "CustomRedirectDomain": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "VdmOptions": {
-   "additionalProperties": false,
-   "properties": {
-    "DashboardOptions": {
-     "$ref": "#/definitions/DashboardOptions"
-    },
-    "GuardianOptions": {
-     "$ref": "#/definitions/GuardianOptions"
-    }
-   },
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Name"
- ],
- "properties": {
-  "DeliveryOptions": {
-   "$ref": "#/definitions/DeliveryOptions"
-  },
-  "Name": {
-   "pattern": "^[a-zA-Z0-9_-]{1,64}$",
-   "type": "string"
-  },
-  "ReputationOptions": {
-   "$ref": "#/definitions/ReputationOptions"
-  },
-  "SendingOptions": {
-   "$ref": "#/definitions/SendingOptions"
-  },
-  "SuppressionOptions": {
-   "$ref": "#/definitions/SuppressionOptions"
-  },
-  "TrackingOptions": {
-   "$ref": "#/definitions/TrackingOptions"
-  },
-  "VdmOptions": {
-   "$ref": "#/definitions/VdmOptions"
-  }
- },
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-ses.git",
- "taggable": false,
- "typeName": "AWS::SES::ConfigurationSet"
-}
diff --git a/src/cfnlint/data/schemas/providers/us_west_1/__init__.py b/src/cfnlint/data/schemas/providers/us_west_1/__init__.py
index 54ba540a44..1853ffe366 100644
--- a/src/cfnlint/data/schemas/providers/us_west_1/__init__.py
+++ b/src/cfnlint/data/schemas/providers/us_west_1/__init__.py
@@ -1108,6 +1108,7 @@
     "aws-cloudformation-resourceversion.json",
     "aws-cloudformation-stack.json",
     "aws-cloudformation-stackset.json",
+    "aws-cloudformation-typeactivation.json",
     "aws-cloudformation-waitcondition.json",
     "aws-cloudformation-waitconditionhandle.json",
     "aws-cloudfront-anycastiplist.json",
@@ -1313,6 +1314,7 @@
     "aws-ec2-vpcendpointservicepermissions.json",
     "aws-ec2-vpcgatewayattachment.json",
     "aws-ec2-vpcpeeringconnection.json",
+    "aws-ec2-vpnconnection.json",
     "aws-ec2-vpnconnectionroute.json",
     "aws-ec2-vpngateway.json",
     "aws-ec2-vpngatewayroutepropagation.json",
@@ -1384,6 +1386,7 @@
     "aws-fis-experimenttemplate.json",
     "aws-fis-targetaccountconfiguration.json",
     "aws-fms-notificationchannel.json",
+    "aws-fms-policy.json",
     "aws-fms-resourceset.json",
     "aws-fsx-datarepositoryassociation.json",
     "aws-fsx-filesystem.json",
diff --git a/src/cfnlint/data/schemas/providers/us_west_1/aws-cloudformation-typeactivation.json b/src/cfnlint/data/schemas/providers/us_west_1/aws-cloudformation-typeactivation.json
deleted file mode 100644
index ff8c82293d..0000000000
--- a/src/cfnlint/data/schemas/providers/us_west_1/aws-cloudformation-typeactivation.json
+++ /dev/null
@@ -1,110 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/ExecutionRoleArn",
-  "/properties/LoggingConfig",
-  "/properties/TypeNameAlias",
-  "/properties/TypeName",
-  "/properties/Type",
-  "/properties/PublisherId",
-  "/properties/PublicTypeArn"
- ],
- "definitions": {
-  "LoggingConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "LogGroupName": {
-     "format": "AWS::Logs::LogGroup.Name",
-     "maxLength": 512,
-     "minLength": 1,
-     "pattern": "^[\\.\\-_/#A-Za-z0-9]+$",
-     "type": "string"
-    },
-    "LogRoleArn": {
-     "maxLength": 256,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "type": "object"
-  }
- },
- "oneOf": [
-  {
-   "required": [
-    "TypeName",
-    "PublisherId",
-    "Type"
-   ]
-  },
-  {
-   "required": [
-    "PublicTypeArn"
-   ]
-  }
- ],
- "primaryIdentifier": [
-  "/properties/Arn"
- ],
- "properties": {
-  "Arn": {
-   "pattern": "arn:aws[A-Za-z0-9-]{0,64}:cloudformation:[A-Za-z0-9-]{1,64}:([0-9]{12})?:type/.+",
-   "type": "string"
-  },
-  "AutoUpdate": {
-   "type": "boolean"
-  },
-  "ExecutionRoleArn": {
-   "type": "string"
-  },
-  "LoggingConfig": {
-   "$ref": "#/definitions/LoggingConfig"
-  },
-  "MajorVersion": {
-   "maxLength": 100000,
-   "minLength": 1,
-   "type": "string"
-  },
-  "PublicTypeArn": {
-   "maxLength": 1024,
-   "pattern": "arn:aws[A-Za-z0-9-]{0,64}:cloudformation:[A-Za-z0-9-]{1,64}:([0-9]{12})?:type/.+",
-   "type": "string"
-  },
-  "PublisherId": {
-   "maxLength": 40,
-   "minLength": 1,
-   "pattern": "[0-9a-zA-Z-]{40}",
-   "type": "string"
-  },
-  "Type": {
-   "enum": [
-    "RESOURCE",
-    "MODULE",
-    "HOOK"
-   ],
-   "type": "string"
-  },
-  "TypeName": {
-   "pattern": "[A-Za-z0-9]{2,64}::[A-Za-z0-9]{2,64}::[A-Za-z0-9]{2,64}(::MODULE){0,1}",
-   "type": "string"
-  },
-  "TypeNameAlias": {
-   "maxLength": 204,
-   "minLength": 10,
-   "pattern": "[A-Za-z0-9]{2,64}::[A-Za-z0-9]{2,64}::[A-Za-z0-9]{2,64}(::MODULE){0,1}",
-   "type": "string"
-  },
-  "VersionBump": {
-   "enum": [
-    "MAJOR",
-    "MINOR"
-   ],
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-cloudformation",
- "typeName": "AWS::CloudFormation::TypeActivation"
-}
diff --git a/src/cfnlint/data/schemas/providers/us_west_1/aws-ec2-vpnconnection.json b/src/cfnlint/data/schemas/providers/us_west_1/aws-ec2-vpnconnection.json
deleted file mode 100644
index 5f9a8ac704..0000000000
--- a/src/cfnlint/data/schemas/providers/us_west_1/aws-ec2-vpnconnection.json
+++ /dev/null
@@ -1,384 +0,0 @@
-{
- "$schema": "https://raw.githubusercontent.com/aws-cloudformation/cloudformation-resource-schema/blob/master/src/main/resources/schema/provider.definition.schema.v1.json",
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/Type",
-  "/properties/CustomerGatewayId",
-  "/properties/VpnGatewayId",
-  "/properties/TransitGatewayId",
-  "/properties/EnableAcceleration",
-  "/properties/LocalIpv4NetworkCidr",
-  "/properties/LocalIpv6NetworkCidr",
-  "/properties/OutsideIpAddressType",
-  "/properties/RemoteIpv4NetworkCidr",
-  "/properties/RemoteIpv6NetworkCidr",
-  "/properties/StaticRoutesOnly",
-  "/properties/TransportTransitGatewayAttachmentId",
-  "/properties/TunnelInsideIpVersion",
-  "/properties/VpnTunnelOptionsSpecifications"
- ],
- "definitions": {
-  "CloudwatchLogOptionsSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "LogEnabled": {
-     "type": "boolean"
-    },
-    "LogGroupArn": {
-     "type": "string"
-    },
-    "LogOutputFormat": {
-     "enum": [
-      "json",
-      "text"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "IKEVersionsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "ikev1",
-      "ikev2"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Phase1DHGroupNumbersRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      2,
-      14,
-      15,
-      16,
-      17,
-      18,
-      19,
-      20,
-      21,
-      22,
-      23,
-      24
-     ],
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "Phase1EncryptionAlgorithmsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "AES128",
-      "AES256",
-      "AES128-GCM-16",
-      "AES256-GCM-16"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Phase1IntegrityAlgorithmsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "SHA1",
-      "SHA2-256",
-      "SHA2-384",
-      "SHA2-512"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Phase2DHGroupNumbersRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      2,
-      5,
-      14,
-      15,
-      16,
-      17,
-      18,
-      19,
-      20,
-      21,
-      22,
-      23,
-      24
-     ],
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
-  "Phase2EncryptionAlgorithmsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "AES128",
-      "AES256",
-      "AES128-GCM-16",
-      "AES256-GCM-16"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Phase2IntegrityAlgorithmsRequestListValue": {
-   "additionalProperties": false,
-   "properties": {
-    "Value": {
-     "enum": [
-      "SHA1",
-      "SHA2-256",
-      "SHA2-384",
-      "SHA2-512"
-     ],
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "type": "string"
-    },
-    "Value": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "VpnTunnelLogOptionsSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "CloudwatchLogOptions": {
-     "$ref": "#/definitions/CloudwatchLogOptionsSpecification"
-    }
-   },
-   "type": "object"
-  },
-  "VpnTunnelOptionsSpecification": {
-   "additionalProperties": false,
-   "properties": {
-    "DPDTimeoutAction": {
-     "enum": [
-      "clear",
-      "none",
-      "restart"
-     ],
-     "type": "string"
-    },
-    "DPDTimeoutSeconds": {
-     "minimum": 30,
-     "type": "integer"
-    },
-    "EnableTunnelLifecycleControl": {
-     "type": "boolean"
-    },
-    "IKEVersions": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/IKEVersionsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "LogOptions": {
-     "$ref": "#/definitions/VpnTunnelLogOptionsSpecification"
-    },
-    "Phase1DHGroupNumbers": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase1DHGroupNumbersRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase1EncryptionAlgorithms": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase1EncryptionAlgorithmsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase1IntegrityAlgorithms": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase1IntegrityAlgorithmsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase1LifetimeSeconds": {
-     "maximum": 28800,
-     "minimum": 900,
-     "type": "integer"
-    },
-    "Phase2DHGroupNumbers": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase2DHGroupNumbersRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase2EncryptionAlgorithms": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase2EncryptionAlgorithmsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase2IntegrityAlgorithms": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/Phase2IntegrityAlgorithmsRequestListValue"
-     },
-     "type": "array",
-     "uniqueItems": false
-    },
-    "Phase2LifetimeSeconds": {
-     "maximum": 3600,
-     "minimum": 900,
-     "type": "integer"
-    },
-    "PreSharedKey": {
-     "type": "string"
-    },
-    "RekeyFuzzPercentage": {
-     "maximum": 100,
-     "minimum": 0,
-     "type": "integer"
-    },
-    "RekeyMarginTimeSeconds": {
-     "minimum": 60,
-     "type": "integer"
-    },
-    "ReplayWindowSize": {
-     "maximum": 2048,
-     "minimum": 64,
-     "type": "integer"
-    },
-    "StartupAction": {
-     "enum": [
-      "add",
-      "start"
-     ],
-     "type": "string"
-    },
-    "TunnelInsideCidr": {
-     "type": "string"
-    },
-    "TunnelInsideIpv6Cidr": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/VpnConnectionId"
- ],
- "properties": {
-  "CustomerGatewayId": {
-   "type": "string"
-  },
-  "EnableAcceleration": {
-   "type": "boolean"
-  },
-  "LocalIpv4NetworkCidr": {
-   "type": "string"
-  },
-  "LocalIpv6NetworkCidr": {
-   "type": "string"
-  },
-  "OutsideIpAddressType": {
-   "type": "string"
-  },
-  "RemoteIpv4NetworkCidr": {
-   "type": "string"
-  },
-  "RemoteIpv6NetworkCidr": {
-   "type": "string"
-  },
-  "StaticRoutesOnly": {
-   "type": "boolean"
-  },
-  "Tags": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "TransitGatewayId": {
-   "type": "string"
-  },
-  "TransportTransitGatewayAttachmentId": {
-   "type": "string"
-  },
-  "TunnelInsideIpVersion": {
-   "type": "string"
-  },
-  "Type": {
-   "type": "string"
-  },
-  "VpnConnectionId": {
-   "type": "string"
-  },
-  "VpnGatewayId": {
-   "type": "string"
-  },
-  "VpnTunnelOptionsSpecifications": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/VpnTunnelOptionsSpecification"
-   },
-   "type": "array",
-   "uniqueItems": false
-  }
- },
- "readOnlyProperties": [
-  "/properties/VpnConnectionId"
- ],
- "required": [
-  "Type",
-  "CustomerGatewayId"
- ],
- "tagging": {
-  "cloudFormationSystemTags": false,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::EC2::VPNConnection"
-}
diff --git a/src/cfnlint/data/schemas/providers/us_west_1/aws-fms-policy.json b/src/cfnlint/data/schemas/providers/us_west_1/aws-fms-policy.json
deleted file mode 100644
index 8422693828..0000000000
--- a/src/cfnlint/data/schemas/providers/us_west_1/aws-fms-policy.json
+++ /dev/null
@@ -1,416 +0,0 @@
-{
- "additionalProperties": false,
- "definitions": {
-  "AccountId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^([0-9]*)$",
-   "type": "string"
-  },
-  "Base62Id": {
-   "maxLength": 22,
-   "minLength": 22,
-   "pattern": "^[a-z0-9A-Z]{22}$",
-   "type": "string"
-  },
-  "FirewallDeploymentModel": {
-   "enum": [
-    "DISTRIBUTED",
-    "CENTRALIZED"
-   ],
-   "type": "string"
-  },
-  "IEMap": {
-   "additionalProperties": false,
-   "properties": {
-    "ACCOUNT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/AccountId"
-     },
-     "type": "array"
-    },
-    "ORGUNIT": {
-     "insertionOrder": true,
-     "items": {
-      "$ref": "#/definitions/OrganizationalUnitId"
-     },
-     "type": "array"
-    }
-   },
-   "type": "object"
-  },
-  "ManagedServiceData": {
-   "maxLength": 30000,
-   "minLength": 1,
-   "type": "string"
-  },
-  "NetworkAclCommonPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "NetworkAclEntrySet": {
-     "$ref": "#/definitions/NetworkAclEntrySet"
-    }
-   },
-   "required": [
-    "NetworkAclEntrySet"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntry": {
-   "additionalProperties": false,
-   "properties": {
-    "CidrBlock": {
-     "pattern": "^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(\\/([0-9]|[1-2][0-9]|3[0-2]))$",
-     "type": "string"
-    },
-    "Egress": {
-     "type": "boolean"
-    },
-    "IcmpTypeCode": {
-     "additionalProperties": false,
-     "properties": {
-      "Code": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "Type": {
-       "maximum": 255,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "Code",
-      "Type"
-     ],
-     "type": "object"
-    },
-    "Ipv6CidrBlock": {
-     "pattern": "^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))(/(1[0-2]|[0-9]))?$",
-     "type": "string"
-    },
-    "PortRange": {
-     "additionalProperties": false,
-     "properties": {
-      "From": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      },
-      "To": {
-       "maximum": 65535,
-       "minimum": 0,
-       "type": "integer"
-      }
-     },
-     "required": [
-      "From",
-      "To"
-     ],
-     "type": "object"
-    },
-    "Protocol": {
-     "pattern": "^(tcp|udp|icmp|-1|([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5]))$",
-     "type": "string"
-    },
-    "RuleAction": {
-     "enum": [
-      "allow",
-      "deny"
-     ],
-     "type": "string"
-    }
-   },
-   "required": [
-    "Egress",
-    "Protocol",
-    "RuleAction"
-   ],
-   "type": "object"
-  },
-  "NetworkAclEntryList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/NetworkAclEntry"
-   },
-   "type": "array"
-  },
-  "NetworkAclEntrySet": {
-   "additionalProperties": false,
-   "anyOf": [
-    {
-     "required": [
-      "FirstEntries"
-     ]
-    },
-    {
-     "required": [
-      "LastEntries"
-     ]
-    }
-   ],
-   "properties": {
-    "FirstEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    },
-    "ForceRemediateForFirstEntries": {
-     "type": "boolean"
-    },
-    "ForceRemediateForLastEntries": {
-     "type": "boolean"
-    },
-    "LastEntries": {
-     "$ref": "#/definitions/NetworkAclEntryList"
-    }
-   },
-   "required": [
-    "ForceRemediateForFirstEntries",
-    "ForceRemediateForLastEntries"
-   ],
-   "type": "object"
-  },
-  "NetworkFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  },
-  "OrganizationalUnitId": {
-   "maxLength": 68,
-   "minLength": 16,
-   "pattern": "^(ou-[0-9a-z]{4,32}-[a-z0-9]{8,32})$",
-   "type": "string"
-  },
-  "PolicyOption": {
-   "additionalProperties": false,
-   "oneOf": [
-    {
-     "required": [
-      "NetworkFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "ThirdPartyFirewallPolicy"
-     ]
-    },
-    {
-     "required": [
-      "NetworkAclCommonPolicy"
-     ]
-    }
-   ],
-   "properties": {
-    "NetworkAclCommonPolicy": {
-     "$ref": "#/definitions/NetworkAclCommonPolicy"
-    },
-    "NetworkFirewallPolicy": {
-     "$ref": "#/definitions/NetworkFirewallPolicy"
-    },
-    "ThirdPartyFirewallPolicy": {
-     "$ref": "#/definitions/ThirdPartyFirewallPolicy"
-    }
-   },
-   "type": "object"
-  },
-  "PolicyTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "pattern": "^([^\\s]*)$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key",
-    "Value"
-   ],
-   "type": "object"
-  },
-  "PolicyType": {
-   "enum": [
-    "WAF",
-    "WAFV2",
-    "SHIELD_ADVANCED",
-    "SECURITY_GROUPS_COMMON",
-    "SECURITY_GROUPS_CONTENT_AUDIT",
-    "SECURITY_GROUPS_USAGE_AUDIT",
-    "NETWORK_FIREWALL",
-    "THIRD_PARTY_FIREWALL",
-    "DNS_FIREWALL",
-    "IMPORT_NETWORK_FIREWALL",
-    "NETWORK_ACL_COMMON"
-   ],
-   "type": "string"
-  },
-  "ResourceArn": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "ResourceTag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Value": {
-     "maxLength": 256,
-     "type": "string"
-    }
-   },
-   "required": [
-    "Key"
-   ],
-   "type": "object"
-  },
-  "ResourceType": {
-   "maxLength": 128,
-   "minLength": 1,
-   "pattern": "^([^\\s]*)$",
-   "type": "string"
-  },
-  "SecurityServicePolicyData": {
-   "additionalProperties": false,
-   "properties": {
-    "ManagedServiceData": {
-     "$ref": "#/definitions/ManagedServiceData"
-    },
-    "PolicyOption": {
-     "$ref": "#/definitions/PolicyOption"
-    },
-    "Type": {
-     "$ref": "#/definitions/PolicyType"
-    }
-   },
-   "required": [
-    "Type"
-   ],
-   "type": "object"
-  },
-  "ThirdPartyFirewallPolicy": {
-   "additionalProperties": false,
-   "properties": {
-    "FirewallDeploymentModel": {
-     "$ref": "#/definitions/FirewallDeploymentModel"
-    }
-   },
-   "required": [
-    "FirewallDeploymentModel"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "Arn": {
-   "$ref": "#/definitions/ResourceArn"
-  },
-  "DeleteAllPolicyResources": {
-   "type": "boolean"
-  },
-  "ExcludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "ExcludeResourceTags": {
-   "type": "boolean"
-  },
-  "Id": {
-   "maxLength": 36,
-   "minLength": 36,
-   "pattern": "^[a-z0-9A-Z-]{36}$",
-   "type": "string"
-  },
-  "IncludeMap": {
-   "$ref": "#/definitions/IEMap"
-  },
-  "PolicyDescription": {
-   "maxLength": 256,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "PolicyName": {
-   "maxLength": 1024,
-   "minLength": 1,
-   "pattern": "^([a-zA-Z0-9_.:/=+\\-@\\s]+)$",
-   "type": "string"
-  },
-  "RemediationEnabled": {
-   "type": "boolean"
-  },
-  "ResourceSetIds": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/Base62Id"
-   },
-   "type": "array",
-   "uniqueItems": true
-  },
-  "ResourceTags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceTag"
-   },
-   "maxItems": 8,
-   "type": "array"
-  },
-  "ResourceType": {
-   "$ref": "#/definitions/ResourceType"
-  },
-  "ResourceTypeList": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/ResourceType"
-   },
-   "type": "array"
-  },
-  "ResourcesCleanUp": {
-   "type": "boolean"
-  },
-  "SecurityServicePolicyData": {
-   "$ref": "#/definitions/SecurityServicePolicyData"
-  },
-  "Tags": {
-   "insertionOrder": true,
-   "items": {
-    "$ref": "#/definitions/PolicyTag"
-   },
-   "type": "array"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Arn",
-  "/properties/Id"
- ],
- "required": [
-  "ExcludeResourceTags",
-  "PolicyName",
-  "RemediationEnabled",
-  "SecurityServicePolicyData"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-fms.git",
- "typeName": "AWS::FMS::Policy",
- "writeOnlyProperties": [
-  "/properties/DeleteAllPolicyResources"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/us_west_2/__init__.py b/src/cfnlint/data/schemas/providers/us_west_2/__init__.py
index ce86272ab9..1195ac86f2 100644
--- a/src/cfnlint/data/schemas/providers/us_west_2/__init__.py
+++ b/src/cfnlint/data/schemas/providers/us_west_2/__init__.py
@@ -1568,6 +1568,7 @@
     "aws-cloudfront-realtimelogconfig.json",
     "aws-cloudfront-responseheaderspolicy.json",
     "aws-cloudfront-streamingdistribution.json",
+    "aws-cloudfront-vpcorigin.json",
     "aws-cloudtrail-channel.json",
     "aws-cloudtrail-dashboard.json",
     "aws-cloudtrail-eventdatastore.json",
@@ -1687,6 +1688,7 @@
     "aws-datasync-locationsmb.json",
     "aws-datasync-storagesystem.json",
     "aws-datasync-task.json",
+    "aws-datazone-datasource.json",
     "aws-datazone-domain.json",
     "aws-datazone-environment.json",
     "aws-datazone-environmentactions.json",
@@ -2309,7 +2311,6 @@
     "aws-organizations-policy.json",
     "aws-organizations-resourcepolicy.json",
     "aws-osis-pipeline.json",
-    "aws-panorama-applicationinstance.json",
     "aws-panorama-package.json",
     "aws-panorama-packageversion.json",
     "aws-paymentcryptography-alias.json",
@@ -2357,12 +2358,8 @@
     "aws-proton-servicetemplate.json",
     "aws-qbusiness-application.json",
     "aws-qbusiness-dataaccessor.json",
-    "aws-qbusiness-datasource.json",
-    "aws-qbusiness-index.json",
     "aws-qbusiness-permission.json",
     "aws-qbusiness-plugin.json",
-    "aws-qbusiness-retriever.json",
-    "aws-qbusiness-webexperience.json",
     "aws-qldb-ledger.json",
     "aws-qldb-stream.json",
     "aws-quicksight-analysis.json",
diff --git a/src/cfnlint/data/schemas/providers/us_west_2/aws-cloudfront-vpcorigin.json b/src/cfnlint/data/schemas/providers/us_west_2/aws-cloudfront-vpcorigin.json
deleted file mode 100644
index 80909b40c9..0000000000
--- a/src/cfnlint/data/schemas/providers/us_west_2/aws-cloudfront-vpcorigin.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
- "additionalProperties": false,
- "definitions": {
-  "Tag": {
-   "additionalProperties": false,
-   "properties": {
-    "Key": {
-     "type": "string"
-    },
-    "Value": {
-     "type": "string"
-    }
-   },
-   "required": [
-    "Value",
-    "Key"
-   ],
-   "type": "object"
-  },
-  "VpcOriginEndpointConfig": {
-   "additionalProperties": false,
-   "properties": {
-    "Arn": {
-     "type": "string"
-    },
-    "HTTPPort": {
-     "default": 80,
-     "type": "integer"
-    },
-    "HTTPSPort": {
-     "default": 443,
-     "type": "integer"
-    },
-    "Name": {
-     "type": "string"
-    },
-    "OriginProtocolPolicy": {
-     "default": "match-viewer",
-     "type": "string"
-    },
-    "OriginSSLProtocols": {
-     "default": [
-      "TLSv1",
-      "SSLv3"
-     ],
-     "items": {
-      "type": "string"
-     },
-     "type": "array",
-     "uniqueItems": false
-    }
-   },
-   "required": [
-    "Name",
-    "Arn"
-   ],
-   "type": "object"
-  }
- },
- "primaryIdentifier": [
-  "/properties/Id"
- ],
- "properties": {
-  "Arn": {
-   "type": "string"
-  },
-  "CreatedTime": {
-   "type": "string"
-  },
-  "Id": {
-   "type": "string"
-  },
-  "LastModifiedTime": {
-   "type": "string"
-  },
-  "Status": {
-   "type": "string"
-  },
-  "Tags": {
-   "items": {
-    "$ref": "#/definitions/Tag"
-   },
-   "type": "array",
-   "uniqueItems": false
-  },
-  "VpcOriginEndpointConfig": {
-   "$ref": "#/definitions/VpcOriginEndpointConfig"
-  }
- },
- "readOnlyProperties": [
-  "/properties/Id",
-  "/properties/Arn",
-  "/properties/Status",
-  "/properties/CreatedTime",
-  "/properties/LastModifiedTime"
- ],
- "required": [
-  "VpcOriginEndpointConfig"
- ],
- "tagging": {
-  "cloudFormationSystemTags": false,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
- "typeName": "AWS::CloudFront::VpcOrigin"
-}
diff --git a/src/cfnlint/data/schemas/providers/us_west_2/aws-datazone-datasource.json b/src/cfnlint/data/schemas/providers/us_west_2/aws-datazone-datasource.json
deleted file mode 100644
index 1f1745b36e..0000000000
--- a/src/cfnlint/data/schemas/providers/us_west_2/aws-datazone-datasource.json
+++ /dev/null
@@ -1,552 +0,0 @@
-{
- "additionalProperties": false,
- "createOnlyProperties": [
-  "/properties/ConnectionIdentifier",
-  "/properties/EnvironmentIdentifier",
-  "/properties/DomainIdentifier",
-  "/properties/ProjectIdentifier",
-  "/properties/Type"
- ],
- "definitions": {
-  "AccountId": {
-   "maxLength": 12,
-   "minLength": 12,
-   "pattern": "^\\d{12}$",
-   "type": "string"
-  },
-  "DataAccessRole": {
-   "pattern": "^arn:aws[^:]*:iam::\\d{12}:(role|role/service-role)/[\\w+=,.@-]{1,128}$",
-   "type": "string"
-  },
-  "DataSourceConfigurationInput": {
-   "oneOf": [
-    {
-     "additionalProperties": false,
-     "properties": {
-      "GlueRunConfiguration": {
-       "$ref": "#/definitions/GlueRunConfigurationInput"
-      }
-     },
-     "title": "GlueRunConfiguration",
-     "type": "object"
-    },
-    {
-     "additionalProperties": false,
-     "properties": {
-      "RedshiftRunConfiguration": {
-       "$ref": "#/definitions/RedshiftRunConfigurationInput"
-      }
-     },
-     "title": "RedshiftRunConfiguration",
-     "type": "object"
-    },
-    {
-     "additionalProperties": false,
-     "properties": {
-      "SageMakerRunConfiguration": {
-       "$ref": "#/definitions/SageMakerRunConfigurationInput"
-      }
-     },
-     "title": "SageMakerRunConfiguration",
-     "type": "object"
-    }
-   ]
-  },
-  "DataSourceStatus": {
-   "enum": [
-    "CREATING",
-    "FAILED_CREATION",
-    "READY",
-    "UPDATING",
-    "FAILED_UPDATE",
-    "RUNNING",
-    "DELETING",
-    "FAILED_DELETION"
-   ],
-   "type": "string"
-  },
-  "EnableSetting": {
-   "enum": [
-    "ENABLED",
-    "DISABLED"
-   ],
-   "type": "string"
-  },
-  "FilterExpression": {
-   "additionalProperties": false,
-   "properties": {
-    "Expression": {
-     "maxLength": 2048,
-     "minLength": 1,
-     "type": "string"
-    },
-    "Type": {
-     "$ref": "#/definitions/FilterExpressionType"
-    }
-   },
-   "required": [
-    "Expression",
-    "Type"
-   ],
-   "type": "object"
-  },
-  "FilterExpressionType": {
-   "enum": [
-    "INCLUDE",
-    "EXCLUDE"
-   ],
-   "type": "string"
-  },
-  "FormInput": {
-   "additionalProperties": false,
-   "properties": {
-    "Content": {
-     "maxLength": 75000,
-     "type": "string"
-    },
-    "FormName": {
-     "$ref": "#/definitions/FormName"
-    },
-    "TypeIdentifier": {
-     "maxLength": 385,
-     "minLength": 1,
-     "pattern": "^(?!\\.)[\\w\\.]*\\w$",
-     "type": "string"
-    },
-    "TypeRevision": {
-     "$ref": "#/definitions/TypeRevision"
-    }
-   },
-   "required": [
-    "FormName"
-   ],
-   "type": "object"
-  },
-  "FormName": {
-   "maxLength": 128,
-   "minLength": 1,
-   "pattern": "^(?![0-9_])\\w+$|^_\\w*[a-zA-Z0-9]\\w*$",
-   "type": "string"
-  },
-  "GlueRunConfigurationInput": {
-   "additionalProperties": false,
-   "properties": {
-    "AutoImportDataQualityResult": {
-     "type": "boolean"
-    },
-    "CatalogName": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "DataAccessRole": {
-     "$ref": "#/definitions/DataAccessRole"
-    },
-    "RelationalFilterConfigurations": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/RelationalFilterConfiguration"
-     },
-     "type": "array"
-    }
-   },
-   "required": [
-    "RelationalFilterConfigurations"
-   ],
-   "type": "object"
-  },
-  "RecommendationConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "EnableBusinessNameGeneration": {
-     "type": "boolean"
-    }
-   },
-   "type": "object"
-  },
-  "RedshiftClusterStorage": {
-   "additionalProperties": false,
-   "properties": {
-    "ClusterName": {
-     "maxLength": 63,
-     "minLength": 1,
-     "pattern": "^[0-9a-z].[a-z0-9\\-]*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "ClusterName"
-   ],
-   "type": "object"
-  },
-  "RedshiftCredentialConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "SecretManagerArn": {
-     "maxLength": 256,
-     "pattern": "^arn:aws[^:]*:secretsmanager:[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]:\\d{12}:secret:.*$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "SecretManagerArn"
-   ],
-   "type": "object"
-  },
-  "RedshiftRunConfigurationInput": {
-   "additionalProperties": false,
-   "properties": {
-    "DataAccessRole": {
-     "$ref": "#/definitions/DataAccessRole"
-    },
-    "RedshiftCredentialConfiguration": {
-     "$ref": "#/definitions/RedshiftCredentialConfiguration"
-    },
-    "RedshiftStorage": {
-     "$ref": "#/definitions/RedshiftStorage"
-    },
-    "RelationalFilterConfigurations": {
-     "$ref": "#/definitions/RelationalFilterConfigurations"
-    }
-   },
-   "required": [
-    "RelationalFilterConfigurations"
-   ],
-   "type": "object"
-  },
-  "RedshiftServerlessStorage": {
-   "additionalProperties": false,
-   "properties": {
-    "WorkgroupName": {
-     "maxLength": 64,
-     "minLength": 3,
-     "pattern": "^[a-z0-9-]+$",
-     "type": "string"
-    }
-   },
-   "required": [
-    "WorkgroupName"
-   ],
-   "type": "object"
-  },
-  "RedshiftStorage": {
-   "oneOf": [
-    {
-     "additionalProperties": false,
-     "properties": {
-      "RedshiftClusterSource": {
-       "$ref": "#/definitions/RedshiftClusterStorage"
-      }
-     },
-     "required": [
-      "RedshiftClusterSource"
-     ],
-     "title": "RedshiftClusterSource",
-     "type": "object"
-    },
-    {
-     "additionalProperties": false,
-     "properties": {
-      "RedshiftServerlessSource": {
-       "$ref": "#/definitions/RedshiftServerlessStorage"
-      }
-     },
-     "required": [
-      "RedshiftServerlessSource"
-     ],
-     "title": "RedshiftServerlessSource",
-     "type": "object"
-    }
-   ]
-  },
-  "Region": {
-   "maxLength": 16,
-   "minLength": 4,
-   "pattern": "[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]",
-   "type": "string"
-  },
-  "RelationalFilterConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "DatabaseName": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    },
-    "FilterExpressions": {
-     "insertionOrder": false,
-     "items": {
-      "$ref": "#/definitions/FilterExpression"
-     },
-     "type": "array"
-    },
-    "SchemaName": {
-     "maxLength": 128,
-     "minLength": 1,
-     "type": "string"
-    }
-   },
-   "required": [
-    "DatabaseName"
-   ],
-   "type": "object"
-  },
-  "RelationalFilterConfigurations": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/RelationalFilterConfiguration"
-   },
-   "type": "array"
-  },
-  "SageMakerRunConfigurationInput": {
-   "additionalProperties": false,
-   "properties": {
-    "TrackingAssets": {
-     "$ref": "#/definitions/TrackingAssets"
-    }
-   },
-   "required": [
-    "TrackingAssets"
-   ],
-   "type": "object"
-  },
-  "ScheduleConfiguration": {
-   "additionalProperties": false,
-   "properties": {
-    "Schedule": {
-     "maxLength": 256,
-     "minLength": 1,
-     "pattern": "cron\\((\\b[0-5]?[0-9]\\b) (\\b2[0-3]\\b|\\b[0-1]?[0-9]\\b) (.*){1,5} (.*){1,5} (.*){1,5} (.*){1,5}\\)",
-     "type": "string"
-    },
-    "Timezone": {
-     "$ref": "#/definitions/Timezone"
-    }
-   },
-   "type": "object"
-  },
-  "Timezone": {
-   "enum": [
-    "AFRICA_JOHANNESBURG",
-    "AMERICA_MONTREAL",
-    "AMERICA_SAO_PAULO",
-    "ASIA_BAHRAIN",
-    "ASIA_BANGKOK",
-    "ASIA_CALCUTTA",
-    "ASIA_DUBAI",
-    "ASIA_HONG_KONG",
-    "ASIA_JAKARTA",
-    "ASIA_KUALA_LUMPUR",
-    "ASIA_SEOUL",
-    "ASIA_SHANGHAI",
-    "ASIA_SINGAPORE",
-    "ASIA_TAIPEI",
-    "ASIA_TOKYO",
-    "AUSTRALIA_MELBOURNE",
-    "AUSTRALIA_SYDNEY",
-    "CANADA_CENTRAL",
-    "CET",
-    "CST6CDT",
-    "ETC_GMT",
-    "ETC_GMT0",
-    "ETC_GMT_ADD_0",
-    "ETC_GMT_ADD_1",
-    "ETC_GMT_ADD_10",
-    "ETC_GMT_ADD_11",
-    "ETC_GMT_ADD_12",
-    "ETC_GMT_ADD_2",
-    "ETC_GMT_ADD_3",
-    "ETC_GMT_ADD_4",
-    "ETC_GMT_ADD_5",
-    "ETC_GMT_ADD_6",
-    "ETC_GMT_ADD_7",
-    "ETC_GMT_ADD_8",
-    "ETC_GMT_ADD_9",
-    "ETC_GMT_NEG_0",
-    "ETC_GMT_NEG_1",
-    "ETC_GMT_NEG_10",
-    "ETC_GMT_NEG_11",
-    "ETC_GMT_NEG_12",
-    "ETC_GMT_NEG_13",
-    "ETC_GMT_NEG_14",
-    "ETC_GMT_NEG_2",
-    "ETC_GMT_NEG_3",
-    "ETC_GMT_NEG_4",
-    "ETC_GMT_NEG_5",
-    "ETC_GMT_NEG_6",
-    "ETC_GMT_NEG_7",
-    "ETC_GMT_NEG_8",
-    "ETC_GMT_NEG_9",
-    "EUROPE_DUBLIN",
-    "EUROPE_LONDON",
-    "EUROPE_PARIS",
-    "EUROPE_STOCKHOLM",
-    "EUROPE_ZURICH",
-    "ISRAEL",
-    "MEXICO_GENERAL",
-    "MST7MDT",
-    "PACIFIC_AUCKLAND",
-    "US_CENTRAL",
-    "US_EASTERN",
-    "US_MOUNTAIN",
-    "US_PACIFIC",
-    "UTC"
-   ],
-   "type": "string"
-  },
-  "TrackingAssets": {
-   "additionalProperties": false,
-   "maxProperties": 1,
-   "patternProperties": {
-    "^.{1,64}$": {
-     "items": {
-      "pattern": "^arn:aws[^:]*:sagemaker:[a-z]{2}-?(iso|gov)?-{1}[a-z]*-{1}[0-9]:\\d{12}:[\\w+=,.@-]{1,128}/[\\w+=,.@-]{1,256}$",
-      "type": "string"
-     },
-     "maxItems": 500,
-     "minItems": 0,
-     "type": "array"
-    }
-   },
-   "type": "object"
-  },
-  "TypeRevision": {
-   "maxLength": 64,
-   "minLength": 1,
-   "pattern": "^[a-zA-Z0-9_-]+$",
-   "type": "string"
-  }
- },
- "primaryIdentifier": [
-  "/properties/DomainId",
-  "/properties/Id"
- ],
- "properties": {
-  "AssetFormsInput": {
-   "insertionOrder": false,
-   "items": {
-    "$ref": "#/definitions/FormInput"
-   },
-   "maxItems": 10,
-   "minItems": 0,
-   "type": "array"
-  },
-  "Configuration": {
-   "$ref": "#/definitions/DataSourceConfigurationInput"
-  },
-  "ConnectionId": {
-   "type": "string"
-  },
-  "ConnectionIdentifier": {
-   "type": "string"
-  },
-  "CreatedAt": {
-   "format": "date-time",
-   "type": "string"
-  },
-  "Description": {
-   "maxLength": 2048,
-   "type": "string"
-  },
-  "DomainId": {
-   "pattern": "^dzd[-_][a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "DomainIdentifier": {
-   "pattern": "^dzd[-_][a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "EnableSetting": {
-   "$ref": "#/definitions/EnableSetting"
-  },
-  "EnvironmentId": {
-   "type": "string"
-  },
-  "EnvironmentIdentifier": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "Id": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "LastRunAssetCount": {
-   "type": "number"
-  },
-  "LastRunAt": {
-   "type": "string"
-  },
-  "LastRunStatus": {
-   "type": "string"
-  },
-  "Name": {
-   "maxLength": 256,
-   "minLength": 1,
-   "type": "string"
-  },
-  "ProjectId": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "ProjectIdentifier": {
-   "pattern": "^[a-zA-Z0-9_-]{1,36}$",
-   "type": "string"
-  },
-  "PublishOnImport": {
-   "type": "boolean"
-  },
-  "Recommendation": {
-   "$ref": "#/definitions/RecommendationConfiguration"
-  },
-  "Schedule": {
-   "$ref": "#/definitions/ScheduleConfiguration"
-  },
-  "Status": {
-   "$ref": "#/definitions/DataSourceStatus"
-  },
-  "Type": {
-   "maxLength": 256,
-   "minLength": 1,
-   "type": "string"
-  },
-  "UpdatedAt": {
-   "format": "date-time",
-   "type": "string"
-  }
- },
- "readOnlyProperties": [
-  "/properties/ConnectionId",
-  "/properties/CreatedAt",
-  "/properties/DomainId",
-  "/properties/EnvironmentId",
-  "/properties/Id",
-  "/properties/LastRunAssetCount",
-  "/properties/LastRunAt",
-  "/properties/LastRunStatus",
-  "/properties/ProjectId",
-  "/properties/Status",
-  "/properties/UpdatedAt"
- ],
- "required": [
-  "Name",
-  "DomainIdentifier",
-  "ProjectIdentifier",
-  "Type"
- ],
- "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-datazone",
- "tagging": {
-  "cloudFormationSystemTags": false,
-  "tagOnCreate": false,
-  "tagUpdatable": false,
-  "taggable": false
- },
- "typeName": "AWS::DataZone::DataSource",
- "writeOnlyProperties": [
-  "/properties/AssetFormsInput",
-  "/properties/ConnectionIdentifier",
-  "/properties/EnvironmentIdentifier",
-  "/properties/DomainIdentifier",
-  "/properties/Configuration",
-  "/properties/ProjectIdentifier"
- ]
-}
diff --git a/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-panorama-applicationinstance.json b/src/cfnlint/data/schemas/providers/us_west_2/aws-panorama-applicationinstance.json
similarity index 97%
rename from src/cfnlint/data/schemas/providers/ap_southeast_1/aws-panorama-applicationinstance.json
rename to src/cfnlint/data/schemas/providers/us_west_2/aws-panorama-applicationinstance.json
index 4c01df56b1..093451f44d 100644
--- a/src/cfnlint/data/schemas/providers/ap_southeast_1/aws-panorama-applicationinstance.json
+++ b/src/cfnlint/data/schemas/providers/us_west_2/aws-panorama-applicationinstance.json
@@ -228,13 +228,7 @@
   "DefaultRuntimeContextDevice"
  ],
  "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git",
- "tagging": {
-  "cloudFormationSystemTags": true,
-  "tagOnCreate": true,
-  "tagProperty": "/properties/Tags",
-  "tagUpdatable": true,
-  "taggable": true
- },
+ "taggable": true,
  "typeName": "AWS::Panorama::ApplicationInstance",
  "writeOnlyProperties": [
   "/properties/ApplicationInstanceIdToReplace"
diff --git a/src/cfnlint/data/schemas/providers/us_west_2/aws-qbusiness-datasource.json b/src/cfnlint/data/schemas/providers/us_west_2/aws-qbusiness-datasource.json
new file mode 100644
index 0000000000..085229b40b
--- /dev/null
+++ b/src/cfnlint/data/schemas/providers/us_west_2/aws-qbusiness-datasource.json
@@ -0,0 +1,418 @@
+{
+ "additionalProperties": false,
+ "createOnlyProperties": [
+  "/properties/ApplicationId",
+  "/properties/IndexId"
+ ],
+ "definitions": {
+  "AttributeValueOperator": {
+   "enum": [
+    "DELETE"
+   ],
+   "type": "string"
+  },
+  "DataSourceStatus": {
+   "enum": [
+    "PENDING_CREATION",
+    "CREATING",
+    "ACTIVE",
+    "DELETING",
+    "FAILED",
+    "UPDATING"
+   ],
+   "type": "string"
+  },
+  "DataSourceVpcConfiguration": {
+   "additionalProperties": false,
+   "properties": {
+    "SecurityGroupIds": {
+     "format": "AWS::EC2::SecurityGroup.Ids",
+     "insertionOrder": false,
+     "items": {
+      "format": "AWS::EC2::SecurityGroup.Id",
+      "maxLength": 200,
+      "minLength": 1,
+      "pattern": "[-0-9a-zA-Z]+",
+      "type": "string"
+     },
+     "maxItems": 10,
+     "minItems": 1,
+     "type": "array"
+    },
+    "SubnetIds": {
+     "insertionOrder": false,
+     "items": {
+      "maxLength": 200,
+      "minLength": 1,
+      "pattern": "[-0-9a-zA-Z]+",
+      "type": "string"
+     },
+     "type": "array"
+    }
+   },
+   "required": [
+    "SecurityGroupIds",
+    "SubnetIds"
+   ],
+   "type": "object"
+  },
+  "DocumentAttributeCondition": {
+   "additionalProperties": false,
+   "properties": {
+    "Key": {
+     "maxLength": 200,
+     "minLength": 1,
+     "pattern": "^[a-zA-Z0-9_][a-zA-Z0-9_-]*$",
+     "type": "string"
+    },
+    "Operator": {
+     "$ref": "#/definitions/DocumentEnrichmentConditionOperator"
+    },
+    "Value": {
+     "$ref": "#/definitions/DocumentAttributeValue"
+    }
+   },
+   "required": [
+    "Key",
+    "Operator"
+   ],
+   "type": "object"
+  },
+  "DocumentAttributeTarget": {
+   "additionalProperties": false,
+   "properties": {
+    "AttributeValueOperator": {
+     "$ref": "#/definitions/AttributeValueOperator"
+    },
+    "Key": {
+     "maxLength": 200,
+     "minLength": 1,
+     "pattern": "^[a-zA-Z0-9_][a-zA-Z0-9_-]*$",
+     "type": "string"
+    },
+    "Value": {
+     "$ref": "#/definitions/DocumentAttributeValue"
+    }
+   },
+   "required": [
+    "Key"
+   ],
+   "type": "object"
+  },
+  "DocumentAttributeValue": {
+   "oneOf": [
+    {
+     "additionalProperties": false,
+     "properties": {
+      "StringValue": {
+       "maxLength": 2048,
+       "type": "string"
+      }
+     },
+     "required": [
+      "StringValue"
+     ],
+     "title": "StringValue",
+     "type": "object"
+    },
+    {
+     "additionalProperties": false,
+     "properties": {
+      "StringListValue": {
+       "insertionOrder": true,
+       "items": {
+        "maxLength": 2048,
+        "minLength": 1,
+        "type": "string"
+       },
+       "type": "array"
+      }
+     },
+     "required": [
+      "StringListValue"
+     ],
+     "title": "StringListValue",
+     "type": "object"
+    },
+    {
+     "additionalProperties": false,
+     "properties": {
+      "LongValue": {
+       "type": "number"
+      }
+     },
+     "required": [
+      "LongValue"
+     ],
+     "title": "LongValue",
+     "type": "object"
+    },
+    {
+     "additionalProperties": false,
+     "properties": {
+      "DateValue": {
+       "format": "date-time",
+       "type": "string"
+      }
+     },
+     "required": [
+      "DateValue"
+     ],
+     "title": "DateValue",
+     "type": "object"
+    }
+   ]
+  },
+  "DocumentContentOperator": {
+   "enum": [
+    "DELETE"
+   ],
+   "type": "string"
+  },
+  "DocumentEnrichmentConditionOperator": {
+   "enum": [
+    "GREATER_THAN",
+    "GREATER_THAN_OR_EQUALS",
+    "LESS_THAN",
+    "LESS_THAN_OR_EQUALS",
+    "EQUALS",
+    "NOT_EQUALS",
+    "CONTAINS",
+    "NOT_CONTAINS",
+    "EXISTS",
+    "NOT_EXISTS",
+    "BEGINS_WITH"
+   ],
+   "type": "string"
+  },
+  "DocumentEnrichmentConfiguration": {
+   "additionalProperties": false,
+   "properties": {
+    "InlineConfigurations": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/InlineDocumentEnrichmentConfiguration"
+     },
+     "maxItems": 100,
+     "minItems": 1,
+     "type": "array"
+    },
+    "PostExtractionHookConfiguration": {
+     "$ref": "#/definitions/HookConfiguration"
+    },
+    "PreExtractionHookConfiguration": {
+     "$ref": "#/definitions/HookConfiguration"
+    }
+   },
+   "type": "object"
+  },
+  "HookConfiguration": {
+   "additionalProperties": false,
+   "properties": {
+    "InvocationCondition": {
+     "$ref": "#/definitions/DocumentAttributeCondition"
+    },
+    "LambdaArn": {
+     "maxLength": 2048,
+     "minLength": 1,
+     "pattern": "^arn:aws[a-zA-Z-]*:lambda:[a-z-]*-[0-9]:[0-9]{12}:function:[a-zA-Z0-9-_]+(/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})?(:[a-zA-Z0-9-_]+)?$",
+     "type": "string"
+    },
+    "RoleArn": {
+     "maxLength": 1284,
+     "minLength": 0,
+     "pattern": "^arn:[a-z0-9-\\.]{1,63}:[a-z0-9-\\.]{0,63}:[a-z0-9-\\.]{0,63}:[a-z0-9-\\.]{0,63}:[^/].{0,1023}$",
+     "type": "string"
+    },
+    "S3BucketName": {
+     "maxLength": 63,
+     "minLength": 1,
+     "pattern": "^[a-z0-9][\\.\\-a-z0-9]{1,61}[a-z0-9]$",
+     "type": "string"
+    }
+   },
+   "type": "object"
+  },
+  "ImageExtractionConfiguration": {
+   "additionalProperties": false,
+   "properties": {
+    "ImageExtractionStatus": {
+     "$ref": "#/definitions/ImageExtractionStatus"
+    }
+   },
+   "required": [
+    "ImageExtractionStatus"
+   ],
+   "type": "object"
+  },
+  "ImageExtractionStatus": {
+   "enum": [
+    "ENABLED",
+    "DISABLED"
+   ],
+   "type": "string"
+  },
+  "InlineDocumentEnrichmentConfiguration": {
+   "additionalProperties": false,
+   "properties": {
+    "Condition": {
+     "$ref": "#/definitions/DocumentAttributeCondition"
+    },
+    "DocumentContentOperator": {
+     "$ref": "#/definitions/DocumentContentOperator"
+    },
+    "Target": {
+     "$ref": "#/definitions/DocumentAttributeTarget"
+    }
+   },
+   "type": "object"
+  },
+  "MediaExtractionConfiguration": {
+   "additionalProperties": false,
+   "properties": {
+    "ImageExtractionConfiguration": {
+     "$ref": "#/definitions/ImageExtractionConfiguration"
+    }
+   },
+   "type": "object"
+  },
+  "Tag": {
+   "additionalProperties": false,
+   "properties": {
+    "Key": {
+     "maxLength": 128,
+     "minLength": 1,
+     "type": "string"
+    },
+    "Value": {
+     "maxLength": 256,
+     "minLength": 0,
+     "type": "string"
+    }
+   },
+   "required": [
+    "Key",
+    "Value"
+   ],
+   "type": "object"
+  }
+ },
+ "primaryIdentifier": [
+  "/properties/ApplicationId",
+  "/properties/DataSourceId",
+  "/properties/IndexId"
+ ],
+ "properties": {
+  "ApplicationId": {
+   "maxLength": 36,
+   "minLength": 36,
+   "pattern": "^[a-zA-Z0-9][a-zA-Z0-9-]{35}$",
+   "type": "string"
+  },
+  "Configuration": {
+   "format": "json",
+   "type": [
+    "object",
+    "string"
+   ]
+  },
+  "CreatedAt": {
+   "format": "date-time",
+   "type": "string"
+  },
+  "DataSourceArn": {
+   "maxLength": 1284,
+   "minLength": 0,
+   "pattern": "^arn:[a-z0-9-\\.]{1,63}:[a-z0-9-\\.]{0,63}:[a-z0-9-\\.]{0,63}:[a-z0-9-\\.]{0,63}:[^/].{0,1023}$",
+   "type": "string"
+  },
+  "DataSourceId": {
+   "maxLength": 36,
+   "minLength": 36,
+   "pattern": "^[a-zA-Z0-9][a-zA-Z0-9-]{35}$",
+   "type": "string"
+  },
+  "Description": {
+   "maxLength": 1000,
+   "minLength": 0,
+   "pattern": "^[\\s\\S]*$",
+   "type": "string"
+  },
+  "DisplayName": {
+   "maxLength": 1000,
+   "minLength": 1,
+   "pattern": "^[a-zA-Z0-9][a-zA-Z0-9_-]*$",
+   "type": "string"
+  },
+  "DocumentEnrichmentConfiguration": {
+   "$ref": "#/definitions/DocumentEnrichmentConfiguration"
+  },
+  "IndexId": {
+   "maxLength": 36,
+   "minLength": 36,
+   "pattern": "^[a-zA-Z0-9][a-zA-Z0-9-]{35}$",
+   "type": "string"
+  },
+  "MediaExtractionConfiguration": {
+   "$ref": "#/definitions/MediaExtractionConfiguration"
+  },
+  "RoleArn": {
+   "maxLength": 1284,
+   "minLength": 0,
+   "pattern": "^arn:[a-z0-9-\\.]{1,63}:[a-z0-9-\\.]{0,63}:[a-z0-9-\\.]{0,63}:[a-z0-9-\\.]{0,63}:[^/].{0,1023}$",
+   "type": "string"
+  },
+  "Status": {
+   "$ref": "#/definitions/DataSourceStatus"
+  },
+  "SyncSchedule": {
+   "maxLength": 998,
+   "pattern": "^[\\s\\S]*$",
+   "type": "string"
+  },
+  "Tags": {
+   "insertionOrder": false,
+   "items": {
+    "$ref": "#/definitions/Tag"
+   },
+   "maxItems": 200,
+   "minItems": 0,
+   "type": "array"
+  },
+  "Type": {
+   "maxLength": 2048,
+   "minLength": 1,
+   "type": "string"
+  },
+  "UpdatedAt": {
+   "format": "date-time",
+   "type": "string"
+  },
+  "VpcConfiguration": {
+   "$ref": "#/definitions/DataSourceVpcConfiguration"
+  }
+ },
+ "readOnlyProperties": [
+  "/properties/CreatedAt",
+  "/properties/DataSourceArn",
+  "/properties/DataSourceId",
+  "/properties/Status",
+  "/properties/Type",
+  "/properties/UpdatedAt"
+ ],
+ "required": [
+  "ApplicationId",
+  "IndexId",
+  "Configuration",
+  "DisplayName"
+ ],
+ "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-qbusiness",
+ "tagging": {
+  "cloudFormationSystemTags": true,
+  "tagOnCreate": true,
+  "tagProperty": "/properties/Tags",
+  "tagUpdatable": true,
+  "taggable": true
+ },
+ "typeName": "AWS::QBusiness::DataSource"
+}
diff --git a/src/cfnlint/data/schemas/providers/us_west_2/aws-qbusiness-index.json b/src/cfnlint/data/schemas/providers/us_west_2/aws-qbusiness-index.json
new file mode 100644
index 0000000000..d532d193f2
--- /dev/null
+++ b/src/cfnlint/data/schemas/providers/us_west_2/aws-qbusiness-index.json
@@ -0,0 +1,208 @@
+{
+ "additionalProperties": false,
+ "createOnlyProperties": [
+  "/properties/ApplicationId",
+  "/properties/Type"
+ ],
+ "definitions": {
+  "AttributeType": {
+   "enum": [
+    "STRING",
+    "STRING_LIST",
+    "NUMBER",
+    "DATE"
+   ],
+   "type": "string"
+  },
+  "DocumentAttributeConfiguration": {
+   "additionalProperties": false,
+   "properties": {
+    "Name": {
+     "maxLength": 30,
+     "minLength": 1,
+     "pattern": "^[a-zA-Z0-9_][a-zA-Z0-9_-]*$",
+     "type": "string"
+    },
+    "Search": {
+     "$ref": "#/definitions/Status"
+    },
+    "Type": {
+     "$ref": "#/definitions/AttributeType"
+    }
+   },
+   "type": "object"
+  },
+  "IndexCapacityConfiguration": {
+   "additionalProperties": false,
+   "properties": {
+    "Units": {
+     "minimum": 1,
+     "type": "number"
+    }
+   },
+   "type": "object"
+  },
+  "IndexStatistics": {
+   "additionalProperties": false,
+   "properties": {
+    "TextDocumentStatistics": {
+     "$ref": "#/definitions/TextDocumentStatistics"
+    }
+   },
+   "type": "object"
+  },
+  "IndexStatus": {
+   "enum": [
+    "CREATING",
+    "ACTIVE",
+    "DELETING",
+    "FAILED",
+    "UPDATING"
+   ],
+   "type": "string"
+  },
+  "IndexType": {
+   "enum": [
+    "ENTERPRISE",
+    "STARTER"
+   ],
+   "type": "string"
+  },
+  "Status": {
+   "enum": [
+    "ENABLED",
+    "DISABLED"
+   ],
+   "type": "string"
+  },
+  "Tag": {
+   "additionalProperties": false,
+   "properties": {
+    "Key": {
+     "maxLength": 128,
+     "minLength": 1,
+     "type": "string"
+    },
+    "Value": {
+     "maxLength": 256,
+     "minLength": 0,
+     "type": "string"
+    }
+   },
+   "required": [
+    "Key",
+    "Value"
+   ],
+   "type": "object"
+  },
+  "TextDocumentStatistics": {
+   "additionalProperties": false,
+   "properties": {
+    "IndexedTextBytes": {
+     "minimum": 0,
+     "type": "number"
+    },
+    "IndexedTextDocumentCount": {
+     "minimum": 0,
+     "type": "number"
+    }
+   },
+   "type": "object"
+  }
+ },
+ "primaryIdentifier": [
+  "/properties/ApplicationId",
+  "/properties/IndexId"
+ ],
+ "properties": {
+  "ApplicationId": {
+   "maxLength": 36,
+   "minLength": 36,
+   "pattern": "^[a-zA-Z0-9][a-zA-Z0-9-]{35}$",
+   "type": "string"
+  },
+  "CapacityConfiguration": {
+   "$ref": "#/definitions/IndexCapacityConfiguration"
+  },
+  "CreatedAt": {
+   "format": "date-time",
+   "type": "string"
+  },
+  "Description": {
+   "maxLength": 1000,
+   "minLength": 0,
+   "pattern": "^[\\s\\S]*$",
+   "type": "string"
+  },
+  "DisplayName": {
+   "maxLength": 1000,
+   "minLength": 1,
+   "pattern": "^[a-zA-Z0-9][a-zA-Z0-9_-]*$",
+   "type": "string"
+  },
+  "DocumentAttributeConfigurations": {
+   "insertionOrder": false,
+   "items": {
+    "$ref": "#/definitions/DocumentAttributeConfiguration"
+   },
+   "maxItems": 500,
+   "minItems": 1,
+   "type": "array"
+  },
+  "IndexArn": {
+   "maxLength": 1284,
+   "minLength": 0,
+   "pattern": "^arn:[a-z0-9-\\.]{1,63}:[a-z0-9-\\.]{0,63}:[a-z0-9-\\.]{0,63}:[a-z0-9-\\.]{0,63}:[^/].{0,1023}$",
+   "type": "string"
+  },
+  "IndexId": {
+   "maxLength": 36,
+   "minLength": 36,
+   "pattern": "^[a-zA-Z0-9][a-zA-Z0-9-]{35}$",
+   "type": "string"
+  },
+  "IndexStatistics": {
+   "$ref": "#/definitions/IndexStatistics"
+  },
+  "Status": {
+   "$ref": "#/definitions/IndexStatus"
+  },
+  "Tags": {
+   "insertionOrder": false,
+   "items": {
+    "$ref": "#/definitions/Tag"
+   },
+   "maxItems": 200,
+   "minItems": 0,
+   "type": "array"
+  },
+  "Type": {
+   "$ref": "#/definitions/IndexType"
+  },
+  "UpdatedAt": {
+   "format": "date-time",
+   "type": "string"
+  }
+ },
+ "readOnlyProperties": [
+  "/properties/CreatedAt",
+  "/properties/IndexArn",
+  "/properties/IndexId",
+  "/properties/IndexStatistics",
+  "/properties/Status",
+  "/properties/UpdatedAt"
+ ],
+ "required": [
+  "ApplicationId",
+  "DisplayName"
+ ],
+ "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-qbusiness",
+ "tagging": {
+  "cloudFormationSystemTags": true,
+  "tagOnCreate": true,
+  "tagProperty": "/properties/Tags",
+  "tagUpdatable": true,
+  "taggable": true
+ },
+ "typeName": "AWS::QBusiness::Index"
+}
diff --git a/src/cfnlint/data/schemas/providers/us_west_2/aws-qbusiness-retriever.json b/src/cfnlint/data/schemas/providers/us_west_2/aws-qbusiness-retriever.json
new file mode 100644
index 0000000000..490e8428e2
--- /dev/null
+++ b/src/cfnlint/data/schemas/providers/us_west_2/aws-qbusiness-retriever.json
@@ -0,0 +1,188 @@
+{
+ "additionalProperties": false,
+ "createOnlyProperties": [
+  "/properties/ApplicationId",
+  "/properties/Type"
+ ],
+ "definitions": {
+  "KendraIndexConfiguration": {
+   "additionalProperties": false,
+   "properties": {
+    "IndexId": {
+     "maxLength": 36,
+     "minLength": 36,
+     "pattern": "^[a-zA-Z0-9][a-zA-Z0-9-]{35}$",
+     "type": "string"
+    }
+   },
+   "required": [
+    "IndexId"
+   ],
+   "type": "object"
+  },
+  "NativeIndexConfiguration": {
+   "additionalProperties": false,
+   "properties": {
+    "IndexId": {
+     "maxLength": 36,
+     "minLength": 36,
+     "pattern": "^[a-zA-Z0-9][a-zA-Z0-9-]{35}$",
+     "type": "string"
+    }
+   },
+   "required": [
+    "IndexId"
+   ],
+   "type": "object"
+  },
+  "RetrieverConfiguration": {
+   "oneOf": [
+    {
+     "additionalProperties": false,
+     "properties": {
+      "NativeIndexConfiguration": {
+       "$ref": "#/definitions/NativeIndexConfiguration"
+      }
+     },
+     "required": [
+      "NativeIndexConfiguration"
+     ],
+     "title": "NativeIndexConfiguration",
+     "type": "object"
+    },
+    {
+     "additionalProperties": false,
+     "properties": {
+      "KendraIndexConfiguration": {
+       "$ref": "#/definitions/KendraIndexConfiguration"
+      }
+     },
+     "required": [
+      "KendraIndexConfiguration"
+     ],
+     "title": "KendraIndexConfiguration",
+     "type": "object"
+    }
+   ]
+  },
+  "RetrieverStatus": {
+   "enum": [
+    "CREATING",
+    "ACTIVE",
+    "FAILED"
+   ],
+   "type": "string"
+  },
+  "RetrieverType": {
+   "enum": [
+    "NATIVE_INDEX",
+    "KENDRA_INDEX"
+   ],
+   "type": "string"
+  },
+  "Tag": {
+   "additionalProperties": false,
+   "properties": {
+    "Key": {
+     "maxLength": 128,
+     "minLength": 1,
+     "type": "string"
+    },
+    "Value": {
+     "maxLength": 256,
+     "minLength": 0,
+     "type": "string"
+    }
+   },
+   "required": [
+    "Key",
+    "Value"
+   ],
+   "type": "object"
+  }
+ },
+ "primaryIdentifier": [
+  "/properties/ApplicationId",
+  "/properties/RetrieverId"
+ ],
+ "properties": {
+  "ApplicationId": {
+   "maxLength": 36,
+   "minLength": 36,
+   "pattern": "^[a-zA-Z0-9][a-zA-Z0-9-]{35}$",
+   "type": "string"
+  },
+  "Configuration": {
+   "$ref": "#/definitions/RetrieverConfiguration"
+  },
+  "CreatedAt": {
+   "format": "date-time",
+   "type": "string"
+  },
+  "DisplayName": {
+   "maxLength": 1000,
+   "minLength": 1,
+   "pattern": "^[a-zA-Z0-9][a-zA-Z0-9_-]*$",
+   "type": "string"
+  },
+  "RetrieverArn": {
+   "maxLength": 1284,
+   "minLength": 0,
+   "pattern": "^arn:[a-z0-9-\\.]{1,63}:[a-z0-9-\\.]{0,63}:[a-z0-9-\\.]{0,63}:[a-z0-9-\\.]{0,63}:[^/].{0,1023}$",
+   "type": "string"
+  },
+  "RetrieverId": {
+   "maxLength": 36,
+   "minLength": 36,
+   "pattern": "^[a-zA-Z0-9][a-zA-Z0-9-]{35}$",
+   "type": "string"
+  },
+  "RoleArn": {
+   "maxLength": 1284,
+   "minLength": 0,
+   "pattern": "^arn:[a-z0-9-\\.]{1,63}:[a-z0-9-\\.]{0,63}:[a-z0-9-\\.]{0,63}:[a-z0-9-\\.]{0,63}:[^/].{0,1023}$",
+   "type": "string"
+  },
+  "Status": {
+   "$ref": "#/definitions/RetrieverStatus"
+  },
+  "Tags": {
+   "insertionOrder": false,
+   "items": {
+    "$ref": "#/definitions/Tag"
+   },
+   "maxItems": 200,
+   "minItems": 0,
+   "type": "array"
+  },
+  "Type": {
+   "$ref": "#/definitions/RetrieverType"
+  },
+  "UpdatedAt": {
+   "format": "date-time",
+   "type": "string"
+  }
+ },
+ "readOnlyProperties": [
+  "/properties/CreatedAt",
+  "/properties/RetrieverArn",
+  "/properties/RetrieverId",
+  "/properties/Status",
+  "/properties/UpdatedAt"
+ ],
+ "required": [
+  "ApplicationId",
+  "Configuration",
+  "DisplayName",
+  "Type"
+ ],
+ "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-qbusiness",
+ "tagging": {
+  "cloudFormationSystemTags": true,
+  "tagOnCreate": true,
+  "tagProperty": "/properties/Tags",
+  "tagUpdatable": true,
+  "taggable": true
+ },
+ "typeName": "AWS::QBusiness::Retriever"
+}
diff --git a/src/cfnlint/data/schemas/providers/us_west_2/aws-qbusiness-webexperience.json b/src/cfnlint/data/schemas/providers/us_west_2/aws-qbusiness-webexperience.json
new file mode 100644
index 0000000000..8717fdaa1a
--- /dev/null
+++ b/src/cfnlint/data/schemas/providers/us_west_2/aws-qbusiness-webexperience.json
@@ -0,0 +1,288 @@
+{
+ "additionalProperties": false,
+ "createOnlyProperties": [
+  "/properties/ApplicationId"
+ ],
+ "definitions": {
+  "BrowserExtension": {
+   "enum": [
+    "FIREFOX",
+    "CHROME"
+   ],
+   "type": "string"
+  },
+  "BrowserExtensionConfiguration": {
+   "additionalProperties": false,
+   "properties": {
+    "EnabledBrowserExtensions": {
+     "insertionOrder": false,
+     "items": {
+      "$ref": "#/definitions/BrowserExtension"
+     },
+     "maxItems": 2,
+     "minItems": 0,
+     "type": "array",
+     "uniqueItems": true
+    }
+   },
+   "required": [
+    "EnabledBrowserExtensions"
+   ],
+   "type": "object"
+  },
+  "CustomizationConfiguration": {
+   "additionalProperties": false,
+   "properties": {
+    "CustomCSSUrl": {
+     "maxLength": 1284,
+     "minLength": 0,
+     "pattern": "^(https?://[a-zA-Z0-9-_.+%/]+\\.css)?$",
+     "type": "string"
+    },
+    "FaviconUrl": {
+     "maxLength": 1284,
+     "minLength": 0,
+     "pattern": "^(https?://[a-zA-Z0-9-_.+%/]+\\.(svg|ico))?$",
+     "type": "string"
+    },
+    "FontUrl": {
+     "maxLength": 1284,
+     "minLength": 0,
+     "pattern": "^(https?://[a-zA-Z0-9-_.+%/]+\\.(ttf|woff|woff2|otf))?$",
+     "type": "string"
+    },
+    "LogoUrl": {
+     "maxLength": 1284,
+     "minLength": 0,
+     "pattern": "^(https?://[a-zA-Z0-9-_.+%/]+\\.(svg|png))?$",
+     "type": "string"
+    }
+   },
+   "type": "object"
+  },
+  "IdentityProviderConfiguration": {
+   "oneOf": [
+    {
+     "additionalProperties": false,
+     "properties": {
+      "SamlConfiguration": {
+       "$ref": "#/definitions/SamlProviderConfiguration"
+      }
+     },
+     "required": [
+      "SamlConfiguration"
+     ],
+     "title": "SamlConfiguration",
+     "type": "object"
+    },
+    {
+     "additionalProperties": false,
+     "properties": {
+      "OpenIDConnectConfiguration": {
+       "$ref": "#/definitions/OpenIDConnectProviderConfiguration"
+      }
+     },
+     "required": [
+      "OpenIDConnectConfiguration"
+     ],
+     "title": "OpenIDConnectConfiguration",
+     "type": "object"
+    }
+   ]
+  },
+  "OpenIDConnectProviderConfiguration": {
+   "additionalProperties": false,
+   "properties": {
+    "SecretsArn": {
+     "maxLength": 1284,
+     "minLength": 0,
+     "pattern": "^arn:[a-z0-9-\\.]{1,63}:[a-z0-9-\\.]{0,63}:[a-z0-9-\\.]{0,63}:[a-z0-9-\\.]{0,63}:[^/].{0,1023}$",
+     "type": "string"
+    },
+    "SecretsRole": {
+     "maxLength": 1284,
+     "minLength": 0,
+     "pattern": "^arn:[a-z0-9-\\.]{1,63}:[a-z0-9-\\.]{0,63}:[a-z0-9-\\.]{0,63}:[a-z0-9-\\.]{0,63}:[^/].{0,1023}$",
+     "type": "string"
+    }
+   },
+   "required": [
+    "SecretsArn",
+    "SecretsRole"
+   ],
+   "type": "object"
+  },
+  "Origin": {
+   "maxLength": 64,
+   "minLength": 1,
+   "pattern": "(http://|https://)[a-zA-Z0-9-_.]+(?::[0-9]{1,5})?",
+   "type": "string"
+  },
+  "SamlProviderConfiguration": {
+   "additionalProperties": false,
+   "properties": {
+    "AuthenticationUrl": {
+     "maxLength": 1284,
+     "minLength": 1,
+     "pattern": "^https://.*$",
+     "type": "string"
+    }
+   },
+   "required": [
+    "AuthenticationUrl"
+   ],
+   "type": "object"
+  },
+  "Tag": {
+   "additionalProperties": false,
+   "properties": {
+    "Key": {
+     "maxLength": 128,
+     "minLength": 1,
+     "type": "string"
+    },
+    "Value": {
+     "maxLength": 256,
+     "minLength": 0,
+     "type": "string"
+    }
+   },
+   "required": [
+    "Key",
+    "Value"
+   ],
+   "type": "object"
+  },
+  "WebExperienceSamplePromptsControlMode": {
+   "enum": [
+    "ENABLED",
+    "DISABLED"
+   ],
+   "type": "string"
+  },
+  "WebExperienceStatus": {
+   "enum": [
+    "CREATING",
+    "ACTIVE",
+    "DELETING",
+    "FAILED",
+    "PENDING_AUTH_CONFIG"
+   ],
+   "type": "string"
+  }
+ },
+ "primaryIdentifier": [
+  "/properties/ApplicationId",
+  "/properties/WebExperienceId"
+ ],
+ "properties": {
+  "ApplicationId": {
+   "maxLength": 36,
+   "minLength": 36,
+   "pattern": "^[a-zA-Z0-9][a-zA-Z0-9-]{35}$",
+   "type": "string"
+  },
+  "BrowserExtensionConfiguration": {
+   "$ref": "#/definitions/BrowserExtensionConfiguration"
+  },
+  "CreatedAt": {
+   "format": "date-time",
+   "type": "string"
+  },
+  "CustomizationConfiguration": {
+   "$ref": "#/definitions/CustomizationConfiguration"
+  },
+  "DefaultEndpoint": {
+   "maxLength": 2048,
+   "minLength": 1,
+   "pattern": "^(https?|ftp|file)://([^\\s]*)$",
+   "type": "string"
+  },
+  "IdentityProviderConfiguration": {
+   "$ref": "#/definitions/IdentityProviderConfiguration"
+  },
+  "Origins": {
+   "insertionOrder": false,
+   "items": {
+    "$ref": "#/definitions/Origin"
+   },
+   "maxItems": 10,
+   "minItems": 0,
+   "type": "array"
+  },
+  "RoleArn": {
+   "maxLength": 1284,
+   "minLength": 0,
+   "pattern": "^arn:[a-z0-9-\\.]{1,63}:[a-z0-9-\\.]{0,63}:[a-z0-9-\\.]{0,63}:[a-z0-9-\\.]{0,63}:[^/].{0,1023}$",
+   "type": "string"
+  },
+  "SamplePromptsControlMode": {
+   "$ref": "#/definitions/WebExperienceSamplePromptsControlMode"
+  },
+  "Status": {
+   "$ref": "#/definitions/WebExperienceStatus"
+  },
+  "Subtitle": {
+   "maxLength": 500,
+   "minLength": 0,
+   "pattern": "^[\\s\\S]*$",
+   "type": "string"
+  },
+  "Tags": {
+   "insertionOrder": false,
+   "items": {
+    "$ref": "#/definitions/Tag"
+   },
+   "maxItems": 200,
+   "minItems": 0,
+   "type": "array"
+  },
+  "Title": {
+   "maxLength": 500,
+   "minLength": 0,
+   "pattern": "^[\\s\\S]*$",
+   "type": "string"
+  },
+  "UpdatedAt": {
+   "format": "date-time",
+   "type": "string"
+  },
+  "WebExperienceArn": {
+   "maxLength": 1284,
+   "minLength": 0,
+   "pattern": "^arn:[a-z0-9-\\.]{1,63}:[a-z0-9-\\.]{0,63}:[a-z0-9-\\.]{0,63}:[a-z0-9-\\.]{0,63}:[^/].{0,1023}$",
+   "type": "string"
+  },
+  "WebExperienceId": {
+   "maxLength": 36,
+   "minLength": 36,
+   "pattern": "^[a-zA-Z0-9][a-zA-Z0-9-]*$",
+   "type": "string"
+  },
+  "WelcomeMessage": {
+   "maxLength": 300,
+   "minLength": 0,
+   "type": "string"
+  }
+ },
+ "readOnlyProperties": [
+  "/properties/CreatedAt",
+  "/properties/DefaultEndpoint",
+  "/properties/Status",
+  "/properties/UpdatedAt",
+  "/properties/WebExperienceArn",
+  "/properties/WebExperienceId"
+ ],
+ "required": [
+  "ApplicationId"
+ ],
+ "sourceUrl": "https://github.com/aws-cloudformation/aws-cloudformation-resource-providers-qbusiness",
+ "tagging": {
+  "cloudFormationSystemTags": true,
+  "tagOnCreate": true,
+  "tagProperty": "/properties/Tags",
+  "tagUpdatable": true,
+  "taggable": true
+ },
+ "typeName": "AWS::QBusiness::WebExperience"
+}