diff --git a/.github/workflows/ci-go.yml b/.github/workflows/ci-go.yml
index b3aed9424..e5144acea 100644
--- a/.github/workflows/ci-go.yml
+++ b/.github/workflows/ci-go.yml
@@ -1,3 +1,4 @@
+---
 name: 'ci-go'
 on:
   pull_request:
diff --git a/.github/workflows/yamllint.yml b/.github/workflows/yamllint.yml
new file mode 100644
index 000000000..eff368492
--- /dev/null
+++ b/.github/workflows/yamllint.yml
@@ -0,0 +1,23 @@
+---
+# MegaLinter GitHub Action configuration file
+# More info at https://oxsecurity.github.io/megalinter
+name: mega-linter-yaml
+
+on:
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    name: mega-linter-yaml
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
+        with:
+          fetch-depth: 1
+
+      - name: yamllint
+        uses: oxsecurity/megalinter/flavors/ci_light@v7
diff --git a/.golangci.yml b/.golangci.yml
index d102526d9..99e2e0005 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,3 +1,4 @@
+---
 run:
   timeout: 10m
   skip-dirs-use-default: true
@@ -22,4 +23,4 @@ linters:
     - unused
 linters-settings:
   goimports:
-    local-prefixes: github.com/Azure/ARO-HCP
\ No newline at end of file
+    local-prefixes: github.com/Azure/ARO-HCP
diff --git a/.yaml-lint.yml b/.yaml-lint.yml
new file mode 100644
index 000000000..e02c0be71
--- /dev/null
+++ b/.yaml-lint.yml
@@ -0,0 +1,30 @@
+---
+yaml-files:
+  - '*.yaml'
+  - '*.yml'
+  - '.yamllint'
+
+rules:
+  braces: enable
+  brackets: enable
+  colons: enable
+  commas: enable
+  comments: disable
+  comments-indentation: disable
+  document-end: disable
+  document-start: disable
+  empty-lines: enable
+  empty-values: disable
+  hyphens: enable
+  indentation: disable
+  key-duplicates: enable
+  key-ordering: disable
+  line-length: disable
+  new-line-at-end-of-file: enable
+  new-lines: enable
+  octal-values: disable
+  quoted-strings: disable
+  trailing-spaces: enable
+  truthy:
+    level: warning
+    check-keys: false
diff --git a/api/redhatopenshift/HcpCluster/hcpCluster-models.tsp b/api/redhatopenshift/HcpCluster/hcpCluster-models.tsp
index 7e115e39e..9c6bd8445 100644
--- a/api/redhatopenshift/HcpCluster/hcpCluster-models.tsp
+++ b/api/redhatopenshift/HcpCluster/hcpCluster-models.tsp
@@ -258,9 +258,6 @@ model PlatformProfile {
   /** The core outgoing configuration */
   outboundType?: OutboundType = OutboundType.loadBalancer;
 
-  /** Specifies whether subnets are pre-attached with an NSG */
-  preconfiguredNsgs: boolean;
-
   /** The id of the disk encryption set to be used for etcd.
    * Configure this when `etcdEncryption` is set to true
    * Is used the https://learn.microsoft.com/en-us/azure/storage/common/customer-managed-keys-overview
diff --git a/api/redhatopenshift/HcpCluster/tspconfig.yaml b/api/redhatopenshift/HcpCluster/tspconfig.yaml
index 46e034857..95042b14e 100644
--- a/api/redhatopenshift/HcpCluster/tspconfig.yaml
+++ b/api/redhatopenshift/HcpCluster/tspconfig.yaml
@@ -1,3 +1,4 @@
+---
 emit:
   - '@azure-tools/typespec-autorest'
 options: