diff --git a/apps/app/src/app/pages/(examples)/examples/notes/(notes).page.ts b/apps/app/src/app/pages/(examples)/examples/notes/(notes).page.ts
index 75fd8d515..e816efbe8 100644
--- a/apps/app/src/app/pages/(examples)/examples/notes/(notes).page.ts
+++ b/apps/app/src/app/pages/(examples)/examples/notes/(notes).page.ts
@@ -1,20 +1,20 @@
 import { RouteMeta } from '@analogjs/router';
-import { waitFor } from '@analogjs/trpc';
 import { AsyncPipe, DatePipe, JsonPipe, NgFor, NgIf } from '@angular/common';
 import { Component, computed, inject, signal } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { RouterLink } from '@angular/router';
+import { waitFor } from '@spartan-ng/trpc';
 import { HlmButtonDirective } from '@spartan-ng/ui-button-helm';
 import { HlmInputDirective } from '@spartan-ng/ui-input-helm';
 import { HlmLabelDirective } from '@spartan-ng/ui-label-helm';
 import { HlmSpinnerComponent } from '@spartan-ng/ui-spinner-helm';
 import { SignalFormBuilder, SignalInputDirective, V, withErrorComponent } from 'ng-signal-forms';
 import { Observable, Subject, catchError, of, switchMap, take, tap } from 'rxjs';
-import { InputErrorComponent } from '~/app/shared/input-error/input-error.component';
-import { SpartanInputErrorDirective } from '~/app/shared/input-error/input-error.directive';
-import { metaWith } from '~/app/shared/meta/meta.util';
-import { Note } from '~/db';
-import { injectTRPCClient } from '~/trpc-client';
+import { Note } from '../../../../../db';
+import { injectTRPCClient } from '../../../../../trpc-client';
+import { InputErrorComponent } from '../../../../shared/input-error/input-error.component';
+import { SpartanInputErrorDirective } from '../../../../shared/input-error/input-error.directive';
+import { metaWith } from '../../../../shared/meta/meta.util';
 import { NoteSkeletonComponent } from './components/note-skeleton.component';
 import { NoteComponent } from './components/note.component';
 import { NotesEmptyComponent } from './components/notes-empty.component';
diff --git a/apps/app/src/server/routes/trpc/[trpc].ts b/apps/app/src/server/routes/trpc/[trpc].ts
index 3294563f2..d692d6fa0 100644
--- a/apps/app/src/server/routes/trpc/[trpc].ts
+++ b/apps/app/src/server/routes/trpc/[trpc].ts
@@ -1,4 +1,4 @@
-import { createTrpcNitroHandler } from '@analogjs/trpc';
+import { createTrpcNitroHandler } from '@spartan-ng/trpc';
 import { createContext } from '../../trpc/context';
 import { appRouter } from '../../trpc/routers';
 // export API handler
diff --git a/apps/app/vite.config.ts b/apps/app/vite.config.ts
index 105af6af7..691a3d1b7 100644
--- a/apps/app/vite.config.ts
+++ b/apps/app/vite.config.ts
@@ -18,14 +18,7 @@ export default defineConfig(({ mode }) => {
 			include: ['@angular/common', '@angular/forms', 'isomorphic-fetch'],
 		},
 		ssr: {
-			noExternal: [
-				'@analogjs/trpc/**',
-				'@spartan-ng/**',
-				'@angular/cdk/**',
-				'@ng-icons/**',
-				'ngx-scrollbar/**',
-				'ng-signal-forms/**',
-			],
+			noExternal: ['@spartan-ng/**', '@angular/cdk/**', '@ng-icons/**', 'ngx-scrollbar/**', 'ng-signal-forms/**'],
 		},
 		build: {
 			target: ['es2020'],
@@ -89,10 +82,6 @@ export default defineConfig(({ mode }) => {
 						host: 'https://www.spartan.ng',
 					},
 				},
-				nitro: {
-					preset: 'vercel',
-					serveStatic: false,
-				},
 			}),
 			nxViteTsPaths(),
 			visualizer() as Plugin,
diff --git a/libs/trpc/project.json b/libs/trpc/project.json
index 1d4fcb6ba..bf7cd2d54 100644
--- a/libs/trpc/project.json
+++ b/libs/trpc/project.json
@@ -1,14 +1,14 @@
 {
 	"name": "trpc",
 	"$schema": "../../node_modules/nx/schemas/project-schema.json",
-	"sourceRoot": "/src",
+	"sourceRoot": "libs/trpc/src",
 	"prefix": "spartan-ng",
 	"tags": [],
 	"projectType": "library",
 	"targets": {
 		"build": {
 			"executor": "@angular-devkit/build-angular:ng-packagr",
-			"outputs": ["{workspaceRoot}/node_modules/@spartan-ng/trpc"],
+			"outputs": ["{workspaceRoot}/dist/libs/trpc"],
 			"options": {
 				"project": "libs/trpc/ng-package.json"
 			},
diff --git a/package.json b/package.json
index 00ae725a2..a31e52bf0 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,6 @@
 		"@analogjs/content": "0.2.19",
 		"@analogjs/platform": "0.2.19",
 		"@analogjs/router": "0.2.19",
-		"@analogjs/trpc": "0.2.19",
 		"@analogjs/vite-plugin-angular": "0.2.19",
 		"@angular/animations": "17.0.2",
 		"@angular/cdk": "17.0.0",