diff --git a/.github/workflows/validate-spectral.yml b/.github/workflows/validate-spectral.yml
index 49255e62..4b769da3 100644
--- a/.github/workflows/validate-spectral.yml
+++ b/.github/workflows/validate-spectral.yml
@@ -37,8 +37,8 @@ jobs:
       - name: Build workspace
         run: npm run build
 
-      - name: Install Spectral-CLI
-        run: npm install @stoplight/spectral-cli
+      - name: Install dependencies for Spectral
+        run: npm install @stoplight/spectral-cli rollup
 
       - name: Run Example Spectral Linting
         run: npx spectral lint --ruleset ./shared/dist/spectral/rules-architecture.js 'calm/samples/api-gateway-architecture(*.json|*.yaml)'
diff --git a/cli/package.json b/cli/package.json
index 269437a1..7f057362 100644
--- a/cli/package.json
+++ b/cli/package.json
@@ -47,6 +47,7 @@
     "eslint": "^9.13.0",
     "globals": "^15.12.0",
     "jest": "^29.7.0",
+    "link": "^2.1.1",
     "ts-jest": "^29.2.5",
     "ts-node": "10.9.2",
     "tsup": "^8.0.0",
diff --git a/cli/test_fixtures/validate_output_junit.xml b/cli/test_fixtures/validate_output_junit.xml
index 52b86f9f..ab68ae6e 100644
--- a/cli/test_fixtures/validate_output_junit.xml
+++ b/cli/test_fixtures/validate_output_junit.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<testsuites tests="23" failures="0" errors="0" skipped="0">
+<testsuites tests="25" failures="0" errors="0" skipped="0">
     <testsuite name="JSON Schema Validation" tests="1" failures="0"
         errors="0" skipped="0">
         <testcase name="JSON Schema Validation succeeded" />
     </testsuite>
-    <testsuite name="Spectral Suite" tests="22"
+    <testsuite name="Spectral Suite" tests="24"
         failures="0" errors="0" skipped="0">
         <testcase name="architecture-has-nodes-relationships" />
         <testcase name="architecture-has-no-empty-properties" />
@@ -16,6 +16,7 @@
         <testcase
             name="connects-relationship-references-existing-nodes-in-architecture" />
         <testcase name="referenced-interfaces-defined-in-architecture" />
+        <testcase name="referenced-interfaces-defined-on-correct-node-in-architecture" />
         <testcase name="composition-relationships-reference-existing-nodes-in-architecture" />
         <testcase name="architecture-nodes-must-be-referenced" />
         <testcase
@@ -31,6 +32,7 @@
         <testcase
             name="relationship-references-existing-nodes-in-pattern" />
         <testcase name="referenced-interfaces-defined-in-pattern" />
+        <testcase name="referenced-interfaces-defined-on-correct-node-in-pattern" />
         <testcase name="pattern-nodes-must-be-referenced" />
         <testcase name="unique-ids-must-be-unique-in-pattern" />
     </testsuite>
diff --git a/package-lock.json b/package-lock.json
index 83dd8283..69a929b8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,6 +13,7 @@
                 "docs"
             ],
             "devDependencies": {
+                "link": "^2.1.1",
                 "npm-run-all2": "^5.0.0"
             }
         },
@@ -43,6 +44,7 @@
                 "eslint": "^9.13.0",
                 "globals": "^15.12.0",
                 "jest": "^29.7.0",
+                "link": "^2.1.1",
                 "ts-jest": "^29.2.5",
                 "ts-node": "10.9.2",
                 "tsup": "^8.0.0",
@@ -6219,13 +6221,12 @@
             "license": "MIT"
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.27.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.27.4.tgz",
-            "integrity": "sha512-2Y3JT6f5MrQkICUyRVCw4oa0sutfAsgaSsb0Lmmy1Wi2y7X5vT9Euqw4gOsCyy0YfKURBg35nhUKZS4mDcfULw==",
+            "version": "4.29.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.29.1.tgz",
+            "integrity": "sha512-ssKhA8RNltTZLpG6/QNkCSge+7mBQGUqJRisZ2MDQcEGaK93QESEgWK2iOpIDZ7k9zPVkG5AS3ksvD5ZWxmItw==",
             "cpu": [
                 "arm"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -6233,13 +6234,12 @@
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.27.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.27.4.tgz",
-            "integrity": "sha512-wzKRQXISyi9UdCVRqEd0H4cMpzvHYt1f/C3CoIjES6cG++RHKhrBj2+29nPF0IB5kpy9MS71vs07fvrNGAl/iA==",
+            "version": "4.29.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.29.1.tgz",
+            "integrity": "sha512-CaRfrV0cd+NIIcVVN/jx+hVLN+VRqnuzLRmfmlzpOzB87ajixsN/+9L5xNmkaUUvEbI5BmIKS+XTwXsHEb65Ew==",
             "cpu": [
                 "arm64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -6247,13 +6247,12 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.27.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.27.4.tgz",
-            "integrity": "sha512-PlNiRQapift4LNS8DPUHuDX/IdXiLjf8mc5vdEmUR0fF/pyy2qWwzdLjB+iZquGr8LuN4LnUoSEvKRwjSVYz3Q==",
+            "version": "4.29.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.29.1.tgz",
+            "integrity": "sha512-2ORr7T31Y0Mnk6qNuwtyNmy14MunTAMx06VAPI6/Ju52W10zk1i7i5U3vlDRWjhOI5quBcrvhkCHyF76bI7kEw==",
             "cpu": [
                 "arm64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -6261,13 +6260,12 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.27.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.27.4.tgz",
-            "integrity": "sha512-o9bH2dbdgBDJaXWJCDTNDYa171ACUdzpxSZt+u/AAeQ20Nk5x+IhA+zsGmrQtpkLiumRJEYef68gcpn2ooXhSQ==",
+            "version": "4.29.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.29.1.tgz",
+            "integrity": "sha512-j/Ej1oanzPjmN0tirRd5K2/nncAhS9W6ICzgxV+9Y5ZsP0hiGhHJXZ2JQ53iSSjj8m6cRY6oB1GMzNn2EUt6Ng==",
             "cpu": [
                 "x64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -6275,13 +6273,12 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-arm64": {
-            "version": "4.27.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.27.4.tgz",
-            "integrity": "sha512-NBI2/i2hT9Q+HySSHTBh52da7isru4aAAo6qC3I7QFVsuhxi2gM8t/EI9EVcILiHLj1vfi+VGGPaLOUENn7pmw==",
+            "version": "4.29.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.29.1.tgz",
+            "integrity": "sha512-91C//G6Dm/cv724tpt7nTyP+JdN12iqeXGFM1SqnljCmi5yTXriH7B1r8AD9dAZByHpKAumqP1Qy2vVNIdLZqw==",
             "cpu": [
                 "arm64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -6289,13 +6286,12 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-x64": {
-            "version": "4.27.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.27.4.tgz",
-            "integrity": "sha512-wYcC5ycW2zvqtDYrE7deary2P2UFmSh85PUpAx+dwTCO9uw3sgzD6Gv9n5X4vLaQKsrfTSZZ7Z7uynQozPVvWA==",
+            "version": "4.29.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.29.1.tgz",
+            "integrity": "sha512-hEioiEQ9Dec2nIRoeHUP6hr1PSkXzQaCUyqBDQ9I9ik4gCXQZjJMIVzoNLBRGet+hIUb3CISMh9KXuCcWVW/8w==",
             "cpu": [
                 "x64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -6303,13 +6299,12 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.27.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.27.4.tgz",
-            "integrity": "sha512-9OwUnK/xKw6DyRlgx8UizeqRFOfi9mf5TYCw1uolDaJSbUmBxP85DE6T4ouCMoN6pXw8ZoTeZCSEfSaYo+/s1w==",
+            "version": "4.29.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.29.1.tgz",
+            "integrity": "sha512-Py5vFd5HWYN9zxBv3WMrLAXY3yYJ6Q/aVERoeUFwiDGiMOWsMs7FokXihSOaT/PMWUty/Pj60XDQndK3eAfE6A==",
             "cpu": [
                 "arm"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -6317,13 +6312,12 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.27.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.27.4.tgz",
-            "integrity": "sha512-Vgdo4fpuphS9V24WOV+KwkCVJ72u7idTgQaBoLRD0UxBAWTF9GWurJO9YD9yh00BzbkhpeXtm6na+MvJU7Z73A==",
+            "version": "4.29.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.29.1.tgz",
+            "integrity": "sha512-RiWpGgbayf7LUcuSNIbahr0ys2YnEERD4gYdISA06wa0i8RALrnzflh9Wxii7zQJEB2/Eh74dX4y/sHKLWp5uQ==",
             "cpu": [
                 "arm"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -6331,13 +6325,12 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.27.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.27.4.tgz",
-            "integrity": "sha512-pleyNgyd1kkBkw2kOqlBx+0atfIIkkExOTiifoODo6qKDSpnc6WzUY5RhHdmTdIJXBdSnh6JknnYTtmQyobrVg==",
+            "version": "4.29.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.29.1.tgz",
+            "integrity": "sha512-Z80O+taYxTQITWMjm/YqNoe9d10OX6kDh8X5/rFCMuPqsKsSyDilvfg+vd3iXIqtfmp+cnfL1UrYirkaF8SBZA==",
             "cpu": [
                 "arm64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -6345,13 +6338,25 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.27.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.27.4.tgz",
-            "integrity": "sha512-caluiUXvUuVyCHr5DxL8ohaaFFzPGmgmMvwmqAITMpV/Q+tPoaHZ/PWa3t8B2WyoRcIIuu1hkaW5KkeTDNSnMA==",
+            "version": "4.29.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.29.1.tgz",
+            "integrity": "sha512-fOHRtF9gahwJk3QVp01a/GqS4hBEZCV1oKglVVq13kcK3NeVlS4BwIFzOHDbmKzt3i0OuHG4zfRP0YoG5OF/rA==",
             "cpu": [
                 "arm64"
             ],
-            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
+            "version": "4.29.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.29.1.tgz",
+            "integrity": "sha512-5a7q3tnlbcg0OodyxcAdrrCxFi0DgXJSoOuidFUzHZ2GixZXQs6Tc3CHmlvqKAmOs5eRde+JJxeIf9DonkmYkw==",
+            "cpu": [
+                "loong64"
+            ],
             "license": "MIT",
             "optional": true,
             "os": [
@@ -6359,13 +6364,12 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.27.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.27.4.tgz",
-            "integrity": "sha512-FScrpHrO60hARyHh7s1zHE97u0KlT/RECzCKAdmI+LEoC1eDh/RDji9JgFqyO+wPDb86Oa/sXkily1+oi4FzJQ==",
+            "version": "4.29.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.29.1.tgz",
+            "integrity": "sha512-9b4Mg5Yfz6mRnlSPIdROcfw1BU22FQxmfjlp/CShWwO3LilKQuMISMTtAu/bxmmrE6A902W2cZJuzx8+gJ8e9w==",
             "cpu": [
                 "ppc64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -6373,13 +6377,12 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.27.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.27.4.tgz",
-            "integrity": "sha512-qyyprhyGb7+RBfMPeww9FlHwKkCXdKHeGgSqmIXw9VSUtvyFZ6WZRtnxgbuz76FK7LyoN8t/eINRbPUcvXB5fw==",
+            "version": "4.29.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.29.1.tgz",
+            "integrity": "sha512-G5pn0NChlbRM8OJWpJFMX4/i8OEU538uiSv0P6roZcbpe/WfhEO+AT8SHVKfp8qhDQzaz7Q+1/ixMy7hBRidnQ==",
             "cpu": [
                 "riscv64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -6387,13 +6390,12 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.27.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.27.4.tgz",
-            "integrity": "sha512-PFz+y2kb6tbh7m3A7nA9++eInGcDVZUACulf/KzDtovvdTizHpZaJty7Gp0lFwSQcrnebHOqxF1MaKZd7psVRg==",
+            "version": "4.29.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.29.1.tgz",
+            "integrity": "sha512-WM9lIkNdkhVwiArmLxFXpWndFGuOka4oJOZh8EP3Vb8q5lzdSCBuhjavJsw68Q9AKDGeOOIHYzYm4ZFvmWez5g==",
             "cpu": [
                 "s390x"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -6401,13 +6403,12 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.27.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.27.4.tgz",
-            "integrity": "sha512-Ni8mMtfo+o/G7DVtweXXV/Ol2TFf63KYjTtoZ5f078AUgJTmaIJnj4JFU7TK/9SVWTaSJGxPi5zMDgK4w+Ez7Q==",
+            "version": "4.29.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.29.1.tgz",
+            "integrity": "sha512-87xYCwb0cPGZFoGiErT1eDcssByaLX4fc0z2nRM6eMtV9njAfEE6OW3UniAoDhX4Iq5xQVpE6qO9aJbCFumKYQ==",
             "cpu": [
                 "x64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -6415,13 +6416,12 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.27.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.27.4.tgz",
-            "integrity": "sha512-5AeeAF1PB9TUzD+3cROzFTnAJAcVUGLuR8ng0E0WXGkYhp6RD6L+6szYVX+64Rs0r72019KHZS1ka1q+zU/wUw==",
+            "version": "4.29.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.29.1.tgz",
+            "integrity": "sha512-xufkSNppNOdVRCEC4WKvlR1FBDyqCSCpQeMMgv9ZyXqqtKBfkw1yfGMTUTs9Qsl6WQbJnsGboWCp7pJGkeMhKA==",
             "cpu": [
                 "x64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -6429,13 +6429,12 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.27.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.27.4.tgz",
-            "integrity": "sha512-yOpVsA4K5qVwu2CaS3hHxluWIK5HQTjNV4tWjQXluMiiiu4pJj4BN98CvxohNCpcjMeTXk/ZMJBRbgRg8HBB6A==",
+            "version": "4.29.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.29.1.tgz",
+            "integrity": "sha512-F2OiJ42m77lSkizZQLuC+jiZ2cgueWQL5YC9tjo3AgaEw+KJmVxHGSyQfDUoYR9cci0lAywv2Clmckzulcq6ig==",
             "cpu": [
                 "arm64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -6443,13 +6442,12 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.27.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.27.4.tgz",
-            "integrity": "sha512-KtwEJOaHAVJlxV92rNYiG9JQwQAdhBlrjNRp7P9L8Cb4Rer3in+0A+IPhJC9y68WAi9H0sX4AiG2NTsVlmqJeQ==",
+            "version": "4.29.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.29.1.tgz",
+            "integrity": "sha512-rYRe5S0FcjlOBZQHgbTKNrqxCBUmgDJem/VQTCcTnA2KCabYSWQDrytOzX7avb79cAAweNmMUb/Zw18RNd4mng==",
             "cpu": [
                 "ia32"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -6457,13 +6455,12 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.27.4",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.27.4.tgz",
-            "integrity": "sha512-3j4jx1TppORdTAoBJRd+/wJRGCPC0ETWkXOecJ6PPZLj6SptXkrXcNqdj0oclbKML6FkQltdz7bBA3rUSirZug==",
+            "version": "4.29.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.29.1.tgz",
+            "integrity": "sha512-+10CMg9vt1MoHj6x1pxyjPSMjHTIlqs8/tBztXvPAx24SKs9jwVnKqHJumlH/IzhaPUaj3T6T6wfZr8okdXaIg==",
             "cpu": [
                 "x64"
             ],
-            "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
@@ -7055,6 +7052,21 @@
                 "node": "^12.20 || >=14.13"
             }
         },
+        "node_modules/@stoplight/spectral-ruleset-bundler/node_modules/rollup": {
+            "version": "2.79.2",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.2.tgz",
+            "integrity": "sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==",
+            "license": "MIT",
+            "bin": {
+                "rollup": "dist/bin/rollup"
+            },
+            "engines": {
+                "node": ">=10.0.0"
+            },
+            "optionalDependencies": {
+                "fsevents": "~2.3.2"
+            }
+        },
         "node_modules/@stoplight/spectral-ruleset-migrator": {
             "version": "1.11.1",
             "resolved": "https://registry.npmjs.org/@stoplight/spectral-ruleset-migrator/-/spectral-ruleset-migrator-1.11.1.tgz",
@@ -8019,9 +8031,9 @@
             "license": "MIT"
         },
         "node_modules/@types/node": {
-            "version": "22.10.5",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.5.tgz",
-            "integrity": "sha512-F8Q+SeGimwOo86fiovQh8qiXfFEh2/ocYv7tU5pJ3EXMSSxk1Joj5wefpFK2fHTf/N6HKGSxIDBT9f3gCxXPkQ==",
+            "version": "22.10.3",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.3.tgz",
+            "integrity": "sha512-DifAyw4BkrufCILvD3ucnuN8eydUfc/C1GlyrnI+LK6543w5/L3VeVgf05o3B4fqSXP1dKYLOZsKfutpxPzZrw==",
             "license": "MIT",
             "dependencies": {
                 "undici-types": "~6.20.0"
@@ -16420,6 +16432,19 @@
             "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
             "license": "MIT"
         },
+        "node_modules/link": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/link/-/link-2.1.1.tgz",
+            "integrity": "sha512-NV3AUVYBovJ6eVQcTeRoPnZSxzt2LOijNd+ugEZKRy/XeQlpTRhVRkuDv5kOlXwMAUx30vfUc7asRFb9RT65yg==",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "link": "dist/cli.js"
+            },
+            "funding": {
+                "url": "https://github.com/privatenumber/link?sponsor=1"
+            }
+        },
         "node_modules/load-tsconfig": {
             "version": "0.2.5",
             "resolved": "https://registry.npmjs.org/load-tsconfig/-/load-tsconfig-0.2.5.tgz",
@@ -23001,6 +23026,44 @@
                 "url": "https://github.com/sponsors/isaacs"
             }
         },
+        "node_modules/rollup": {
+            "version": "4.29.1",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.29.1.tgz",
+            "integrity": "sha512-RaJ45M/kmJUzSWDs1Nnd5DdV4eerC98idtUOVr6FfKcgxqvjwHmxc5upLF9qZU9EpsVzzhleFahrT3shLuJzIw==",
+            "license": "MIT",
+            "dependencies": {
+                "@types/estree": "1.0.6"
+            },
+            "bin": {
+                "rollup": "dist/bin/rollup"
+            },
+            "engines": {
+                "node": ">=18.0.0",
+                "npm": ">=8.0.0"
+            },
+            "optionalDependencies": {
+                "@rollup/rollup-android-arm-eabi": "4.29.1",
+                "@rollup/rollup-android-arm64": "4.29.1",
+                "@rollup/rollup-darwin-arm64": "4.29.1",
+                "@rollup/rollup-darwin-x64": "4.29.1",
+                "@rollup/rollup-freebsd-arm64": "4.29.1",
+                "@rollup/rollup-freebsd-x64": "4.29.1",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.29.1",
+                "@rollup/rollup-linux-arm-musleabihf": "4.29.1",
+                "@rollup/rollup-linux-arm64-gnu": "4.29.1",
+                "@rollup/rollup-linux-arm64-musl": "4.29.1",
+                "@rollup/rollup-linux-loongarch64-gnu": "4.29.1",
+                "@rollup/rollup-linux-powerpc64le-gnu": "4.29.1",
+                "@rollup/rollup-linux-riscv64-gnu": "4.29.1",
+                "@rollup/rollup-linux-s390x-gnu": "4.29.1",
+                "@rollup/rollup-linux-x64-gnu": "4.29.1",
+                "@rollup/rollup-linux-x64-musl": "4.29.1",
+                "@rollup/rollup-win32-arm64-msvc": "4.29.1",
+                "@rollup/rollup-win32-ia32-msvc": "4.29.1",
+                "@rollup/rollup-win32-x64-msvc": "4.29.1",
+                "fsevents": "~2.3.2"
+            }
+        },
         "node_modules/rtl-detect": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/rtl-detect/-/rtl-detect-1.1.2.tgz",
@@ -25027,44 +25090,6 @@
                 "node": ">=8"
             }
         },
-        "node_modules/tsup/node_modules/rollup": {
-            "version": "4.27.4",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.27.4.tgz",
-            "integrity": "sha512-RLKxqHEMjh/RGLsDxAEsaLO3mWgyoU6x9w6n1ikAzet4B3gI2/3yP6PWY2p9QzRTh6MfEIXB3MwsOY0Iv3vNrw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@types/estree": "1.0.6"
-            },
-            "bin": {
-                "rollup": "dist/bin/rollup"
-            },
-            "engines": {
-                "node": ">=18.0.0",
-                "npm": ">=8.0.0"
-            },
-            "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.27.4",
-                "@rollup/rollup-android-arm64": "4.27.4",
-                "@rollup/rollup-darwin-arm64": "4.27.4",
-                "@rollup/rollup-darwin-x64": "4.27.4",
-                "@rollup/rollup-freebsd-arm64": "4.27.4",
-                "@rollup/rollup-freebsd-x64": "4.27.4",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.27.4",
-                "@rollup/rollup-linux-arm-musleabihf": "4.27.4",
-                "@rollup/rollup-linux-arm64-gnu": "4.27.4",
-                "@rollup/rollup-linux-arm64-musl": "4.27.4",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.27.4",
-                "@rollup/rollup-linux-riscv64-gnu": "4.27.4",
-                "@rollup/rollup-linux-s390x-gnu": "4.27.4",
-                "@rollup/rollup-linux-x64-gnu": "4.27.4",
-                "@rollup/rollup-linux-x64-musl": "4.27.4",
-                "@rollup/rollup-win32-arm64-msvc": "4.27.4",
-                "@rollup/rollup-win32-ia32-msvc": "4.27.4",
-                "@rollup/rollup-win32-x64-msvc": "4.27.4",
-                "fsevents": "~2.3.2"
-            }
-        },
         "node_modules/tsup/node_modules/source-map": {
             "version": "0.8.0-beta.0",
             "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz",
diff --git a/package.json b/package.json
index 49141caa..941ddef8 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
         "link:cli": "npm link --workspace cli"
     },
     "devDependencies": {
+        "link": "^2.1.1",
         "npm-run-all2": "^5.0.0"
     }
 }
diff --git a/shared/src/commands/generate/components/instantiate.spec.ts b/shared/src/commands/generate/components/instantiate.spec.ts
index f4927995..3dcce1f6 100644
--- a/shared/src/commands/generate/components/instantiate.spec.ts
+++ b/shared/src/commands/generate/components/instantiate.spec.ts
@@ -1,4 +1,4 @@
-/* eslint-disable  @typescript-eslint/no-explicit-any */
+ 
 
 import { SchemaDirectory } from '../schema-directory';
 import { instantiateGenericObject } from './instantiate';
diff --git a/shared/src/commands/generate/components/property.spec.ts b/shared/src/commands/generate/components/property.spec.ts
index 2c7d4730..12c01cf0 100644
--- a/shared/src/commands/generate/components/property.spec.ts
+++ b/shared/src/commands/generate/components/property.spec.ts
@@ -1,4 +1,4 @@
-/* eslint-disable  @typescript-eslint/no-explicit-any */
+ 
 
 import { getConstValue, getEnumPlaceholder, getPropertyValue } from './property';
 
diff --git a/shared/src/spectral/functions/architecture/interface-id-exists-on-node.ts b/shared/src/spectral/functions/architecture/interface-id-exists-on-node.ts
new file mode 100644
index 00000000..1cad5e75
--- /dev/null
+++ b/shared/src/spectral/functions/architecture/interface-id-exists-on-node.ts
@@ -0,0 +1,53 @@
+import { JSONPath } from 'jsonpath-plus';
+import { difference } from 'lodash';
+
+/**
+ * Checks that the input value exists as an interface with matching unique ID defined under a node in the document.
+ */
+export function interfaceIdExistsOnNode(input, _, context) {
+    if (!input || !input.interfaces) {
+        return [];
+    }
+
+    if (!input.node) {
+        return [{
+            message: 'Invalid connects relationship - no node defined.',
+            path: [...context.path]
+        }];
+    }
+
+    const nodeId = input.node;
+    const nodeMatch: object[] = JSONPath({ path: `$.nodes[?(@['unique-id'] == '${nodeId}')]`, json: context.document.data });
+    if (!nodeMatch || nodeMatch.length === 0) {
+        // other rule will report undefined node
+        return [];
+    }
+
+    // all of these must be present on the referenced node
+    const desiredInterfaces = input.interfaces;
+
+    const node = nodeMatch[0];
+
+    const nodeInterfaces = JSONPath({ path: '$.interfaces[*].unique-id', json: node });
+    if (!nodeInterfaces || nodeInterfaces.length === 0) {
+        return [
+            { message: `Node with unique-id ${nodeId} has no interfaces defined, expected interfaces [${desiredInterfaces}].` }
+        ];
+    }
+
+    const missingInterfaces = difference(desiredInterfaces, nodeInterfaces);
+
+    // difference always returns an array
+    if (missingInterfaces.length === 0) {
+        return [];
+    }
+    const results = [];
+
+    for (const missing of missingInterfaces) {
+        results.push({
+            message: `Referenced interface with ID '${missing}' was not defined on the node with ID '${nodeId}'.`,
+            path: [...context.path]
+        });
+    }
+    return results;
+}
\ No newline at end of file
diff --git a/shared/src/spectral/functions/pattern/interface-id-exists-on-node.ts b/shared/src/spectral/functions/pattern/interface-id-exists-on-node.ts
new file mode 100644
index 00000000..15c5fea8
--- /dev/null
+++ b/shared/src/spectral/functions/pattern/interface-id-exists-on-node.ts
@@ -0,0 +1,53 @@
+import { JSONPath } from 'jsonpath-plus';
+import { difference } from 'lodash';
+
+/**
+ * Checks that the input value exists as an interface with matching unique ID defined under a node in the document.
+ */
+export function interfaceIdExistsOnNode(input, _, context) {
+    if (!input || !input.interfaces) {
+        return [];
+    }
+
+    if (!input.node) {
+        return [{
+            message: 'Invalid connects relationship - no node defined.',
+            path: [...context.path]
+        }];
+    }
+
+    const nodeId = input.node;
+    const nodeMatch: object[] = JSONPath({ path: `$.properties.nodes.prefixItems[?(@.properties['unique-id'].const == '${nodeId}')]`, json: context.document.data });
+    if (!nodeMatch || nodeMatch.length === 0) {
+        // other rule will report undefined node
+        return [];
+    }
+
+    // all of these must be present on the referenced node
+    const desiredInterfaces = input.interfaces;
+
+    const node = nodeMatch[0];
+
+    const nodeInterfaces = JSONPath({ path: '$.properties.interfaces.prefixItems[*].properties.unique-id.const', json: node });
+    if (!nodeInterfaces || nodeInterfaces.length === 0) {
+        return [
+            { message: `Node with unique-id ${nodeId} has no interfaces defined, expected interfaces [${desiredInterfaces}]` }
+        ];
+    }
+
+    const missingInterfaces = difference(desiredInterfaces, nodeInterfaces);
+
+    // difference always returns an array
+    if (missingInterfaces.length === 0) {
+        return [];
+    }
+    const results = [];
+
+    for (const missing of missingInterfaces) {
+        results.push({
+            message: `Referenced interface with ID '${missing}' was not defined on the node with ID '${nodeId}'.`,
+            path: [...context.path]
+        });
+    }
+    return results;
+}
\ No newline at end of file
diff --git a/shared/src/spectral/rules-architecture.ts b/shared/src/spectral/rules-architecture.ts
index dd6752fc..469a3f69 100644
--- a/shared/src/spectral/rules-architecture.ts
+++ b/shared/src/spectral/rules-architecture.ts
@@ -5,6 +5,7 @@ import { idsAreUnique } from './functions/architecture/ids-are-unique';
 import { nodeIdExists } from './functions/architecture/node-id-exists';
 import { interfaceIdExists } from './functions/architecture/interface-id-exists';
 import { nodeHasRelationship } from './functions/architecture/node-has-relationship';
+import { interfaceIdExistsOnNode } from './functions/architecture/interface-id-exists-on-node';
 
 const architectureRules: RulesetDefinition = {
     rules: {
@@ -101,7 +102,7 @@ const architectureRules: RulesetDefinition = {
         },
 
         'referenced-interfaces-defined-in-architecture': {
-            description: 'Referenced interfaces must be defined ',
+            description: 'Referenced interfaces must be defined',
             severity: 'error',
             message: '{{error}}',
             given: '$.relationships[*].relationship-type.connects.*.interfaces[*]',
@@ -109,6 +110,16 @@ const architectureRules: RulesetDefinition = {
                 function: interfaceIdExists
             },
         },
+        
+        'referenced-interfaces-defined-on-correct-node-in-architecture': {
+            description: 'Connects relationships must reference interfaces that exist on the correct nodes',
+            severity: 'error',
+            message: '{{error}}',
+            given: '$.relationships[*].relationship-type.connects.*',
+            then: {
+                function: interfaceIdExistsOnNode
+            },
+        },
 
         'composition-relationships-reference-existing-nodes-in-architecture': {
             description: 'All nodes in a composition relationship must reference existing nodes',
diff --git a/shared/src/spectral/rules-pattern.ts b/shared/src/spectral/rules-pattern.ts
index 9ff3e8c0..d03fd1dd 100644
--- a/shared/src/spectral/rules-pattern.ts
+++ b/shared/src/spectral/rules-pattern.ts
@@ -5,6 +5,7 @@ import nodeIdExists from './functions/pattern/node-id-exists';
 import idsAreUnique from './functions/pattern/ids-are-unique';
 import nodeHasRelationship from './functions/pattern/node-has-relationship';
 import { interfaceIdExists } from './functions/pattern/interface-id-exists';
+import { interfaceIdExistsOnNode } from './functions/pattern/interface-id-exists-on-node';
 
 
 const patternRules: RulesetDefinition = {
@@ -110,6 +111,15 @@ const patternRules: RulesetDefinition = {
                 function: interfaceIdExists,
             },
         },
+        'referenced-interfaces-defined-on-correct-node-in-pattern': {
+            description: 'Connects relationships must reference interfaces that exist on the correct nodes',
+            severity: 'error',
+            message: '{{error}}',
+            given: '$..relationship-type.const.connects.*',
+            then: {
+                function: interfaceIdExistsOnNode
+            },
+        },
         'pattern-nodes-must-be-referenced': {
             description: 'Nodes must be referenced by at least one relationship',
             severity: 'warn',