diff --git a/.gitea/workflows/publish.yml b/.gitea/workflows/publish.yml
index f09cd60..9c27121 100644
--- a/.gitea/workflows/publish.yml
+++ b/.gitea/workflows/publish.yml
@@ -21,6 +21,10 @@ jobs:
           node-version: 24
           registry-url: "https://registry.npmjs.org"
 
+      # Stage-only tokens require `npm stage publish` (npm >= 11.15.0).
+      - name: Update npm
+        run: npm install -g npm@^11.15.0
+
       - name: Install dependencies
         run: bun install --frozen-lockfile
 
@@ -33,7 +37,7 @@ jobs:
       - name: Build
         run: bun run build
 
-      - name: Publish
-        run: npm publish --access public
+      - name: Stage publish
+        run: npm stage publish --access public
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/template/.gitignore b/template/.gitignore
index f58ea61..9bc34f9 100644
--- a/template/.gitignore
+++ b/template/.gitignore
@@ -10,3 +10,6 @@ devenv.local.yaml
 .pre-commit-config.yaml
 node_modules
 scripts/node_modules
+
+# Android emulator state
+.android
diff --git "a/template/apps/<@if(eq(context.project.frontend,\"svelte-kit\"))>web/src/routes/+page.svelte" "b/template/apps/<@if(eq(context.project.frontend,\"svelte-kit\"))>web/src/routes/+page.svelte"
index f358f96..8323f29 100644
--- "a/template/apps/<@if(eq(context.project.frontend,\"svelte-kit\"))>web/src/routes/+page.svelte"
+++ "b/template/apps/<@if(eq(context.project.frontend,\"svelte-kit\"))>web/src/routes/+page.svelte"
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { createRouter, type Todo } from "@glstack-test/rpc"
+  import { createRouter, type Todo } from "@<@var(context.project.name)>/rpc"
     import type { ChangeEventHandler } from "svelte/elements";
   const router = createRouter("http://127.0.0.1:8080");
   let todos = $state<Todo[]>([])
diff --git a/template/devenv.nix b/template/devenv.nix
index f56227c..3440424 100644
--- a/template/devenv.nix
+++ b/template/devenv.nix
@@ -30,13 +30,14 @@
       version = [ "27.1.12297006" ];
     };
   };
-  enterShell = ''
+  # The emulator's bundled libs are only needed on Linux; macOS uses DYLD paths.
+  enterShell = lib.optionalString pkgs.stdenv.isLinux ''
     export LD_LIBRARY_PATH=$ANDROID_HOME/emulator/lib64:$LD_LIBRARY_PATH
   '';
+  # Use a system image matching the host CPU (arm64 on Apple Silicon, x86_64 elsewhere).
   scripts.create-avd.exec = ''
-    if [ ! -f .avd-created ]; then
-      avdmanager create avd -n "Pixel_5_API34" -k "system-images;android-34;google_apis_playstore;x86_64" -d "pixel_5";
-      touch .avd-created;
+    if ! avdmanager list avd -c | grep -qx "Pixel_5_API34"; then
+      echo no | avdmanager create avd -n "Pixel_5_API34" -k "system-images;android-34;google_apis_playstore;${if pkgs.stdenv.hostPlatform.isAarch64 then "arm64-v8a" else "x86_64"}" -d "pixel_5"
     fi
   '';
  <@endif>
diff --git a/template/services/api/server/todo/todo.go b/template/services/api/server/todo/todo.go
index 3150c07..0efafad 100644
--- a/template/services/api/server/todo/todo.go
+++ b/template/services/api/server/todo/todo.go
@@ -9,10 +9,10 @@ import (
 
 	"connectrpc.com/connect"
 	"connectrpc.com/validate"
-	"github.com/<@var(context.project.name)>/<@var(context.project.name)>/db"
+	"<@var(context.project.goprefix)>/<@var(context.project.name)>/db"
 	todov1 "<@var(context.project.goprefix)>/<@var(context.project.name)>/gen/todo/v1"
 	"<@var(context.project.goprefix)>/<@var(context.project.name)>/gen/todo/v1/todov1connect"
-	. "<@var(context.project.goprefix)>/glstack-test/utils"
+	. "<@var(context.project.goprefix)>/<@var(context.project.name)>/utils"
 	"github.com/jackc/pgx/v5/pgtype"
 )