diff --git a/samples/connection-string-sqlite/EntityFrameworkCoreProject/efcpt-config.json b/samples/connection-string-sqlite/EntityFrameworkCoreProject/efcpt-config.json
index 60d10f0..2fadfb9 100644
--- a/samples/connection-string-sqlite/EntityFrameworkCoreProject/efcpt-config.json
+++ b/samples/connection-string-sqlite/EntityFrameworkCoreProject/efcpt-config.json
@@ -1,9 +1,10 @@
 {
+  "$schema": "https://raw.githubusercontent.com/ErikEJ/EFCorePowerTools/master/samples/efcpt-config.schema.json",
   "names": {
     "root-namespace": "EntityFrameworkCoreProject",
     "dbcontext-name": "SampleDbContext",
     "dbcontext-namespace": null,
-    "entity-namespace": "EntityFrameworkCoreProject.Models"
+    "model-namespace": "EntityFrameworkCoreProject.Models"
   },
   "code-generation": {
     "use-t4": true,
@@ -12,8 +13,6 @@
   },
   "file-layout": {
     "output-path": "Models",
-    "output-dbcontext-path": ".",
-    "use-schema-folders-preview": true,
-    "use-schema-namespaces-preview": false
+    "output-dbcontext-path": "."
   }
 }
diff --git a/samples/custom-renaming/EntityFrameworkCoreProject/efcpt-config.json b/samples/custom-renaming/EntityFrameworkCoreProject/efcpt-config.json
index 9131489..715ecf2 100644
--- a/samples/custom-renaming/EntityFrameworkCoreProject/efcpt-config.json
+++ b/samples/custom-renaming/EntityFrameworkCoreProject/efcpt-config.json
@@ -11,8 +11,7 @@
     "use-t4": false
   },
   "file-layout": {
-    "output-path": "Models",
-    "use-schema-folders-preview": false
+    "output-path": "Models"
   },
   "tables": [
     { "name": "[dbo].[tblCustomers]" },
diff --git a/samples/msbuild-sdk-sql-proj-generation/EntityFrameworkCoreProject/efcpt-config.json b/samples/msbuild-sdk-sql-proj-generation/EntityFrameworkCoreProject/efcpt-config.json
index 72c4aeb..2fadfb9 100644
--- a/samples/msbuild-sdk-sql-proj-generation/EntityFrameworkCoreProject/efcpt-config.json
+++ b/samples/msbuild-sdk-sql-proj-generation/EntityFrameworkCoreProject/efcpt-config.json
@@ -1,20 +1,18 @@
 {
+  "$schema": "https://raw.githubusercontent.com/ErikEJ/EFCorePowerTools/master/samples/efcpt-config.schema.json",
   "names": {
     "root-namespace": "EntityFrameworkCoreProject",
     "dbcontext-name": "SampleDbContext",
     "dbcontext-namespace": null,
-    "entity-namespace": "EntityFrameworkCoreProject.Models"
+    "model-namespace": "EntityFrameworkCoreProject.Models"
   },
   "code-generation": {
     "use-t4": true,
     "t4-template-path": ".",
     "enable-on-configuring": false
-    
   },
   "file-layout": {
     "output-path": "Models",
-    "output-dbcontext-path": ".",
-    "use-schema-folders-preview": true,
-    "use-schema-namespaces-preview": false
+    "output-dbcontext-path": "."
   }
 }
diff --git a/samples/simple-generation/EntityFrameworkCoreProject/efcpt-config.json b/samples/simple-generation/EntityFrameworkCoreProject/efcpt-config.json
index 72c4aeb..2fadfb9 100644
--- a/samples/simple-generation/EntityFrameworkCoreProject/efcpt-config.json
+++ b/samples/simple-generation/EntityFrameworkCoreProject/efcpt-config.json
@@ -1,20 +1,18 @@
 {
+  "$schema": "https://raw.githubusercontent.com/ErikEJ/EFCorePowerTools/master/samples/efcpt-config.schema.json",
   "names": {
     "root-namespace": "EntityFrameworkCoreProject",
     "dbcontext-name": "SampleDbContext",
     "dbcontext-namespace": null,
-    "entity-namespace": "EntityFrameworkCoreProject.Models"
+    "model-namespace": "EntityFrameworkCoreProject.Models"
   },
   "code-generation": {
     "use-t4": true,
     "t4-template-path": ".",
     "enable-on-configuring": false
-    
   },
   "file-layout": {
     "output-path": "Models",
-    "output-dbcontext-path": ".",
-    "use-schema-folders-preview": true,
-    "use-schema-namespaces-preview": false
+    "output-dbcontext-path": "."
   }
 }
diff --git a/samples/split-data-and-models-between-multiple-projects/src/SampleApp.Models/efcpt-config.json b/samples/split-data-and-models-between-multiple-projects/src/SampleApp.Models/efcpt-config.json
index 1328caa..6c8c145 100644
--- a/samples/split-data-and-models-between-multiple-projects/src/SampleApp.Models/efcpt-config.json
+++ b/samples/split-data-and-models-between-multiple-projects/src/SampleApp.Models/efcpt-config.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "https://raw.githubusercontent.com/ErikEJ/EFCorePowerTools/master/samples/efcpt-config.schema.json",
   "names": {
     "root-namespace": "SampleApp",
     "dbcontext-name": "SampleDbContext",
@@ -12,8 +13,6 @@
   },
   "file-layout": {
     "output-path": "Models",
-    "output-dbcontext-path": ".",
-    "use-schema-folders-preview": false,
-    "use-schema-namespaces-preview": false
+    "output-dbcontext-path": "."
   }
 }
diff --git a/src/JD.Efcpt.Build.Tasks/packages.lock.json b/src/JD.Efcpt.Build.Tasks/packages.lock.json
index 8afd5aa..3b14daf 100644
--- a/src/JD.Efcpt.Build.Tasks/packages.lock.json
+++ b/src/JD.Efcpt.Build.Tasks/packages.lock.json
@@ -73,6 +73,15 @@
           "SQLitePCLRaw.core": "2.1.10"
         }
       },
+      "Microsoft.NETFramework.ReferenceAssemblies": {
+        "type": "Direct",
+        "requested": "[1.0.3, )",
+        "resolved": "1.0.3",
+        "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==",
+        "dependencies": {
+          "Microsoft.NETFramework.ReferenceAssemblies.net472": "1.0.3"
+        }
+      },
       "MySqlConnector": {
         "type": "Direct",
         "requested": "[2.4.0, )",
@@ -494,6 +503,11 @@
           "System.Runtime.CompilerServices.Unsafe": "6.1.0"
         }
       },
+      "Microsoft.NETFramework.ReferenceAssemblies.net472": {
+        "type": "Transitive",
+        "resolved": "1.0.3",
+        "contentHash": "0E7evZXHXaDYYiLRfpyXvCh+yzM2rNTyuZDI+ZO7UUqSc6GfjePiXTdqJGtgIKUwdI81tzQKmaWprnUiPj9hAw=="
+      },
       "Mono.Unix": {
         "type": "Transitive",
         "resolved": "7.1.0-final.1.21458.1",
diff --git a/src/JD.Efcpt.Build.Templates/templates/efcptbuild/efcpt-config.json b/src/JD.Efcpt.Build.Templates/templates/efcptbuild/efcpt-config.json
index 5377eef..63c38da 100644
--- a/src/JD.Efcpt.Build.Templates/templates/efcptbuild/efcpt-config.json
+++ b/src/JD.Efcpt.Build.Templates/templates/efcptbuild/efcpt-config.json
@@ -1,26 +1,9 @@
 {
+  "$schema": "https://raw.githubusercontent.com/ErikEJ/EFCorePowerTools/master/samples/efcpt-config.schema.json",
   "names": {
     "root-namespace": "EfcptProject",
     "dbcontext-name": "ApplicationDbContext",
     "dbcontext-namespace": "EfcptProject.Data",
-    "entity-namespace": "EfcptProject.Data.Entities"
-  },
-  "code-generation": {
-    "use-nullable-reference-types": true,
-    "use-date-only-time-only": true,
-    "enable-on-configuring": false,
-    "use-t4": false
-  },
-  "file-layout": {
-    "output-path": "Models",
-    "output-dbcontext-path": ".",
-    "use-schema-folders-preview": true,
-    "use-schema-namespaces-preview": true
-  },
-  "table-selection": [
-    {
-      "schema": "dbo",
-      "include": true
-    }
-  ]
+    "model-namespace": "EfcptProject.Data.Entities"
+  }
 }