diff --git a/.github/workflows/create_tag_on_main_merge.yaml b/.github/workflows/create_tag_on_main_merge.yaml
new file mode 100644
index 0000000..496e0d8
--- /dev/null
+++ b/.github/workflows/create_tag_on_main_merge.yaml
@@ -0,0 +1,20 @@
+name: Bump version
+on:
+  push:
+    branches:
+      - master
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+
+    - uses: actions/checkout@master
+      with:
+        # Fetches entire history, so we can analyze commits since last tag
+        fetch-depth: 0
+
+    - name: Bump version and push tag
+      id: tag_version
+      uses: mathieudutour/github-tag-action@v6.2
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/sync_data_schema_updates.yaml b/.github/workflows/sync_data_schema_updates.yaml
new file mode 100644
index 0000000..8485408
--- /dev/null
+++ b/.github/workflows/sync_data_schema_updates.yaml
@@ -0,0 +1,51 @@
+name: Synchronize Repo with Data Schemas
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+    paths:
+      - 'jsonschema/**'
+      - 'scripts/**'
+      - '.github/workflows/sync_data_schema_updates.yaml'
+
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Check out repo
+      uses: actions/checkout@v4
+
+    - name: Setup Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.13'
+    
+    - name: Set git user and generate files
+      run: |
+        git config --global user.name 'equinix-labs@auto-commit-workflow'
+        git config --global user.email 'bot@equinix.noreply.github.com'
+        git config advice.addIgnoredFile false
+        git fetch
+        echo -e "\nThis is executing for branch: ${GITHUB_HEAD_REF##*/}."
+        git checkout ${GITHUB_HEAD_REF##*/}
+
+    - name: Update Data Loaders
+      run: python3 ./scripts/update_data_loader.py
+
+    - name: Update JSON Catalog
+      run: python3 ./scripts/generate_json_catalog.py
+
+    - name: Update README.md 
+      run: python3 ./scripts/generate_readme_event_catalog.py
+
+    - name: Auto Commit Updates
+      run: |
+        git add .
+        echo -e "\nGit status:"
+        echo `git status`
+        cdate=`date`
+        cmsg="Auto commit generated client synchronization changes for Data Schema Updates - $cdate"
+        echo -e "\nCommit message created : $cmsg"
+        echo -e "\nCommitting if there are files to update in client dir:"
+        echo `git commit -m "$cmsg"`
+        echo `git push`
diff --git a/.github/workflows/validate_json_schemas.yaml b/.github/workflows/validate_json_schemas.yaml
new file mode 100644
index 0000000..9faf8ca
--- /dev/null
+++ b/.github/workflows/validate_json_schemas.yaml
@@ -0,0 +1,30 @@
+name: Validate JSON Schemas Syntax
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+    paths:
+      - 'jsonschema/**'
+      - 'scripts/**'
+      - '.github/workflows/validate_json_schemas.yaml'
+
+
+jobs:
+  validate:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Check out repo
+      uses: actions/checkout@v4
+
+    - name: Setup Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.13' 
+
+    - name: Install Python requirements.txt Dependencies
+      run: python3 -m pip install -r ./scripts/requirements.txt
+
+    - name: Download schema specifications
+      run: curl -o ./scripts/jsonschema-org-schema.json https://json-schema.org/draft-04/schema
+
+    - name: Validate JSON Schema
+      run: python3 ./scripts/validate_json_schemas.py
diff --git a/.gitignore b/.gitignore
index c111e88..01f814d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,6 @@
 
 # Local Setup Scripts for Repo
 local_helper_scripts/*
+
+# Python Generated Files
+__pycache__
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000..8e3d73b
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at support@equinixmetal.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..91ec76a
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,99 @@
+# Equinix CloudEvents Contributors
+
+Thanks for your interest! We're so glad you're here.
+
+The Equinix CloudEvents Repo is a self-service contribution model that allows cross functional teams to manage their own
+data schemas related to the CloudEvent types, metric names, and alert names that will be published from their team.
+
+We follow the [CloudEvents](https://cloudevents.io/) project.
+
+Every Data Schema is published to Github Pages through this repo on merges to the `main` branch. Contribution guidelines for
+registration and promotion are provided in this document. Please read it thoroughly.
+
+## Code of Conduct
+
+Available via [https://github.com/equinix/equinix-cloudevents/blob/main/.github/CODE_OF_CONDUCT.md](https://github.com/equinix/equinix-cloudevents/blob/main/.github/CODE_OF_CONDUCT.md)
+
+## Data Schema Gating through Equinix Event Manager
+
+Each data schema is created to support CloudEvent types, metrics, and alerts. 
+The team responsible for the data schema manages which environment the data schema is ready to support by managing the 
+`cloudeventTypes`, `metricNames`, and `alertNames` attributes in the JSON. Each attribute is an object with list attributes 
+`released` and `preview` that mark which environment the data schema is ready to suppport the given event/metric/alert in. Only 
+place types in the `released` list if it is fully tested and ready for production. Place it into the `preview` list if it is under 
+development and should only be available in UAT.
+* `released` - attribute list under `cloudeventTypes`, `metricNames` and `alertNames` signifying that the name listed is fully tested and ready to be sent in production
+* `preview` - attribute list under `cloudeventTypes`, `metricNames` and `alertNames` signifying that the name listed is under preview; meaning that the name is in development and should only be exposed to UAT
+
+**Even if the data schema is not using metrics, or alerts, each attribute and sub attribute is required in the data schema. The Github Action will fail if they are not present and the Pull Request will not be merged.**
+
+These lists are retrieved automatically via Github Actions to create a Data Loader that the Equinix Event Manager uses for event,
+metric, and alert gating. **Contributing teams are fully responsible for managing these lists to ensure the proper gating is occuring for the Equinix Event Manager.**
+
+Example of complete use case for the attributes:
+
+```
+...
+ "cloudeventTypes": {
+    "released": [
+        "equinix.fabric.connection.ipv4_installed_routes.utilization",
+        "equinix.fabric.connection.ipv6_installed_routes.utilization",
+        "equinix.fabric.router.ipv4_installed_routes.utilization",
+        "equinix.fabric.router.ipv6_installed_routes.utilization"
+    ],
+    "preview": []
+},
+"metricNames": {
+    "released": [],
+    "preview": []
+},
+"alertNames": {
+    "released": [],
+    "preview": []
+}
+...
+```
+
+## Registering a Data Schema
+
+Each team will be adding data schemas in JSON format to their domain. The data schema will be used in the CloudEvent envelope to
+specify the format of the data being streamed to customers.
+
+The domains are added under `jsonschema/equinix` in the repository. Of the pattern `jsonschema/equinix/<domain>/<major_version>` with a full example being `jsonschema/equinix/fabric/v1`.
+
+Each data schema is created to support CloudEvent types, metrics, and alerts. Please ensure the [Gating](#data-schema-gating-through-equinix-event-manager) section is read and properly understood to abide by those rules.
+
+Each contributed data schema requires the following attributes:
+* "$id" - The fully resolved URL to the data schema for linking from CloudEvent envelope and for generating Github Pages Site
+* "name" - The name of the Data Schema being registered. Should match the file name
+* "examples" - Provided examples of what the data schema could contain in a streamed event. Can be an empty list `[]` to start.
+* "package" - The name of the package containing the data schema. Example: `equinix.fabric.v1`
+* "datatype" - The full name of the datatype within the package. Example: `equinix.fabric.v1.ChangeEvent`
+* "$schema" - The JSON Schema Specification used to draft the data schema. Use `"http://json-schema.org/draft-04/schema#"` for all
+* "$ref" - The reference to the definition provided for the data schema. Example: `#/definitions/Data`
+* "definitions" - The JSON Schema definition that describes the contents of the data schema for what will be contained in the event, metric, or alert that is supported by this data schema
+* "cloudeventTypes" - Object with list attributes `released` and `preview` that mark which environment the data schema is ready to suppport the given event type in. Only place types in the `released` list if it is fully tested and ready for production. Place it into the `preview` list if it is under development and should only be available in UAT.
+* "metricNames" - - Object with list attributes `released` and `preview` that mark which environment the data schema is ready to suppport the given metric in. Only place types in the `released` list if it is fully tested and ready for production. Place it into the `preview` list if it is under development and should only be available in UAT.
+* "alertNames" - Object with list attributes `released` and `preview` that mark which environment the data schema is ready to suppport the given event type in. Only place types in the `released` list if it is fully tested and ready for production. Place it into the `preview` list if it is under development and should only be available in UAT.
+
+## Data Schema Versioning
+
+Versioning for data schemas is only based on major versions; there are no minor or patch versions. The major versions
+are determined by the directory structure containing the data schema.
+
+If no breaking changes (only additions, no modifications or deletions) are made to the data_schema when it is updated it can stay under the same major version; i.e. v1.
+
+If a breaking change is made to the data_schema (deletion or modification) then it needs to be put into the next major version in a new version directory; i.e. v2.
+
+Not all data_schemas need to be moved to v2. Just the ones that have breaking changes.
+
+## Repository Versioning
+
+The self service contribution model is setup to ensure the repo is always in a stable state that can be released to either UAT or production. Each time a Pull Request is merged into main a new version tag will be created based on SemVar for the commit names
+present in the change. This tag will always be available to the Equinix Event Manager for releases. This setup is possible because of our CODEOWNERSHIP model.
+
+## CODEOWNERS
+
+CODEOWNERS file will be in place to establish a Github team (Synced with Equinix IAM) responsible for the files along the domain path they are contributing to. This ensures that 1 member from each domain team and 1 architect will always be necessary to approve a Pull Request before it can be merged.
+
+This is critical because the responsibility of maintaining the `released` and `preview` lists outlined in the [Gating](#data-schema-gating-through-equinix-event-manager) section lies with the Domain owners and not the architects. Should any production defect be found the Domain owner is responsible for resolution
\ No newline at end of file
diff --git a/DataLoader.json b/DataLoader.json
index 54fb2dc..398eef3 100644
--- a/DataLoader.json
+++ b/DataLoader.json
@@ -1,131 +1,185 @@
 {
     "access_manager": {
-        "eventTypes": [],
-        "metricNames": []
+        "cloudeventTypes": {
+            "released": [],
+            "preview": []
+        },
+        "metricNames": {
+            "released": [],
+            "preview": []
+        },
+        "alertNames": {
+            "released": [],
+            "preview": []
+        }
     },
     "fabric": {
-        "eventTypes": [
-            "equinix.fabric.connection.attribute.changed",
-            "equinix.fabric.connection.bgpipv4_session_status.connect",
-            "equinix.fabric.connection.bgpipv4_session_status.established",
-            "equinix.fabric.connection.bgpipv4_session_status.idle",
-            "equinix.fabric.connection.bgpipv6_session_status.connect",
-            "equinix.fabric.connection.bgpipv6_session_status.established",
-            "equinix.fabric.connection.bgpipv6_session_status.idle",
-            "equinix.fabric.connection.state.deprovisioned",
-            "equinix.fabric.connection.state.deprovisioning",
-            "equinix.fabric.connection.state.pending",
-            "equinix.fabric.connection.state.pending_approval",
-            "equinix.fabric.connection.state.pending_interface_configuration",
-            "equinix.fabric.connection.state.provisioned",
-            "equinix.fabric.connection.state.provisioning",
-            "equinix.fabric.connection.status.down",
-            "equinix.fabric.connection.status.up",
-            "equinix.fabric.metric",
-            "equinix.fabric.network.state.deprovisioned",
-            "equinix.fabric.network.state.deprovisioning",
-            "equinix.fabric.network.state.provisioned",
-            "equinix.fabric.network.state.provisioning",
-            "equinix.fabric.port.state.deprovisioned",
-            "equinix.fabric.port.state.failed",
-            "equinix.fabric.port.state.provisioned",
-            "equinix.fabric.port.status.down",
-            "equinix.fabric.port.status.up",
-            "equinix.fabric.router.state.deprovisioned",
-            "equinix.fabric.router.state.deprovisioning",
-            "equinix.fabric.router.state.failed",
-            "equinix.fabric.router.state.not_deprovisioned",
-            "equinix.fabric.router.state.not_provisioned",
-            "equinix.fabric.router.state.provisioned",
-            "equinix.fabric.router.state.provisioning",
-            "equinix.fabric.router.state.reprovisioning",
-            "equinix.fabric.service_token.attribute.changed",
-            "equinix.fabric.service_token.state.deleted",
-            "equinix.fabric.service_token.state.inactive"
-        ],
-        "metricNames": [
-            "equinix.fabric.connection.bandwidth_rx.usage",
-            "equinix.fabric.connection.bandwidth_tx.usage",
-            "equinix.fabric.metro.am_{:metroCode}.latency",
-            "equinix.fabric.metro.at_{:metroCode}.latency",
-            "equinix.fabric.metro.ba_{:metroCode}.latency",
-            "equinix.fabric.metro.bg_{:metroCode}.latency",
-            "equinix.fabric.metro.bl_{:metroCode}.latency",
-            "equinix.fabric.metro.bo_{:metroCode}.latency",
-            "equinix.fabric.metro.bx_{:metroCode}.latency",
-            "equinix.fabric.metro.ca_{:metroCode}.latency",
-            "equinix.fabric.metro.ch_{:metroCode}.latency",
-            "equinix.fabric.metro.cl_{:metroCode}.latency",
-            "equinix.fabric.metro.cu_{:metroCode}.latency",
-            "equinix.fabric.metro.da_{:metroCode}.latency",
-            "equinix.fabric.metro.db_{:metroCode}.latency",
-            "equinix.fabric.metro.dc_{:metroCode}.latency",
-            "equinix.fabric.metro.de_{:metroCode}.latency",
-            "equinix.fabric.metro.dx_{:metroCode}.latency",
-            "equinix.fabric.metro.fr_{:metroCode}.latency",
-            "equinix.fabric.metro.gv_{:metroCode}.latency",
-            "equinix.fabric.metro.he_{:metroCode}.latency",
-            "equinix.fabric.metro.hh_{:metroCode}.latency",
-            "equinix.fabric.metro.hk_{:metroCode}.latency",
-            "equinix.fabric.metro.ho_{:metroCode}.latency",
-            "equinix.fabric.metro.il_{:metroCode}.latency",
-            "equinix.fabric.metro.jh_{:metroCode}.latency",
-            "equinix.fabric.metro.ka_{:metroCode}.latency",
-            "equinix.fabric.metro.kl_{:metroCode}.latency",
-            "equinix.fabric.metro.la_{:metroCode}.latency",
-            "equinix.fabric.metro.ld_{:metroCode}.latency",
-            "equinix.fabric.metro.lm_{:metroCode}.latency",
-            "equinix.fabric.metro.ls_{:metroCode}.latency",
-            "equinix.fabric.metro.ma_{:metroCode}.latency",
-            "equinix.fabric.metro.mb_{:metroCode}.latency",
-            "equinix.fabric.metro.md_{:metroCode}.latency",
-            "equinix.fabric.metro.me_{:metroCode}.latency",
-            "equinix.fabric.metro.mi_{:metroCode}.latency",
-            "equinix.fabric.metro.ml_{:metroCode}.latency",
-            "equinix.fabric.metro.mo_{:metroCode}.latency",
-            "equinix.fabric.metro.mt_{:metroCode}.latency",
-            "equinix.fabric.metro.mu_{:metroCode}.latency",
-            "equinix.fabric.metro.mx_{:metroCode}.latency",
-            "equinix.fabric.metro.ny_{:metroCode}.latency",
-            "equinix.fabric.metro.os_{:metroCode}.latency",
-            "equinix.fabric.metro.ot_{:metroCode}.latency",
-            "equinix.fabric.metro.pa_{:metroCode}.latency",
-            "equinix.fabric.metro.pe_{:metroCode}.latency",
-            "equinix.fabric.metro.ph_{:metroCode}.latency",
-            "equinix.fabric.metro.rj_{:metroCode}.latency",
-            "equinix.fabric.metro.se_{:metroCode}.latency",
-            "equinix.fabric.metro.sg_{:metroCode}.latency",
-            "equinix.fabric.metro.sk_{:metroCode}.latency",
-            "equinix.fabric.metro.sl_{:metroCode}.latency",
-            "equinix.fabric.metro.so_{:metroCode}.latency",
-            "equinix.fabric.metro.sp_{:metroCode}.latency",
-            "equinix.fabric.metro.st_{:metroCode}.latency",
-            "equinix.fabric.metro.sv_{:metroCode}.latency",
-            "equinix.fabric.metro.sy_{:metroCode}.latency",
-            "equinix.fabric.metro.tr_{:metroCode}.latency",
-            "equinix.fabric.metro.ty_{:metroCode}.latency",
-            "equinix.fabric.metro.va_{:metroCode}.latency",
-            "equinix.fabric.metro.wa_{:metroCode}.latency",
-            "equinix.fabric.metro.wi_{:metroCode}.latency",
-            "equinix.fabric.metro.zh_{:metroCode}.latency",
-            "equinix.fabric.port.bandwidth_rx.usage",
-            "equinix.fabric.port.bandwidth_tx.usage",
-            "equinix.fabric.port.packets_dropped_rx.count",
-            "equinix.fabric.port.packets_dropped_tx.count",
-            "equinix.fabric.port.packets_erred_rx.count",
-            "equinix.fabric.port.packets_erred_tx.count"
-        ]
+        "cloudeventTypes": {
+            "released": [
+                "equinix.fabric.connection.attribute.changed",
+                "equinix.fabric.connection.bgpipv4_session_status.connect",
+                "equinix.fabric.connection.bgpipv4_session_status.established",
+                "equinix.fabric.connection.bgpipv4_session_status.idle",
+                "equinix.fabric.connection.bgpipv4_session_status.open_confirm",
+                "equinix.fabric.connection.bgpipv4_session_status.open_sent",
+                "equinix.fabric.connection.bgpipv6_session_status.connect",
+                "equinix.fabric.connection.bgpipv6_session_status.established",
+                "equinix.fabric.connection.bgpipv6_session_status.idle",
+                "equinix.fabric.connection.ipv4_installed_routes.utilization",
+                "equinix.fabric.connection.ipv6_installed_routes.utilization",
+                "equinix.fabric.connection.state.deprovisioned",
+                "equinix.fabric.connection.state.deprovisioning",
+                "equinix.fabric.connection.state.pending",
+                "equinix.fabric.connection.state.provisioned",
+                "equinix.fabric.connection.state.provisioning",
+                "equinix.fabric.connection.status.down",
+                "equinix.fabric.connection.status.up",
+                "equinix.fabric.metric",
+                "equinix.fabric.network.state.deprovisioned",
+                "equinix.fabric.network.state.deprovisioning",
+                "equinix.fabric.network.state.provisioned",
+                "equinix.fabric.network.state.provisioning",
+                "equinix.fabric.port.state.deprovisioned",
+                "equinix.fabric.port.state.failed",
+                "equinix.fabric.port.state.provisioned",
+                "equinix.fabric.port.status.down",
+                "equinix.fabric.port.status.up",
+                "equinix.fabric.router.ipv4_installed_routes.utilization",
+                "equinix.fabric.router.ipv6_installed_routes.utilization",
+                "equinix.fabric.router.state.deprovisioned",
+                "equinix.fabric.router.state.deprovisioning",
+                "equinix.fabric.router.state.failed",
+                "equinix.fabric.router.state.not_deprovisioned",
+                "equinix.fabric.router.state.not_provisioned",
+                "equinix.fabric.router.state.provisioned",
+                "equinix.fabric.router.state.provisioning",
+                "equinix.fabric.router.state.reprovisioning",
+                "equinix.fabric.service_token.attribute.changed",
+                "equinix.fabric.service_token.state.deleted",
+                "equinix.fabric.service_token.state.inactive"
+            ],
+            "preview": []
+        },
+        "metricNames": {
+            "released": [
+                "equinix.fabric.connection.bandwidth_rx.usage",
+                "equinix.fabric.connection.bandwidth_tx.usage",
+                "equinix.fabric.metro.am_{:metroCode}.latency",
+                "equinix.fabric.metro.at_{:metroCode}.latency",
+                "equinix.fabric.metro.ba_{:metroCode}.latency",
+                "equinix.fabric.metro.bg_{:metroCode}.latency",
+                "equinix.fabric.metro.bl_{:metroCode}.latency",
+                "equinix.fabric.metro.bo_{:metroCode}.latency",
+                "equinix.fabric.metro.bx_{:metroCode}.latency",
+                "equinix.fabric.metro.ca_{:metroCode}.latency",
+                "equinix.fabric.metro.ch_{:metroCode}.latency",
+                "equinix.fabric.metro.cl_{:metroCode}.latency",
+                "equinix.fabric.metro.cu_{:metroCode}.latency",
+                "equinix.fabric.metro.da_{:metroCode}.latency",
+                "equinix.fabric.metro.db_{:metroCode}.latency",
+                "equinix.fabric.metro.dc_{:metroCode}.latency",
+                "equinix.fabric.metro.de_{:metroCode}.latency",
+                "equinix.fabric.metro.dx_{:metroCode}.latency",
+                "equinix.fabric.metro.fr_{:metroCode}.latency",
+                "equinix.fabric.metro.gv_{:metroCode}.latency",
+                "equinix.fabric.metro.he_{:metroCode}.latency",
+                "equinix.fabric.metro.hh_{:metroCode}.latency",
+                "equinix.fabric.metro.hk_{:metroCode}.latency",
+                "equinix.fabric.metro.ho_{:metroCode}.latency",
+                "equinix.fabric.metro.il_{:metroCode}.latency",
+                "equinix.fabric.metro.jh_{:metroCode}.latency",
+                "equinix.fabric.metro.ka_{:metroCode}.latency",
+                "equinix.fabric.metro.kl_{:metroCode}.latency",
+                "equinix.fabric.metro.la_{:metroCode}.latency",
+                "equinix.fabric.metro.ld_{:metroCode}.latency",
+                "equinix.fabric.metro.lm_{:metroCode}.latency",
+                "equinix.fabric.metro.ls_{:metroCode}.latency",
+                "equinix.fabric.metro.ma_{:metroCode}.latency",
+                "equinix.fabric.metro.mb_{:metroCode}.latency",
+                "equinix.fabric.metro.md_{:metroCode}.latency",
+                "equinix.fabric.metro.me_{:metroCode}.latency",
+                "equinix.fabric.metro.mi_{:metroCode}.latency",
+                "equinix.fabric.metro.ml_{:metroCode}.latency",
+                "equinix.fabric.metro.mo_{:metroCode}.latency",
+                "equinix.fabric.metro.mt_{:metroCode}.latency",
+                "equinix.fabric.metro.mu_{:metroCode}.latency",
+                "equinix.fabric.metro.mx_{:metroCode}.latency",
+                "equinix.fabric.metro.ny_{:metroCode}.latency",
+                "equinix.fabric.metro.os_{:metroCode}.latency",
+                "equinix.fabric.metro.ot_{:metroCode}.latency",
+                "equinix.fabric.metro.pa_{:metroCode}.latency",
+                "equinix.fabric.metro.pe_{:metroCode}.latency",
+                "equinix.fabric.metro.ph_{:metroCode}.latency",
+                "equinix.fabric.metro.rj_{:metroCode}.latency",
+                "equinix.fabric.metro.se_{:metroCode}.latency",
+                "equinix.fabric.metro.sg_{:metroCode}.latency",
+                "equinix.fabric.metro.sk_{:metroCode}.latency",
+                "equinix.fabric.metro.sl_{:metroCode}.latency",
+                "equinix.fabric.metro.so_{:metroCode}.latency",
+                "equinix.fabric.metro.sp_{:metroCode}.latency",
+                "equinix.fabric.metro.st_{:metroCode}.latency",
+                "equinix.fabric.metro.sv_{:metroCode}.latency",
+                "equinix.fabric.metro.sy_{:metroCode}.latency",
+                "equinix.fabric.metro.tr_{:metroCode}.latency",
+                "equinix.fabric.metro.ty_{:metroCode}.latency",
+                "equinix.fabric.metro.va_{:metroCode}.latency",
+                "equinix.fabric.metro.wa_{:metroCode}.latency",
+                "equinix.fabric.metro.wi_{:metroCode}.latency",
+                "equinix.fabric.metro.zh_{:metroCode}.latency",
+                "equinix.fabric.port.bandwidth_rx.usage",
+                "equinix.fabric.port.bandwidth_tx.usage",
+                "equinix.fabric.port.packets_dropped_rx.count",
+                "equinix.fabric.port.packets_dropped_tx.count",
+                "equinix.fabric.port.packets_erred_rx.count",
+                "equinix.fabric.port.packets_erred_tx.count"
+            ],
+            "preview": []
+        },
+        "alertNames": {
+            "released": [],
+            "preview": []
+        }
     },
     "identity": {
-        "eventTypes": [],
-        "metricNames": []
+        "cloudeventTypes": {
+            "released": [],
+            "preview": []
+        },
+        "metricNames": {
+            "released": [],
+            "preview": []
+        },
+        "alertNames": {
+            "released": [],
+            "preview": []
+        }
     },
     "network_edge": {
-        "eventTypes": [],
-        "metricNames": []
+        "cloudeventTypes": {
+            "released": [],
+            "preview": []
+        },
+        "metricNames": {
+            "released": [],
+            "preview": []
+        },
+        "alertNames": {
+            "released": [],
+            "preview": []
+        }
     },
     "resource_manager": {
-        "eventTypes": [],
-        "metricNames": []
+        "cloudeventTypes": {
+            "released": [],
+            "preview": []
+        },
+        "metricNames": {
+            "released": [],
+            "preview": []
+        },
+        "alertNames": {
+            "released": [],
+            "preview": []
+        }
     }
 }
diff --git a/README.md b/README.md
index cd86c7c..9ead2e7 100644
--- a/README.md
+++ b/README.md
@@ -9,165 +9,217 @@ Definitive "source of truth" for the Equinix Interconnection Observability event
 The following data payloads are the supported events and formats for Equinix Interconnection Observability
 
 <!-- CATALOG_GENERATION_START -->
+---
 ### Equinix Access Manager ChangeEvent
 #### DataSchema [JSON](https://equinix.github.io/equinix-cloudevents/jsonschema/equinix/access_manager/v1/ChangeEvent.json)
 #### Data Type
 `equinix.access_manager.v1.ChangeEvent`
-#### CloudEvent Type(s)
+#### Supported Events, Metrics, and Alerts
 
 
+
+---
 ### Equinix Fabric ChangeAlert
 #### DataSchema [JSON](https://equinix.github.io/equinix-cloudevents/jsonschema/equinix/fabric/v1/ChangeAlert.json)
 #### Data Type
 `equinix.fabric.v1.ChangeAlert`
-#### CloudEvent Type(s)
+#### Supported Events, Metrics, and Alerts
+
 
 
+---
 ### Equinix Fabric ChangeEvent
 #### DataSchema [JSON](https://equinix.github.io/equinix-cloudevents/jsonschema/equinix/fabric/v1/ChangeEvent.json)
 #### Data Type
 `equinix.fabric.v1.ChangeEvent`
-#### CloudEvent Type(s)
-`equinix.fabric.connection.state.pending`<br>
-`equinix.fabric.connection.state.pending_interface_configuration`<br>
-`equinix.fabric.connection.state.provisioning`<br>
-`equinix.fabric.connection.state.provisioned`<br>
-`equinix.fabric.connection.state.deprovisioning`<br>
-`equinix.fabric.connection.state.deprovisioned`<br>
-`equinix.fabric.connection.state.pending_approval`<br>
-`equinix.fabric.connection.attribute.changed`<br>
-`equinix.fabric.connection.status.up`<br>
-`equinix.fabric.connection.status.down`<br>
-`equinix.fabric.connection.bgpipv4_session_status.established`<br>
-`equinix.fabric.connection.bgpipv4_session_status.idle`<br>
-`equinix.fabric.connection.bgpipv4_session_status.connect`<br>
-`equinix.fabric.connection.bgpipv6_session_status.established`<br>
-`equinix.fabric.connection.bgpipv6_session_status.idle`<br>
-`equinix.fabric.connection.bgpipv6_session_status.connect`<br>
-`equinix.fabric.network.state.provisioning`<br>
-`equinix.fabric.network.state.provisioned`<br>
-`equinix.fabric.network.state.deprovisioning`<br>
-`equinix.fabric.network.state.deprovisioned`<br>
-`equinix.fabric.port.state.provisioned`<br>
-`equinix.fabric.port.state.deprovisioned`<br>
-`equinix.fabric.port.state.failed`<br>
-`equinix.fabric.port.status.up`<br>
-`equinix.fabric.port.status.down`<br>
-`equinix.fabric.router.state.provisioning`<br>
-`equinix.fabric.router.state.provisioned`<br>
-`equinix.fabric.router.state.reprovisioning`<br>
-`equinix.fabric.router.state.deprovisioning`<br>
-`equinix.fabric.router.state.deprovisioned`<br>
-`equinix.fabric.router.state.failed`<br>
-`equinix.fabric.router.state.not_provisioned`<br>
-`equinix.fabric.router.state.not_deprovisioned`<br>
-`equinix.fabric.service_token.state.inactive`<br>
-`equinix.fabric.service_token.state.deleted`<br>
-`equinix.fabric.service_token.attribute.changed`
-
+#### Supported Events, Metrics, and Alerts
+#### Events
+
+<details>
+<summary>Released</summary>
+
+`equinix.fabric.connection.attribute.changed` <br>
+`equinix.fabric.connection.bgpipv4_session_status.connect` <br>
+`equinix.fabric.connection.bgpipv4_session_status.established` <br>
+`equinix.fabric.connection.bgpipv4_session_status.idle` <br>
+`equinix.fabric.connection.bgpipv4_session_status.open_confirm` <br>
+`equinix.fabric.connection.bgpipv4_session_status.open_confirm` <br>
+`equinix.fabric.connection.bgpipv4_session_status.open_sent` <br>
+`equinix.fabric.connection.bgpipv4_session_status.open_sent` <br>
+`equinix.fabric.connection.bgpipv6_session_status.connect` <br>
+`equinix.fabric.connection.bgpipv6_session_status.established` <br>
+`equinix.fabric.connection.bgpipv6_session_status.idle` <br>
+`equinix.fabric.connection.state.deprovisioned` <br>
+`equinix.fabric.connection.state.deprovisioning` <br>
+`equinix.fabric.connection.state.pending` <br>
+`equinix.fabric.connection.state.provisioned` <br>
+`equinix.fabric.connection.state.provisioning` <br>
+`equinix.fabric.connection.status.down` <br>
+`equinix.fabric.connection.status.up` <br>
+`equinix.fabric.network.state.deprovisioned` <br>
+`equinix.fabric.network.state.deprovisioning` <br>
+`equinix.fabric.network.state.provisioned` <br>
+`equinix.fabric.network.state.provisioning` <br>
+`equinix.fabric.port.state.deprovisioned` <br>
+`equinix.fabric.port.state.failed` <br>
+`equinix.fabric.port.state.provisioned` <br>
+`equinix.fabric.port.status.down` <br>
+`equinix.fabric.port.status.up` <br>
+`equinix.fabric.router.state.deprovisioned` <br>
+`equinix.fabric.router.state.deprovisioning` <br>
+`equinix.fabric.router.state.failed` <br>
+`equinix.fabric.router.state.not_deprovisioned` <br>
+`equinix.fabric.router.state.not_provisioned` <br>
+`equinix.fabric.router.state.provisioned` <br>
+`equinix.fabric.router.state.provisioning` <br>
+`equinix.fabric.router.state.reprovisioning` <br>
+`equinix.fabric.service_token.attribute.changed` <br>
+`equinix.fabric.service_token.state.deleted` <br>
+`equinix.fabric.service_token.state.inactive`
+
+</details>
+
+
+
+---
 ### Equinix Fabric MetricAlert
 #### DataSchema [JSON](https://equinix.github.io/equinix-cloudevents/jsonschema/equinix/fabric/v1/MetricAlert.json)
 #### Data Type
 `equinix.fabric.v1.MetricAlert`
-#### CloudEvent Type(s)
+#### Supported Events, Metrics, and Alerts
+#### Events
+
+<details>
+<summary>Released</summary>
+
+`equinix.fabric.connection.ipv4_installed_routes.utilization` <br>
+`equinix.fabric.connection.ipv6_installed_routes.utilization` <br>
+`equinix.fabric.router.ipv4_installed_routes.utilization` <br>
+`equinix.fabric.router.ipv6_installed_routes.utilization`
+
+</details>
+
 
 
+---
 ### Equinix Fabric MetricEvent
 #### DataSchema [JSON](https://equinix.github.io/equinix-cloudevents/jsonschema/equinix/fabric/v1/MetricEvent.json)
 #### Data Type
 `equinix.fabric.v1.MetricEvent`
-#### CloudEvent Type(s)
+#### Supported Events, Metrics, and Alerts
+#### Events
+
+<details>
+<summary>Released</summary>
+
 `equinix.fabric.metric`
-#### Metric Name(s)
-`equinix.fabric.connection.bandwidth_rx.usage`<br>
-`equinix.fabric.connection.bandwidth_tx.usage`<br>
-`equinix.fabric.metro.am_{:metroCode}.latency`<br>
-`equinix.fabric.metro.at_{:metroCode}.latency`<br>
-`equinix.fabric.metro.ba_{:metroCode}.latency`<br>
-`equinix.fabric.metro.bg_{:metroCode}.latency`<br>
-`equinix.fabric.metro.bl_{:metroCode}.latency`<br>
-`equinix.fabric.metro.bo_{:metroCode}.latency`<br>
-`equinix.fabric.metro.bx_{:metroCode}.latency`<br>
-`equinix.fabric.metro.ca_{:metroCode}.latency`<br>
-`equinix.fabric.metro.ch_{:metroCode}.latency`<br>
-`equinix.fabric.metro.cl_{:metroCode}.latency`<br>
-`equinix.fabric.metro.cu_{:metroCode}.latency`<br>
-`equinix.fabric.metro.da_{:metroCode}.latency`<br>
-`equinix.fabric.metro.db_{:metroCode}.latency`<br>
-`equinix.fabric.metro.dc_{:metroCode}.latency`<br>
-`equinix.fabric.metro.de_{:metroCode}.latency`<br>
-`equinix.fabric.metro.dx_{:metroCode}.latency`<br>
-`equinix.fabric.metro.fr_{:metroCode}.latency`<br>
-`equinix.fabric.metro.gv_{:metroCode}.latency`<br>
-`equinix.fabric.metro.he_{:metroCode}.latency`<br>
-`equinix.fabric.metro.hh_{:metroCode}.latency`<br>
-`equinix.fabric.metro.hk_{:metroCode}.latency`<br>
-`equinix.fabric.metro.ho_{:metroCode}.latency`<br>
-`equinix.fabric.metro.il_{:metroCode}.latency`<br>
-`equinix.fabric.metro.jh_{:metroCode}.latency`<br>
-`equinix.fabric.metro.ka_{:metroCode}.latency`<br>
-`equinix.fabric.metro.kl_{:metroCode}.latency`<br>
-`equinix.fabric.metro.la_{:metroCode}.latency`<br>
-`equinix.fabric.metro.ld_{:metroCode}.latency`<br>
-`equinix.fabric.metro.lm_{:metroCode}.latency`<br>
-`equinix.fabric.metro.ls_{:metroCode}.latency`<br>
-`equinix.fabric.metro.ma_{:metroCode}.latency`<br>
-`equinix.fabric.metro.mb_{:metroCode}.latency`<br>
-`equinix.fabric.metro.md_{:metroCode}.latency`<br>
-`equinix.fabric.metro.me_{:metroCode}.latency`<br>
-`equinix.fabric.metro.mi_{:metroCode}.latency`<br>
-`equinix.fabric.metro.ml_{:metroCode}.latency`<br>
-`equinix.fabric.metro.mo_{:metroCode}.latency`<br>
-`equinix.fabric.metro.mt_{:metroCode}.latency`<br>
-`equinix.fabric.metro.mu_{:metroCode}.latency`<br>
-`equinix.fabric.metro.mx_{:metroCode}.latency`<br>
-`equinix.fabric.metro.ny_{:metroCode}.latency`<br>
-`equinix.fabric.metro.os_{:metroCode}.latency`<br>
-`equinix.fabric.metro.ot_{:metroCode}.latency`<br>
-`equinix.fabric.metro.pa_{:metroCode}.latency`<br>
-`equinix.fabric.metro.pe_{:metroCode}.latency`<br>
-`equinix.fabric.metro.ph_{:metroCode}.latency`<br>
-`equinix.fabric.metro.rj_{:metroCode}.latency`<br>
-`equinix.fabric.metro.se_{:metroCode}.latency`<br>
-`equinix.fabric.metro.sg_{:metroCode}.latency`<br>
-`equinix.fabric.metro.sk_{:metroCode}.latency`<br>
-`equinix.fabric.metro.sl_{:metroCode}.latency`<br>
-`equinix.fabric.metro.so_{:metroCode}.latency`<br>
-`equinix.fabric.metro.sp_{:metroCode}.latency`<br>
-`equinix.fabric.metro.st_{:metroCode}.latency`<br>
-`equinix.fabric.metro.sv_{:metroCode}.latency`<br>
-`equinix.fabric.metro.sy_{:metroCode}.latency`<br>
-`equinix.fabric.metro.tr_{:metroCode}.latency`<br>
-`equinix.fabric.metro.ty_{:metroCode}.latency`<br>
-`equinix.fabric.metro.va_{:metroCode}.latency`<br>
-`equinix.fabric.metro.wa_{:metroCode}.latency`<br>
-`equinix.fabric.metro.wi_{:metroCode}.latency`<br>
-`equinix.fabric.metro.zh_{:metroCode}.latency`<br>
-`equinix.fabric.port.bandwidth_rx.usage`<br>
-`equinix.fabric.port.bandwidth_tx.usage`<br>
-`equinix.fabric.port.packets_erred_rx.count`<br>
-`equinix.fabric.port.packets_erred_tx.count`<br>
-`equinix.fabric.port.packets_dropped_rx.count`<br>
-`equinix.fabric.port.packets_dropped_tx.count`
+
+</details>
+
+#### Metrics
+
+<details>
+<summary>Released</summary>
+
+`equinix.fabric.connection.bandwidth_rx.usage` <br>
+`equinix.fabric.connection.bandwidth_tx.usage` <br>
+`equinix.fabric.metro.am_{:metroCode}.latency` <br>
+`equinix.fabric.metro.at_{:metroCode}.latency` <br>
+`equinix.fabric.metro.ba_{:metroCode}.latency` <br>
+`equinix.fabric.metro.bg_{:metroCode}.latency` <br>
+`equinix.fabric.metro.bl_{:metroCode}.latency` <br>
+`equinix.fabric.metro.bo_{:metroCode}.latency` <br>
+`equinix.fabric.metro.bx_{:metroCode}.latency` <br>
+`equinix.fabric.metro.ca_{:metroCode}.latency` <br>
+`equinix.fabric.metro.ch_{:metroCode}.latency` <br>
+`equinix.fabric.metro.cl_{:metroCode}.latency` <br>
+`equinix.fabric.metro.cu_{:metroCode}.latency` <br>
+`equinix.fabric.metro.da_{:metroCode}.latency` <br>
+`equinix.fabric.metro.db_{:metroCode}.latency` <br>
+`equinix.fabric.metro.dc_{:metroCode}.latency` <br>
+`equinix.fabric.metro.de_{:metroCode}.latency` <br>
+`equinix.fabric.metro.dx_{:metroCode}.latency` <br>
+`equinix.fabric.metro.fr_{:metroCode}.latency` <br>
+`equinix.fabric.metro.gv_{:metroCode}.latency` <br>
+`equinix.fabric.metro.he_{:metroCode}.latency` <br>
+`equinix.fabric.metro.hh_{:metroCode}.latency` <br>
+`equinix.fabric.metro.hk_{:metroCode}.latency` <br>
+`equinix.fabric.metro.ho_{:metroCode}.latency` <br>
+`equinix.fabric.metro.il_{:metroCode}.latency` <br>
+`equinix.fabric.metro.jh_{:metroCode}.latency` <br>
+`equinix.fabric.metro.ka_{:metroCode}.latency` <br>
+`equinix.fabric.metro.kl_{:metroCode}.latency` <br>
+`equinix.fabric.metro.la_{:metroCode}.latency` <br>
+`equinix.fabric.metro.ld_{:metroCode}.latency` <br>
+`equinix.fabric.metro.lm_{:metroCode}.latency` <br>
+`equinix.fabric.metro.ls_{:metroCode}.latency` <br>
+`equinix.fabric.metro.ma_{:metroCode}.latency` <br>
+`equinix.fabric.metro.mb_{:metroCode}.latency` <br>
+`equinix.fabric.metro.md_{:metroCode}.latency` <br>
+`equinix.fabric.metro.me_{:metroCode}.latency` <br>
+`equinix.fabric.metro.mi_{:metroCode}.latency` <br>
+`equinix.fabric.metro.ml_{:metroCode}.latency` <br>
+`equinix.fabric.metro.mo_{:metroCode}.latency` <br>
+`equinix.fabric.metro.mt_{:metroCode}.latency` <br>
+`equinix.fabric.metro.mu_{:metroCode}.latency` <br>
+`equinix.fabric.metro.mx_{:metroCode}.latency` <br>
+`equinix.fabric.metro.ny_{:metroCode}.latency` <br>
+`equinix.fabric.metro.os_{:metroCode}.latency` <br>
+`equinix.fabric.metro.ot_{:metroCode}.latency` <br>
+`equinix.fabric.metro.pa_{:metroCode}.latency` <br>
+`equinix.fabric.metro.pe_{:metroCode}.latency` <br>
+`equinix.fabric.metro.ph_{:metroCode}.latency` <br>
+`equinix.fabric.metro.rj_{:metroCode}.latency` <br>
+`equinix.fabric.metro.se_{:metroCode}.latency` <br>
+`equinix.fabric.metro.sg_{:metroCode}.latency` <br>
+`equinix.fabric.metro.sk_{:metroCode}.latency` <br>
+`equinix.fabric.metro.sl_{:metroCode}.latency` <br>
+`equinix.fabric.metro.so_{:metroCode}.latency` <br>
+`equinix.fabric.metro.sp_{:metroCode}.latency` <br>
+`equinix.fabric.metro.st_{:metroCode}.latency` <br>
+`equinix.fabric.metro.sv_{:metroCode}.latency` <br>
+`equinix.fabric.metro.sy_{:metroCode}.latency` <br>
+`equinix.fabric.metro.tr_{:metroCode}.latency` <br>
+`equinix.fabric.metro.ty_{:metroCode}.latency` <br>
+`equinix.fabric.metro.va_{:metroCode}.latency` <br>
+`equinix.fabric.metro.wa_{:metroCode}.latency` <br>
+`equinix.fabric.metro.wi_{:metroCode}.latency` <br>
+`equinix.fabric.metro.zh_{:metroCode}.latency` <br>
+`equinix.fabric.port.bandwidth_rx.usage` <br>
+`equinix.fabric.port.bandwidth_tx.usage` <br>
+`equinix.fabric.port.packets_dropped_rx.count` <br>
+`equinix.fabric.port.packets_dropped_tx.count` <br>
+`equinix.fabric.port.packets_erred_rx.count` <br>
+`equinix.fabric.port.packets_erred_tx.count`
+
+</details>
+
+
+---
 ### Equinix Identity ChangeEvent
 #### DataSchema [JSON](https://equinix.github.io/equinix-cloudevents/jsonschema/equinix/identity/v1/ChangeEvent.json)
 #### Data Type
 `equinix.identity.v1.ChangeEvent`
-#### CloudEvent Type(s)
+#### Supported Events, Metrics, and Alerts
 
 
+
+---
 ### Equinix Network Edge ChangeEvent
 #### DataSchema [JSON](https://equinix.github.io/equinix-cloudevents/jsonschema/equinix/network_edge/v1/ChangeEvent.json)
 #### Data Type
 `equinix.network_edge.v1.ChangeEvent`
-#### CloudEvent Type(s)
+#### Supported Events, Metrics, and Alerts
+
 
 
+---
 ### Equinix Resource Manager ChangeEvent
 #### DataSchema [JSON](https://equinix.github.io/equinix-cloudevents/jsonschema/equinix/resource_manager/v1/ChangeEvent.json)
 #### Data Type
 `equinix.resource_manager.v1.ChangeEvent`
-#### CloudEvent Type(s)
+#### Supported Events, Metrics, and Alerts
+
 
 
 <!-- CATALOG_GENERATION_END -->
diff --git a/jsonschema/catalog.json b/jsonschema/catalog.json
index 7eb3d3d..14feb89 100644
--- a/jsonschema/catalog.json
+++ b/jsonschema/catalog.json
@@ -8,7 +8,18 @@
             "name": "ChangeEvent",
             "description": "The data within all ChangeEvent events.",
             "datatype": "equinix.access_manager.v1.ChangeEvent",
-            "cloudeventTypes": []
+            "cloudeventTypes": {
+                "released": [],
+                "preview": []
+            },
+            "metricNames": {
+                "released": [],
+                "preview": []
+            },
+            "alertNames": {
+                "released": [],
+                "preview": []
+            }
         },
         {
             "url": "https://equinix.github.io/equinix-cloudevents/jsonschema/equinix/fabric/v1/ChangeAlert.json",
@@ -16,7 +27,18 @@
             "name": "ChangeAlert",
             "description": "The data within all ChangeAlert events.",
             "datatype": "equinix.fabric.v1.ChangeAlert",
-            "cloudeventTypes": []
+            "cloudeventTypes": {
+                "released": [],
+                "preview": []
+            },
+            "metricNames": {
+                "released": [],
+                "preview": []
+            },
+            "alertNames": {
+                "released": [],
+                "preview": []
+            }
         },
         {
             "url": "https://equinix.github.io/equinix-cloudevents/jsonschema/equinix/fabric/v1/ChangeEvent.json",
@@ -24,44 +46,57 @@
             "name": "ChangeEvent",
             "description": "The data within all ChangeEvent events.",
             "datatype": "equinix.fabric.v1.ChangeEvent",
-            "cloudeventTypes": [
-                "equinix.fabric.connection.state.pending",
-                "equinix.fabric.connection.state.pending_interface_configuration",
-                "equinix.fabric.connection.state.provisioning",
-                "equinix.fabric.connection.state.provisioned",
-                "equinix.fabric.connection.state.deprovisioning",
-                "equinix.fabric.connection.state.deprovisioned",
-                "equinix.fabric.connection.state.pending_approval",
-                "equinix.fabric.connection.attribute.changed",
-                "equinix.fabric.connection.status.up",
-                "equinix.fabric.connection.status.down",
-                "equinix.fabric.connection.bgpipv4_session_status.established",
-                "equinix.fabric.connection.bgpipv4_session_status.idle",
-                "equinix.fabric.connection.bgpipv4_session_status.connect",
-                "equinix.fabric.connection.bgpipv6_session_status.established",
-                "equinix.fabric.connection.bgpipv6_session_status.idle",
-                "equinix.fabric.connection.bgpipv6_session_status.connect",
-                "equinix.fabric.network.state.provisioning",
-                "equinix.fabric.network.state.provisioned",
-                "equinix.fabric.network.state.deprovisioning",
-                "equinix.fabric.network.state.deprovisioned",
-                "equinix.fabric.port.state.provisioned",
-                "equinix.fabric.port.state.deprovisioned",
-                "equinix.fabric.port.state.failed",
-                "equinix.fabric.port.status.up",
-                "equinix.fabric.port.status.down",
-                "equinix.fabric.router.state.provisioning",
-                "equinix.fabric.router.state.provisioned",
-                "equinix.fabric.router.state.reprovisioning",
-                "equinix.fabric.router.state.deprovisioning",
-                "equinix.fabric.router.state.deprovisioned",
-                "equinix.fabric.router.state.failed",
-                "equinix.fabric.router.state.not_provisioned",
-                "equinix.fabric.router.state.not_deprovisioned",
-                "equinix.fabric.service_token.state.inactive",
-                "equinix.fabric.service_token.state.deleted",
-                "equinix.fabric.service_token.attribute.changed"
-            ]
+            "cloudeventTypes": {
+                "released": [
+                    "equinix.fabric.connection.attribute.changed",
+                    "equinix.fabric.connection.bgpipv4_session_status.connect",
+                    "equinix.fabric.connection.bgpipv4_session_status.established",
+                    "equinix.fabric.connection.bgpipv4_session_status.idle",
+                    "equinix.fabric.connection.bgpipv4_session_status.open_confirm",
+                    "equinix.fabric.connection.bgpipv4_session_status.open_confirm",
+                    "equinix.fabric.connection.bgpipv4_session_status.open_sent",
+                    "equinix.fabric.connection.bgpipv4_session_status.open_sent",
+                    "equinix.fabric.connection.bgpipv6_session_status.connect",
+                    "equinix.fabric.connection.bgpipv6_session_status.established",
+                    "equinix.fabric.connection.bgpipv6_session_status.idle",
+                    "equinix.fabric.connection.state.deprovisioned",
+                    "equinix.fabric.connection.state.deprovisioning",
+                    "equinix.fabric.connection.state.pending",
+                    "equinix.fabric.connection.state.provisioned",
+                    "equinix.fabric.connection.state.provisioning",
+                    "equinix.fabric.connection.status.down",
+                    "equinix.fabric.connection.status.up",
+                    "equinix.fabric.network.state.deprovisioned",
+                    "equinix.fabric.network.state.deprovisioning",
+                    "equinix.fabric.network.state.provisioned",
+                    "equinix.fabric.network.state.provisioning",
+                    "equinix.fabric.port.state.deprovisioned",
+                    "equinix.fabric.port.state.failed",
+                    "equinix.fabric.port.state.provisioned",
+                    "equinix.fabric.port.status.down",
+                    "equinix.fabric.port.status.up",
+                    "equinix.fabric.router.state.deprovisioned",
+                    "equinix.fabric.router.state.deprovisioning",
+                    "equinix.fabric.router.state.failed",
+                    "equinix.fabric.router.state.not_deprovisioned",
+                    "equinix.fabric.router.state.not_provisioned",
+                    "equinix.fabric.router.state.provisioned",
+                    "equinix.fabric.router.state.provisioning",
+                    "equinix.fabric.router.state.reprovisioning",
+                    "equinix.fabric.service_token.attribute.changed",
+                    "equinix.fabric.service_token.state.deleted",
+                    "equinix.fabric.service_token.state.inactive"
+                ],
+                "preview": []
+            },
+            "metricNames": {
+                "released": [],
+                "preview": []
+            },
+            "alertNames": {
+                "released": [],
+                "preview": []
+            }
         },
         {
             "url": "https://equinix.github.io/equinix-cloudevents/jsonschema/equinix/fabric/v1/MetricAlert.json",
@@ -69,7 +104,23 @@
             "name": "MetricAlert",
             "description": "The data within all MetricAlert events.",
             "datatype": "equinix.fabric.v1.MetricAlert",
-            "cloudeventTypes": []
+            "cloudeventTypes": {
+                "released": [
+                    "equinix.fabric.connection.ipv4_installed_routes.utilization",
+                    "equinix.fabric.connection.ipv6_installed_routes.utilization",
+                    "equinix.fabric.router.ipv4_installed_routes.utilization",
+                    "equinix.fabric.router.ipv6_installed_routes.utilization"
+                ],
+                "preview": []
+            },
+            "metricNames": {
+                "released": [],
+                "preview": []
+            },
+            "alertNames": {
+                "released": [],
+                "preview": []
+            }
         },
         {
             "url": "https://equinix.github.io/equinix-cloudevents/jsonschema/equinix/fabric/v1/MetricEvent.json",
@@ -77,81 +128,91 @@
             "name": "MetricEvent",
             "description": "The data within all MetricEvent events.",
             "datatype": "equinix.fabric.v1.MetricEvent",
-            "cloudeventTypes": [
-                "equinix.fabric.metric"
-            ],
-            "metricNames": [
-                "equinix.fabric.connection.bandwidth_rx.usage",
-                "equinix.fabric.connection.bandwidth_tx.usage",
-                "equinix.fabric.metro.am_{:metroCode}.latency",
-                "equinix.fabric.metro.at_{:metroCode}.latency",
-                "equinix.fabric.metro.ba_{:metroCode}.latency",
-                "equinix.fabric.metro.bg_{:metroCode}.latency",
-                "equinix.fabric.metro.bl_{:metroCode}.latency",
-                "equinix.fabric.metro.bo_{:metroCode}.latency",
-                "equinix.fabric.metro.bx_{:metroCode}.latency",
-                "equinix.fabric.metro.ca_{:metroCode}.latency",
-                "equinix.fabric.metro.ch_{:metroCode}.latency",
-                "equinix.fabric.metro.cl_{:metroCode}.latency",
-                "equinix.fabric.metro.cu_{:metroCode}.latency",
-                "equinix.fabric.metro.da_{:metroCode}.latency",
-                "equinix.fabric.metro.db_{:metroCode}.latency",
-                "equinix.fabric.metro.dc_{:metroCode}.latency",
-                "equinix.fabric.metro.de_{:metroCode}.latency",
-                "equinix.fabric.metro.dx_{:metroCode}.latency",
-                "equinix.fabric.metro.fr_{:metroCode}.latency",
-                "equinix.fabric.metro.gv_{:metroCode}.latency",
-                "equinix.fabric.metro.he_{:metroCode}.latency",
-                "equinix.fabric.metro.hh_{:metroCode}.latency",
-                "equinix.fabric.metro.hk_{:metroCode}.latency",
-                "equinix.fabric.metro.ho_{:metroCode}.latency",
-                "equinix.fabric.metro.il_{:metroCode}.latency",
-                "equinix.fabric.metro.jh_{:metroCode}.latency",
-                "equinix.fabric.metro.ka_{:metroCode}.latency",
-                "equinix.fabric.metro.kl_{:metroCode}.latency",
-                "equinix.fabric.metro.la_{:metroCode}.latency",
-                "equinix.fabric.metro.ld_{:metroCode}.latency",
-                "equinix.fabric.metro.lm_{:metroCode}.latency",
-                "equinix.fabric.metro.ls_{:metroCode}.latency",
-                "equinix.fabric.metro.ma_{:metroCode}.latency",
-                "equinix.fabric.metro.mb_{:metroCode}.latency",
-                "equinix.fabric.metro.md_{:metroCode}.latency",
-                "equinix.fabric.metro.me_{:metroCode}.latency",
-                "equinix.fabric.metro.mi_{:metroCode}.latency",
-                "equinix.fabric.metro.ml_{:metroCode}.latency",
-                "equinix.fabric.metro.mo_{:metroCode}.latency",
-                "equinix.fabric.metro.mt_{:metroCode}.latency",
-                "equinix.fabric.metro.mu_{:metroCode}.latency",
-                "equinix.fabric.metro.mx_{:metroCode}.latency",
-                "equinix.fabric.metro.ny_{:metroCode}.latency",
-                "equinix.fabric.metro.os_{:metroCode}.latency",
-                "equinix.fabric.metro.ot_{:metroCode}.latency",
-                "equinix.fabric.metro.pa_{:metroCode}.latency",
-                "equinix.fabric.metro.pe_{:metroCode}.latency",
-                "equinix.fabric.metro.ph_{:metroCode}.latency",
-                "equinix.fabric.metro.rj_{:metroCode}.latency",
-                "equinix.fabric.metro.se_{:metroCode}.latency",
-                "equinix.fabric.metro.sg_{:metroCode}.latency",
-                "equinix.fabric.metro.sk_{:metroCode}.latency",
-                "equinix.fabric.metro.sl_{:metroCode}.latency",
-                "equinix.fabric.metro.so_{:metroCode}.latency",
-                "equinix.fabric.metro.sp_{:metroCode}.latency",
-                "equinix.fabric.metro.st_{:metroCode}.latency",
-                "equinix.fabric.metro.sv_{:metroCode}.latency",
-                "equinix.fabric.metro.sy_{:metroCode}.latency",
-                "equinix.fabric.metro.tr_{:metroCode}.latency",
-                "equinix.fabric.metro.ty_{:metroCode}.latency",
-                "equinix.fabric.metro.va_{:metroCode}.latency",
-                "equinix.fabric.metro.wa_{:metroCode}.latency",
-                "equinix.fabric.metro.wi_{:metroCode}.latency",
-                "equinix.fabric.metro.zh_{:metroCode}.latency",
-                "equinix.fabric.port.bandwidth_rx.usage",
-                "equinix.fabric.port.bandwidth_tx.usage",
-                "equinix.fabric.port.packets_erred_rx.count",
-                "equinix.fabric.port.packets_erred_tx.count",
-                "equinix.fabric.port.packets_dropped_rx.count",
-                "equinix.fabric.port.packets_dropped_tx.count"
-            ]
+            "cloudeventTypes": {
+                "released": [
+                    "equinix.fabric.metric"
+                ],
+                "preview": []
+            },
+            "metricNames": {
+                "released": [
+                    "equinix.fabric.connection.bandwidth_rx.usage",
+                    "equinix.fabric.connection.bandwidth_tx.usage",
+                    "equinix.fabric.metro.am_{:metroCode}.latency",
+                    "equinix.fabric.metro.at_{:metroCode}.latency",
+                    "equinix.fabric.metro.ba_{:metroCode}.latency",
+                    "equinix.fabric.metro.bg_{:metroCode}.latency",
+                    "equinix.fabric.metro.bl_{:metroCode}.latency",
+                    "equinix.fabric.metro.bo_{:metroCode}.latency",
+                    "equinix.fabric.metro.bx_{:metroCode}.latency",
+                    "equinix.fabric.metro.ca_{:metroCode}.latency",
+                    "equinix.fabric.metro.ch_{:metroCode}.latency",
+                    "equinix.fabric.metro.cl_{:metroCode}.latency",
+                    "equinix.fabric.metro.cu_{:metroCode}.latency",
+                    "equinix.fabric.metro.da_{:metroCode}.latency",
+                    "equinix.fabric.metro.db_{:metroCode}.latency",
+                    "equinix.fabric.metro.dc_{:metroCode}.latency",
+                    "equinix.fabric.metro.de_{:metroCode}.latency",
+                    "equinix.fabric.metro.dx_{:metroCode}.latency",
+                    "equinix.fabric.metro.fr_{:metroCode}.latency",
+                    "equinix.fabric.metro.gv_{:metroCode}.latency",
+                    "equinix.fabric.metro.he_{:metroCode}.latency",
+                    "equinix.fabric.metro.hh_{:metroCode}.latency",
+                    "equinix.fabric.metro.hk_{:metroCode}.latency",
+                    "equinix.fabric.metro.ho_{:metroCode}.latency",
+                    "equinix.fabric.metro.il_{:metroCode}.latency",
+                    "equinix.fabric.metro.jh_{:metroCode}.latency",
+                    "equinix.fabric.metro.ka_{:metroCode}.latency",
+                    "equinix.fabric.metro.kl_{:metroCode}.latency",
+                    "equinix.fabric.metro.la_{:metroCode}.latency",
+                    "equinix.fabric.metro.ld_{:metroCode}.latency",
+                    "equinix.fabric.metro.lm_{:metroCode}.latency",
+                    "equinix.fabric.metro.ls_{:metroCode}.latency",
+                    "equinix.fabric.metro.ma_{:metroCode}.latency",
+                    "equinix.fabric.metro.mb_{:metroCode}.latency",
+                    "equinix.fabric.metro.md_{:metroCode}.latency",
+                    "equinix.fabric.metro.me_{:metroCode}.latency",
+                    "equinix.fabric.metro.mi_{:metroCode}.latency",
+                    "equinix.fabric.metro.ml_{:metroCode}.latency",
+                    "equinix.fabric.metro.mo_{:metroCode}.latency",
+                    "equinix.fabric.metro.mt_{:metroCode}.latency",
+                    "equinix.fabric.metro.mu_{:metroCode}.latency",
+                    "equinix.fabric.metro.mx_{:metroCode}.latency",
+                    "equinix.fabric.metro.ny_{:metroCode}.latency",
+                    "equinix.fabric.metro.os_{:metroCode}.latency",
+                    "equinix.fabric.metro.ot_{:metroCode}.latency",
+                    "equinix.fabric.metro.pa_{:metroCode}.latency",
+                    "equinix.fabric.metro.pe_{:metroCode}.latency",
+                    "equinix.fabric.metro.ph_{:metroCode}.latency",
+                    "equinix.fabric.metro.rj_{:metroCode}.latency",
+                    "equinix.fabric.metro.se_{:metroCode}.latency",
+                    "equinix.fabric.metro.sg_{:metroCode}.latency",
+                    "equinix.fabric.metro.sk_{:metroCode}.latency",
+                    "equinix.fabric.metro.sl_{:metroCode}.latency",
+                    "equinix.fabric.metro.so_{:metroCode}.latency",
+                    "equinix.fabric.metro.sp_{:metroCode}.latency",
+                    "equinix.fabric.metro.st_{:metroCode}.latency",
+                    "equinix.fabric.metro.sv_{:metroCode}.latency",
+                    "equinix.fabric.metro.sy_{:metroCode}.latency",
+                    "equinix.fabric.metro.tr_{:metroCode}.latency",
+                    "equinix.fabric.metro.ty_{:metroCode}.latency",
+                    "equinix.fabric.metro.va_{:metroCode}.latency",
+                    "equinix.fabric.metro.wa_{:metroCode}.latency",
+                    "equinix.fabric.metro.wi_{:metroCode}.latency",
+                    "equinix.fabric.metro.zh_{:metroCode}.latency",
+                    "equinix.fabric.port.bandwidth_rx.usage",
+                    "equinix.fabric.port.bandwidth_tx.usage",
+                    "equinix.fabric.port.packets_dropped_rx.count",
+                    "equinix.fabric.port.packets_dropped_tx.count",
+                    "equinix.fabric.port.packets_erred_rx.count",
+                    "equinix.fabric.port.packets_erred_tx.count"
+                ],
+                "preview": []
+            },
+            "alertNames": {
+                "released": [],
+                "preview": []
+            }
         },
         {
             "url": "https://equinix.github.io/equinix-cloudevents/jsonschema/equinix/identity/v1/ChangeEvent.json",
@@ -159,7 +220,18 @@
             "name": "ChangeEvent",
             "description": "The data within all ChangeEvent events.",
             "datatype": "equinix.identity.v1.ChangeEvent",
-            "cloudeventTypes": []
+            "cloudeventTypes": {
+                "released": [],
+                "preview": []
+            },
+            "metricNames": {
+                "released": [],
+                "preview": []
+            },
+            "alertNames": {
+                "released": [],
+                "preview": []
+            }
         },
         {
             "url": "https://equinix.github.io/equinix-cloudevents/jsonschema/equinix/network_edge/v1/ChangeEvent.json",
@@ -167,7 +239,18 @@
             "name": "ChangeEvent",
             "description": "The data within all ChangeEvent events.",
             "datatype": "equinix.network_edge.v1.ChangeEvent",
-            "cloudeventTypes": []
+            "cloudeventTypes": {
+                "released": [],
+                "preview": []
+            },
+            "metricNames": {
+                "released": [],
+                "preview": []
+            },
+            "alertNames": {
+                "released": [],
+                "preview": []
+            }
         },
         {
             "url": "https://equinix.github.io/equinix-cloudevents/jsonschema/equinix/resource_manager/v1/ChangeEvent.json",
@@ -175,7 +258,18 @@
             "name": "ChangeEvent",
             "description": "The data within all ChangeEvent events.",
             "datatype": "equinix.resource_manager.v1.ChangeEvent",
-            "cloudeventTypes": []
+            "cloudeventTypes": {
+                "released": [],
+                "preview": []
+            },
+            "metricNames": {
+                "released": [],
+                "preview": []
+            },
+            "alertNames": {
+                "released": [],
+                "preview": []
+            }
         }
     ]
 }
diff --git a/jsonschema/equinix/access_manager/v1/ChangeEvent.json b/jsonschema/equinix/access_manager/v1/ChangeEvent.json
index 0a8c02d..576539c 100644
--- a/jsonschema/equinix/access_manager/v1/ChangeEvent.json
+++ b/jsonschema/equinix/access_manager/v1/ChangeEvent.json
@@ -4,8 +4,6 @@
     "examples": [],
     "package": "equinix.access_manager.v1",
     "datatype": "equinix.access_manager.v1.ChangeEvent",
-    "cloudeventTypes": [
-    ],
     "domain": "Equinix Access Manager ChangeEvent",
     "$schema": "http://json-schema.org/draft-04/schema#",
     "$ref": "#/definitions/Data",
@@ -33,5 +31,17 @@
             "title": "Resource",
             "description": "Schema of the resource that fired the event"
         }
+    },
+    "cloudeventTypes": {
+        "released": [],
+        "preview": []
+    },
+    "metricNames": {
+        "released": [],
+        "preview": []
+    },
+    "alertNames": {
+        "released": [],
+        "preview": []
     }
 }
diff --git a/jsonschema/equinix/fabric/v1/ChangeAlert.json b/jsonschema/equinix/fabric/v1/ChangeAlert.json
index 4c0d903..76f5b7f 100644
--- a/jsonschema/equinix/fabric/v1/ChangeAlert.json
+++ b/jsonschema/equinix/fabric/v1/ChangeAlert.json
@@ -4,7 +4,6 @@
     "examples": [],
     "package": "equinix.fabric.v1",
     "datatype": "equinix.fabric.v1.ChangeAlert",
-    "cloudeventTypes": [],
     "domain": "Equinix Fabric ChangeAlert",
     "$schema": "http://json-schema.org/draft-04/schema#",
     "$ref": "#/definitions/Data",
@@ -151,5 +150,17 @@
             "title": "ChangeData",
             "description": "ChangeData attribute schema"
         }
+    },
+    "cloudeventTypes": {
+        "released": [],
+        "preview": []
+    },
+    "metricNames": {
+        "released": [],
+        "preview": []
+    },
+    "alertNames": {
+        "released": [],
+        "preview": []
     }
 }
diff --git a/jsonschema/equinix/fabric/v1/ChangeEvent.json b/jsonschema/equinix/fabric/v1/ChangeEvent.json
index 949c3a0..f7712b1 100644
--- a/jsonschema/equinix/fabric/v1/ChangeEvent.json
+++ b/jsonschema/equinix/fabric/v1/ChangeEvent.json
@@ -4,44 +4,6 @@
     "examples": [],
     "package": "equinix.fabric.v1",
     "datatype": "equinix.fabric.v1.ChangeEvent",
-    "cloudeventTypes": [
-        "equinix.fabric.connection.state.pending",
-        "equinix.fabric.connection.state.pending_interface_configuration",
-        "equinix.fabric.connection.state.provisioning",
-        "equinix.fabric.connection.state.provisioned",
-        "equinix.fabric.connection.state.deprovisioning",
-        "equinix.fabric.connection.state.deprovisioned",
-        "equinix.fabric.connection.state.pending_approval",
-        "equinix.fabric.connection.attribute.changed",
-        "equinix.fabric.connection.status.up",
-        "equinix.fabric.connection.status.down",
-        "equinix.fabric.connection.bgpipv4_session_status.established",
-        "equinix.fabric.connection.bgpipv4_session_status.idle",
-        "equinix.fabric.connection.bgpipv4_session_status.connect",
-        "equinix.fabric.connection.bgpipv6_session_status.established",
-        "equinix.fabric.connection.bgpipv6_session_status.idle",
-        "equinix.fabric.connection.bgpipv6_session_status.connect",
-        "equinix.fabric.network.state.provisioning",
-        "equinix.fabric.network.state.provisioned",
-        "equinix.fabric.network.state.deprovisioning",
-        "equinix.fabric.network.state.deprovisioned",
-        "equinix.fabric.port.state.provisioned",
-        "equinix.fabric.port.state.deprovisioned",
-        "equinix.fabric.port.state.failed",
-        "equinix.fabric.port.status.up",
-        "equinix.fabric.port.status.down",
-        "equinix.fabric.router.state.provisioning",
-        "equinix.fabric.router.state.provisioned",
-        "equinix.fabric.router.state.reprovisioning",
-        "equinix.fabric.router.state.deprovisioning",
-        "equinix.fabric.router.state.deprovisioned",
-        "equinix.fabric.router.state.failed",
-        "equinix.fabric.router.state.not_provisioned",
-        "equinix.fabric.router.state.not_deprovisioned",
-        "equinix.fabric.service_token.state.inactive",
-        "equinix.fabric.service_token.state.deleted",
-        "equinix.fabric.service_token.attribute.changed"
-    ],
     "domain": "Equinix Fabric ChangeEvent",
     "$schema": "http://json-schema.org/draft-04/schema#",
     "$ref": "#/definitions/Data",
@@ -156,5 +118,56 @@
             "title": "ChangeData",
             "description": "ChangeData attribute schema"
         }
+    },
+    "cloudeventTypes": {
+        "released": [
+            "equinix.fabric.connection.state.pending",
+            "equinix.fabric.connection.state.provisioning",
+            "equinix.fabric.connection.state.provisioned",
+            "equinix.fabric.connection.state.deprovisioning",
+            "equinix.fabric.connection.state.deprovisioned",
+            "equinix.fabric.connection.attribute.changed",
+            "equinix.fabric.connection.status.up",
+            "equinix.fabric.connection.status.down",
+            "equinix.fabric.connection.bgpipv4_session_status.established",
+            "equinix.fabric.connection.bgpipv4_session_status.idle",
+            "equinix.fabric.connection.bgpipv4_session_status.connect",
+            "equinix.fabric.connection.bgpipv4_session_status.open_sent",
+            "equinix.fabric.connection.bgpipv4_session_status.open_confirm",
+            "equinix.fabric.connection.bgpipv6_session_status.established",
+            "equinix.fabric.connection.bgpipv6_session_status.idle",
+            "equinix.fabric.connection.bgpipv6_session_status.connect",
+            "equinix.fabric.connection.bgpipv4_session_status.open_sent",
+            "equinix.fabric.connection.bgpipv4_session_status.open_confirm",
+            "equinix.fabric.network.state.provisioning",
+            "equinix.fabric.network.state.provisioned",
+            "equinix.fabric.network.state.deprovisioning",
+            "equinix.fabric.network.state.deprovisioned",
+            "equinix.fabric.port.state.provisioned",
+            "equinix.fabric.port.state.deprovisioned",
+            "equinix.fabric.port.state.failed",
+            "equinix.fabric.port.status.up",
+            "equinix.fabric.port.status.down",
+            "equinix.fabric.router.state.provisioning",
+            "equinix.fabric.router.state.provisioned",
+            "equinix.fabric.router.state.reprovisioning",
+            "equinix.fabric.router.state.deprovisioning",
+            "equinix.fabric.router.state.deprovisioned",
+            "equinix.fabric.router.state.failed",
+            "equinix.fabric.router.state.not_provisioned",
+            "equinix.fabric.router.state.not_deprovisioned",
+            "equinix.fabric.service_token.state.inactive",
+            "equinix.fabric.service_token.state.deleted",
+            "equinix.fabric.service_token.attribute.changed"
+        ],
+        "preview": []
+    },
+    "metricNames": {
+        "released": [],
+        "preview": []
+    },
+    "alertNames": {
+        "released": [],
+        "preview": []
     }
 }
diff --git a/jsonschema/equinix/fabric/v1/MetricAlert.json b/jsonschema/equinix/fabric/v1/MetricAlert.json
index bd5d42e..2aa4090 100644
--- a/jsonschema/equinix/fabric/v1/MetricAlert.json
+++ b/jsonschema/equinix/fabric/v1/MetricAlert.json
@@ -4,7 +4,6 @@
     "examples": [],
     "package": "equinix.fabric.v1",
     "datatype": "equinix.fabric.v1.MetricAlert",
-    "cloudeventTypes": [],
     "domain": "Equinix Fabric MetricAlert",
     "$schema": "http://json-schema.org/draft-04/schema#",
     "$ref": "#/definitions/Data",
@@ -150,5 +149,22 @@
             "title": "AlertRule",
             "description": "Schema definition of AlertRule data"
         }
+    },
+    "cloudeventTypes": {
+        "released": [
+            "equinix.fabric.connection.ipv4_installed_routes.utilization",
+            "equinix.fabric.connection.ipv6_installed_routes.utilization",
+            "equinix.fabric.router.ipv4_installed_routes.utilization",
+            "equinix.fabric.router.ipv6_installed_routes.utilization"
+        ],
+        "preview": []
+    },
+    "metricNames": {
+        "released": [],
+        "preview": []
+    },
+    "alertNames": {
+        "released": [],
+        "preview": []
     }
 }
diff --git a/jsonschema/equinix/fabric/v1/MetricEvent.json b/jsonschema/equinix/fabric/v1/MetricEvent.json
index 955f6f9..8ca2e10 100644
--- a/jsonschema/equinix/fabric/v1/MetricEvent.json
+++ b/jsonschema/equinix/fabric/v1/MetricEvent.json
@@ -4,84 +4,9 @@
     "examples": [],
     "package": "equinix.fabric.v1",
     "datatype": "equinix.fabric.v1.MetricEvent",
-    "cloudeventTypes": [
-        "equinix.fabric.metric"
-    ],
     "domain": "Equinix Fabric MetricEvent",
     "$schema": "http://json-schema.org/draft-04/schema#",
     "$ref": "#/definitions/Data",
-    "metricNames": [
-        "equinix.fabric.connection.bandwidth_rx.usage",
-        "equinix.fabric.connection.bandwidth_tx.usage",
-        "equinix.fabric.metro.am_{:metroCode}.latency",
-        "equinix.fabric.metro.at_{:metroCode}.latency",
-        "equinix.fabric.metro.ba_{:metroCode}.latency",
-        "equinix.fabric.metro.bg_{:metroCode}.latency",
-        "equinix.fabric.metro.bl_{:metroCode}.latency",
-        "equinix.fabric.metro.bo_{:metroCode}.latency",
-        "equinix.fabric.metro.bx_{:metroCode}.latency",
-        "equinix.fabric.metro.ca_{:metroCode}.latency",
-        "equinix.fabric.metro.ch_{:metroCode}.latency",
-        "equinix.fabric.metro.cl_{:metroCode}.latency",
-        "equinix.fabric.metro.cu_{:metroCode}.latency",
-        "equinix.fabric.metro.da_{:metroCode}.latency",
-        "equinix.fabric.metro.db_{:metroCode}.latency",
-        "equinix.fabric.metro.dc_{:metroCode}.latency",
-        "equinix.fabric.metro.de_{:metroCode}.latency",
-        "equinix.fabric.metro.dx_{:metroCode}.latency",
-        "equinix.fabric.metro.fr_{:metroCode}.latency",
-        "equinix.fabric.metro.gv_{:metroCode}.latency",
-        "equinix.fabric.metro.he_{:metroCode}.latency",
-        "equinix.fabric.metro.hh_{:metroCode}.latency",
-        "equinix.fabric.metro.hk_{:metroCode}.latency",
-        "equinix.fabric.metro.ho_{:metroCode}.latency",
-        "equinix.fabric.metro.il_{:metroCode}.latency",
-        "equinix.fabric.metro.jh_{:metroCode}.latency",
-        "equinix.fabric.metro.ka_{:metroCode}.latency",
-        "equinix.fabric.metro.kl_{:metroCode}.latency",
-        "equinix.fabric.metro.la_{:metroCode}.latency",
-        "equinix.fabric.metro.ld_{:metroCode}.latency",
-        "equinix.fabric.metro.lm_{:metroCode}.latency",
-        "equinix.fabric.metro.ls_{:metroCode}.latency",
-        "equinix.fabric.metro.ma_{:metroCode}.latency",
-        "equinix.fabric.metro.mb_{:metroCode}.latency",
-        "equinix.fabric.metro.md_{:metroCode}.latency",
-        "equinix.fabric.metro.me_{:metroCode}.latency",
-        "equinix.fabric.metro.mi_{:metroCode}.latency",
-        "equinix.fabric.metro.ml_{:metroCode}.latency",
-        "equinix.fabric.metro.mo_{:metroCode}.latency",
-        "equinix.fabric.metro.mt_{:metroCode}.latency",
-        "equinix.fabric.metro.mu_{:metroCode}.latency",
-        "equinix.fabric.metro.mx_{:metroCode}.latency",
-        "equinix.fabric.metro.ny_{:metroCode}.latency",
-        "equinix.fabric.metro.os_{:metroCode}.latency",
-        "equinix.fabric.metro.ot_{:metroCode}.latency",
-        "equinix.fabric.metro.pa_{:metroCode}.latency",
-        "equinix.fabric.metro.pe_{:metroCode}.latency",
-        "equinix.fabric.metro.ph_{:metroCode}.latency",
-        "equinix.fabric.metro.rj_{:metroCode}.latency",
-        "equinix.fabric.metro.se_{:metroCode}.latency",
-        "equinix.fabric.metro.sg_{:metroCode}.latency",
-        "equinix.fabric.metro.sk_{:metroCode}.latency",
-        "equinix.fabric.metro.sl_{:metroCode}.latency",
-        "equinix.fabric.metro.so_{:metroCode}.latency",
-        "equinix.fabric.metro.sp_{:metroCode}.latency",
-        "equinix.fabric.metro.st_{:metroCode}.latency",
-        "equinix.fabric.metro.sv_{:metroCode}.latency",
-        "equinix.fabric.metro.sy_{:metroCode}.latency",
-        "equinix.fabric.metro.tr_{:metroCode}.latency",
-        "equinix.fabric.metro.ty_{:metroCode}.latency",
-        "equinix.fabric.metro.va_{:metroCode}.latency",
-        "equinix.fabric.metro.wa_{:metroCode}.latency",
-        "equinix.fabric.metro.wi_{:metroCode}.latency",
-        "equinix.fabric.metro.zh_{:metroCode}.latency",
-        "equinix.fabric.port.bandwidth_rx.usage",
-        "equinix.fabric.port.bandwidth_tx.usage",
-        "equinix.fabric.port.packets_erred_rx.count",
-        "equinix.fabric.port.packets_erred_tx.count",
-        "equinix.fabric.port.packets_dropped_rx.count",
-        "equinix.fabric.port.packets_dropped_tx.count"
-    ],
     "definitions": {
         "Data": {
             "properties": {
@@ -192,5 +117,90 @@
             "title": "DataPoints",
             "additionalProperties": true
         }
+    },
+    "cloudeventTypes": {
+        "released": [
+            "equinix.fabric.metric"
+        ],
+        "preview": []
+    },
+    "metricNames": {
+        "released": [
+            "equinix.fabric.connection.bandwidth_rx.usage",
+            "equinix.fabric.connection.bandwidth_tx.usage",
+            "equinix.fabric.metro.am_{:metroCode}.latency",
+            "equinix.fabric.metro.at_{:metroCode}.latency",
+            "equinix.fabric.metro.ba_{:metroCode}.latency",
+            "equinix.fabric.metro.bg_{:metroCode}.latency",
+            "equinix.fabric.metro.bl_{:metroCode}.latency",
+            "equinix.fabric.metro.bo_{:metroCode}.latency",
+            "equinix.fabric.metro.bx_{:metroCode}.latency",
+            "equinix.fabric.metro.ca_{:metroCode}.latency",
+            "equinix.fabric.metro.ch_{:metroCode}.latency",
+            "equinix.fabric.metro.cl_{:metroCode}.latency",
+            "equinix.fabric.metro.cu_{:metroCode}.latency",
+            "equinix.fabric.metro.da_{:metroCode}.latency",
+            "equinix.fabric.metro.db_{:metroCode}.latency",
+            "equinix.fabric.metro.dc_{:metroCode}.latency",
+            "equinix.fabric.metro.de_{:metroCode}.latency",
+            "equinix.fabric.metro.dx_{:metroCode}.latency",
+            "equinix.fabric.metro.fr_{:metroCode}.latency",
+            "equinix.fabric.metro.gv_{:metroCode}.latency",
+            "equinix.fabric.metro.he_{:metroCode}.latency",
+            "equinix.fabric.metro.hh_{:metroCode}.latency",
+            "equinix.fabric.metro.hk_{:metroCode}.latency",
+            "equinix.fabric.metro.ho_{:metroCode}.latency",
+            "equinix.fabric.metro.il_{:metroCode}.latency",
+            "equinix.fabric.metro.jh_{:metroCode}.latency",
+            "equinix.fabric.metro.ka_{:metroCode}.latency",
+            "equinix.fabric.metro.kl_{:metroCode}.latency",
+            "equinix.fabric.metro.la_{:metroCode}.latency",
+            "equinix.fabric.metro.ld_{:metroCode}.latency",
+            "equinix.fabric.metro.lm_{:metroCode}.latency",
+            "equinix.fabric.metro.ls_{:metroCode}.latency",
+            "equinix.fabric.metro.ma_{:metroCode}.latency",
+            "equinix.fabric.metro.mb_{:metroCode}.latency",
+            "equinix.fabric.metro.md_{:metroCode}.latency",
+            "equinix.fabric.metro.me_{:metroCode}.latency",
+            "equinix.fabric.metro.mi_{:metroCode}.latency",
+            "equinix.fabric.metro.ml_{:metroCode}.latency",
+            "equinix.fabric.metro.mo_{:metroCode}.latency",
+            "equinix.fabric.metro.mt_{:metroCode}.latency",
+            "equinix.fabric.metro.mu_{:metroCode}.latency",
+            "equinix.fabric.metro.mx_{:metroCode}.latency",
+            "equinix.fabric.metro.ny_{:metroCode}.latency",
+            "equinix.fabric.metro.os_{:metroCode}.latency",
+            "equinix.fabric.metro.ot_{:metroCode}.latency",
+            "equinix.fabric.metro.pa_{:metroCode}.latency",
+            "equinix.fabric.metro.pe_{:metroCode}.latency",
+            "equinix.fabric.metro.ph_{:metroCode}.latency",
+            "equinix.fabric.metro.rj_{:metroCode}.latency",
+            "equinix.fabric.metro.se_{:metroCode}.latency",
+            "equinix.fabric.metro.sg_{:metroCode}.latency",
+            "equinix.fabric.metro.sk_{:metroCode}.latency",
+            "equinix.fabric.metro.sl_{:metroCode}.latency",
+            "equinix.fabric.metro.so_{:metroCode}.latency",
+            "equinix.fabric.metro.sp_{:metroCode}.latency",
+            "equinix.fabric.metro.st_{:metroCode}.latency",
+            "equinix.fabric.metro.sv_{:metroCode}.latency",
+            "equinix.fabric.metro.sy_{:metroCode}.latency",
+            "equinix.fabric.metro.tr_{:metroCode}.latency",
+            "equinix.fabric.metro.ty_{:metroCode}.latency",
+            "equinix.fabric.metro.va_{:metroCode}.latency",
+            "equinix.fabric.metro.wa_{:metroCode}.latency",
+            "equinix.fabric.metro.wi_{:metroCode}.latency",
+            "equinix.fabric.metro.zh_{:metroCode}.latency",
+            "equinix.fabric.port.bandwidth_rx.usage",
+            "equinix.fabric.port.bandwidth_tx.usage",
+            "equinix.fabric.port.packets_erred_rx.count",
+            "equinix.fabric.port.packets_erred_tx.count",
+            "equinix.fabric.port.packets_dropped_rx.count",
+            "equinix.fabric.port.packets_dropped_tx.count"
+        ],
+        "preview": []
+    },
+    "alertNames": {
+        "released": [],
+        "preview": []
     }
 }
diff --git a/jsonschema/equinix/identity/v1/ChangeEvent.json b/jsonschema/equinix/identity/v1/ChangeEvent.json
index f80a3ed..e8bfaf2 100644
--- a/jsonschema/equinix/identity/v1/ChangeEvent.json
+++ b/jsonschema/equinix/identity/v1/ChangeEvent.json
@@ -4,8 +4,6 @@
     "examples": [],
     "package": "equinix.identity.v1",
     "datatype": "equinix.identity.v1.ChangeEvent",
-    "cloudeventTypes": [
-    ],
     "domain": "Equinix Identity ChangeEvent",
     "$schema": "http://json-schema.org/draft-04/schema#",
     "$ref": "#/definitions/Data",
@@ -33,5 +31,17 @@
             "title": "Resource",
             "description": "Schema of the resource that fired the event"
         }
+    },
+    "cloudeventTypes": {
+        "released": [],
+        "preview": []
+    },
+    "metricNames": {
+        "released": [],
+        "preview": []
+    },
+    "alertNames": {
+        "released": [],
+        "preview": []
     }
 }
diff --git a/jsonschema/equinix/network_edge/v1/ChangeEvent.json b/jsonschema/equinix/network_edge/v1/ChangeEvent.json
index 7f396aa..fb32ddc 100644
--- a/jsonschema/equinix/network_edge/v1/ChangeEvent.json
+++ b/jsonschema/equinix/network_edge/v1/ChangeEvent.json
@@ -4,8 +4,6 @@
     "examples": [],
     "package": "equinix.network_edge.v1",
     "datatype": "equinix.network_edge.v1.ChangeEvent",
-    "cloudeventTypes": [
-    ],
     "domain": "Equinix Network Edge ChangeEvent",
     "$schema": "http://json-schema.org/draft-04/schema#",
     "$ref": "#/definitions/Data",
@@ -33,5 +31,17 @@
             "title": "Resource",
             "description": "Schema of the resource that fired the event"
         }
+    },
+    "cloudeventTypes": {
+        "released": [],
+        "preview": []
+    },
+    "metricNames": {
+        "released": [],
+        "preview": []
+    },
+    "alertNames": {
+        "released": [],
+        "preview": []
     }
 }
diff --git a/scripts/generate_json_catalog.py b/scripts/generate_json_catalog.py
index f99cd2b..c42c5bd 100644
--- a/scripts/generate_json_catalog.py
+++ b/scripts/generate_json_catalog.py
@@ -1,5 +1,6 @@
 import os
 import json
+import script_constants as sc
 
 def retrieve_json_schemas():
     directory = os.path.dirname(os.path.abspath(__file__)) + '/../jsonschema'
@@ -9,16 +10,28 @@ def retrieve_json_schemas():
             if file.endswith('.json') and file != "catalog.json":
                 with open(root + "/" + file, "r") as eventFile:
                     data = json.load(eventFile)
+                    events = {
+                        sc.RELEASED: sorted(data[sc.EVENTS][sc.RELEASED]),
+                        sc.PREVIEW: sorted(data[sc.EVENTS][sc.PREVIEW])
+                    }
+                    metrics = {
+                        sc.RELEASED: sorted(data[sc.METRICS][sc.RELEASED]),
+                        sc.PREVIEW: sorted(data[sc.METRICS][sc.PREVIEW])
+                    }
+                    alerts = {
+                        sc.RELEASED: sorted(data[sc.ALERTS][sc.RELEASED]),
+                        sc.PREVIEW: sorted(data[sc.ALERTS][sc.PREVIEW])
+                    }
                     newItem = {
                         "url": data["$id"],
                         "domain": data["domain"],
                         "name": data["name"],
                         "description": data["definitions"]["Data"]["description"],
                         "datatype": data["datatype"],
-                        "cloudeventTypes": data["cloudeventTypes"]
+                        "cloudeventTypes": events,
+                        "metricNames": metrics,
+                        "alertNames": alerts
                     }
-                    if "metricNames" in data:
-                        newItem["metricNames"] = data["metricNames"]
                     json_schemas.append(newItem)
     json_schemas.sort(key=lambda x: x["url"])
     return json_schemas
diff --git a/scripts/generate_readme_event_catalog.py b/scripts/generate_readme_event_catalog.py
index b97fcb3..4ff4774 100644
--- a/scripts/generate_readme_event_catalog.py
+++ b/scripts/generate_readme_event_catalog.py
@@ -1,26 +1,45 @@
 import os
 import json
+import script_constants as sc
 
-def table_row(schema):
-    cloudEventTypes = "<br>\n".join(map(lambda x: f"`{x}`", schema["cloudeventTypes"]))
+def dropdowns(type, supported):
+    dropdowns = "#### " + type
+    if len(supported[sc.PREVIEW]) > 0:
+        dropdowns += "\n\n<details>\n<summary>In Preview</summary>\n\n"
+        dropdowns += " <br>\n".join(map(lambda x: f"`{x}`", supported[sc.PREVIEW]))
+        dropdowns += "\n\n</details>\n\n"
+    if len(supported[sc.RELEASED]) > 0:
+        dropdowns += "\n\n<details>\n<summary>Released</summary>\n\n"
+        dropdowns += " <br>\n".join(map(lambda x: f"`{x}`", supported[sc.RELEASED]))
+        dropdowns += "\n\n</details>\n"""
+    return dropdowns if len(dropdowns) > 20 else ""
+
+def schema_entry(schema):
+    cloudEventTypes = ""
     metrics = ""
-    if "metricNames" in schema:
-        metricNames = "<br>\n".join(map(lambda x: f"`{x}`", schema["metricNames"]))
-        metrics = f"#### Metric Name(s)\n{metricNames}"
-    return f"""### {schema["domain"]}
+    alerts = ""
+    if sc.EVENTS in schema:
+        cloudEventTypes = dropdowns(sc.README_EVENTS, schema[sc.EVENTS])
+    if sc.METRICS in schema:
+        metrics = dropdowns(sc.README_METRICS, schema[sc.METRICS])
+    if sc.ALERTS in schema:
+        alerts = dropdowns(sc.README_ALERTS, schema[sc.ALERTS])
+    return f"""---
+### {schema["domain"]}
 #### DataSchema [JSON]({schema["url"]})
 #### Data Type
 `{schema["datatype"]}`
-#### CloudEvent Type(s)
+#### Supported Events, Metrics, and Alerts
 {cloudEventTypes}
-{metrics}"""
+{metrics}
+{alerts}"""
 
 def replace_readme_catalog():
     readme_path = os.path.dirname(os.path.abspath(__file__)) + "/../README.md"
     catalog_path = os.path.dirname(os.path.abspath(__file__)) + "/../jsonschema/catalog.json"
     with open(catalog_path, "r") as catalog_file:
         catalog = json.load(catalog_file)
-        schemas = "\n".join(map(table_row, catalog["schemas"]))
+        schemas = "\n".join(map(schema_entry, catalog["schemas"]))
 
     with open(readme_path, "r+") as readme_file:
         content = readme_file.read()
diff --git a/scripts/requirements.txt b/scripts/requirements.txt
new file mode 100644
index 0000000..89099e3
--- /dev/null
+++ b/scripts/requirements.txt
@@ -0,0 +1 @@
+jsonschema==4.23.0
diff --git a/scripts/script_constants.py b/scripts/script_constants.py
new file mode 100644
index 0000000..120804c
--- /dev/null
+++ b/scripts/script_constants.py
@@ -0,0 +1,10 @@
+RELEASED = "released"
+PREVIEW = "preview"
+
+EVENTS = "cloudeventTypes"
+METRICS = "metricNames"
+ALERTS = "alertNames"
+
+README_EVENTS = "Events"
+README_METRICS = "Metrics"
+README_ALERTS = "Alerts"
\ No newline at end of file
diff --git a/scripts/update_data_loader.py b/scripts/update_data_loader.py
index 570d1e4..a6d7818 100644
--- a/scripts/update_data_loader.py
+++ b/scripts/update_data_loader.py
@@ -1,6 +1,7 @@
 import os
 import json
 from collections import defaultdict
+import script_constants as sc
 
 def retrieve_supported_events():
     directory = os.path.dirname(os.path.abspath(__file__)) + '/../jsonschema'
@@ -9,20 +10,41 @@ def retrieve_supported_events():
         for file in files:
             if file.endswith('.json') and file != "catalog.json":
                 with open(root + "/" + file, "r") as eventFile:
-                    product = root.split("/")[-2]
+                    domain = root.split("/")[-2]
                     data = json.load(eventFile)
-                    if product not in dataLoaderStructure:
-                        dataLoaderStructure[product] = {
-                            "eventTypes": [],
-                            "metricNames": [],
+                    if domain not in dataLoaderStructure:
+                        dataLoaderStructure[domain] = {
+                            sc.EVENTS: {
+                                sc.RELEASED: [],
+                                sc.PREVIEW: []
+                            },
+                            sc.METRICS: {
+                                sc.RELEASED: [],
+                                sc.PREVIEW: []
+                            },
+                            sc.ALERTS: {
+                                sc.RELEASED: [],
+                                sc.PREVIEW: []
+                            }
                         }
-                    dataLoaderStructure[product]["eventTypes"].extend(data["cloudeventTypes"])
-                    if "metricNames" in data:
-                        dataLoaderStructure[product]["metricNames"].extend(data["metricNames"])
-                    dataLoaderStructure[product]["eventTypes"] = sorted(set(dataLoaderStructure[product]["eventTypes"]))
-                    dataLoaderStructure[product]["metricNames"] = sorted(set(dataLoaderStructure[product]["metricNames"]))
+                    data[sc.EVENTS][sc.RELEASED]
+                    dataLoaderStructure[domain][sc.EVENTS][sc.RELEASED].extend(data[sc.EVENTS][sc.RELEASED])
+                    dataLoaderStructure[domain][sc.EVENTS][sc.PREVIEW].extend(data[sc.EVENTS][sc.PREVIEW])
+                    dataLoaderStructure[domain][sc.METRICS][sc.RELEASED].extend(data[sc.METRICS][sc.RELEASED])
+                    dataLoaderStructure[domain][sc.METRICS][sc.PREVIEW].extend(data[sc.METRICS][sc.PREVIEW])
+                    dataLoaderStructure[domain][sc.ALERTS][sc.RELEASED].extend(data[sc.ALERTS][sc.RELEASED])
+                    dataLoaderStructure[domain][sc.ALERTS][sc.PREVIEW].extend(data[sc.ALERTS][sc.PREVIEW])
 
-    return dict(sorted(dataLoaderStructure.items()))
+                    dataLoaderStructure[domain][sc.EVENTS][sc.RELEASED] = sorted(set(dataLoaderStructure[domain][sc.EVENTS][sc.RELEASED]))
+                    dataLoaderStructure[domain][sc.EVENTS][sc.PREVIEW] = sorted(set(dataLoaderStructure[domain][sc.EVENTS][sc.PREVIEW]))
+                    dataLoaderStructure[domain][sc.METRICS][sc.RELEASED] = sorted(set(dataLoaderStructure[domain][sc.METRICS][sc.RELEASED]))
+                    dataLoaderStructure[domain][sc.METRICS][sc.PREVIEW] = sorted(set(dataLoaderStructure[domain][sc.METRICS][sc.PREVIEW]))
+                    dataLoaderStructure[domain][sc.ALERTS][sc.RELEASED] = sorted(set(dataLoaderStructure[domain][sc.ALERTS][sc.RELEASED]))
+                    dataLoaderStructure[domain][sc.ALERTS][sc.PREVIEW] = sorted(set(dataLoaderStructure[domain][sc.ALERTS][sc.PREVIEW]))
+
+    dataLoaderStructure = dict(sorted(dataLoaderStructure.items()))
+
+    return dataLoaderStructure
 
 def writeSupportedEventsToDataLoaderFile(supportedEvents):
     with open(os.path.dirname(os.path.abspath(__file__)) + "/../DataLoader.json", "w") as eventsFile:
diff --git a/scripts/validate_json_schemas.py b/scripts/validate_json_schemas.py
new file mode 100644
index 0000000..fd4e7df
--- /dev/null
+++ b/scripts/validate_json_schemas.py
@@ -0,0 +1,19 @@
+import os
+from jsonschema import validate
+import json
+
+def validateJsonSchemas():
+    validationSchemaFile = os.path.dirname(os.path.abspath(__file__))+"/jsonschema-org-schema.json"
+    with open(validationSchemaFile, "r") as schemaFile:
+        schema = json.load(schemaFile)
+    directory = os.path.dirname(os.path.abspath(__file__)) + '/../jsonschema'
+    for root, dirs, files in os.walk(directory):
+        for file in files:
+            if file.endswith('.json') and file != "catalog.json":
+                with open(root + "/" + file, "r") as eventFile:
+                    data = json.load(eventFile)
+                    validate(instance=data, schema=schema)
+
+
+if __name__ == "__main__":
+    validateJsonSchemas()