diff --git a/package-lock.json b/package-lock.json
index 8833651d..167cad0f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
         "packages/plugin-runtime",
         "packages/plugin-runtime-types",
         "plugins-external/mcp-server",
-        "plugins-external/template-function-faker",
+        "plugins/template-function-faker",
         "plugins-external/httpsnippet",
         "plugins/action-copy-curl",
         "plugins/action-copy-grpcurl",
@@ -4153,6 +4153,10 @@
       "resolved": "plugins/auth-oauth2",
       "link": true
     },
+    "node_modules/@yaak/faker": {
+      "resolved": "plugins/template-function-faker",
+      "link": true
+    },
     "node_modules/@yaak/filter-jsonpath": {
       "resolved": "plugins/filter-jsonpath",
       "link": true
@@ -16058,6 +16062,18 @@
       "name": "@yaak/auth-oauth2",
       "version": "0.1.0"
     },
+    "plugins/faker": {
+      "name": "@yaak/faker",
+      "version": "1.1.1",
+      "extraneous": true,
+      "dependencies": {
+        "@faker-js/faker": "^10.1.0"
+      },
+      "devDependencies": {
+        "@types/node": "^25.0.3",
+        "typescript": "^5.9.3"
+      }
+    },
     "plugins/filter-jsonpath": {
       "name": "@yaak/filter-jsonpath",
       "version": "0.1.0",
@@ -16135,6 +16151,33 @@
       "name": "@yaak/template-function-encode",
       "version": "0.1.0"
     },
+    "plugins/template-function-faker": {
+      "name": "@yaak/faker",
+      "version": "1.1.1",
+      "dependencies": {
+        "@faker-js/faker": "^10.1.0"
+      },
+      "devDependencies": {
+        "@types/node": "^25.0.3",
+        "typescript": "^5.9.3"
+      }
+    },
+    "plugins/template-function-faker/node_modules/@faker-js/faker": {
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-10.3.0.tgz",
+      "integrity": "sha512-It0Sne6P3szg7JIi6CgKbvTZoMjxBZhcv91ZrqrNuaZQfB5WoqYYbzCUOq89YR+VY8juY9M1vDWmDDa2TzfXCw==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fakerjs"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": "^20.19.0 || ^22.13.0 || ^23.5.0 || >=24.0.0",
+        "npm": ">=10"
+      }
+    },
     "plugins/template-function-fs": {
       "name": "@yaak/template-function-fs",
       "version": "0.1.0"
diff --git a/package.json b/package.json
index 2501b08a..3a9d76df 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "packages/plugin-runtime",
     "packages/plugin-runtime-types",
     "plugins-external/mcp-server",
-    "plugins-external/template-function-faker",
+    "plugins/template-function-faker",
     "plugins-external/httpsnippet",
     "plugins/action-copy-curl",
     "plugins/action-copy-grpcurl",
diff --git a/plugins-external/faker/README.md b/plugins/template-function-faker/README.md
similarity index 100%
rename from plugins-external/faker/README.md
rename to plugins/template-function-faker/README.md
diff --git a/plugins-external/faker/package.json b/plugins/template-function-faker/package.json
similarity index 91%
rename from plugins-external/faker/package.json
rename to plugins/template-function-faker/package.json
index b5d00a7e..5e281288 100755
--- a/plugins-external/faker/package.json
+++ b/plugins/template-function-faker/package.json
@@ -7,7 +7,7 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/mountain-loop/yaak.git",
-    "directory": "plugins-external/faker"
+    "directory": "plugins/template-function-faker"
   },
   "scripts": {
     "build": "yaakcli build",
diff --git a/plugins-external/faker/src/index.ts b/plugins/template-function-faker/src/index.ts
similarity index 100%
rename from plugins-external/faker/src/index.ts
rename to plugins/template-function-faker/src/index.ts
diff --git a/plugins-external/faker/tests/init.test.ts b/plugins/template-function-faker/tests/init.test.ts
similarity index 100%
rename from plugins-external/faker/tests/init.test.ts
rename to plugins/template-function-faker/tests/init.test.ts
diff --git a/plugins-external/faker/tsconfig.json b/plugins/template-function-faker/tsconfig.json
similarity index 100%
rename from plugins-external/faker/tsconfig.json
rename to plugins/template-function-faker/tsconfig.json