diff --git a/.github/workflows/e2e-snapshots.yml b/.github/workflows/e2e-snapshots.yml
index 433f626..a00dd93 100644
--- a/.github/workflows/e2e-snapshots.yml
+++ b/.github/workflows/e2e-snapshots.yml
@@ -28,10 +28,10 @@ jobs:
       - name: Run emulator
         run: |
           set -e
-          juno dev start --headless &
-          juno dev wait
+          juno emulator start --headless &
+          juno emulator wait
           juno login --emulator --mode development --headless
-          juno config --mode development --headless
+          juno config apply --mode development --headless
 
       - name: Run tests and update Snapshots
         run: ./scripts/e2e e2e:ci:snapshots
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index e1f4bf9..1801da1 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -24,10 +24,10 @@ jobs:
       - name: Run emulator
         run: |
           set -e
-          juno dev start --headless &
-          juno dev wait
+          juno emulator start --headless &
+          juno emulator wait
           juno login --emulator --mode development --headless
-          juno config --mode development --headless
+          juno config apply --mode development --headless
 
       - name: Run tests
         run: ./scripts/e2e e2e:ci
diff --git a/src/index.ts b/src/index.ts
index ab8c5d2..af0250b 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -32,7 +32,7 @@ const outro = ({
 
   const liveReload =
     nonNullish(serverlessFunctions) && ['ts', 'js'].includes(serverlessFunctions) ? ' --watch' : '';
-  const startCmd = `juno dev start${liveReload}`;
+  const startCmd = `juno emulator start${liveReload}`;
   const runJunoDevStart = `In another terminal, run ${cyan(startCmd)} to quickstart the local development emulator`;
 
   const runs = (index: number): string =>
diff --git a/templates/angular-example/README.md b/templates/angular-example/README.md
index 294b50f..312a32a 100644
--- a/templates/angular-example/README.md
+++ b/templates/angular-example/README.md
@@ -19,7 +19,7 @@ To start experimenting with Juno locally, follow these steps:
 This will spin up the Juno backend locally:
 
 ```bash
-juno dev start
+juno emulator start
 ```
 
 ### 2. Create a Satellite
@@ -104,13 +104,13 @@ Check out the full guides in the [docs](https://juno.build/docs/category/deploym
 
 All commands are run from the root of the project, from a terminal:
 
-| Command          | Action                                                         |
-| :--------------- | :------------------------------------------------------------- |
-| `npm install`    | Installs dependencies                                          |
-| `npm run start`  | Starts frontend dev server at `localhost:4200`                 |
-| `juno dev start` | Quickstart the local development emulator                      |
-| `npm run build`  | Build your production site to `./dist/angular-starter/browser` |
-| `juno deploy`    | Deploy your project to a Satellite                             |
+| Command               | Action                                                         |
+| :-------------------- | :------------------------------------------------------------- |
+| `npm install`         | Installs dependencies                                          |
+| `npm run start`       | Starts frontend dev server at `localhost:4200`                 |
+| `juno emulator start` | Quickstart the local development emulator                      |
+| `npm run build`       | Build your production site to `./dist/angular-starter/browser` |
+| `juno hosting deploy` | Deploy your project to a Satellite                             |
 
 ## 🚀 Launch
 
diff --git a/templates/angular-starter/README.md b/templates/angular-starter/README.md
index cdab971..c8bb570 100644
--- a/templates/angular-starter/README.md
+++ b/templates/angular-starter/README.md
@@ -20,13 +20,13 @@ A starter kit developed for [Juno](https://juno.build) using [Angular](https://a
 
 All commands are run from the root of the project, from a terminal:
 
-| Command          | Action                                                         |
-| :--------------- | :------------------------------------------------------------- |
-| `npm install`    | Installs dependencies                                          |
-| `npm run start`  | Starts frontend dev server at `localhost:4200`                 |
-| `juno dev start` | Quickstart the local development emulator                      |
-| `npm run build`  | Build your production site to `./dist/angular-starter/browser` |
-| `juno deploy`    | Deploy your project to a Satellite                             |
+| Command               | Action                                                         |
+| :-------------------- | :------------------------------------------------------------- |
+| `npm install`         | Installs dependencies                                          |
+| `npm run start`       | Starts frontend dev server at `localhost:4200`                 |
+| `juno emulator start` | Quickstart the local development emulator                      |
+| `npm run build`       | Build your production site to `./dist/angular-starter/browser` |
+| `juno hosting deploy` | Deploy your project to a Satellite                             |
 
 ## 🚀 Launch
 
diff --git a/templates/astro-starter/README.md b/templates/astro-starter/README.md
index 068c1fb..6541031 100644
--- a/templates/astro-starter/README.md
+++ b/templates/astro-starter/README.md
@@ -20,13 +20,13 @@ A starter kit developed for [Juno](https://juno.build) using [Astro](https://doc
 
 All commands are run from the root of the project, from a terminal:
 
-| Command          | Action                                         |
-| :--------------- | :--------------------------------------------- |
-| `npm install`    | Installs dependencies                          |
-| `npm run dev`    | Starts frontend dev server at `localhost:4321` |
-| `juno dev start` | Quickstart the local development emulator      |
-| `npm run build`  | Build your production site to `./dist/`        |
-| `juno deploy`    | Deploy your project to a Satellite             |
+| Command               | Action                                         |
+| :-------------------- | :--------------------------------------------- |
+| `npm install`         | Installs dependencies                          |
+| `npm run dev`         | Starts frontend dev server at `localhost:4321` |
+| `juno emulator start` | Quickstart the local development emulator      |
+| `npm run build`       | Build your production site to `./dist/`        |
+| `juno hosting deploy` | Deploy your project to a Satellite             |
 
 ## 🚀 Launch
 
diff --git a/templates/nextjs-example/README.md b/templates/nextjs-example/README.md
index 609b1c5..f57a465 100644
--- a/templates/nextjs-example/README.md
+++ b/templates/nextjs-example/README.md
@@ -19,7 +19,7 @@ To start experimenting with Juno locally, follow these steps:
 This will spin up the Juno backend locally:
 
 ```bash
-juno dev start
+juno emulator start
 ```
 
 ### 2. Create a Satellite
@@ -101,13 +101,13 @@ Check out the full guides in the [docs](https://juno.build/docs/category/deploym
 
 All commands are run from the root of the project, from a terminal:
 
-| Command          | Action                                         |
-| :--------------- | :--------------------------------------------- |
-| `npm install`    | Installs dependencies                          |
-| `npm run dev`    | Starts frontend dev server at `localhost:3000` |
-| `juno dev start` | Quickstart the local development emulator      |
-| `npm run build`  | Build your production site to `./out/`         |
-| `juno deploy`    | Deploy your project to a Satellite             |
+| Command               | Action                                         |
+| :-------------------- | :--------------------------------------------- |
+| `npm install`         | Installs dependencies                          |
+| `npm run dev`         | Starts frontend dev server at `localhost:3000` |
+| `juno emulator start` | Quickstart the local development emulator      |
+| `npm run build`       | Build your production site to `./out/`         |
+| `juno hosting deploy` | Deploy your project to a Satellite             |
 
 ## 🚀 Launch
 
diff --git a/templates/nextjs-starter/README.md b/templates/nextjs-starter/README.md
index 5b10398..9bb63ed 100644
--- a/templates/nextjs-starter/README.md
+++ b/templates/nextjs-starter/README.md
@@ -20,13 +20,13 @@ A starter kit developed for [Juno](https://juno.build) using [Next.js](https://n
 
 All commands are run from the root of the project, from a terminal:
 
-| Command          | Action                                         |
-| :--------------- | :--------------------------------------------- |
-| `npm install`    | Installs dependencies                          |
-| `npm run dev`    | Starts frontend dev server at `localhost:3000` |
-| `juno dev start` | Quickstart the local development emulator      |
-| `npm run build`  | Build your production site to `./out/`         |
-| `juno deploy`    | Deploy your project to a Satellite             |
+| Command               | Action                                         |
+| :-------------------- | :--------------------------------------------- |
+| `npm install`         | Installs dependencies                          |
+| `npm run dev`         | Starts frontend dev server at `localhost:3000` |
+| `juno emulator start` | Quickstart the local development emulator      |
+| `npm run build`       | Build your production site to `./out/`         |
+| `juno hosting deploy` | Deploy your project to a Satellite             |
 
 ## 🚀 Launch
 
diff --git a/templates/react-example/README.md b/templates/react-example/README.md
index f4768d6..7e70937 100644
--- a/templates/react-example/README.md
+++ b/templates/react-example/README.md
@@ -19,7 +19,7 @@ To start experimenting with Juno locally, follow these steps:
 This will spin up the Juno backend locally:
 
 ```bash
-juno dev start
+juno emulator start
 ```
 
 ### 2. Create a Satellite
@@ -101,13 +101,13 @@ Check out the full guides in the [docs](https://juno.build/docs/category/deploym
 
 All commands are run from the root of the project, from a terminal:
 
-| Command          | Action                                         |
-| :--------------- | :--------------------------------------------- |
-| `npm install`    | Installs dependencies                          |
-| `npm run dev`    | Starts frontend dev server at `localhost:5173` |
-| `juno dev start` | Quickstart the local development emulator      |
-| `npm run build`  | Build your production site to `./dist/`        |
-| `juno deploy`    | Deploy your project to a Satellite             |
+| Command               | Action                                         |
+| :-------------------- | :--------------------------------------------- |
+| `npm install`         | Installs dependencies                          |
+| `npm run dev`         | Starts frontend dev server at `localhost:5173` |
+| `juno emulator start` | Quickstart the local development emulator      |
+| `npm run build`       | Build your production site to `./dist/`        |
+| `juno hosting deploy` | Deploy your project to a Satellite             |
 
 ## 🚀 Launch
 
diff --git a/templates/react-starter/README.md b/templates/react-starter/README.md
index 93f69e1..1457562 100644
--- a/templates/react-starter/README.md
+++ b/templates/react-starter/README.md
@@ -20,13 +20,13 @@ A starter kit developed for [Juno](https://juno.build) using [React](https://rea
 
 All commands are run from the root of the project, from a terminal:
 
-| Command          | Action                                         |
-| :--------------- | :--------------------------------------------- |
-| `npm install`    | Installs dependencies                          |
-| `npm run dev`    | Starts frontend dev server at `localhost:5173` |
-| `juno dev start` | Quickstart the local development emulator      |
-| `npm run build`  | Build your production site to `./dist/`        |
-| `juno deploy`    | Deploy your project to a Satellite             |
+| Command               | Action                                         |
+| :-------------------- | :--------------------------------------------- |
+| `npm install`         | Installs dependencies                          |
+| `npm run dev`         | Starts frontend dev server at `localhost:5173` |
+| `juno emulator start` | Quickstart the local development emulator      |
+| `npm run build`       | Build your production site to `./dist/`        |
+| `juno hosting deploy` | Deploy your project to a Satellite             |
 
 ## 🚀 Launch
 
diff --git a/templates/react-ts-example/README.md b/templates/react-ts-example/README.md
index 7c14274..97dcd7f 100644
--- a/templates/react-ts-example/README.md
+++ b/templates/react-ts-example/README.md
@@ -19,7 +19,7 @@ To start experimenting with Juno locally, follow these steps:
 This will spin up the Juno backend locally:
 
 ```bash
-juno dev start
+juno emulator start
 ```
 
 ### 2. Create a Satellite
@@ -101,13 +101,13 @@ Check out the full guides in the [docs](https://juno.build/docs/category/deploym
 
 All commands are run from the root of the project, from a terminal:
 
-| Command          | Action                                         |
-| :--------------- | :--------------------------------------------- |
-| `npm install`    | Installs dependencies                          |
-| `npm run dev`    | Starts frontend dev server at `localhost:5173` |
-| `juno dev start` | Quickstart the local development emulator      |
-| `npm run build`  | Build your production site to `./dist/`        |
-| `juno deploy`    | Deploy your project to a Satellite             |
+| Command               | Action                                         |
+| :-------------------- | :--------------------------------------------- |
+| `npm install`         | Installs dependencies                          |
+| `npm run dev`         | Starts frontend dev server at `localhost:5173` |
+| `juno emulator start` | Quickstart the local development emulator      |
+| `npm run build`       | Build your production site to `./dist/`        |
+| `juno hosting deploy` | Deploy your project to a Satellite             |
 
 ## 🚀 Launch
 
diff --git a/templates/react-ts-starter/README.md b/templates/react-ts-starter/README.md
index d73a5e5..1025099 100644
--- a/templates/react-ts-starter/README.md
+++ b/templates/react-ts-starter/README.md
@@ -20,13 +20,13 @@ A starter kit developed for [Juno](https://juno.build) using [React](https://rea
 
 All commands are run from the root of the project, from a terminal:
 
-| Command          | Action                                         |
-| :--------------- | :--------------------------------------------- |
-| `npm install`    | Installs dependencies                          |
-| `npm run dev`    | Starts frontend dev server at `localhost:5173` |
-| `juno dev start` | Quickstart the local development emulator      |
-| `npm run build`  | Build your production site to `./dist/`        |
-| `juno deploy`    | Deploy your project to a Satellite             |
+| Command               | Action                                         |
+| :-------------------- | :--------------------------------------------- |
+| `npm install`         | Installs dependencies                          |
+| `npm run dev`         | Starts frontend dev server at `localhost:5173` |
+| `juno emulator start` | Quickstart the local development emulator      |
+| `npm run build`       | Build your production site to `./dist/`        |
+| `juno hosting deploy` | Deploy your project to a Satellite             |
 
 ## 🚀 Launch
 
diff --git a/templates/sveltekit-example/README.md b/templates/sveltekit-example/README.md
index d994462..1bed7f3 100644
--- a/templates/sveltekit-example/README.md
+++ b/templates/sveltekit-example/README.md
@@ -19,7 +19,7 @@ To start experimenting with Juno locally, follow these steps:
 This will spin up the Juno backend locally:
 
 ```bash
-juno dev start
+juno emulator start
 ```
 
 ### 2. Create a Satellite
@@ -101,13 +101,13 @@ Check out the full guides in the [docs](https://juno.build/docs/category/deploym
 
 All commands are run from the root of the project, from a terminal:
 
-| Command          | Action                                         |
-| :--------------- | :--------------------------------------------- |
-| `npm install`    | Installs dependencies                          |
-| `npm run dev`    | Starts frontend dev server at `localhost:5173` |
-| `juno dev start` | Quickstart the local development emulator      |
-| `npm run build`  | Build your production site to `./build/`       |
-| `juno deploy`    | Deploy your project to a Satellite             |
+| Command               | Action                                         |
+| :-------------------- | :--------------------------------------------- |
+| `npm install`         | Installs dependencies                          |
+| `npm run dev`         | Starts frontend dev server at `localhost:5173` |
+| `juno emulator start` | Quickstart the local development emulator      |
+| `npm run build`       | Build your production site to `./build/`       |
+| `juno hosting deploy` | Deploy your project to a Satellite             |
 
 ## 🚀 Launch
 
diff --git a/templates/sveltekit-starter/README.md b/templates/sveltekit-starter/README.md
index 2a5ecbc..53fd3c2 100644
--- a/templates/sveltekit-starter/README.md
+++ b/templates/sveltekit-starter/README.md
@@ -20,13 +20,13 @@ A starter kit developed for [Juno](https://juno.build) using [SvelteKit](https:/
 
 All commands are run from the root of the project, from a terminal:
 
-| Command          | Action                                         |
-| :--------------- | :--------------------------------------------- |
-| `npm install`    | Installs dependencies                          |
-| `npm run dev`    | Starts frontend dev server at `localhost:5173` |
-| `juno dev start` | Quickstart the local development emulator      |
-| `npm run build`  | Build your production site to `./build/`       |
-| `juno deploy`    | Deploy your project to a Satellite             |
+| Command               | Action                                         |
+| :-------------------- | :--------------------------------------------- |
+| `npm install`         | Installs dependencies                          |
+| `npm run dev`         | Starts frontend dev server at `localhost:5173` |
+| `juno emulator start` | Quickstart the local development emulator      |
+| `npm run build`       | Build your production site to `./build/`       |
+| `juno hosting deploy` | Deploy your project to a Satellite             |
 
 ## 🚀 Launch
 
diff --git a/templates/vanilla-js-example/README.md b/templates/vanilla-js-example/README.md
index 7ec8695..aa1b915 100644
--- a/templates/vanilla-js-example/README.md
+++ b/templates/vanilla-js-example/README.md
@@ -19,7 +19,7 @@ To start experimenting with Juno locally, follow these steps:
 This will spin up the Juno backend locally:
 
 ```bash
-juno dev start
+juno emulator start
 ```
 
 ### 2. Create a Satellite
@@ -100,13 +100,13 @@ Check out the full guides in the [docs](https://juno.build/docs/category/deploym
 
 All commands are run from the root of the project, from a terminal:
 
-| Command          | Action                                         |
-| :--------------- | :--------------------------------------------- |
-| `npm install`    | Installs dependencies                          |
-| `npm run dev`    | Starts frontend dev server at `localhost:5173` |
-| `juno dev start` | Quickstart the local development emulator      |
-| `npm run build`  | Build your production site to `./dist/`        |
-| `juno deploy`    | Deploy your project to a Satellite             |
+| Command               | Action                                         |
+| :-------------------- | :--------------------------------------------- |
+| `npm install`         | Installs dependencies                          |
+| `npm run dev`         | Starts frontend dev server at `localhost:5173` |
+| `juno emulator start` | Quickstart the local development emulator      |
+| `npm run build`       | Build your production site to `./dist/`        |
+| `juno hosting deploy` | Deploy your project to a Satellite             |
 
 ## 🚀 Launch
 
diff --git a/templates/vue-example/README.md b/templates/vue-example/README.md
index 4ad58b7..2d6920e 100644
--- a/templates/vue-example/README.md
+++ b/templates/vue-example/README.md
@@ -19,7 +19,7 @@ To start experimenting with Juno locally, follow these steps:
 This will spin up the Juno backend locally:
 
 ```bash
-juno dev start
+juno emulator start
 ```
 
 ### 2. Create a Satellite
@@ -105,9 +105,9 @@ All commands are run from the root of the project, from a terminal:
 | :--------------- | :---------------------------------------------------------- |
 | `npm install`    | Installs dependencies                                       |
 | `npm run dev`    | Starts frontend dev server at `localhost:5173`              |
-| `juno dev start` | Quickstart the local development emulator |
+| `juno emulator start` | Quickstart the local development emulator |
 | `npm run build`  | Build your production site to `./dist/`                     |
-| `juno deploy`    | Deploy your project to a Satellite                          |
+| `juno hosting deploy`    | Deploy your project to a Satellite                          |
 
 ## 🚀 Launch
 
diff --git a/templates/vue-starter/README.md b/templates/vue-starter/README.md
index 06b353f..42c21af 100644
--- a/templates/vue-starter/README.md
+++ b/templates/vue-starter/README.md
@@ -24,9 +24,9 @@ All commands are run from the root of the project, from a terminal:
 | :--------------- | :---------------------------------------------------------- |
 | `npm install`    | Installs dependencies                                       |
 | `npm run dev`    | Starts frontend dev server at `localhost:5173`              |
-| `juno dev start` | Quickstart the local development emulator |
+| `juno emulator start` | Quickstart the local development emulator |
 | `npm run build`  | Build your production site to `./dist/`                     |
-| `juno deploy`    | Deploy your project to a Satellite                          |
+| `juno hosting deploy`    | Deploy your project to a Satellite                          |
 
 ## 🚀 Launch