diff --git a/nx.json b/nx.json
index 5fc21721f..65b361513 100644
--- a/nx.json
+++ b/nx.json
@@ -2,31 +2,17 @@
   "$schema": "./node_modules/nx/schemas/nx-schema.json",
   "targetDefaults": {
     "build": {
-      "dependsOn": [
-        "^build"
-      ],
-      "inputs": [
-        "production",
-        "^production"
-      ],
+      "dependsOn": ["^build"],
+      "inputs": ["production", "^production"],
       "cache": true
     },
     "build-storybook": {
-      "inputs": [
-        "default",
-        "^production",
-        "{projectRoot}/.storybook/**/*",
-        "{projectRoot}/tsconfig.storybook.json"
-      ],
+      "inputs": ["default", "^production", "{projectRoot}/.storybook/**/*", "{projectRoot}/tsconfig.storybook.json"],
       "cache": true
     },
     "@nx/jest:jest": {
       "cache": true,
-      "inputs": [
-        "default",
-        "^production",
-        "{workspaceRoot}/jest.preset.js"
-      ],
+      "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
       "options": {
         "passWithNoTests": true
       },
@@ -38,18 +24,17 @@
       }
     },
     "@nx/eslint:lint": {
-      "inputs": [
-        "default",
-        "{workspaceRoot}/.eslintrc.json"
-      ],
+      "inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
       "cache": true
+    },
+    "@nx/js:tsc": {
+      "cache": true,
+      "dependsOn": ["^build"],
+      "inputs": ["production", "^production"]
     }
   },
   "namedInputs": {
-    "default": [
-      "{projectRoot}/**/*",
-      "sharedGlobals"
-    ],
+    "default": ["{projectRoot}/**/*", "sharedGlobals"],
     "production": [
       "default",
       "!{projectRoot}/.eslintrc.json",
diff --git a/packages/nx-generator/.eslintrc.json b/packages/nx-generator/.eslintrc.json
index 322682724..d71647388 100644
--- a/packages/nx-generator/.eslintrc.json
+++ b/packages/nx-generator/.eslintrc.json
@@ -1,6 +1,6 @@
 {
   "extends": ["../../.eslintrc.json"],
-  "ignorePatterns": ["./**/files"],
+  "ignorePatterns": ["!**/*"],
   "overrides": [
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
@@ -15,7 +15,14 @@
       "rules": {}
     },
     {
-      "files": ["./package.json", "./generators.json", "./executors.json"],
+      "files": ["*.json"],
+      "parser": "jsonc-eslint-parser",
+      "rules": {
+        "@nx/dependency-checks": "error"
+      }
+    },
+    {
+      "files": ["./package.json", "./generators.json"],
       "parser": "jsonc-eslint-parser",
       "rules": {
         "@nx/nx-plugin-checks": "error"
diff --git a/packages/nx-generator/executors.json b/packages/nx-generator/executors.json
deleted file mode 100644
index b92c873c3..000000000
--- a/packages/nx-generator/executors.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "$schema": "http://json-schema.org/schema",
-  "executors": {
-    "build": {
-      "implementation": "./src/executors/build/executor",
-      "schema": "./src/executors/build/schema.json",
-      "description": "build executor"
-    }
-  }
-}
diff --git a/packages/nx-generator/package.json b/packages/nx-generator/package.json
index eef80f899..29eb4e4ad 100644
--- a/packages/nx-generator/package.json
+++ b/packages/nx-generator/package.json
@@ -1,7 +1,13 @@
 {
   "name": "@availity/nx-generator",
   "version": "0.0.1",
-  "main": "src/index.js",
-  "generators": "./generators.json",
-  "executors": "./executors.json"
+  "dependencies": {
+    "@nx/devkit": "18.2.4",
+    "tslib": "^2.3.0"
+  },
+  "type": "commonjs",
+  "main": "./src/index.js",
+  "typings": "./src/index.d.ts",
+  "private": true,
+  "generators": "./generators.json"
 }
diff --git a/packages/nx-generator/src/executors/build/executor.spec.ts b/packages/nx-generator/src/executors/build/executor.spec.ts
deleted file mode 100644
index 32de13c6b..000000000
--- a/packages/nx-generator/src/executors/build/executor.spec.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { BuildExecutorSchema } from './schema';
-import executor from './executor';
-
-const options: BuildExecutorSchema = {};
-
-describe('Build Executor', () => {
-  it('can run', async () => {
-    const output = await executor(options);
-    expect(output.success).toBe(true);
-  });
-});
diff --git a/packages/nx-generator/src/executors/build/executor.ts b/packages/nx-generator/src/executors/build/executor.ts
deleted file mode 100644
index 39569a7db..000000000
--- a/packages/nx-generator/src/executors/build/executor.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { BuildExecutorSchema } from './schema';
-
-export default async function runExecutor(options: BuildExecutorSchema) {
-  console.log('Executor ran for Build', options);
-  return {
-    success: true,
-  };
-}
diff --git a/packages/nx-generator/src/executors/build/schema.d.ts b/packages/nx-generator/src/executors/build/schema.d.ts
deleted file mode 100644
index f8247abd5..000000000
--- a/packages/nx-generator/src/executors/build/schema.d.ts
+++ /dev/null
@@ -1 +0,0 @@
-export interface BuildExecutorSchema {} // eslint-disable-line
diff --git a/packages/nx-generator/src/executors/build/schema.json b/packages/nx-generator/src/executors/build/schema.json
deleted file mode 100644
index 992432fee..000000000
--- a/packages/nx-generator/src/executors/build/schema.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "$schema": "http://json-schema.org/schema",
-  "version": 2,
-  "title": "Build executor",
-  "description": "",
-  "type": "object",
-  "properties": {},
-  "required": []
-}
diff --git a/packages/nx-generator/src/generators/nx-generator/files/project.json__template__ b/packages/nx-generator/src/generators/nx-generator/files/project.json__template__
index eb26cb346..865cf6891 100644
--- a/packages/nx-generator/src/generators/nx-generator/files/project.json__template__
+++ b/packages/nx-generator/src/generators/nx-generator/files/project.json__template__
@@ -6,10 +6,9 @@
   "tags": [],
   "targets": {
     "lint": {
-      "executor": "@nx/eslint:eslint",
+      "executor": "@nx/eslint:lint",
       "options": {
         "eslintConfig": ".eslintrc.json",
-        "lintFilePatterns": ["packages/<%= fileName %>/**/*.{js,ts}"],
         "silent": false,
         "fix": false,
         "cache": true,
@@ -23,10 +22,9 @@
     },
     "test": {
       "executor": "@nx/jest:jest",
-      "outputs": ["coverage/<%= fileName %>"],
+      "outputs": ["{workspaceRoot}/coverage/<%= fileName %>"],
       "options": {
-        "jestConfig": "packages/<%= fileName %>/jest.config.js",
-        "passWithNoTests": true
+        "jestConfig": "packages/<%= fileName %>/jest.config.js"
       }
     },
     "version": {
diff --git a/packages/nx-generator/src/generators/nx-generator/files/src/lib/__componentName__.tsx__template__ b/packages/nx-generator/src/generators/nx-generator/files/src/lib/__componentName__.tsx__template__
index b4b53ea22..f7fc3573a 100644
--- a/packages/nx-generator/src/generators/nx-generator/files/src/lib/__componentName__.tsx__template__
+++ b/packages/nx-generator/src/generators/nx-generator/files/src/lib/__componentName__.tsx__template__
@@ -1,4 +1,5 @@
-import { Card as MuiCard, CardProps as MuiCardProps } from '@mui/material';
+// For bundling purposes, always use the direct import for an mui component, i.e. '@mui/material/xxx'
+import MuiCard, { CardProps as MuiCardProps } from '@mui/material/Card';
 
 export interface <%= componentName %>Props extends MuiCardProps {
   children?: React.ReactNode;
diff --git a/packages/nx-generator/src/generators/nx-generator/generator.js b/packages/nx-generator/src/generators/nx-generator/generator.js
deleted file mode 100644
index 65836f0d5..000000000
--- a/packages/nx-generator/src/generators/nx-generator/generator.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// @filename generator.js
-const { workspaceRoot } = require('nx/src/utils/workspace-root');
-const { registerTsProject } = require('nx/src/utils/register');
-
-registerTsProject(workspaceRoot, 'tsconfig.base.json');
-
-module.exports = require('./generator.ts');
-
diff --git a/packages/nx-generator/src/index.ts b/packages/nx-generator/src/index.ts
index cb0ff5c3b..e69de29bb 100644
--- a/packages/nx-generator/src/index.ts
+++ b/packages/nx-generator/src/index.ts
@@ -1 +0,0 @@
-export {};
diff --git a/yarn.lock b/yarn.lock
index 66c189d75..5a3e406be 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -748,6 +748,9 @@ __metadata:
 "@availity/nx-generator@workspace:packages/nx-generator":
   version: 0.0.0-use.local
   resolution: "@availity/nx-generator@workspace:packages/nx-generator"
+  dependencies:
+    "@nx/devkit": 18.2.4
+    tslib: ^2.3.0
   languageName: unknown
   linkType: soft