diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..5e85614
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Keep embedded template contents identical across build platforms.
+templates/** text=auto eol=lf
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64e7d9c..e718387 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+- Deliver all templates as embedded source files and restore `.tmpl` filenames during generation.
+- Remove template ZIP packaging, downloads, external registries, and cache commands.
+- Resolve template version checks and upgrade reports from the bundled registry only.
+
 ## 1.2.0 - 2026-08-30
 
 - Remove checked-in build artifacts and an orphan generated application file.
diff --git a/README.md b/README.md
index 9dd30b9..e7de5e3 100644
--- a/README.md
+++ b/README.md
@@ -4,13 +4,11 @@ Foundry is a single Go CLI for creating and extending projects from reusable fou
 
 ## Highlights
 
-- external, versioned template registry support
-- SHA-256 verified template ZIP downloads
-- local template cache and offline generation
-- `foundry template update` / `foundry template list`
+- Go and Flutter templates bundled directly as source files in one executable
+- offline project generation with no template downloads or packaging step
+- `foundry template list` to inspect the bundled templates
 - `foundry add service` and `foundry add migration` for Go projects
 - `foundry add feature` and `foundry add package` for Flutter workspaces
-- bundled templates remain available without a registry or network connection
 
 ## Bundled templates
 
@@ -75,20 +73,7 @@ foundry new mediguide \
   --org ug.go.health
 ```
 
-Select an external/cached version:
-
-```bash
-foundry new users-service \
-  --template go \
-  --version 1.2.0 \
-  --module github.com/your-org/users-service
-```
-
-Force offline operation:
-
-```bash
-foundry new users-service --template go --version 1.2.0 --offline
-```
+Both templates are available offline. Optional generation hooks may invoke installed SDKs and their package managers; use `--no-hooks` to skip them.
 
 ## Extend an existing project
 
@@ -112,68 +97,20 @@ foundry add package foundation_analytics
 
 A Flutter feature is created as a small clean slice with `domain`, `application`, `data`, and `presentation` directories.
 
-## External template registry
-
-Foundry does not require a registry. The built-in templates always remain available. A registry lets templates evolve independently from the Foundry binary.
+## Template delivery
 
-Configure it once:
+All templates are maintained under `templates/` and embedded directly into the Foundry executable. Generation copies their files, restores template filenames, and substitutes project settings.
 
-```bash
-export FOUNDRY_REGISTRY_URL="https://raw.githubusercontent.com/your-org/foundry-templates/main/registry.json"
-foundry template update
-foundry template list
-```
+| Template | Source folder | Delivery |
+| --- | --- | --- |
+| Go Foundations | `templates/go-foundations/` | Embedded source files |
+| Flutter Foundations | `templates/flutter_foundations/` | Embedded source files |
 
-or provide the URL explicitly:
+Go source files use `.go.tmpl` and its module manifest uses `go.mod.tmpl` to keep the template separate from Foundry's Go module. Generated projects receive ordinary `.go` files and `go.mod`.
 
-```bash
-foundry template update --registry https://example.org/foundry/registry.json
-```
-
-Registry format:
-
-```json
-{
-  "schema": 1,
-  "updated_at": "2026-08-14T12:00:00Z",
-  "templates": [
-    {
-      "id": "go-foundations",
-      "name": "Go Foundations",
-      "version": "1.2.0",
-      "description": "Production Go gRPC foundation",
-      "kind": "go",
-      "aliases": ["go", "grpc", "backend"],
-      "url": "https://github.com/your-org/foundry-templates/releases/download/go-foundations-v1.2.0/go-foundations.zip",
-      "sha256": "<sha256-of-the-zip>"
-    }
-  ]
-}
-```
+Template changes ship with a new Foundry build/release. There is no external template registry, template archive download, or template cache. `foundry template list` shows the available versions; `--version` can assert the bundled version but cannot select an external release.
 
-The `url` can be a GitHub Release asset or any direct HTTP(S) ZIP. Foundry verifies the downloaded archive against `sha256` before adding it to the cache.
-
-Cache layout is platform-specific under the operating system's standard user-cache directory:
-
-```text
-foundry/
-├── registry.json
-└── templates/
-    └── go-foundations/
-        └── 1.2.0/
-            └── template.zip
-```
-
-Set `FOUNDRY_CACHE_DIR` to use an explicit cache location, which is useful in
-CI, containers, and other isolated environments.
-
-Once downloaded:
-
-```bash
-foundry new demo --template go --version 1.2.0 --offline
-```
-
-works without a network connection.
+To update a template, edit its source files and rebuild Foundry with `make build`.
 
 ## Commands
 
@@ -185,12 +122,9 @@ foundry add migration <name>
 foundry add feature <name>
 foundry add package <name>
 foundry template list
-foundry template update --registry <url>
 foundry list
 foundry info <template>
 foundry doctor
-foundry cache list
-foundry cache clean
 foundry version
 ```
 
@@ -200,8 +134,7 @@ foundry version
 --module       Go module path
 --org          Flutter organization identifier
 --package      Flutter package token
---version      external/cached template version
---offline      do not download missing templates
+--version      require this bundled template version
 --destination  output path
 --force        generate into a non-empty directory
 --no-hooks     skip post-generation hooks
@@ -213,11 +146,6 @@ foundry version
 Foundry CLI
    |
    +-- built-in registry
-   +-- external registry
-   |      `-- SHA-256 verified releases
-   |
-   +-- template cache
-   |
    +-- project generator
    |      +-- Go foundation
    |      `-- Flutter foundation
@@ -228,8 +156,7 @@ Foundry CLI
    |      +-- Flutter feature
    |      `-- Flutter package
    |
-   +-- doctor
-   `-- cache
+   `-- doctor
 ```
 
 Authentication/RBAC choices belong to the generated Go foundation, not to Foundry itself. Flutter's platform folders are generated using the installed Flutter SDK before the foundation overlay is applied when Flutter is available.
@@ -243,7 +170,7 @@ make build
 make smoke
 ```
 
-`go test ./...` includes tests for registry fetching/caching/checksum validation and the Go/Flutter add generators.
+`go test ./...` checks bundled template generation, module substitution, CLI behavior, and the Go/Flutter add generators.
 
 ### Releases
 
@@ -267,7 +194,7 @@ Every newly generated project now includes `.foundry.yaml`, recording the templa
 foundry upgrade --check
 ```
 
-The v1.2 upgrade command is intentionally read-only: it compares the project template version with bundled/cached registry releases and reports whether an update is available.
+The v1.2 upgrade command is intentionally read-only: it compares the project template version with the bundled template version and reports whether an update is available.
 
 Additional Go generators:
 
@@ -282,16 +209,3 @@ Flutter Mason bricks can be invoked consistently through Foundry:
 ```bash
 foundry mason feature --name profile
 ```
-
-Template maintainers can create versioned release archives and SHA-256 checksums:
-
-```bash
-foundry template pack ./my-template \
-  --id my-template \
-  --version 1.0.0 \
-  --kind go \
-  --out my-template-1.0.0.zip
-```
-
-If `--url` is supplied, Foundry also prints a registry JSON entry containing the generated SHA-256 digest.
-# foundry
diff --git a/assets.go b/assets.go
index 87fe72a..76f4c4d 100644
--- a/assets.go
+++ b/assets.go
@@ -2,7 +2,40 @@ package foundry
 
 import "embed"
 
-// Templates contains the Foundry v1 bundled project foundations.
+// Templates contains the bundled project foundations as source files.
 //
-//go:embed all:templates
+//go:embed all:templates/go-foundations/.gitignore
+//go:embed all:templates/go-foundations/Dockerfile
+//go:embed all:templates/go-foundations/FILES.txt
+//go:embed all:templates/go-foundations/Makefile
+//go:embed all:templates/go-foundations/README.md
+//go:embed all:templates/go-foundations/api
+//go:embed all:templates/go-foundations/buf.gen.yaml
+//go:embed all:templates/go-foundations/buf.lock
+//go:embed all:templates/go-foundations/buf.yaml
+//go:embed all:templates/go-foundations/cmd
+//go:embed all:templates/go-foundations/compose.yaml
+//go:embed all:templates/go-foundations/configs
+//go:embed all:templates/go-foundations/deploy
+//go:embed all:templates/go-foundations/gen
+//go:embed all:templates/go-foundations/go.mod.tmpl
+//go:embed all:templates/go-foundations/go.sum
+//go:embed all:templates/go-foundations/internal
+//go:embed all:templates/go-foundations/migrations
+//go:embed all:templates/go-foundations/scripts
+//go:embed all:templates/go-foundations/secrets
+//go:embed all:templates/flutter_foundations/.env.example
+//go:embed all:templates/flutter_foundations/.fvmrc
+//go:embed all:templates/flutter_foundations/.gitignore
+//go:embed all:templates/flutter_foundations/README.md
+//go:embed all:templates/flutter_foundations/VERSION
+//go:embed all:templates/flutter_foundations/analysis_options.yaml
+//go:embed all:templates/flutter_foundations/apps
+//go:embed all:templates/flutter_foundations/bricks
+//go:embed all:templates/flutter_foundations/env
+//go:embed all:templates/flutter_foundations/mason.yaml
+//go:embed templates/flutter_foundations/packages
+//go:embed all:templates/flutter_foundations/pubspec.lock
+//go:embed all:templates/flutter_foundations/pubspec.yaml
+//go:embed all:templates/flutter_foundations/scripts
 var Templates embed.FS
diff --git a/internal/cache/cache.go b/internal/cache/cache.go
deleted file mode 100644
index a116820..0000000
--- a/internal/cache/cache.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package cache
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
-)
-
-func Dir() (string, error) {
-	d := strings.TrimSpace(os.Getenv("FOUNDRY_CACHE_DIR"))
-	if d == "" {
-		base, err := os.UserCacheDir()
-		if err != nil {
-			return "", err
-		}
-		d = filepath.Join(base, "foundry")
-	} else {
-		var err error
-		d, err = filepath.Abs(d)
-		if err != nil {
-			return "", err
-		}
-	}
-	if err := os.MkdirAll(d, 0o755); err != nil {
-		return "", err
-	}
-	return d, nil
-}
-
-func Clean() error {
-	d, err := Dir()
-	if err != nil {
-		return err
-	}
-	entries, err := os.ReadDir(d)
-	if err != nil {
-		return err
-	}
-	for _, e := range entries {
-		if err := os.RemoveAll(filepath.Join(d, e.Name())); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func Summary() (string, error) {
-	d, err := Dir()
-	if err != nil {
-		return "", err
-	}
-	entries, err := os.ReadDir(d)
-	if err != nil {
-		return "", err
-	}
-	return fmt.Sprintf("%s (%d entries)", d, len(entries)), nil
-}
diff --git a/internal/cache/cache_test.go b/internal/cache/cache_test.go
deleted file mode 100644
index 288a67a..0000000
--- a/internal/cache/cache_test.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package cache
-
-import (
-	"path/filepath"
-	"testing"
-)
-
-func TestDirHonorsOverride(t *testing.T) {
-	want := filepath.Join(t.TempDir(), "foundry-cache")
-	t.Setenv("FOUNDRY_CACHE_DIR", want)
-
-	got, err := Dir()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if got != want {
-		t.Fatalf("Dir() = %q, want %q", got, want)
-	}
-}
diff --git a/internal/cli/cli.go b/internal/cli/cli.go
index 6ec050b..c54f95b 100644
--- a/internal/cli/cli.go
+++ b/internal/cli/cli.go
@@ -11,12 +11,9 @@ import (
 	"strings"
 
 	addgen "github.com/jabahum/foundry/internal/add"
-	"github.com/jabahum/foundry/internal/cache"
 	"github.com/jabahum/foundry/internal/doctor"
 	"github.com/jabahum/foundry/internal/generator"
-	"github.com/jabahum/foundry/internal/publish"
 	"github.com/jabahum/foundry/internal/registry"
-	"github.com/jabahum/foundry/internal/templatehub"
 	"github.com/jabahum/foundry/internal/upgrade"
 )
 
@@ -59,8 +56,6 @@ func (a App) Run(args []string) int {
 	case "doctor":
 		doctor.Print()
 		return 0
-	case "cache":
-		return cacheCmd(args[1:])
 	case "version", "--version", "-v":
 		fmt.Println("foundry", Version)
 		return 0
@@ -111,7 +106,6 @@ func (a App) newCmd(args []string) int {
 	dest := f.String("destination", "", "output directory")
 	force := f.Bool("force", false, "allow generation into non-empty directory")
 	noHooks := f.Bool("no-hooks", false, "skip post-generation hooks")
-	offline := f.Bool("offline", false, "never download a template")
 	if err := f.Parse(args); err != nil {
 		return 2
 	}
@@ -127,18 +121,22 @@ func (a App) newCmd(args []string) int {
 		return 2
 	}
 
-	resolved, err := templatehub.Resolve(*tmpl, *version, *offline)
+	selected, err := registry.Find(*tmpl)
 	if err != nil {
 		fmt.Fprintln(os.Stderr, "error:", err)
 		return 1
 	}
+	if *version != "" && *version != selected.Version {
+		fmt.Fprintf(os.Stderr, "template %q version %q is not bundled; this Foundry build includes %s\n", selected.ID, *version, selected.Version)
+		return 1
+	}
 	g := generator.Generator{FS: a.FS}
-	err = g.Generate(resolved.Template, generator.Options{Name: name, Destination: *dest, Module: *module, Org: *org, Package: *pkg, ArchivePath: resolved.ArchivePath, Force: *force, NoHooks: *noHooks})
+	err = g.Generate(selected, generator.Options{Name: name, Destination: *dest, Module: *module, Org: *org, Package: *pkg, Force: *force, NoHooks: *noHooks})
 	if err != nil {
 		fmt.Fprintln(os.Stderr, "error:", err)
 		return 1
 	}
-	fmt.Printf("Template source: %s\n", resolved.Source)
+	fmt.Println("Template source: bundled files")
 	return 0
 }
 
@@ -203,72 +201,10 @@ func addCmd(args []string) int {
 
 func templateCmd(args []string) int {
 	if len(args) == 0 || args[0] == "list" {
-		releases, err := templatehub.ListCached()
-		if err != nil {
-			fmt.Fprintln(os.Stderr, err)
-			return 1
-		}
-		if len(releases) == 0 {
-			fmt.Println("No external template registry cached. Bundled templates remain available.")
-			return 0
-		}
-		fmt.Printf("%-22s %-10s %-10s %s\n", "TEMPLATE", "VERSION", "KIND", "DESCRIPTION")
-		for _, r := range releases {
-			fmt.Printf("%-22s %-10s %-10s %s\n", r.ID, r.Version, r.Kind, r.Description)
-		}
-		return 0
-	}
-	if args[0] == "pack" {
-		packArgs := args[1:]
-		dir := ""
-		if len(packArgs) > 0 && !strings.HasPrefix(packArgs[0], "-") {
-			dir = packArgs[0]
-			packArgs = packArgs[1:]
-		}
-		f := flag.NewFlagSet("template pack", flag.ContinueOnError)
-		f.SetOutput(os.Stderr)
-		out := f.String("out", "", "output zip path")
-		id := f.String("id", "", "template id")
-		version := f.String("version", "", "template version")
-		kind := f.String("kind", "", "template kind")
-		url := f.String("url", "", "published archive URL for registry entry")
-		if err := f.Parse(packArgs); err != nil {
-			return 2
-		}
-		if dir == "" && len(f.Args()) > 0 {
-			dir = f.Args()[0]
-		}
-		if dir == "" {
-			fmt.Fprintln(os.Stderr, "usage: foundry template pack <directory> --id ID --version VERSION --kind KIND [--out file.zip]")
-			return 2
-		}
-		sha, err := publish.Pack(dir, *out)
-		if err != nil {
-			fmt.Fprintln(os.Stderr, "error:", err)
-			return 1
-		}
-		fmt.Println("sha256:", sha)
-		if *id != "" && *version != "" && *kind != "" && *url != "" {
-			fmt.Println("registry entry:", publish.RegistryEntry(*id, *version, *kind, *url, sha))
-		}
-		return 0
-	}
-	if args[0] == "update" {
-		f := flag.NewFlagSet("template update", flag.ContinueOnError)
-		f.SetOutput(os.Stderr)
-		url := f.String("registry", "", "registry JSON URL (or FOUNDRY_REGISTRY_URL)")
-		if err := f.Parse(args[1:]); err != nil {
-			return 2
-		}
-		m, err := templatehub.Update(*url)
-		if err != nil {
-			fmt.Fprintln(os.Stderr, "error:", err)
-			return 1
-		}
-		fmt.Printf("Template registry updated: %d releases\n", len(m.Templates))
+		printTemplates()
 		return 0
 	}
-	fmt.Fprintln(os.Stderr, "usage: foundry template [list|update --registry URL]")
+	fmt.Fprintln(os.Stderr, "usage: foundry template list (templates ship with Foundry; install a newer Foundry release for updates)")
 	return 2
 }
 
@@ -281,27 +217,6 @@ func printTemplates() {
 func printInfo(t registry.Template) {
 	fmt.Printf("%s\nID: %s\nVersion: %s\nAliases: %s\n%s\n", t.Name, t.ID, t.Version, strings.Join(t.Aliases, ", "), t.Description)
 }
-func cacheCmd(args []string) int {
-	if len(args) == 0 || args[0] == "list" {
-		s, e := cache.Summary()
-		if e != nil {
-			fmt.Fprintln(os.Stderr, e)
-			return 1
-		}
-		fmt.Println(s)
-		return 0
-	}
-	if args[0] == "clean" {
-		if e := cache.Clean(); e != nil {
-			fmt.Fprintln(os.Stderr, e)
-			return 1
-		}
-		fmt.Println("cache cleaned")
-		return 0
-	}
-	fmt.Fprintln(os.Stderr, "usage: foundry cache [list|clean]")
-	return 2
-}
 func upgradeCmd(args []string) int {
 	f := flag.NewFlagSet("upgrade", flag.ContinueOnError)
 	f.SetOutput(os.Stderr)
@@ -352,8 +267,8 @@ func usage() {
 
 Usage:
   foundry
-  foundry new <name> --template go [--module path] [--version version] [--offline]
-  foundry new <name> --template flutter [--org com.example] [--version version] [--offline]
+  foundry new <name> --template go [--module path] [--version version]
+  foundry new <name> --template flutter [--org com.example] [--version version]
   foundry add service <name> [--project path]
   foundry add repository <name> [--project path]
   foundry add usecase <domain> <name> [--project path]
@@ -362,13 +277,10 @@ Usage:
   foundry add feature <name> [--project path]
   foundry add package <name> [--project path]
   foundry template list
-  foundry template update --registry <url>
-  foundry template pack <directory> --id ID --version VERSION --kind KIND
   foundry upgrade [--project path] [--check]
   foundry mason <brick> [args...]
   foundry list
   foundry info <template>
   foundry doctor
-  foundry cache [list|clean]
   foundry version`)
 }
diff --git a/internal/cli/cli_test.go b/internal/cli/cli_test.go
index dbdb63a..7f2b578 100644
--- a/internal/cli/cli_test.go
+++ b/internal/cli/cli_test.go
@@ -3,27 +3,60 @@ package cli
 import (
 	"os"
 	"path/filepath"
+	"strings"
 	"testing"
+
+	"github.com/jabahum/foundry"
 )
 
-func TestTemplatePackAcceptsDocumentedDirectoryFirstSyntax(t *testing.T) {
-	dir := t.TempDir()
-	if err := os.WriteFile(filepath.Join(dir, "README.md"), []byte("template"), 0o644); err != nil {
-		t.Fatal(err)
+func TestBundledTemplateCommands(t *testing.T) {
+	app := App{FS: foundry.Templates}
+	for _, args := range [][]string{{"template", "list"}, {"list"}, {"info", "go-foundations"}} {
+		if code := app.Run(args); code != 0 {
+			t.Fatalf("%v: exit %d", args, code)
+		}
 	}
-	out := filepath.Join(t.TempDir(), "template.zip")
+}
 
-	code := templateCmd([]string{
-		"pack", dir,
-		"--out", out,
-		"--id", "example",
-		"--version", "1.0.0",
-		"--kind", "go",
-	})
-	if code != 0 {
-		t.Fatalf("template pack exit code = %d, want 0", code)
+func TestNewUsesOnlyBundledVersion(t *testing.T) {
+	t.Setenv("FOUNDRY_REGISTRY_URL", "http://127.0.0.1:1/registry.json")
+	app := App{FS: foundry.Templates}
+	for _, version := range []string{"", "1.0.0", "99.0.0"} {
+		t.Run(version, func(t *testing.T) {
+			dest := filepath.Join(t.TempDir(), "project")
+			args := []string{"new", "demo", "--template", "go", "--destination", dest, "--no-hooks"}
+			if version != "" {
+				args = append(args, "--version", version)
+			}
+			code := app.Run(args)
+			if version == "99.0.0" {
+				if code == 0 {
+					t.Fatal("unbundled version unexpectedly succeeded")
+				}
+				if _, err := os.Stat(dest); !os.IsNotExist(err) {
+					t.Fatal("unbundled version created output")
+				}
+				return
+			}
+			if code != 0 {
+				t.Fatalf("new exit %d", code)
+			}
+			data, err := os.ReadFile(filepath.Join(dest, "go.mod"))
+			if err != nil {
+				t.Fatal(err)
+			}
+			if !strings.Contains(string(data), "module demo\n") {
+				t.Fatalf("unexpected module: %s", data)
+			}
+		})
 	}
-	if _, err := os.Stat(out); err != nil {
-		t.Fatalf("archive was not created at --out path: %v", err)
+}
+
+func TestRetiredDeliveryCommandsAreRejected(t *testing.T) {
+	app := App{FS: foundry.Templates}
+	for _, args := range [][]string{{"template", "pack"}, {"template", "update"}, {"cache", "list"}} {
+		if code := app.Run(args); code != 2 {
+			t.Fatalf("%v: exit %d, want 2", args, code)
+		}
 	}
 }
diff --git a/internal/generator/generator.go b/internal/generator/generator.go
index 6a476fa..21cd294 100644
--- a/internal/generator/generator.go
+++ b/internal/generator/generator.go
@@ -1,11 +1,8 @@
 package generator
 
 import (
-	"archive/zip"
 	"bufio"
-	"bytes"
 	"fmt"
-	"io"
 	"io/fs"
 	"os"
 	"os/exec"
@@ -18,7 +15,6 @@ import (
 
 type Options struct {
 	Name, Destination, Module, Org, Package string
-	ArchivePath                             string
 	Force, NoHooks                          bool
 }
 
@@ -49,18 +45,8 @@ func (g Generator) Generate(t registry.Template, o Options) error {
 			fmt.Fprintf(os.Stderr, "warning: flutter platform scaffold: %v\n", err)
 		}
 	}
-	if o.ArchivePath != "" {
-		if err := extractZipFile(o.ArchivePath, dest); err != nil {
-			return err
-		}
-	} else if t.EmbeddedArchive != "" {
-		if err := extractEmbeddedZip(g.FS, t.EmbeddedArchive, dest); err != nil {
-			return err
-		}
-	} else {
-		if err := copyTree(g.FS, t.EmbeddedDir, dest); err != nil {
-			return err
-		}
+	if err := copyTree(g.FS, t.EmbeddedDir, dest); err != nil {
+		return err
 	}
 
 	vars := map[string]string{
@@ -85,105 +71,6 @@ func (g Generator) Generate(t registry.Template, o Options) error {
 	return nil
 }
 
-func extractZipFile(archivePath, dst string) error {
-	f, err := os.Open(archivePath)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-	st, err := f.Stat()
-	if err != nil {
-		return err
-	}
-	zr, err := zip.NewReader(f, st.Size())
-	if err != nil {
-		return fmt.Errorf("open template archive: %w", err)
-	}
-	for _, zf := range zr.File {
-		clean := filepath.Clean(zf.Name)
-		if clean == "." || strings.HasPrefix(clean, ".."+string(filepath.Separator)) || filepath.IsAbs(clean) {
-			return fmt.Errorf("unsafe archive path %q", zf.Name)
-		}
-		target := filepath.Join(dst, clean)
-		if zf.FileInfo().IsDir() {
-			if err := os.MkdirAll(target, 0o755); err != nil {
-				return err
-			}
-			continue
-		}
-		if err := os.MkdirAll(filepath.Dir(target), 0o755); err != nil {
-			return err
-		}
-		r, err := zf.Open()
-		if err != nil {
-			return err
-		}
-		data, readErr := io.ReadAll(r)
-		closeErr := r.Close()
-		if readErr != nil {
-			return readErr
-		}
-		if closeErr != nil {
-			return closeErr
-		}
-		mode := zf.Mode()
-		if mode == 0 {
-			mode = 0o644
-		}
-		if err := os.WriteFile(target, data, mode); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func extractEmbeddedZip(src fs.FS, archivePath, dst string) error {
-	data, err := fs.ReadFile(src, archivePath)
-	if err != nil {
-		return err
-	}
-	zr, err := zip.NewReader(bytes.NewReader(data), int64(len(data)))
-	if err != nil {
-		return fmt.Errorf("open embedded template archive: %w", err)
-	}
-	for _, f := range zr.File {
-		clean := filepath.Clean(f.Name)
-		if clean == "." || strings.HasPrefix(clean, ".."+string(filepath.Separator)) || filepath.IsAbs(clean) {
-			return fmt.Errorf("unsafe archive path %q", f.Name)
-		}
-		target := filepath.Join(dst, clean)
-		if f.FileInfo().IsDir() {
-			if err := os.MkdirAll(target, 0o755); err != nil {
-				return err
-			}
-			continue
-		}
-		if err := os.MkdirAll(filepath.Dir(target), 0o755); err != nil {
-			return err
-		}
-		r, err := f.Open()
-		if err != nil {
-			return err
-		}
-		content, err := io.ReadAll(r)
-		closeErr := r.Close()
-		if err != nil {
-			return err
-		}
-		if closeErr != nil {
-			return closeErr
-		}
-		mode := f.Mode()
-		if mode == 0 {
-			mode = 0o644
-		}
-		if err := os.WriteFile(target, content, mode); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
 func copyTree(src fs.FS, root, dst string) error {
 	return fs.WalkDir(src, root, func(path string, d fs.DirEntry, err error) error {
 		if err != nil {
@@ -196,6 +83,9 @@ func copyTree(src fs.FS, root, dst string) error {
 		if rel == "." {
 			return nil
 		}
+		if !d.IsDir() {
+			rel = strings.TrimSuffix(rel, ".tmpl")
+		}
 		target := filepath.Join(dst, rel)
 		if d.IsDir() {
 			return os.MkdirAll(target, 0o755)
@@ -205,6 +95,10 @@ func copyTree(src fs.FS, root, dst string) error {
 			return err
 		}
 		mode := fs.FileMode(0o644)
+		// embed.FS normalizes permissions, so restore runnable shell scripts.
+		if filepath.Ext(rel) == ".sh" {
+			mode = 0o755
+		}
 		if info, e := d.Info(); e == nil && info.Mode()&0o111 != 0 {
 			mode = 0o755
 		}
diff --git a/internal/generator/generator_test.go b/internal/generator/generator_test.go
index babce1d..e930e25 100644
--- a/internal/generator/generator_test.go
+++ b/internal/generator/generator_test.go
@@ -1,8 +1,10 @@
 package generator
 
 import (
+	"io/fs"
 	"os"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"testing"
 	"testing/fstest"
@@ -23,6 +25,41 @@ func TestBundledTemplatesGenerate(t *testing.T) {
 			if err := g.Generate(tmpl, Options{Name: "demo", Destination: dest, NoHooks: true}); err != nil {
 				t.Fatal(err)
 			}
+			if err := filepath.WalkDir(dest, func(path string, d fs.DirEntry, err error) error {
+				if err != nil {
+					return err
+				}
+				if strings.HasSuffix(path, ".tmpl") {
+					t.Errorf("unrestored template filename: %s", path)
+				}
+				if d.IsDir() && (d.Name() == ".dart_tool" || d.Name() == ".fvm" || d.Name() == ".mason") {
+					t.Errorf("local tool cache delivered: %s", path)
+				}
+				return nil
+			}); err != nil {
+				t.Fatal(err)
+			}
+			if name == "go" {
+				if _, err := os.Stat(filepath.Join(dest, "internal/application/auth/service_test.go")); err != nil {
+					t.Fatal(err)
+				}
+				if _, err := os.Stat(filepath.Join(dest, "gen/proto/auth/v1/auth.pb.go")); err != nil {
+					t.Fatal(err)
+				}
+			}
+			if runtime.GOOS != "windows" {
+				script := "scripts/setup.sh"
+				if name == "go" {
+					script = "scripts/generate-dev-keys.sh"
+				}
+				info, err := os.Stat(filepath.Join(dest, script))
+				if err != nil {
+					t.Fatal(err)
+				}
+				if info.Mode()&0o111 == 0 {
+					t.Errorf("script is not executable: %s", script)
+				}
+			}
 			file, expected := "pubspec.yaml", "name: flutter_foundation_workspace"
 			if name == "go" {
 				file, expected = "go.mod", "module demo\n"
@@ -44,8 +81,8 @@ func TestGenerateGoModule(t *testing.T) {
 			t.Run(placeholder+"/"+module, func(t *testing.T) {
 				dest := t.TempDir()
 				g := Generator{FS: fstest.MapFS{
-					"template/go.mod":  &fstest.MapFile{Data: []byte("module " + placeholder + "\n")},
-					"template/main.go": &fstest.MapFile{Data: []byte("package main\nimport _ \"" + placeholder + "/internal/app\"\n")},
+					"template/go.mod.tmpl":  &fstest.MapFile{Data: []byte("module " + placeholder + "\n")},
+					"template/main.go.tmpl": &fstest.MapFile{Data: []byte("package main\nimport _ \"" + placeholder + "/internal/app\"\n")},
 				}}
 				err := g.Generate(registry.Template{ID: "go", Kind: "go", EmbeddedDir: "template"}, Options{Name: "demo", Destination: dest, Module: module, NoHooks: true})
 				if err != nil {
diff --git a/internal/publish/pack.go b/internal/publish/pack.go
deleted file mode 100644
index 7051089..0000000
--- a/internal/publish/pack.go
+++ /dev/null
@@ -1,88 +0,0 @@
-package publish
-
-import (
-	"archive/zip"
-	"crypto/sha256"
-	"encoding/hex"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"strings"
-)
-
-func Pack(dir, out string) (string, error) {
-	dir, err := filepath.Abs(dir)
-	if err != nil {
-		return "", err
-	}
-	if out == "" {
-		out = filepath.Base(dir) + ".zip"
-	}
-	f, err := os.Create(out)
-	if err != nil {
-		return "", err
-	}
-	zw := zip.NewWriter(f)
-	walkErr := filepath.WalkDir(dir, func(path string, d os.DirEntry, err error) error {
-		if err != nil {
-			return err
-		}
-		if d.IsDir() {
-			return nil
-		}
-		rel, e := filepath.Rel(dir, path)
-		if e != nil {
-			return e
-		}
-		rel = filepath.ToSlash(rel)
-		if strings.HasPrefix(rel, ".git/") || rel == ".DS_Store" {
-			return nil
-		}
-		info, e := d.Info()
-		if e != nil {
-			return e
-		}
-		h, e := zip.FileInfoHeader(info)
-		if e != nil {
-			return e
-		}
-		h.Name = rel
-		h.Method = zip.Deflate
-		w, e := zw.CreateHeader(h)
-		if e != nil {
-			return e
-		}
-		in, e := os.Open(path)
-		if e != nil {
-			return e
-		}
-		_, copyErr := io.Copy(w, in)
-		closeErr := in.Close()
-		if copyErr != nil {
-			return copyErr
-		}
-		return closeErr
-	})
-	closeZip := zw.Close()
-	closeFile := f.Close()
-	if walkErr != nil {
-		return "", walkErr
-	}
-	if closeZip != nil {
-		return "", closeZip
-	}
-	if closeFile != nil {
-		return "", closeFile
-	}
-	data, err := os.ReadFile(out)
-	if err != nil {
-		return "", err
-	}
-	sum := sha256.Sum256(data)
-	return hex.EncodeToString(sum[:]), nil
-}
-
-func RegistryEntry(id, version, kind, url, sha string) string {
-	return fmt.Sprintf(`{"id":%q,"version":%q,"kind":%q,"url":%q,"sha256":%q}`, id, version, kind, url, sha)
-}
diff --git a/internal/publish/pack_test.go b/internal/publish/pack_test.go
deleted file mode 100644
index 7384f89..0000000
--- a/internal/publish/pack_test.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package publish
-
-import (
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-func TestPack(t *testing.T) {
-	dir := t.TempDir()
-	if err := os.WriteFile(filepath.Join(dir, "hello.txt"), []byte("hello"), 0644); err != nil {
-		t.Fatal(err)
-	}
-	out := filepath.Join(t.TempDir(), "x.zip")
-	sha, err := Pack(dir, out)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(sha) != 64 {
-		t.Fatalf("sha=%q", sha)
-	}
-	if _, err := os.Stat(out); err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/internal/registry/registry.go b/internal/registry/registry.go
index e1ffe86..db790cb 100644
--- a/internal/registry/registry.go
+++ b/internal/registry/registry.go
@@ -7,21 +7,20 @@ import (
 )
 
 type Template struct {
-	ID              string
-	Name            string
-	Version         string
-	Description     string
-	Aliases         []string
-	EmbeddedDir     string
-	EmbeddedArchive string
-	Kind            string
+	ID          string
+	Name        string
+	Version     string
+	Description string
+	Aliases     []string
+	EmbeddedDir string
+	Kind        string
 }
 
 var templates = []Template{
 	{
 		ID: "go-foundations", Name: "Go Foundations", Version: "1.0.0",
 		Description: "Go + gRPC + Protobuf + PostgreSQL + local JWT + optional OIDC + local RBAC + observability",
-		Aliases:     []string{"go", "grpc", "backend"}, EmbeddedArchive: "templates/go-foundations.zip", Kind: "go",
+		Aliases:     []string{"go", "grpc", "backend"}, EmbeddedDir: "templates/go-foundations", Kind: "go",
 	},
 	{
 		ID: "flutter-foundations", Name: "Flutter Foundations", Version: "1.0.0",
diff --git a/internal/templatehub/hub.go b/internal/templatehub/hub.go
deleted file mode 100644
index 9fc133d..0000000
--- a/internal/templatehub/hub.go
+++ /dev/null
@@ -1,253 +0,0 @@
-package templatehub
-
-import (
-	"crypto/sha256"
-	"encoding/hex"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-	"path/filepath"
-	"sort"
-	"strings"
-	"time"
-
-	"github.com/jabahum/foundry/internal/cache"
-	"github.com/jabahum/foundry/internal/registry"
-)
-
-type Manifest struct {
-	Schema    int               `json:"schema"`
-	UpdatedAt string            `json:"updated_at,omitempty"`
-	Templates []TemplateRelease `json:"templates"`
-}
-
-type TemplateRelease struct {
-	ID          string   `json:"id"`
-	Name        string   `json:"name"`
-	Version     string   `json:"version"`
-	Description string   `json:"description"`
-	Kind        string   `json:"kind"`
-	Aliases     []string `json:"aliases,omitempty"`
-	URL         string   `json:"url"`
-	SHA256      string   `json:"sha256"`
-}
-
-type Resolved struct {
-	Template    registry.Template
-	ArchivePath string
-	Source      string
-}
-
-func registryPath() (string, error) {
-	d, err := cache.Dir()
-	if err != nil {
-		return "", err
-	}
-	return filepath.Join(d, "registry.json"), nil
-}
-
-func LoadCachedManifest() (*Manifest, error) {
-	p, err := registryPath()
-	if err != nil {
-		return nil, err
-	}
-	b, err := os.ReadFile(p)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil, nil
-		}
-		return nil, err
-	}
-	var m Manifest
-	if err := json.Unmarshal(b, &m); err != nil {
-		return nil, fmt.Errorf("parse cached registry: %w", err)
-	}
-	return &m, nil
-}
-
-func Update(registryURL string) (*Manifest, error) {
-	registryURL = strings.TrimSpace(registryURL)
-	if registryURL == "" {
-		registryURL = strings.TrimSpace(os.Getenv("FOUNDRY_REGISTRY_URL"))
-	}
-	if registryURL == "" {
-		return nil, fmt.Errorf("registry URL required: use --registry or FOUNDRY_REGISTRY_URL")
-	}
-
-	client := &http.Client{Timeout: 20 * time.Second}
-	resp, err := client.Get(registryURL)
-	if err != nil {
-		return nil, fmt.Errorf("fetch registry: %w", err)
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
-		return nil, fmt.Errorf("fetch registry: HTTP %s", resp.Status)
-	}
-	body, err := io.ReadAll(io.LimitReader(resp.Body, 4<<20))
-	if err != nil {
-		return nil, err
-	}
-	var m Manifest
-	if err := json.Unmarshal(body, &m); err != nil {
-		return nil, fmt.Errorf("parse registry: %w", err)
-	}
-	if m.Schema == 0 {
-		m.Schema = 1
-	}
-	for _, t := range m.Templates {
-		if t.ID == "" || t.Version == "" || t.URL == "" || t.SHA256 == "" {
-			return nil, fmt.Errorf("registry contains incomplete template release")
-		}
-	}
-	p, err := registryPath()
-	if err != nil {
-		return nil, err
-	}
-	if err := os.WriteFile(p, body, 0o644); err != nil {
-		return nil, err
-	}
-	return &m, nil
-}
-
-func ListCached() ([]TemplateRelease, error) {
-	m, err := LoadCachedManifest()
-	if err != nil || m == nil {
-		return nil, err
-	}
-	out := append([]TemplateRelease(nil), m.Templates...)
-	sort.Slice(out, func(i, j int) bool {
-		if out[i].ID == out[j].ID {
-			return out[i].Version > out[j].Version
-		}
-		return out[i].ID < out[j].ID
-	})
-	return out, nil
-}
-
-func Resolve(name, version string, offline bool) (Resolved, error) {
-	builtin, builtinErr := registry.Find(name)
-	if version == "" && builtinErr == nil {
-		return Resolved{Template: builtin, Source: "embedded"}, nil
-	}
-
-	m, err := LoadCachedManifest()
-	if err != nil {
-		return Resolved{}, err
-	}
-	if m == nil {
-		if builtinErr == nil && (version == "" || version == builtin.Version) {
-			return Resolved{Template: builtin, Source: "embedded"}, nil
-		}
-		return Resolved{}, fmt.Errorf("template %q version %q is not cached; run foundry template update first", name, version)
-	}
-
-	var candidates []TemplateRelease
-	q := strings.ToLower(strings.TrimSpace(name))
-	for _, r := range m.Templates {
-		match := q == strings.ToLower(r.ID) || q == strings.ToLower(r.Name)
-		if !match {
-			for _, a := range r.Aliases {
-				if q == strings.ToLower(a) {
-					match = true
-					break
-				}
-			}
-		}
-		if match && (version == "" || r.Version == version) {
-			candidates = append(candidates, r)
-		}
-	}
-	if len(candidates) == 0 {
-		if builtinErr == nil && (version == "" || version == builtin.Version) {
-			return Resolved{Template: builtin, Source: "embedded"}, nil
-		}
-		return Resolved{}, fmt.Errorf("template %q version %q not found in cached registry", name, version)
-	}
-	sort.Slice(candidates, func(i, j int) bool { return candidates[i].Version > candidates[j].Version })
-	rel := candidates[0]
-	path, err := archivePath(rel)
-	if err != nil {
-		return Resolved{}, err
-	}
-	if _, err := os.Stat(path); err == nil {
-		if err := verify(path, rel.SHA256); err == nil {
-			return Resolved{Template: toTemplate(rel), ArchivePath: path, Source: "cache"}, nil
-		}
-		_ = os.Remove(path)
-	}
-	if offline {
-		return Resolved{}, fmt.Errorf("template %s@%s is not cached and --offline was set", rel.ID, rel.Version)
-	}
-	if err := download(rel, path); err != nil {
-		return Resolved{}, err
-	}
-	return Resolved{Template: toTemplate(rel), ArchivePath: path, Source: "remote"}, nil
-}
-
-func toTemplate(r TemplateRelease) registry.Template {
-	return registry.Template{ID: r.ID, Name: r.Name, Version: r.Version, Description: r.Description, Aliases: r.Aliases, Kind: r.Kind}
-}
-
-func archivePath(r TemplateRelease) (string, error) {
-	d, err := cache.Dir()
-	if err != nil {
-		return "", err
-	}
-	dir := filepath.Join(d, "templates", r.ID, r.Version)
-	if err := os.MkdirAll(dir, 0o755); err != nil {
-		return "", err
-	}
-	return filepath.Join(dir, "template.zip"), nil
-}
-
-func download(r TemplateRelease, target string) error {
-	client := &http.Client{Timeout: 2 * time.Minute}
-	resp, err := client.Get(r.URL)
-	if err != nil {
-		return fmt.Errorf("download %s@%s: %w", r.ID, r.Version, err)
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
-		return fmt.Errorf("download %s@%s: HTTP %s", r.ID, r.Version, resp.Status)
-	}
-	tmp := target + ".part"
-	f, err := os.Create(tmp)
-	if err != nil {
-		return err
-	}
-	_, copyErr := io.Copy(f, io.LimitReader(resp.Body, 512<<20))
-	closeErr := f.Close()
-	if copyErr != nil {
-		_ = os.Remove(tmp)
-		return copyErr
-	}
-	if closeErr != nil {
-		_ = os.Remove(tmp)
-		return closeErr
-	}
-	if err := verify(tmp, r.SHA256); err != nil {
-		_ = os.Remove(tmp)
-		return err
-	}
-	return os.Rename(tmp, target)
-}
-
-func verify(path, want string) error {
-	f, err := os.Open(path)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-	h := sha256.New()
-	if _, err := io.Copy(h, f); err != nil {
-		return err
-	}
-	got := hex.EncodeToString(h.Sum(nil))
-	want = strings.ToLower(strings.TrimSpace(strings.TrimPrefix(want, "sha256:")))
-	if got != want {
-		return fmt.Errorf("checksum mismatch for %s: got %s want %s", path, got, want)
-	}
-	return nil
-}
diff --git a/internal/templatehub/hub_test.go b/internal/templatehub/hub_test.go
deleted file mode 100644
index f15da37..0000000
--- a/internal/templatehub/hub_test.go
+++ /dev/null
@@ -1,59 +0,0 @@
-package templatehub
-
-import (
-	"archive/zip"
-	"bytes"
-	"crypto/sha256"
-	"encoding/hex"
-	"encoding/json"
-	"net/http"
-	"net/http/httptest"
-	"os"
-	"testing"
-)
-
-func TestUpdateAndResolveRemoteRelease(t *testing.T) {
-	t.Setenv("FOUNDRY_CACHE_DIR", t.TempDir())
-	var z bytes.Buffer
-	zw := zip.NewWriter(&z)
-	w, err := zw.Create("README.md")
-	if err != nil {
-		t.Fatal(err)
-	}
-	_, _ = w.Write([]byte("hello"))
-	if err := zw.Close(); err != nil {
-		t.Fatal(err)
-	}
-	sum := sha256.Sum256(z.Bytes())
-	checksum := hex.EncodeToString(sum[:])
-	var server *httptest.Server
-	server = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.URL.Path == "/template.zip" {
-			w.Write(z.Bytes())
-			return
-		}
-		m := Manifest{Schema: 1, Templates: []TemplateRelease{{ID: "remote-go", Name: "Remote Go", Version: "2.0.0", Kind: "go", Aliases: []string{"rg"}, URL: server.URL + "/template.zip", SHA256: checksum}}}
-		_ = json.NewEncoder(w).Encode(m)
-	}))
-	defer server.Close()
-	if _, err := Update(server.URL + "/registry.json"); err != nil {
-		t.Fatal(err)
-	}
-	resolved, err := Resolve("rg", "2.0.0", false)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if resolved.ArchivePath == "" || resolved.Source != "remote" {
-		t.Fatalf("unexpected resolution: %#v", resolved)
-	}
-	if _, err := os.Stat(resolved.ArchivePath); err != nil {
-		t.Fatal(err)
-	}
-	cached, err := Resolve("rg", "2.0.0", true)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if cached.Source != "cache" {
-		t.Fatalf("expected cache, got %s", cached.Source)
-	}
-}
diff --git a/internal/upgrade/upgrade.go b/internal/upgrade/upgrade.go
index 2f60c85..a1df558 100644
--- a/internal/upgrade/upgrade.go
+++ b/internal/upgrade/upgrade.go
@@ -2,9 +2,9 @@ package upgrade
 
 import (
 	"fmt"
+
 	"github.com/jabahum/foundry/internal/projectconfig"
 	"github.com/jabahum/foundry/internal/registry"
-	"github.com/jabahum/foundry/internal/templatehub"
 )
 
 type Report struct {
@@ -23,14 +23,6 @@ func Check(root string) (Report, error) {
 	}
 	latest := builtin.Version
 	source := "bundled"
-	if releases, e := templatehub.ListCached(); e == nil {
-		for _, r := range releases {
-			if r.ID == builtin.ID && newer(r.Version, latest) {
-				latest = r.Version
-				source = "cached registry"
-			}
-		}
-	}
 	return Report{Current: c.TemplateVersion, Latest: latest, Template: builtin.ID, Source: source, UpdateAvailable: newer(latest, c.TemplateVersion)}, nil
 }
 
diff --git a/internal/upgrade/upgrade_test.go b/internal/upgrade/upgrade_test.go
new file mode 100644
index 0000000..38297d1
--- /dev/null
+++ b/internal/upgrade/upgrade_test.go
@@ -0,0 +1,25 @@
+package upgrade
+
+import (
+	"testing"
+
+	"github.com/jabahum/foundry/internal/projectconfig"
+)
+
+func TestCheckUsesBundledVersion(t *testing.T) {
+	for _, version := range []string{"0.9.0", "1.0.0", "2.0.0"} {
+		t.Run(version, func(t *testing.T) {
+			root := t.TempDir()
+			if err := projectconfig.Write(root, projectconfig.Config{Template: "go-foundations", TemplateVersion: version}); err != nil {
+				t.Fatal(err)
+			}
+			report, err := Check(root)
+			if err != nil {
+				t.Fatal(err)
+			}
+			if report.Latest != "1.0.0" || report.Source != "bundled" || report.UpdateAvailable != (version == "0.9.0") {
+				t.Fatalf("unexpected upgrade report: %#v", report)
+			}
+		})
+	}
+}
diff --git a/templates/flutter_foundations/apps/.gitkeep b/templates/flutter_foundations/apps/.gitkeep
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/templates/flutter_foundations/apps/.gitkeep
@@ -0,0 +1 @@
+
diff --git a/templates/go-foundations.zip b/templates/go-foundations.zip
deleted file mode 100644
index 489f1cd..0000000
Binary files a/templates/go-foundations.zip and /dev/null differ
diff --git a/templates/go-foundations/README.md b/templates/go-foundations/README.md
index b9a72d4..71eab47 100644
--- a/templates/go-foundations/README.md
+++ b/templates/go-foundations/README.md
@@ -335,13 +335,9 @@ After regenerating contracts, review the generated changes before committing the
 
 This template is maintained in Foundry's `templates/go-foundations` folder. Its Go module uses `go-foundations` as the placeholder that Foundry replaces with the application's module path during generation.
 
-Go excludes nested modules from embedded directories, so Foundry bundles this template as `templates/go-foundations.zip`. After changing this template, rebuild its archive from the Foundry repository root:
+Foundry embeds this folder directly. Go source files use `.go.tmpl` and the module manifest uses `go.mod.tmpl` so the template is separate from Foundry's own Go module. Generation removes the `.tmpl` suffix and substitutes the application's module path.
 
-```bash
-go run ./cmd/foundry template pack ./templates/go-foundations \
-  --id go-foundations --version 1.0.0 --kind go \
-  --out ./templates/go-foundations.zip
-```
+Edit these source templates and rebuild Foundry to deliver changes. To run this foundation's checks, generate a project first and run the commands from its folder.
 
 ## Health and operations
 
diff --git a/templates/go-foundations/cmd/server/main.go b/templates/go-foundations/cmd/server/main.go.tmpl
similarity index 100%
rename from templates/go-foundations/cmd/server/main.go
rename to templates/go-foundations/cmd/server/main.go.tmpl
diff --git a/templates/go-foundations/gen/proto/audit/v1/audit.pb.go b/templates/go-foundations/gen/proto/audit/v1/audit.pb.go.tmpl
similarity index 100%
rename from templates/go-foundations/gen/proto/audit/v1/audit.pb.go
rename to templates/go-foundations/gen/proto/audit/v1/audit.pb.go.tmpl
diff --git a/templates/go-foundations/gen/proto/audit/v1/audit.pb.gw.go b/templates/go-foundations/gen/proto/audit/v1/audit.pb.gw.go.tmpl
similarity index 100%
rename from templates/go-foundations/gen/proto/audit/v1/audit.pb.gw.go
rename to templates/go-foundations/gen/proto/audit/v1/audit.pb.gw.go.tmpl
diff --git a/templates/go-foundations/gen/proto/audit/v1/audit_grpc.pb.go b/templates/go-foundations/gen/proto/audit/v1/audit_grpc.pb.go.tmpl
similarity index 100%
rename from templates/go-foundations/gen/proto/audit/v1/audit_grpc.pb.go
rename to templates/go-foundations/gen/proto/audit/v1/audit_grpc.pb.go.tmpl
diff --git a/templates/go-foundations/gen/proto/auth/v1/auth.pb.go b/templates/go-foundations/gen/proto/auth/v1/auth.pb.go.tmpl
similarity index 100%
rename from templates/go-foundations/gen/proto/auth/v1/auth.pb.go
rename to templates/go-foundations/gen/proto/auth/v1/auth.pb.go.tmpl
diff --git a/templates/go-foundations/gen/proto/auth/v1/auth.pb.gw.go b/templates/go-foundations/gen/proto/auth/v1/auth.pb.gw.go.tmpl
similarity index 100%
rename from templates/go-foundations/gen/proto/auth/v1/auth.pb.gw.go
rename to templates/go-foundations/gen/proto/auth/v1/auth.pb.gw.go.tmpl
diff --git a/templates/go-foundations/gen/proto/auth/v1/auth_grpc.pb.go b/templates/go-foundations/gen/proto/auth/v1/auth_grpc.pb.go.tmpl
similarity index 100%
rename from templates/go-foundations/gen/proto/auth/v1/auth_grpc.pb.go
rename to templates/go-foundations/gen/proto/auth/v1/auth_grpc.pb.go.tmpl
diff --git a/templates/go-foundations/gen/proto/rbac/v1/rbac.pb.go b/templates/go-foundations/gen/proto/rbac/v1/rbac.pb.go.tmpl
similarity index 100%
rename from templates/go-foundations/gen/proto/rbac/v1/rbac.pb.go
rename to templates/go-foundations/gen/proto/rbac/v1/rbac.pb.go.tmpl
diff --git a/templates/go-foundations/gen/proto/rbac/v1/rbac.pb.gw.go b/templates/go-foundations/gen/proto/rbac/v1/rbac.pb.gw.go.tmpl
similarity index 100%
rename from templates/go-foundations/gen/proto/rbac/v1/rbac.pb.gw.go
rename to templates/go-foundations/gen/proto/rbac/v1/rbac.pb.gw.go.tmpl
diff --git a/templates/go-foundations/gen/proto/rbac/v1/rbac_grpc.pb.go b/templates/go-foundations/gen/proto/rbac/v1/rbac_grpc.pb.go.tmpl
similarity index 100%
rename from templates/go-foundations/gen/proto/rbac/v1/rbac_grpc.pb.go
rename to templates/go-foundations/gen/proto/rbac/v1/rbac_grpc.pb.go.tmpl
diff --git a/templates/go-foundations/gen/proto/user/v1/user.pb.go b/templates/go-foundations/gen/proto/user/v1/user.pb.go.tmpl
similarity index 100%
rename from templates/go-foundations/gen/proto/user/v1/user.pb.go
rename to templates/go-foundations/gen/proto/user/v1/user.pb.go.tmpl
diff --git a/templates/go-foundations/gen/proto/user/v1/user.pb.gw.go b/templates/go-foundations/gen/proto/user/v1/user.pb.gw.go.tmpl
similarity index 100%
rename from templates/go-foundations/gen/proto/user/v1/user.pb.gw.go
rename to templates/go-foundations/gen/proto/user/v1/user.pb.gw.go.tmpl
diff --git a/templates/go-foundations/gen/proto/user/v1/user_grpc.pb.go b/templates/go-foundations/gen/proto/user/v1/user_grpc.pb.go.tmpl
similarity index 100%
rename from templates/go-foundations/gen/proto/user/v1/user_grpc.pb.go
rename to templates/go-foundations/gen/proto/user/v1/user_grpc.pb.go.tmpl
diff --git a/templates/go-foundations/go.mod b/templates/go-foundations/go.mod.tmpl
similarity index 100%
rename from templates/go-foundations/go.mod
rename to templates/go-foundations/go.mod.tmpl
diff --git a/templates/go-foundations/internal/application/audit/service.go b/templates/go-foundations/internal/application/audit/service.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/application/audit/service.go
rename to templates/go-foundations/internal/application/audit/service.go.tmpl
diff --git a/templates/go-foundations/internal/application/audit/service_test.go b/templates/go-foundations/internal/application/audit/service_test.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/application/audit/service_test.go
rename to templates/go-foundations/internal/application/audit/service_test.go.tmpl
diff --git a/templates/go-foundations/internal/application/auth/authentication.go b/templates/go-foundations/internal/application/auth/authentication.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/application/auth/authentication.go
rename to templates/go-foundations/internal/application/auth/authentication.go.tmpl
diff --git a/templates/go-foundations/internal/application/auth/service.go b/templates/go-foundations/internal/application/auth/service.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/application/auth/service.go
rename to templates/go-foundations/internal/application/auth/service.go.tmpl
diff --git a/templates/go-foundations/internal/application/auth/service_test.go b/templates/go-foundations/internal/application/auth/service_test.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/application/auth/service_test.go
rename to templates/go-foundations/internal/application/auth/service_test.go.tmpl
diff --git a/templates/go-foundations/internal/application/rbac/service.go b/templates/go-foundations/internal/application/rbac/service.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/application/rbac/service.go
rename to templates/go-foundations/internal/application/rbac/service.go.tmpl
diff --git a/templates/go-foundations/internal/application/user/service.go b/templates/go-foundations/internal/application/user/service.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/application/user/service.go
rename to templates/go-foundations/internal/application/user/service.go.tmpl
diff --git a/templates/go-foundations/internal/application/user/service_test.go b/templates/go-foundations/internal/application/user/service_test.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/application/user/service_test.go
rename to templates/go-foundations/internal/application/user/service_test.go.tmpl
diff --git a/templates/go-foundations/internal/domain/audit/model.go b/templates/go-foundations/internal/domain/audit/model.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/domain/audit/model.go
rename to templates/go-foundations/internal/domain/audit/model.go.tmpl
diff --git a/templates/go-foundations/internal/domain/auth/auth.go b/templates/go-foundations/internal/domain/auth/auth.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/domain/auth/auth.go
rename to templates/go-foundations/internal/domain/auth/auth.go.tmpl
diff --git a/templates/go-foundations/internal/domain/auth/session.go b/templates/go-foundations/internal/domain/auth/session.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/domain/auth/session.go
rename to templates/go-foundations/internal/domain/auth/session.go.tmpl
diff --git a/templates/go-foundations/internal/domain/idempotency/model.go b/templates/go-foundations/internal/domain/idempotency/model.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/domain/idempotency/model.go
rename to templates/go-foundations/internal/domain/idempotency/model.go.tmpl
diff --git a/templates/go-foundations/internal/domain/rbac/model.go b/templates/go-foundations/internal/domain/rbac/model.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/domain/rbac/model.go
rename to templates/go-foundations/internal/domain/rbac/model.go.tmpl
diff --git a/templates/go-foundations/internal/domain/rbac/repository.go b/templates/go-foundations/internal/domain/rbac/repository.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/domain/rbac/repository.go
rename to templates/go-foundations/internal/domain/rbac/repository.go.tmpl
diff --git a/templates/go-foundations/internal/domain/user/entity.go b/templates/go-foundations/internal/domain/user/entity.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/domain/user/entity.go
rename to templates/go-foundations/internal/domain/user/entity.go.tmpl
diff --git a/templates/go-foundations/internal/domain/user/errors.go b/templates/go-foundations/internal/domain/user/errors.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/domain/user/errors.go
rename to templates/go-foundations/internal/domain/user/errors.go.tmpl
diff --git a/templates/go-foundations/internal/domain/user/repository.go b/templates/go-foundations/internal/domain/user/repository.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/domain/user/repository.go
rename to templates/go-foundations/internal/domain/user/repository.go.tmpl
diff --git a/templates/go-foundations/internal/infrastructure/auth/local/jwt.go b/templates/go-foundations/internal/infrastructure/auth/local/jwt.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/infrastructure/auth/local/jwt.go
rename to templates/go-foundations/internal/infrastructure/auth/local/jwt.go.tmpl
diff --git a/templates/go-foundations/internal/infrastructure/auth/local/password.go b/templates/go-foundations/internal/infrastructure/auth/local/password.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/infrastructure/auth/local/password.go
rename to templates/go-foundations/internal/infrastructure/auth/local/password.go.tmpl
diff --git a/templates/go-foundations/internal/infrastructure/auth/local/password_test.go b/templates/go-foundations/internal/infrastructure/auth/local/password_test.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/infrastructure/auth/local/password_test.go
rename to templates/go-foundations/internal/infrastructure/auth/local/password_test.go.tmpl
diff --git a/templates/go-foundations/internal/infrastructure/auth/oidc/verifier.go b/templates/go-foundations/internal/infrastructure/auth/oidc/verifier.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/infrastructure/auth/oidc/verifier.go
rename to templates/go-foundations/internal/infrastructure/auth/oidc/verifier.go.tmpl
diff --git a/templates/go-foundations/internal/infrastructure/bootstrap/admin.go b/templates/go-foundations/internal/infrastructure/bootstrap/admin.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/infrastructure/bootstrap/admin.go
rename to templates/go-foundations/internal/infrastructure/bootstrap/admin.go.tmpl
diff --git a/templates/go-foundations/internal/infrastructure/config/config.go b/templates/go-foundations/internal/infrastructure/config/config.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/infrastructure/config/config.go
rename to templates/go-foundations/internal/infrastructure/config/config.go.tmpl
diff --git a/templates/go-foundations/internal/infrastructure/database/postgres.go b/templates/go-foundations/internal/infrastructure/database/postgres.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/infrastructure/database/postgres.go
rename to templates/go-foundations/internal/infrastructure/database/postgres.go.tmpl
diff --git a/templates/go-foundations/internal/infrastructure/observability/metrics.go b/templates/go-foundations/internal/infrastructure/observability/metrics.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/infrastructure/observability/metrics.go
rename to templates/go-foundations/internal/infrastructure/observability/metrics.go.tmpl
diff --git a/templates/go-foundations/internal/infrastructure/observability/telemetry.go b/templates/go-foundations/internal/infrastructure/observability/telemetry.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/infrastructure/observability/telemetry.go
rename to templates/go-foundations/internal/infrastructure/observability/telemetry.go.tmpl
diff --git a/templates/go-foundations/internal/infrastructure/persistence/memory/user_repository.go b/templates/go-foundations/internal/infrastructure/persistence/memory/user_repository.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/infrastructure/persistence/memory/user_repository.go
rename to templates/go-foundations/internal/infrastructure/persistence/memory/user_repository.go.tmpl
diff --git a/templates/go-foundations/internal/infrastructure/persistence/postgres/audit_repository.go b/templates/go-foundations/internal/infrastructure/persistence/postgres/audit_repository.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/infrastructure/persistence/postgres/audit_repository.go
rename to templates/go-foundations/internal/infrastructure/persistence/postgres/audit_repository.go.tmpl
diff --git a/templates/go-foundations/internal/infrastructure/persistence/postgres/idempotency_store.go b/templates/go-foundations/internal/infrastructure/persistence/postgres/idempotency_store.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/infrastructure/persistence/postgres/idempotency_store.go
rename to templates/go-foundations/internal/infrastructure/persistence/postgres/idempotency_store.go.tmpl
diff --git a/templates/go-foundations/internal/infrastructure/persistence/postgres/rbac_repository.go b/templates/go-foundations/internal/infrastructure/persistence/postgres/rbac_repository.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/infrastructure/persistence/postgres/rbac_repository.go
rename to templates/go-foundations/internal/infrastructure/persistence/postgres/rbac_repository.go.tmpl
diff --git a/templates/go-foundations/internal/infrastructure/persistence/postgres/session_repository.go b/templates/go-foundations/internal/infrastructure/persistence/postgres/session_repository.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/infrastructure/persistence/postgres/session_repository.go
rename to templates/go-foundations/internal/infrastructure/persistence/postgres/session_repository.go.tmpl
diff --git a/templates/go-foundations/internal/infrastructure/persistence/postgres/user_repository.go b/templates/go-foundations/internal/infrastructure/persistence/postgres/user_repository.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/infrastructure/persistence/postgres/user_repository.go
rename to templates/go-foundations/internal/infrastructure/persistence/postgres/user_repository.go.tmpl
diff --git a/templates/go-foundations/internal/security/context.go b/templates/go-foundations/internal/security/context.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/security/context.go
rename to templates/go-foundations/internal/security/context.go.tmpl
diff --git a/templates/go-foundations/internal/transport/grpc/apierror/error.go b/templates/go-foundations/internal/transport/grpc/apierror/error.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/transport/grpc/apierror/error.go
rename to templates/go-foundations/internal/transport/grpc/apierror/error.go.tmpl
diff --git a/templates/go-foundations/internal/transport/grpc/apierror/error_test.go b/templates/go-foundations/internal/transport/grpc/apierror/error_test.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/transport/grpc/apierror/error_test.go
rename to templates/go-foundations/internal/transport/grpc/apierror/error_test.go.tmpl
diff --git a/templates/go-foundations/internal/transport/grpc/audit_handler.go b/templates/go-foundations/internal/transport/grpc/audit_handler.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/transport/grpc/audit_handler.go
rename to templates/go-foundations/internal/transport/grpc/audit_handler.go.tmpl
diff --git a/templates/go-foundations/internal/transport/grpc/auth_handler.go b/templates/go-foundations/internal/transport/grpc/auth_handler.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/transport/grpc/auth_handler.go
rename to templates/go-foundations/internal/transport/grpc/auth_handler.go.tmpl
diff --git a/templates/go-foundations/internal/transport/grpc/interceptor/audit.go b/templates/go-foundations/internal/transport/grpc/interceptor/audit.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/transport/grpc/interceptor/audit.go
rename to templates/go-foundations/internal/transport/grpc/interceptor/audit.go.tmpl
diff --git a/templates/go-foundations/internal/transport/grpc/interceptor/audit_test.go b/templates/go-foundations/internal/transport/grpc/interceptor/audit_test.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/transport/grpc/interceptor/audit_test.go
rename to templates/go-foundations/internal/transport/grpc/interceptor/audit_test.go.tmpl
diff --git a/templates/go-foundations/internal/transport/grpc/interceptor/authentication.go b/templates/go-foundations/internal/transport/grpc/interceptor/authentication.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/transport/grpc/interceptor/authentication.go
rename to templates/go-foundations/internal/transport/grpc/interceptor/authentication.go.tmpl
diff --git a/templates/go-foundations/internal/transport/grpc/interceptor/authorization.go b/templates/go-foundations/internal/transport/grpc/interceptor/authorization.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/transport/grpc/interceptor/authorization.go
rename to templates/go-foundations/internal/transport/grpc/interceptor/authorization.go.tmpl
diff --git a/templates/go-foundations/internal/transport/grpc/interceptor/errors.go b/templates/go-foundations/internal/transport/grpc/interceptor/errors.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/transport/grpc/interceptor/errors.go
rename to templates/go-foundations/internal/transport/grpc/interceptor/errors.go.tmpl
diff --git a/templates/go-foundations/internal/transport/grpc/interceptor/idempotency.go b/templates/go-foundations/internal/transport/grpc/interceptor/idempotency.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/transport/grpc/interceptor/idempotency.go
rename to templates/go-foundations/internal/transport/grpc/interceptor/idempotency.go.tmpl
diff --git a/templates/go-foundations/internal/transport/grpc/interceptor/idempotency_test.go b/templates/go-foundations/internal/transport/grpc/interceptor/idempotency_test.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/transport/grpc/interceptor/idempotency_test.go
rename to templates/go-foundations/internal/transport/grpc/interceptor/idempotency_test.go.tmpl
diff --git a/templates/go-foundations/internal/transport/grpc/interceptor/logging.go b/templates/go-foundations/internal/transport/grpc/interceptor/logging.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/transport/grpc/interceptor/logging.go
rename to templates/go-foundations/internal/transport/grpc/interceptor/logging.go.tmpl
diff --git a/templates/go-foundations/internal/transport/grpc/interceptor/metrics.go b/templates/go-foundations/internal/transport/grpc/interceptor/metrics.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/transport/grpc/interceptor/metrics.go
rename to templates/go-foundations/internal/transport/grpc/interceptor/metrics.go.tmpl
diff --git a/templates/go-foundations/internal/transport/grpc/interceptor/recovery.go b/templates/go-foundations/internal/transport/grpc/interceptor/recovery.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/transport/grpc/interceptor/recovery.go
rename to templates/go-foundations/internal/transport/grpc/interceptor/recovery.go.tmpl
diff --git a/templates/go-foundations/internal/transport/grpc/interceptor/request_id.go b/templates/go-foundations/internal/transport/grpc/interceptor/request_id.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/transport/grpc/interceptor/request_id.go
rename to templates/go-foundations/internal/transport/grpc/interceptor/request_id.go.tmpl
diff --git a/templates/go-foundations/internal/transport/grpc/interceptor/validation.go b/templates/go-foundations/internal/transport/grpc/interceptor/validation.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/transport/grpc/interceptor/validation.go
rename to templates/go-foundations/internal/transport/grpc/interceptor/validation.go.tmpl
diff --git a/templates/go-foundations/internal/transport/grpc/interceptor/validation_test.go b/templates/go-foundations/internal/transport/grpc/interceptor/validation_test.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/transport/grpc/interceptor/validation_test.go
rename to templates/go-foundations/internal/transport/grpc/interceptor/validation_test.go.tmpl
diff --git a/templates/go-foundations/internal/transport/grpc/policy/policy.go b/templates/go-foundations/internal/transport/grpc/policy/policy.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/transport/grpc/policy/policy.go
rename to templates/go-foundations/internal/transport/grpc/policy/policy.go.tmpl
diff --git a/templates/go-foundations/internal/transport/grpc/rbac_handler.go b/templates/go-foundations/internal/transport/grpc/rbac_handler.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/transport/grpc/rbac_handler.go
rename to templates/go-foundations/internal/transport/grpc/rbac_handler.go.tmpl
diff --git a/templates/go-foundations/internal/transport/grpc/user_handler.go b/templates/go-foundations/internal/transport/grpc/user_handler.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/transport/grpc/user_handler.go
rename to templates/go-foundations/internal/transport/grpc/user_handler.go.tmpl
diff --git a/templates/go-foundations/internal/transport/http/documentation.go b/templates/go-foundations/internal/transport/http/documentation.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/transport/http/documentation.go
rename to templates/go-foundations/internal/transport/http/documentation.go.tmpl
diff --git a/templates/go-foundations/internal/transport/http/gateway.go b/templates/go-foundations/internal/transport/http/gateway.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/transport/http/gateway.go
rename to templates/go-foundations/internal/transport/http/gateway.go.tmpl
diff --git a/templates/go-foundations/internal/transport/http/gateway_test.go b/templates/go-foundations/internal/transport/http/gateway_test.go.tmpl
similarity index 100%
rename from templates/go-foundations/internal/transport/http/gateway_test.go
rename to templates/go-foundations/internal/transport/http/gateway_test.go.tmpl