diff --git a/app/controllers/application.js b/app/controllers/application.js
new file mode 100644
index 0000000000..89a43bc03a
--- /dev/null
+++ b/app/controllers/application.js
@@ -0,0 +1,5 @@
+import GuideMakerApp from 'guidemaker/controllers/application';
+
+export default class ApplicationController extends GuideMakerApp {
+  queryParams = ['feature_flags']
+}
diff --git a/app/routes/application.js b/app/routes/application.js
new file mode 100644
index 0000000000..bf2cedc834
--- /dev/null
+++ b/app/routes/application.js
@@ -0,0 +1,17 @@
+import GuideMakerApp from 'guidemaker/routes/application';
+import { service } from '@ember/service';
+
+const FEATURES = {
+  'template-tag': false,
+};
+
+export default class ApplicationRoute extends GuideMakerApp {
+  @service features;
+
+  model(params, ...rest) {
+    let { feature_flags } = params;
+    let overrides = Object.fromEntries(feature_flags?.split(',').map(flag => [flag, true]) ?? []);
+    this.features.setupFeatures(Object.assign({}, FEATURES, overrides));
+    return super.model(params, ...rest);
+  }
+}
diff --git a/config/environment.js b/config/environment.js
index fbbb70e7f4..093aa0da0a 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -5,7 +5,10 @@ module.exports = function (environment) {
     modulePrefix: 'ember-guides',
     environment,
     rootURL: '/',
-    locationType: 'trailing-history',
+
+    // TODO: fix trailing-history to support query params
+    locationType: 'history',
+
     historySupportMiddleware: true,
 
     EmberENV: {
diff --git a/guides/release/getting-started/quick-start.md b/guides/release/getting-started/quick-start.md
index a621c7933e..c64179c3d7 100644
--- a/guides/release/getting-started/quick-start.md
+++ b/guides/release/getting-started/quick-start.md
@@ -83,6 +83,22 @@ Congratulations! You just created and booted your first Ember app.
 
 ## Write some HTML in a template
 
+<feature-flag-on-template-tag>
+
+We will start by editing the `application` template.
+This template is always on screen while the user has your application loaded.
+In your editor, open `app/templates/application.gjs` and change it to the following:
+
+```gjs {data-filename=app/templates/application.gjs}
+<template>
+  <h1>PeopleTracker</h1>
+  {{outlet}}
+</template>
+```
+</feature-flag-on-template-tag>
+
+<feature-flag-off-template-tag>
+
 We will start by editing the `application` template.
 This template is always on screen while the user has your application loaded.
 In your editor, open `app/templates/application.hbs` and change it to the following:
@@ -93,6 +109,8 @@ In your editor, open `app/templates/application.hbs` and change it to the follow
 {{outlet}}
 ```
 
+</feature-flag-off-template-tag>
+
 Ember detects the changed file and automatically reloads the page for you in the background.
 You should see that the welcome page has been replaced by "PeopleTracker".
 You also added an `{{outlet}}` to this page,
diff --git a/package.json b/package.json
index 65665cd966..a545a65c56 100644
--- a/package.json
+++ b/package.json
@@ -86,7 +86,7 @@
     "eslint-plugin-qunit": "^7.2.0",
     "gfm-code-blocks": "^1.0.0",
     "guidemaker": "^4.0.3",
-    "guidemaker-ember-template": "^4.0.1",
+    "guidemaker-ember-template": "^4.1.0",
     "loader.js": "^4.7.0",
     "lodash": "^4.17.21",
     "markdown-link-extractor": "1.2.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8d6439fb5f..7e14c4463d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -147,8 +147,8 @@ devDependencies:
     specifier: ^4.0.3
     version: 4.0.3(@ember-data/adapter@4.12.8)(@ember-data/model@4.12.8)(@ember-data/serializer@4.12.8)(ember-source@4.4.5)(showdown@2.1.0)(webpack@5.96.1)
   guidemaker-ember-template:
-    specifier: ^4.0.1
-    version: 4.0.2(@babel/core@7.26.0)(@glimmer/tracking@1.1.2)(ember-cli-head@2.0.0)(ember-source@4.4.5)(guidemaker@4.0.3)(showdown@2.1.0)(webpack@5.96.1)
+    specifier: ^4.1.0
+    version: 4.1.0(@babel/core@7.26.0)(@glimmer/tracking@1.1.2)(ember-cli-head@2.0.0)(ember-source@4.4.5)(guidemaker@4.0.3)(showdown@2.1.0)(webpack@5.96.1)
   loader.js:
     specifier: ^4.7.0
     version: 4.7.0
@@ -10241,8 +10241,8 @@ packages:
     resolution: {integrity: sha512-+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw==}
     dev: true
 
-  /guidemaker-ember-template@4.0.2(@babel/core@7.26.0)(@glimmer/tracking@1.1.2)(ember-cli-head@2.0.0)(ember-source@4.4.5)(guidemaker@4.0.3)(showdown@2.1.0)(webpack@5.96.1):
-    resolution: {integrity: sha512-9CFYUQef31+ORmuo3MfA78Wm22A038AOZS1OowWQuFiKRXL3UWwiOQCIgcNmk2WE6JJ3s1H79nnMz6L65txxMQ==}
+  /guidemaker-ember-template@4.1.0(@babel/core@7.26.0)(@glimmer/tracking@1.1.2)(ember-cli-head@2.0.0)(ember-source@4.4.5)(guidemaker@4.0.3)(showdown@2.1.0)(webpack@5.96.1):
+    resolution: {integrity: sha512-d+w2aqdqHOg+lk7EgEKPmKLWwlSRRML0t0ad4ZhQ8g01Zcsu+etoR+F5WNyrPeYwOxMWZ2s/+cItVbqr15kDeg==}
     peerDependencies:
       ember-cli-head: '*'
       guidemaker: ^4.0.1