diff --git a/specification/keyvault/Security.KeyVault.EKM/tspconfig.yaml b/specification/keyvault/Security.KeyVault.EKM/tspconfig.yaml
index 1bbe6254e79a..b330eb569d04 100644
--- a/specification/keyvault/Security.KeyVault.EKM/tspconfig.yaml
+++ b/specification/keyvault/Security.KeyVault.EKM/tspconfig.yaml
@@ -26,11 +26,11 @@ options:
   # "@azure-tools/typespec-ts": true
   "@azure-tools/typespec-go":
     service-dir: "sdk/security/keyvault"
-    package-dir: "azadmin/ekm"
+    package-dir: "azkeys/ekm"
     inject-spans: true
     single-client: true
     generate-fakes: true
-    module: "github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azadmin"
+    module: "github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys"
     module-version: "0.0.1"
   "@azure-tools/typespec-client-generator-cli":
     additionalDirectories:
diff --git a/specification/keyvault/Security.KeyVault.Keys/models.tsp b/specification/keyvault/Security.KeyVault.Keys/models.tsp
index f59b9ee0765a..66cf55346fc3 100644
--- a/specification/keyvault/Security.KeyVault.Keys/models.tsp
+++ b/specification/keyvault/Security.KeyVault.Keys/models.tsp
@@ -2,6 +2,7 @@ import "@typespec/http";
 import "@typespec/rest";
 import "@typespec/versioning";
 import "@azure-tools/typespec-azure-core";
+import "../Security.KeyVault.EKM/models.tsp";
 
 using TypeSpec.Http;
 using TypeSpec.Rest;
diff --git a/specification/keyvault/Security.KeyVault.Keys/routes.tsp b/specification/keyvault/Security.KeyVault.Keys/routes.tsp
index 3d4f0b1b83b3..4261c6fce8b9 100644
--- a/specification/keyvault/Security.KeyVault.Keys/routes.tsp
+++ b/specification/keyvault/Security.KeyVault.Keys/routes.tsp
@@ -4,6 +4,7 @@ import "@typespec/openapi";
 import "@typespec/rest";
 import "./models.tsp";
 import "../Security.KeyVault.Common/common.tsp";
+import "../Security.KeyVault.EKM/routes.tsp";
 
 using Azure.ClientGenerator.Core;
 using TypeSpec.Http;
diff --git a/specification/keyvault/Security.KeyVault.Keys/tspconfig.yaml b/specification/keyvault/Security.KeyVault.Keys/tspconfig.yaml
index 13fc8ea253d8..890ffa31d270 100644
--- a/specification/keyvault/Security.KeyVault.Keys/tspconfig.yaml
+++ b/specification/keyvault/Security.KeyVault.Keys/tspconfig.yaml
@@ -66,3 +66,4 @@ options:
   "@azure-tools/typespec-client-generator-cli":
     additionalDirectories:
       - "specification/keyvault/Security.KeyVault.Common/"
+      - "specification/keyvault/Security.KeyVault.EKM/"
diff --git a/specification/keyvault/cspell.yaml b/specification/keyvault/cspell.yaml
index 9c8d7e2a60bd..eb77d375c7a4 100644
--- a/specification/keyvault/cspell.yaml
+++ b/specification/keyvault/cspell.yaml
@@ -10,6 +10,7 @@ words:
   - assetid
   - azadmin
   - azekm
+  - azkeys
   - backuprestore
   - byok
   - CBCPAD
@@ -54,15 +55,9 @@ overrides:
   - filename: '**/specification/keyvault/Security.KeyVault.Certificates/tspconfig.yaml'
     words:
       - azcertificates
-  - filename: '**/specification/keyvault/Security.KeyVault.EKM/tspconfig.yaml'
-    words:
-      - azekm
   - filename: '**/specification/keyvault/Security.KeyVault.Secrets/tspconfig.yaml'
     words:
       - azsecrets
-  - filename: '**/specification/keyvault/Security.KeyVault.Keys/tspconfig.yaml'
-    words:
-      - azkeys
   - filename: '**/specification/keyvault/data-plane/Microsoft.KeyVault/**/storage.json'
     words:
       - regenerte