diff --git a/.github/workflows/admin.yaml b/.github/workflows/admin.yaml
index b7d0af6a..3561f007 100644
--- a/.github/workflows/admin.yaml
+++ b/.github/workflows/admin.yaml
@@ -5,7 +5,7 @@ on:
     branches:
       - master
     paths:
-      - "server/admin-next/**"
+      - "server/admin/**"
   workflow_dispatch:
 
 jobs:
@@ -35,4 +35,4 @@ jobs:
       - name: Install packages
         run: pnpm install --frozen-lockfile
       - name: Check Build
-        run: pnpm build:admin-next
+        run: pnpm build:admin
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 666aef56..c12bcf8c 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -8,7 +8,6 @@ packages:
   - 'server'
   - 'server/admin'
   - 'server/admin-old'
-  - 'server/admin-next'
   - 'server/packages/**'
   - 'server/plugins/**'
   - 'server/test/demo/**'
diff --git a/server/admin/package.json b/server/admin/package.json
index 2e24e039..58a8657c 100644
--- a/server/admin/package.json
+++ b/server/admin/package.json
@@ -5,7 +5,7 @@
   "author": "moonrailgun",
   "scripts": {
     "dev": "nodemon",
-    "start": "cross-env NODE_ENV=production node dist/admin-next/src/server/index.js",
+    "start": "cross-env NODE_ENV=production node dist/admin/src/server/index.js",
     "build": "pnpm build:client && pnpm build:server",
     "build:client": "vite build",
     "build:server": "tsc -p tsconfig.server.json"
diff --git a/server/package.json b/server/package.json
index 324c2e45..e3e36c64 100644
--- a/server/package.json
+++ b/server/package.json
@@ -6,12 +6,11 @@
   "license": "Apache-2.0",
   "private": true,
   "scripts": {
-    "dev": "concurrently --kill-others npm:dev:main npm:dev:sdk npm:dev:plugins npm:dev:admin-next",
+    "dev": "concurrently --kill-others npm:dev:main npm:dev:sdk npm:dev:plugins npm:dev:admin",
     "dev:main": "ts-node ./runner.ts",
     "dev:sdk": "cd packages/sdk && pnpm watch",
     "dev:plugins": "pnpm run --filter \"./plugins/*\" build:web:watch",
     "dev:admin": "cd admin && pnpm dev",
-    "dev:admin-next": "cd admin-next && pnpm dev",
     "debug": "node --inspect -r ts-node/register ./runner.ts",
     "build": "ts-node scripts/build.ts",
     "start:service": "cd dist && tailchat-runner --config moleculer.config.js",
diff --git a/server/tsconfig.json b/server/tsconfig.json
index cf554b2c..e58c05bd 100644
--- a/server/tsconfig.json
+++ b/server/tsconfig.json
@@ -15,5 +15,5 @@
     "outDir": "dist"
   },
   "include": ["./**/*"],
-  "exclude": ["node_modules/**/*", "dist", "plugins/**/web/**", "packages/sdk/**", "admin/**", "admin-next/**"]
+  "exclude": ["node_modules/**/*", "dist", "plugins/**/web/**", "packages/sdk/**", "admin/**"]
 }