diff --git a/app/src/cli/commands/create/create.ts b/app/src/cli/commands/create/create.ts
index 49ac6f0..d4ba370 100644
--- a/app/src/cli/commands/create/create.ts
+++ b/app/src/cli/commands/create/create.ts
@@ -172,25 +172,29 @@ async function action(options: { template?: string; dir?: string; integration?:
    const ctx = { template, dir: downloadOpts.dir };
 
    {
+      // @todo: only while in PR
+      const ref = "feat/cli-starters";
+      //const ref = `v${version}`;
+
       const prefix =
          template.ref === true
-            ? `#v${version}`
+            ? `#${ref}`
             : typeof template.ref === "string"
               ? `#${template.ref}`
               : "";
       const url = `${template.path}${prefix}`;
 
-      console.log("url", url);
+      //console.log("url", url);
       const s = $p.spinner();
       s.start("Downloading template...");
       const result = await downloadTemplate(url, {
          dir: ctx.dir,
          force: downloadOpts.clean ? "clean" : true
       });
-      console.log("result", result);
+      //console.log("result", result);
 
       s.stop("Template downloaded.");
-      await updateBkndPackages({ dir: ctx.dir });
+      await updateBkndPackages(ctx.dir);
 
       if (template.preinstall) {
          await template.preinstall(ctx);
diff --git a/app/src/cli/commands/create/npm.ts b/app/src/cli/commands/create/npm.ts
index fe10f1b..e698683 100644
--- a/app/src/cli/commands/create/npm.ts
+++ b/app/src/cli/commands/create/npm.ts
@@ -65,11 +65,18 @@ export async function replacePackageJsonVersions(
    );
 }
 
-export async function updateBkndPackages(opts?: { dir?: string }) {
-   await replacePackageJsonVersions(async (pkg) => {
-      if (pkg === "bknd") {
-         return "^" + (await getVersion(pkg));
-      }
-      return;
-   }, opts);
+export async function updateBkndPackages(dir?: string, map?: Record<string, string>) {
+   const versions = {
+      bknd: "^" + (await getVersion("bknd")),
+      ...(map ?? {})
+   };
+   await replacePackageJsonVersions(
+      async (pkg) => {
+         if (pkg in versions) {
+            return versions[pkg];
+         }
+         return;
+      },
+      { dir }
+   );
 }
diff --git a/app/src/cli/commands/create/templates/cloudflare.ts b/app/src/cli/commands/create/templates/cloudflare.ts
index 964a6b8..0028535 100644
--- a/app/src/cli/commands/create/templates/cloudflare.ts
+++ b/app/src/cli/commands/create/templates/cloudflare.ts
@@ -12,6 +12,18 @@ export const cloudflare = {
    path: "gh:bknd-io/bknd/examples/cloudflare-worker",
    ref: true,
    setup: async (ctx) => {
+      // overwrite assets directory
+      await overrideJson(
+         "wrangler.json",
+         (json) => ({
+            ...json,
+            assets: {
+               directory: "node_modules/bknd/dist/static"
+            }
+         }),
+         { dir: ctx.dir }
+      );
+
       const db = await $p.select({
          message: "What database do you want to use?",
          options: [