diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6736bd6d48..37518348d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,69 @@
+#### 2.12.0: Release
+
+ - Add note about Private CA chain (#4901)
+ - Bump actions/github-script from 6 to 7 (#4897)
+ - Bump flowfuse/github-actions-workflows from 0.37.0 to 0.38.0 (#4896)
+ - Make it clearer which IP address to use (#4887)
+ - Bump codecov/codecov-action from 4 to 5 (#4795)
+ - Support disabling instance launcher "auto safe mode" (#4922) @Steve-Mcl
+ - Allow NR Dashboard to be loaded in iFrames (#4900) @hardillb
+ - Add system-ui as a backup font for heebo (to match internal font) (#4946) @cstns
+ - Remove platform banners from the applications page (#4939) @cstns
+ - Better device proxy cache (#4792) @hardillb
+ - Fix application child routes not making the applications nav menu active (#4885) @cstns
+ - Decrease device auto timeout to 15 seconds from 30 (#4932) @hardillb
+ - Add logo version for dark backgrounds (#4930) @Yndira-E
+ - Open Dashboard and Editor links in new tab by default (#4923) @joepavitt
+ - Update the sign up page and box layout to new branding (#4924) @joepavitt
+ - Bump nanoid from 3.3.7 to 3.3.8 (#4918) @app/dependabot
+ - Add note to Instance Types setting default Stack (#4917) @hardillb
+ - Team Bill Of Materials UI (#4872) @cstns
+ - Remove notifications for deleted instances (#4899) @hardillb
+ - Revert Device log changes (#4916) @hardillb
+ - Allow for prefix/suffix to SSO GroupNames (#4902) @hardillb
+ - Add device agent docker timezone docs (#4907) @hardillb
+ - Ensure Device Provisioning tokens removed with Team (#4906) @hardillb
+ - Return device type in application/devices (#4904) @hardillb
+ - Fix device log race condition between publish and disconnect (#4903) @cstns
+ - Ensure device logs always shown (#4893) @hardillb
+ - Add some Team Broker developement docs (#4799) @hardillb
+ - Ensure Instance suspended on expired license (#4888) @hardillb
+ - Bump cypress from 13.13.1 to 13.16.1 (#4895) @app/dependabot
+ - ci: Fix prestaging slack notification conditional (#4892) @ppawlowski
+ - ci: "upstream" packages validation workflow (#4455) @ppawlowski
+ - docs: Change links to Docker Compose files (#4890) @ppawlowski
+ - Fix main nav matching context order (#4869) @cstns
+ - Use default behavior for platform wide anchors (part I) (#4834) @cstns
+ - Bump path-to-regexp and express (#4879) @app/dependabot
+ - Fix padding on Device Group Settings view (#4865) @knolleary
+ - docs: Add description how to start Device Agent on system boot (#4878) @ppawlowski
+ - Send invite Reminders (#4824) @hardillb
+ - Fixe the outline of the first search result title (#4877) @cstns
+ - Add more filters for admin notification targeting (#4843) @knolleary
+ - Topic hierarchy follow up (#4818) @cstns
+ - Update role-based permissions table (#4863) @sumitshinde-84
+ - Add Team BOM api endpoint (#4849) @hardillb
+ - Ensure existing http auth tokens shown (#4861) @hardillb
+ - fix hovering over pipeline and application name and update empty state message (#4859) @cstns
+ - Expand the UNS Hierarchy by default & improve hover behaviour (#4854) @joepavitt
+ - Fix access permission for team pipeline api (#4856) @hardillb
+ - Improve help text and empty state language for Teams > Pipelines (#4855) @joepavitt
+ - Navigation - Add Team Pipelines View (#4852) @cstns
+ - Prevent viewer role users from getting 404 when accesing applications (#4846) @cstns
+ - Team Pipelines API (#4847) @hardillb
+ - ci: Publish to npm only on successful tests (#4848) @ppawlowski
+ - Team member device mode toggle (#4844) @hardillb
+ - Improve padding/sizing of the global search box (#4825) @joepavitt
+ - Bump @sentry/browser and @sentry/vue (#4731) @app/dependabot
+ - Allow branding settings to be cleared in the UI (#4841) @knolleary
+ - ci: Test docs along with website (#4840) @ppawlowski
+ - Improved Admin Team view (#4770) @knolleary
+ - 4563 replace instance and audit logs dropdowns (#4567) @cstns
+ - Support Search by id in Global Search (#4814) @Steve-Mcl
+ - fix device groups layout (#4817) @Steve-Mcl
+ - docs: fix failing anchors on kubernetes and docker docs (#4812) @ppawlowski
+ - Fix broken anchor links in docs (#4811) @Steve-Mcl
+
 #### 2.11.0: Release
 
  - Bump flowfuse/github-actions-workflows from 0.36.0 to 0.37.0 (#4733)
diff --git a/forge/db/models/Project.js b/forge/db/models/Project.js
index c972312f41..d9b8b1013a 100644
--- a/forge/db/models/Project.js
+++ b/forge/db/models/Project.js
@@ -17,7 +17,7 @@ const { col, fn, DataTypes, Op, where } = require('sequelize')
 
 const Controllers = require('../controllers')
 
-const { KEY_HOSTNAME, KEY_SETTINGS, KEY_HA, KEY_PROTECTED, KEY_HEALTH_CHECK_INTERVAL, KEY_CUSTOM_HOSTNAME } = require('./ProjectSettings')
+const { KEY_HOSTNAME, KEY_SETTINGS, KEY_HA, KEY_PROTECTED, KEY_HEALTH_CHECK_INTERVAL, KEY_CUSTOM_HOSTNAME, KEY_DISABLE_AUTO_SAFE_MODE } = require('./ProjectSettings')
 
 const BANNED_NAME_LIST = [
     'app',
@@ -408,7 +408,8 @@ module.exports = {
                                     { key: KEY_HA },
                                     { key: KEY_PROTECTED },
                                     { key: KEY_CUSTOM_HOSTNAME },
-                                    { key: KEY_HEALTH_CHECK_INTERVAL }
+                                    { key: KEY_HEALTH_CHECK_INTERVAL },
+                                    { key: KEY_DISABLE_AUTO_SAFE_MODE }
                                 ]
                             },
                             required: false
diff --git a/forge/db/models/ProjectSettings.js b/forge/db/models/ProjectSettings.js
index 628574e766..4f6b50e2de 100644
--- a/forge/db/models/ProjectSettings.js
+++ b/forge/db/models/ProjectSettings.js
@@ -16,6 +16,7 @@ const KEY_PROTECTED = 'protected'
 const KEY_HEALTH_CHECK_INTERVAL = 'healthCheckInterval'
 const KEY_CUSTOM_HOSTNAME = 'customHostname'
 const KEY_SHARED_ASSETS = 'sharedAssets'
+const KEY_DISABLE_AUTO_SAFE_MODE = 'disableAutoSafeMode'
 
 module.exports = {
     KEY_SETTINGS,
@@ -25,6 +26,7 @@ module.exports = {
     KEY_HEALTH_CHECK_INTERVAL,
     KEY_CUSTOM_HOSTNAME,
     KEY_SHARED_ASSETS,
+    KEY_DISABLE_AUTO_SAFE_MODE,
     name: 'ProjectSettings',
     schema: {
         ProjectId: { type: DataTypes.UUID, unique: 'pk_settings' },
diff --git a/forge/db/models/Team.js b/forge/db/models/Team.js
index e6449d599d..5a7c058976 100644
--- a/forge/db/models/Team.js
+++ b/forge/db/models/Team.js
@@ -182,6 +182,13 @@ module.exports = {
                         }]
                     })
                 },
+                countForUser: async function (User) {
+                    return M.TeamMember.count({
+                        where: {
+                            UserId: User.id
+                        }
+                    })
+                },
                 forUser: async function (User) {
                     return M.TeamMember.findAll({
                         where: {
diff --git a/forge/db/views/Project.js b/forge/db/views/Project.js
index 3d9033c4d8..2f4c4d28d1 100644
--- a/forge/db/views/Project.js
+++ b/forge/db/views/Project.js
@@ -1,4 +1,4 @@
-const { KEY_HOSTNAME, KEY_SETTINGS, KEY_HA, KEY_PROTECTED, KEY_HEALTH_CHECK_INTERVAL, KEY_CUSTOM_HOSTNAME } = require('../models/ProjectSettings')
+const { KEY_HOSTNAME, KEY_SETTINGS, KEY_HA, KEY_PROTECTED, KEY_HEALTH_CHECK_INTERVAL, KEY_CUSTOM_HOSTNAME, KEY_DISABLE_AUTO_SAFE_MODE } = require('../models/ProjectSettings')
 
 module.exports = function (app) {
     app.addSchema({
@@ -37,7 +37,8 @@ module.exports = function (app) {
             launcherSettings: {
                 type: 'object',
                 properties: {
-                    healthCheckInterval: { type: 'number' }
+                    healthCheckInterval: { type: 'number' },
+                    disableAutoSafeMode: { type: 'boolean' }
                 },
                 additionalProperties: false
             }
@@ -75,6 +76,11 @@ module.exports = function (app) {
                 result.launcherSettings = {}
                 result.launcherSettings.healthCheckInterval = heathCheckIntervalRow?.value
             }
+            const disableAutoSafeMode = proj.ProjectSettings?.find((projectSettingsRow) => projectSettingsRow.key === KEY_DISABLE_AUTO_SAFE_MODE)
+            if (typeof disableAutoSafeMode?.value === 'boolean') {
+                result.launcherSettings = result.launcherSettings || {}
+                result.launcherSettings.disableAutoSafeMode = disableAutoSafeMode.value
+            }
             // Environment
             result.settings.env = app.db.controllers.Project.insertPlatformSpecificEnvVars(proj, result.settings.env)
             if (!result.settings.palette?.modules) {
diff --git a/forge/lib/templates.js b/forge/lib/templates.js
index be22313abd..930684a775 100644
--- a/forge/lib/templates.js
+++ b/forge/lib/templates.js
@@ -4,6 +4,7 @@ module.exports = {
         'disableTours',
         'httpAdminRoot',
         'dashboardUI',
+        'dashboardIFrame',
         'codeEditor',
         'theme',
         'page_title',
@@ -36,6 +37,7 @@ module.exports = {
         disableTours: false,
         httpAdminRoot: '',
         dashboardUI: '/ui',
+        dashboardIFrame: false,
         codeEditor: 'monaco',
         theme: 'forge-light',
         page_title: 'FlowFuse',
@@ -65,6 +67,7 @@ module.exports = {
         disableTours: true,
         httpAdminRoot: true,
         dashboardUI: true,
+        dashboardIFrame: true,
         codeEditor: true,
         theme: true,
         page_title: false,
diff --git a/forge/lib/userTeam.js b/forge/lib/userTeam.js
index cd8b5b58d2..d2313ea5ce 100644
--- a/forge/lib/userTeam.js
+++ b/forge/lib/userTeam.js
@@ -33,7 +33,7 @@ async function completeUserSignup (app, user) {
             // return
         }
         // only create a personal team if no other teams exist
-        if (!((await app.db.models.Team.forUser(user)).length)) {
+        if ((await app.db.models.Team.countForUser(user)) === 0) {
             let teamTypeId = app.settings.get('user:team:auto-create:teamType')
 
             if (!teamTypeId) {
diff --git a/forge/routes/api/project.js b/forge/routes/api/project.js
index 1c635e258c..46bdc75f94 100644
--- a/forge/routes/api/project.js
+++ b/forge/routes/api/project.js
@@ -1,4 +1,4 @@
-const { KEY_SETTINGS, KEY_HEALTH_CHECK_INTERVAL, KEY_SHARED_ASSETS } = require('../../db/models/ProjectSettings')
+const { KEY_SETTINGS, KEY_HEALTH_CHECK_INTERVAL, KEY_DISABLE_AUTO_SAFE_MODE, KEY_SHARED_ASSETS } = require('../../db/models/ProjectSettings')
 const { Roles } = require('../../lib/roles')
 
 const ProjectActions = require('./projectActions')
@@ -456,15 +456,24 @@ module.exports = async function (app) {
         }
 
         // Launcher settings
-        if (request.body?.launcherSettings?.healthCheckInterval) {
-            const oldInterval = await request.project.getSetting(KEY_HEALTH_CHECK_INTERVAL)
-            const newInterval = parseInt(request.body.launcherSettings.healthCheckInterval, 10)
-            if (isNaN(newInterval) || newInterval < 5000) {
-                reply.code(400).send({ code: 'invalid_heathCheckInterval', error: 'Invalid heath check interval' })
-                return
+        if (request.body?.launcherSettings) {
+            if (request.body.launcherSettings.healthCheckInterval) {
+                const oldInterval = await request.project.getSetting(KEY_HEALTH_CHECK_INTERVAL)
+                const newInterval = parseInt(request.body.launcherSettings.healthCheckInterval, 10)
+                if (isNaN(newInterval) || newInterval < 5000) {
+                    reply.code(400).send({ code: 'invalid_heathCheckInterval', error: 'Invalid heath check interval' })
+                    return
+                }
+                if (oldInterval !== newInterval) {
+                    changesToPersist.healthCheckInterval = { from: oldInterval, to: newInterval }
+                }
             }
-            if (oldInterval !== newInterval) {
-                changesToPersist.healthCheckInterval = { from: oldInterval, to: newInterval }
+            if (typeof request.body.launcherSettings.disableAutoSafeMode === 'boolean') {
+                const oldInterval = await request.project.getSetting(KEY_DISABLE_AUTO_SAFE_MODE)
+                const newInterval = request.body.launcherSettings.disableAutoSafeMode
+                if (oldInterval !== newInterval) {
+                    changesToPersist.disableAutoSafeMode = { from: oldInterval, to: newInterval }
+                }
             }
         }
 
@@ -529,6 +538,10 @@ module.exports = async function (app) {
                 await request.project.updateSetting(KEY_HEALTH_CHECK_INTERVAL, changesToPersist.healthCheckInterval.to, { transaction })
                 updates.pushDifferences({ healthCheckInterval: changesToPersist.healthCheckInterval.from }, { healthCheckInterval: changesToPersist.healthCheckInterval.to })
             }
+            if (changesToPersist.disableAutoSafeMode) {
+                await request.project.updateSetting(KEY_DISABLE_AUTO_SAFE_MODE, changesToPersist.disableAutoSafeMode.to, { transaction })
+                updates.pushDifferences({ disableAutoSafeMode: changesToPersist.disableAutoSafeMode.from }, { disableAutoSafeMode: changesToPersist.disableAutoSafeMode.to })
+            }
 
             await transaction.commit() // all good, commit the transaction
 
@@ -802,6 +815,7 @@ module.exports = async function (app) {
         settings.state = request.project.state
         settings.stack = request.project.ProjectStack?.properties || {}
         settings.healthCheckInterval = await request.project.getSetting(KEY_HEALTH_CHECK_INTERVAL)
+        settings.disableAutoSafeMode = await request.project.getSetting(KEY_DISABLE_AUTO_SAFE_MODE)
         settings.settings = await app.db.controllers.Project.getRuntimeSettings(request.project)
         if (settings.settings.env) {
             settings.env = Object.assign({}, settings.settings.env, settings.env)
diff --git a/forge/routes/api/team.js b/forge/routes/api/team.js
index bf125b868c..982096c098 100644
--- a/forge/routes/api/team.js
+++ b/forge/routes/api/team.js
@@ -1,3 +1,5 @@
+const crypto = require('crypto')
+
 const { Op } = require('sequelize')
 
 const { Roles } = require('../../lib/roles')
@@ -395,7 +397,8 @@ module.exports = async function (app) {
                 properties: {
                     name: { type: 'string' },
                     type: { type: 'string' },
-                    slug: { type: 'string' }
+                    slug: { type: 'string' },
+                    trial: { type: 'boolean' }
                 }
             },
             response: {
@@ -429,6 +432,34 @@ module.exports = async function (app) {
             return
         }
 
+        let trialMode = false
+        if (app.license.active() && app.billing && request.body.trial) {
+            // Check this user is allowed to create a trial team of this type.
+            // Rules:
+            // 1. teamType must have trial mode enabled
+            const teamTrialActive = await teamType.getProperty('trial.active', false)
+            if (!teamTrialActive) {
+                reply.code(400).send({ code: 'invalid_request', error: 'trial mode not available' })
+                return
+            }
+            // 2. user must have no existing teams
+            const existingTeamCount = await app.db.models.Team.countForUser(request.session.User)
+            if (existingTeamCount > 0) {
+                reply.code(400).send({ code: 'invalid_request', error: 'trial mode not available' })
+                return
+            }
+            // 3. user must be < 1 week old
+            const delta = Date.now() - request.session.User.createdAt.getTime()
+            if (delta > 1000 * 60 * 60 * 24 * 7) {
+                reply.code(400).send({ code: 'invalid_request', error: 'trial mode not available' })
+                return
+            }
+            trialMode = true
+        } else if (request.body.trial) {
+            reply.code(400).send({ code: 'invalid_request', error: 'trial mode not available' })
+            return
+        }
+
         let team
 
         try {
@@ -444,9 +475,43 @@ module.exports = async function (app) {
             const teamView = app.db.views.Team.team(team)
 
             if (app.license.active() && app.billing) {
-                const session = await app.billing.createSubscriptionSession(team, request.session.User)
-                app.auditLog.Team.billing.session.created(request.session.User, null, team, session)
-                teamView.billingURL = session.url
+                if (trialMode) {
+                    await app.billing.setupTrialTeamSubscription(team, request.session.User)
+                    // In trial mode, we may also auto-create their first application and instance
+                    if (app.settings.get('user:team:auto-create:instanceType')) {
+                        const instanceTypeId = app.settings.get('user:team:auto-create:instanceType')
+                        const instanceType = await app.db.models.ProjectType.byId(instanceTypeId)
+                        const instanceStack = await instanceType?.getDefaultStack() || (await instanceType.getProjectStacks())?.[0]
+                        const instanceTemplate = await app.db.models.ProjectTemplate.findOne({ where: { active: true } })
+                        if (!instanceType) {
+                            app.log.warn(`Unable to create Trial Instance in team ${team.hashid}: Instance type with id ${instanceTypeId} from 'user:team:auto-create:instanceType' not found`)
+                        } else if (!instanceStack) {
+                            app.log.warn(`Unable to create Trial Instance in team ${team.hashid}: Unable to find a stack for use with instance type ${instanceTypeId}`)
+                        } else if (!instanceTemplate) {
+                            app.log.warn(`Unable to create Trial Instance in team ${team.hashid}: Unable to find the default instance template`)
+                        } else {
+                            const applicationName = `${request.session.User.name}'s Application`
+                            const application = await app.db.models.Application.create({
+                                name: applicationName.charAt(0).toUpperCase() + applicationName.slice(1),
+                                TeamId: team.id
+                            })
+                            await app.auditLog.Team.application.created(request.session.User, null, team, application)
+                            await app.auditLog.Application.application.created(request.session.User, null, application)
+
+                            const safeTeamName = team.name.toLowerCase().replace(/[\W_]/g, '-')
+                            const safeUserName = request.session.User.username.toLowerCase().replace(/[\W_]/g, '-')
+
+                            const instanceProperties = {
+                                name: `${safeTeamName}-${safeUserName}-${crypto.randomBytes(4).toString('hex')}`
+                            }
+                            await app.db.controllers.Project.create(team, application, request.session.User, instanceType, instanceStack, instanceTemplate, instanceProperties)
+                        }
+                    }
+                } else {
+                    const session = await app.billing.createSubscriptionSession(team, request.session.User)
+                    app.auditLog.Team.billing.session.created(request.session.User, null, team, session)
+                    teamView.billingURL = session.url
+                }
             }
 
             reply.send(teamView)
diff --git a/frontend/src/components/PageHeader.vue b/frontend/src/components/PageHeader.vue
index 21ec32c4e0..5d9568736b 100644
--- a/frontend/src/components/PageHeader.vue
+++ b/frontend/src/components/PageHeader.vue
@@ -11,7 +11,7 @@
         <router-link :to="homeLink">
             <img class="ff-logo" src="/ff-logo--wordmark--dark.png">
         </router-link>
-        <global-search v-if="hasAMinimumTeamRoleOf(Roles.Viewer)" />
+        <global-search v-if="teams.length > 0 && hasAMinimumTeamRoleOf(Roles.Viewer)" />
         <!-- Mobile: Toggle(User Options) -->
         <div class="flex ff-mobile-navigation-right" data-el="mobile-nav-right">
             <NotificationsButton class="ff-header--mobile-notificationstoggle" :class="{'active': mobileTeamSelectionOpen}" />
diff --git a/frontend/src/components/TeamTypeSelection.vue b/frontend/src/components/TeamTypeSelection.vue
new file mode 100644
index 0000000000..2c41bfc209
--- /dev/null
+++ b/frontend/src/components/TeamTypeSelection.vue
@@ -0,0 +1,34 @@
+<template>
+    <div>
+        <div class="flex gap-6 justify-center relative z-10 flex-wrap">
+            <team-type-tile v-for="type in types" :key="type.id" :team-type="type" />
+        </div>
+    </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+import teamTypesApi from '../api/teamTypes.js'
+
+import TeamTypeTile from './TeamTypeTile.vue'
+
+export default {
+    name: 'TeamTypeSelection',
+    components: {
+        'team-type-tile': TeamTypeTile
+    },
+    data () {
+        return {
+            types: []
+        }
+    },
+    computed: {
+        ...mapState('account', ['user'])
+    },
+    async created () {
+        const { types } = await teamTypesApi.getTeamTypes()
+        this.types = types.sort((a, b) => a.order - b.order)
+    }
+}
+</script>
diff --git a/frontend/src/components/TeamTypeTile.vue b/frontend/src/components/TeamTypeTile.vue
new file mode 100644
index 0000000000..19b0e3c100
--- /dev/null
+++ b/frontend/src/components/TeamTypeTile.vue
@@ -0,0 +1,143 @@
+<template>
+    <div class="ff-team-type-tile">
+        <div v-if="isTrial(teamType)" class="trial-ribbon">
+            <label>{{ teamType.properties.trial.duration }} Days Free Trial</label>
+        </div>
+        <div class="space-y-2">
+            <img class="w-36 m-auto" src="../images/empty-states/application-instances.png">
+            <div class="flex flex-col gap-5">
+                <div class="flex justify-between items-center text-2xl">
+                    <label class="font-medium">{{ teamType.name }}</label>
+                    <span v-if="pricing?.value">
+                        {{ pricing.value }} <span class="text-xs">/{{ pricing.interval }}</span>
+                    </span>
+                </div>
+                <ff-markdown-viewer :content="teamType.description" />
+            </div>
+        </div>
+        <template v-if="enableCTA">
+            <ff-button v-if="isTrial(teamType)" kind="primary" class="w-full mt-4" :to="`/team/create?teamType=${teamType.id}`">
+                Start Free Trial
+            </ff-button>
+            <ff-button v-else-if="isManualBilling(teamType)" kind="secondary" class="w-full mt-4" @click="contactFF(teamType)">
+                Contact FlowFuse
+            </ff-button>
+            <ff-button v-else kind="secondary" class="w-full mt-4" :to="`/team/create?teamType=${teamType.id}`">
+                Select
+            </ff-button>
+        </template>
+    </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+import BillingAPI from '../api/billing.js'
+import Alerts from '../services/alerts.js'
+
+export default {
+    name: 'TeamTypeTile',
+    props: {
+        teamType: {
+            type: Object,
+            required: true
+        },
+        enableCTA: {
+            type: Boolean,
+            default: true
+        }
+    },
+    computed: {
+        ...mapState('account', ['user', 'teams']),
+        pricing: function () {
+            const billing = this.teamType.properties?.billing.description?.split('/')
+            const price = {}
+            if (typeof billing !== 'undefined') {
+                price.value = billing[0]
+                price.interval = billing[1]
+            }
+            return price
+        }
+    },
+    methods: {
+        isTrial (teamType) {
+            // A team trial can be offered if:
+            // 1. User has no other teams
+            return this.teams.length === 0 &&
+            // 2. User is less than a week old
+                (Date.now() - (new Date(this.user.createdAt)).getTime()) < 1000 * 60 * 60 * 24 * 7 &&
+            // 3. TeamType meta data says so
+                teamType.properties?.trial?.active
+        },
+        isManualBilling (teamType) {
+            return teamType.properties?.billing?.requireContact
+        },
+        contactFF (teamType) {
+            BillingAPI.sendTeamTypeContact(this.user, teamType, 'Create Team').then(() => {
+                Alerts.emit('A message has been sent to our team. We will contact you soon regarding your request. In the mean time, feel free to choose another plan to get started.', 'confirmation', 20000)
+            }).catch(err => {
+                Alerts.emit('Something went wrong with the request. Please try again or contact support for help.', 'warning', 15000)
+                console.error('Failed to submit hubspot form: ', err)
+            })
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+.ff-team-type-tile {
+    position: relative;
+    border-radius: 6px;
+    border: 2px solid $ff-grey-300;
+    background: white;
+    box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.25);
+    padding: 24px;
+    width: 100%;
+    max-width: 300px;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    ul {
+        list-style: disc;
+        padding-left: 16px;
+        li {
+            margin-bottom: 6px;
+        }
+    }
+}
+.trial-ribbon {
+    --ribbon-overlap: 8px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 30px;
+    left: calc(-1 * var(--ribbon-overlap));
+    line-height: 1.3;
+    width: calc(100% + 2 * var(--ribbon-overlap));
+    margin: 0;
+    position: absolute;
+    top: 8px;
+    color: white;
+    // text-shadow: 0 1px 1px #111;
+    border-top: 1px solid #363636;
+    border-bottom: 1px solid #202020;
+    background: $ff-red-500;
+    // background: linear-gradient($ff-red-500 0%, $ff-red-700 100%);
+    border-radius: 2px 2px 0 0;
+    box-shadow: 0 1px 2px rgba(0,0,0,0.3);
+}
+.trial-ribbon::before,
+.trial-ribbon::after {
+    content: '';
+    display: block;
+    width: 0;
+    height: 0;
+    position: absolute;
+    bottom: calc((-2 * var(--ribbon-overlap)) - 1px);
+    z-index: -10;
+    border: var(--ribbon-overlap) solid;
+    border-color: $ff-red-900 transparent transparent transparent;
+}
+.trial-ribbon::before {left: 0;}
+.trial-ribbon::after {right: 0;}
+</style>
diff --git a/frontend/src/pages/Home.vue b/frontend/src/pages/Home.vue
index c9c9de5165..3ad5432886 100644
--- a/frontend/src/pages/Home.vue
+++ b/frontend/src/pages/Home.vue
@@ -1,13 +1,20 @@
 <template>
-    <main>
+    <main class="min-h-full">
         <template v-if="pending">
             <div class="flex-grow flex flex-col items-center justify-center mx-auto text-gray-600 opacity-50">
                 <FlowFuseLogo class="max-w-xs mx-auto w-full" />
             </div>
         </template>
-        <template v-else-if="teams.length === 0">
-            <NoTeamsUser />
-        </template>
+        <ff-page v-else-if="teams.length === 0">
+            <template #header>
+                <ff-page-header title="Choose Team Type">
+                    <template #context>
+                        Choose which team type you'd like to get started with.
+                    </template>
+                </ff-page-header>
+            </template>
+            <TeamTypeSelection />
+        </ff-page>
     </main>
 </template>
 
@@ -17,13 +24,13 @@ import { mapGetters, mapState } from 'vuex'
 
 import FlowFuseLogo from '../components/Logo.vue'
 
-import NoTeamsUser from './account/NoTeamsUser.vue'
+import TeamTypeSelection from '../components/TeamTypeSelection.vue'
 
 export default {
     name: 'HomePage',
     components: {
         FlowFuseLogo,
-        NoTeamsUser
+        TeamTypeSelection
     },
     data () {
         return {
diff --git a/frontend/src/pages/account/NoTeamsUser.vue b/frontend/src/pages/account/NoTeamsUser.vue
deleted file mode 100644
index dfd7eb0aa8..0000000000
--- a/frontend/src/pages/account/NoTeamsUser.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-    <form class="py-8 text-center">
-        <p class="text-gray-700 text-lg">You need to be in a team to create projects.</p>
-        <p v-if="invitationCount === 0 && !user.admin && !settings['team:create']" class="text-gray-700 text-lg mt-10 ">Ask an Admin or Team Owner to add you to a team.</p>
-        <div class="pt-4 justify-center flex gap-5" :class="invitationCount > 0?'sm:grid-cols-2':'max-w-xs mx-auto'">
-            <router-link v-if="user.admin || settings['team:create']" to="/team/create" class="forge-button-secondary p-4 sm:h-36 inline-flex sm:flex-col items-center sm:justify-center gap-4">
-                <UserGroupIcon class="w-10" />
-                Create a new team
-            </router-link>
-            <router-link v-if="invitationCount>0" data-nav="team-invites" to="/account/teams/invitations" class="forge-button-secondary p-4 sm:h-36 inline-flex sm:flex-col items-center sm:justify-center gap-4">
-                <InboxInIcon class="w-10" />
-                You have {{ invitationCount }} team {{ $filters.pluralize(invitationCount,"invitation") }}
-            </router-link>
-        </div>
-    </form>
-</template>
-
-<script>
-
-import { InboxInIcon, UserGroupIcon } from '@heroicons/vue/outline'
-import { mapGetters, mapState } from 'vuex'
-
-export default {
-    name: 'NoTeamsUser',
-    components: {
-        UserGroupIcon,
-        InboxInIcon
-    },
-    computed: {
-        ...mapState('account', ['settings', 'user']),
-        ...mapGetters('account', {
-            invitationCount: 'teamInvitationsCount'
-        })
-    },
-    mounted () {
-        this.fetchData()
-    },
-    methods: {
-        async fetchData () {
-            await this.$store.dispatch('account/getInvitations')
-        }
-    }
-}
-</script>
diff --git a/frontend/src/pages/admin/TeamTypes/dialogs/TeamTypeEditDialog.vue b/frontend/src/pages/admin/TeamTypes/dialogs/TeamTypeEditDialog.vue
index 082c7b8b83..de0ff84900 100644
--- a/frontend/src/pages/admin/TeamTypes/dialogs/TeamTypeEditDialog.vue
+++ b/frontend/src/pages/admin/TeamTypes/dialogs/TeamTypeEditDialog.vue
@@ -14,7 +14,7 @@
                     Order
                     <template #description>Set the sort order when listing the types</template>
                 </FormRow>
-                <FormRow v-model="input.description" :error="errors.description" data-form="description">
+                <FormRow v-model="input.description" :error="errors.description" data-form="description" containerClass="w-full">
                     Description
                     <template #description>Use markdown for formatting</template>
                     <template #input><textarea v-model="input.description" class="w-full" rows="6" /></template>
diff --git a/frontend/src/pages/admin/TeamTypes/index.vue b/frontend/src/pages/admin/TeamTypes/index.vue
index 7f6573d94b..f975a3478f 100644
--- a/frontend/src/pages/admin/TeamTypes/index.vue
+++ b/frontend/src/pages/admin/TeamTypes/index.vue
@@ -79,7 +79,7 @@ export default {
     },
     computed: {
         activeTeamTypes () {
-            const types = this.teamTypes.filter(pt => pt.active)
+            const types = this.teamTypes.filter(pt => pt.active).sort((a, b) => a.order - b.order)
             return types
         },
         inactiveTeamTypes () {
diff --git a/frontend/src/pages/admin/Template/sections/Editor.vue b/frontend/src/pages/admin/Template/sections/Editor.vue
index 9aa92c2262..4e1dd2a350 100644
--- a/frontend/src/pages/admin/Template/sections/Editor.vue
+++ b/frontend/src/pages/admin/Template/sections/Editor.vue
@@ -66,6 +66,27 @@
             </div>
             <LockSetting class="flex justify-end flex-col" tooltip="This setting is fixed and cannot be changed." />
         </div>
+        <div v-if="dashboardIFrameAvailable">
+            <div class="flex flex-col sm:flex-row">
+                <div class="w-full max-w-md sm:mr-8">
+                    <FormRow v-model="editable.settings.dashboardIFrame" :error="editable.errors.dashboardIFrame" :disabled="!editTemplate && !editable.policy.dashboardIFrame" type="checkbox">
+                        Allow Dashboard to be embedded in an iFrame
+                        <template #description>
+                            Sets the <span>Content-Security-Policy: frame-ancestor '*'</span> HTTP Header for the Dashboard
+                        </template>
+                        <template #append><ChangeIndicator :value="editable.changed.settings.dashboardIFrame" /></template>
+                    </FormRow>
+                </div>
+                <LockSetting v-model="editable.policy.dashboardIFrame" class="flex justify-end flex-col" :editTemplate="editTemplate" :changed="editable.changed.policy.dashboardIFrame" />
+            </div>
+        </div>
+        <div v-else class="flex flex-col sm:flex-row">
+            <div class="space-y-4 w-full max-w-md sm:mr-8">
+                <p>Upgrade your stack to be able to enable</p>
+                <p>embedding Dashboards in iFrames</p>
+                <ff-button size="small" to="general">Upgrade</ff-button>
+            </div>
+        </div>
         <div class="flex flex-col sm:flex-row">
             <div class="w-full max-w-md sm:mr-8">
                 <FormRow v-model="editable.settings.codeEditor" :disabled="!editTemplate && !editable.policy.codeEditor" type="select" :options="[{label:'monaco', value:'monaco'},{label:'ace', value:'ace'}]">
@@ -248,6 +269,15 @@ export default {
         },
         debugLimitDisabled () {
             return !this.editTemplate && !this.editable.policy.debugMaxLength
+        },
+        dashboardIFrameAvailable () {
+            const launcherVersion = this.instance?.meta?.versions?.launcher
+            if (!launcherVersion) {
+                // We won't have this for a suspended project - so err on the side
+                // of permissive
+                return true
+            }
+            return SemVer.satisfies(SemVer.coerce(launcherVersion), '>=2.12.0')
         }
     }
 }
diff --git a/frontend/src/pages/instance/Settings/LauncherSettings.vue b/frontend/src/pages/instance/Settings/LauncherSettings.vue
index ba3de78328..8032c4ac19 100644
--- a/frontend/src/pages/instance/Settings/LauncherSettings.vue
+++ b/frontend/src/pages/instance/Settings/LauncherSettings.vue
@@ -8,6 +8,18 @@
                 Flows that perform CPU intensive work may need to increase this from the default of 7500ms.
             </template>
         </FormRow>
+        <FormRow v-if="launcherSupportsAutoSafeMode" v-model="input.disableAutoSafeMode" type="checkbox">
+            Disable Auto Safe Mode
+            <template #description>
+                Prevent Node-RED from automatically entering safe mode when a crash loop is detected.
+                WARNING: Disabling Auto Safe Mode is not recommended. A problem that causes Node-RED to crash multiple successive times may result in a contineous bootloop that will need to be manually resolved.
+            </template>
+        </FormRow>
+        <div v-else class="flex flex-col sm:flex-row">
+            <div class="text-gray-800 block text-sm font-medium">
+                Some settings are not available until you upgrade your stack. <ff-button size="small" to="general">Upgrade</ff-button>
+            </div>
+        </div>
 
         <div class="space-x-4 whitespace-nowrap">
             <ff-button size="small" :disabled="!unsavedChanges || !validateFormInputs()" data-action="save-settings" @click="saveSettings()">Save settings</ff-button>
@@ -17,6 +29,7 @@
 
 <script>
 
+import SemVer from 'semver'
 import { useRouter } from 'vue-router'
 
 import { mapState } from 'vuex'
@@ -46,10 +59,12 @@ export default {
         return {
             mounted: false,
             original: {
-                healthCheckInterval: null
+                healthCheckInterval: null,
+                disableAutoSafeMode: null
             },
             input: {
-                healthCheckInterval: null
+                healthCheckInterval: null,
+                disableAutoSafeMode: null
             },
             errors: {
                 healthCheckInterval: ''
@@ -60,7 +75,17 @@ export default {
     computed: {
         ...mapState('account', ['team', 'teamMembership']),
         unsavedChanges: function () {
-            return this.original.healthCheckInterval !== this.input.healthCheckInterval
+            return +this.original.healthCheckInterval !== +this.input.healthCheckInterval ||
+                this.original.disableAutoSafeMode !== this.input.disableAutoSafeMode
+        },
+        launcherSupportsAutoSafeMode: function () {
+            const launcherVersion = this.project?.meta?.versions?.launcher
+            if (!launcherVersion) {
+                // We won't have this for a suspended project - so err on the side
+                // of permissive
+                return true
+            }
+            return SemVer.satisfies(SemVer.coerce(launcherVersion), '>=2.12.0')
         }
     },
     watch: {
@@ -69,6 +94,11 @@ export default {
             if (this.mounted) {
                 this.validateFormInputs()
             }
+        },
+        'input.disableAutoSafeMode': function (value) {
+            if (this.mounted) {
+                this.validateFormInputs()
+            }
         }
     },
     mounted () {
@@ -86,7 +116,7 @@ export default {
             if (!this.unsavedChanges) {
                 this.errors.healthCheckInterval = ''
             } else {
-                const hci = parseInt(this.input.healthCheckInterval)
+                const hci = +this.input.healthCheckInterval
                 if (isNaN(hci) || hci < 5000) {
                     this.errors.healthCheckInterval = 'Health check interval must be 5000 or greater'
                 } else {
@@ -96,12 +126,23 @@ export default {
             return !this.errors.healthCheckInterval
         },
         getSettings: function () {
-            this.original.healthCheckInterval = this.project?.launcherSettings?.healthCheckInterval
-            this.input.healthCheckInterval = this.project?.launcherSettings.healthCheckInterval
+            this.original.healthCheckInterval = this.project?.launcherSettings?.healthCheckInterval ?? 7500
+            this.input.healthCheckInterval = this.project?.launcherSettings?.healthCheckInterval ?? 7500
+            this.original.disableAutoSafeMode = this.project?.launcherSettings?.disableAutoSafeMode ?? false
+            this.input.disableAutoSafeMode = this.project?.launcherSettings?.disableAutoSafeMode ?? false
         },
         async saveSettings () {
-            const launcherSettings = {
-                healthCheckInterval: this.input.healthCheckInterval
+            const launcherSettings = {}
+            // only send update if the value has changed
+            if (+this.original.healthCheckInterval !== +this.input.healthCheckInterval) {
+                launcherSettings.healthCheckInterval = +this.input.healthCheckInterval
+            }
+            // only send the update if the launcher supports the feature
+            if (this.launcherSupportsAutoSafeMode) {
+                // only send update if the value has changed
+                if (this.original.disableAutoSafeMode !== this.input.disableAutoSafeMode) {
+                    launcherSettings.disableAutoSafeMode = this.input.disableAutoSafeMode
+                }
             }
             if (!this.validateFormInputs()) {
                 alerts.emit('Please correct the errors before saving.', 'error')
diff --git a/frontend/src/pages/instance/components/InstanceForm.vue b/frontend/src/pages/instance/components/InstanceForm.vue
index 3e1c81cd24..24edd3c403 100644
--- a/frontend/src/pages/instance/components/InstanceForm.vue
+++ b/frontend/src/pages/instance/components/InstanceForm.vue
@@ -1,6 +1,4 @@
 <template>
-    <FeatureUnavailableToTeam v-if="teamRuntimeLimitReached" fullMessage="You have reached the runtime limit for this team." />
-    <FeatureUnavailableToTeam v-else-if="teamInstanceLimitReached" fullMessage="You have reached the instance limit for this team." />
     <form class="space-y-6" @submit.prevent="onSubmit">
         <SectionTopMenu v-if="hasHeader" :hero="heroTitle" />
         <!-- Form title -->
@@ -67,6 +65,8 @@
         </FormRow>
 
         <div v-if="!creatingApplication || input.createInstance" :class="creatingApplication ? 'ml-6' : ''" class="space-y-6">
+            <FeatureUnavailableToTeam v-if="teamRuntimeLimitReached" fullMessage="You have reached the runtime limit for this team." />
+            <FeatureUnavailableToTeam v-else-if="teamInstanceLimitReached" fullMessage="You have reached the instance limit for this team." />
             <!-- Instance Name -->
             <div>
                 <FormRow
@@ -452,6 +452,10 @@ export default {
             return (teamTypeRuntimeLimit > 0 && currentRuntimeCount >= teamTypeRuntimeLimit)
         },
         teamInstanceLimitReached () {
+            // this.projectTypes.length > 0 : There are Instance Types defined
+            // this.activeProjectTypeCount : How instance types are available for the user to select
+            //                               taking into account their limits
+            // Hence, if activeProjectTypeCount === 0, then they are at their limit of usage
             return this.projectTypes.length > 0 && this.activeProjectTypeCount === 0
         },
         atLeastOneFlowBlueprint () {
@@ -648,6 +652,9 @@ export default {
                 ...this.preDefinedInputs
             }
         }
+        if (this.teamInstanceLimitReached || this.teamRuntimeLimitReached) {
+            this.input.createInstance = false
+        }
     },
     async beforeMount () {
         // Billing feature must be enabled
diff --git a/frontend/src/pages/team/create.vue b/frontend/src/pages/team/create.vue
index cc0bc83c40..cd667c8775 100644
--- a/frontend/src/pages/team/create.vue
+++ b/frontend/src/pages/team/create.vue
@@ -1,13 +1,21 @@
 <template>
     <ff-page>
+        <template #header>
+            <ff-page-header title="Create New Team">
+                <template #context>
+                    Teams provide a way to organize who collaborates on your applications.
+                </template>
+            </ff-page-header>
+        </template>
         <ff-loading v-if="redirecting" message="Redirecting to Stripe..." />
         <ff-loading v-else-if="loading" message="Creating Team..." />
-        <div v-else class="m-auto">
-            <form class="space-y-6">
-                <FormHeading>Create a new team</FormHeading>
-                <div class="mb-8 text-sm text-gray-500">Teams are how you organize who collaborates on your applications.</div>
+        <div v-else class="m-auto max-w-5xl" :class="presetTeamType ? 'flex flex-col gap-4 sm:flex-row sm:gap-0' : 'space-y-6 max-w-4xl m-auto'">
+            <div v-if="presetTeamType" class="w-full max-w-lg">
+                <team-type-tile class="m-auto" :team-type="presetTeamType" :enableCTA="false" />
+            </div>
+            <form>
                 <!-- TeamType Type -->
-                <div class="grid">
+                <div v-if="!presetTeamType" class="grid mb-3">
                     <ff-tile-selection v-model="input.teamTypeId">
                         <ff-tile-selection-option
                             v-for="(teamType, index) in teamTypes" :key="index"
@@ -18,15 +26,15 @@
                         />
                     </ff-tile-selection>
                 </div>
-                <template v-if="!isContactRequired">
-                    <FormRow id="team" v-model="input.name" :error="errors.name">
+                <div v-if="!isContactRequired" class="space-y-3">
+                    <FormRow id="team" v-model="input.name" :error="errors.name" containerClass="max-w-md">
                         Team Name
                         <template #description>
                             eg. 'Development'
                         </template>
                     </FormRow>
 
-                    <FormRow id="team" v-model="input.slug" :error="input.slugError" :placeholder="input.defaultSlug">
+                    <FormRow id="team" v-model="input.slug" :error="input.slugError" :placeholder="input.defaultSlug" containerClass="max-w-md">
                         URL Slug
                         <template #description>
                             Use the default slug based on the team name or set your own.<br>
@@ -36,7 +44,8 @@
 
                     <template v-if="billingEnabled">
                         <div class="mb-8 text-sm text-gray-500 space-y-2">
-                            <p>To create the team we need to setup payment details via Stripe, our secure payment provider.</p>
+                            <p v-if="!presetTeamType || !presetTeamType.isFree">To create the team we need to setup payment details via Stripe, our secure payment provider.</p>
+                            <p v-else>Please note that, whilst we do require credit card details, this Team is free of charge, and no charges will be made.</p>
                         </div>
                         <ff-button :disabled="!formValid" @click="createTeam()">
                             <template #icon-right><ExternalLinkIcon /></template>
@@ -46,7 +55,7 @@
                     <ff-button v-else :disabled="!formValid" @click="createTeam()">
                         Create team
                     </ff-button>
-                </template>
+                </div>
                 <template v-else>
                     <div class="mb-8 text-sm text-gray-500 space-y-2">
                         <p>To learn more about our {{ input.teamType?.name }} plan, click below to contact our sales team.</p>
@@ -68,9 +77,9 @@ import billingApi from '../../api/billing.js'
 import teamApi from '../../api/team.js'
 import teamTypesApi from '../../api/teamTypes.js'
 import teamsApi from '../../api/teams.js'
-import FormHeading from '../../components/FormHeading.vue'
 import FormRow from '../../components/FormRow.vue'
 
+import TeamTypeTile from '../../components/TeamTypeTile.vue'
 import Alerts from '../../services/alerts.js'
 import slugify from '../../utils/slugify.js'
 
@@ -96,7 +105,8 @@ export default {
             needsBilling: false,
             newTeam: null,
             errors: {},
-            pendingSlugCheck: null
+            pendingSlugCheck: null,
+            presetTeamType: false
         }
     },
     watch: {
@@ -127,7 +137,7 @@ export default {
         }
     },
     computed: {
-        ...mapState('account', ['user', 'team', 'features']),
+        ...mapState('account', ['user', 'team', 'teams', 'features']),
         formValid () {
             return this.input.teamTypeId && this.input.name && this.input.slug && !this.pendingSlugCheck && !this.input.slugError && !this.errors.name
         },
@@ -146,11 +156,22 @@ export default {
     async created () {
         const teamTypesPromise = await teamTypesApi.getTeamTypes()
 
-        this.teamTypes = (await teamTypesPromise).types
+        this.teamTypes = (await teamTypesPromise).types.sort((a, b) => a.order - b.order)
         this.input.teamTypeId = this.teamTypes[0].id
+
+        if (this.$route.query.teamType) {
+            this.input.teamTypeId = this.$route.query.teamType
+            for (const teamType of this.teamTypes) {
+                if (teamType.id === this.input.teamTypeId) {
+                    this.presetTeamType = teamType
+                    break
+                }
+            }
+        }
     },
     mounted () {
         this.mounted = true
+        // was a team type pre-determined
     },
     methods: {
         createTeam () {
@@ -161,6 +182,17 @@ export default {
                 slug: this.input.slug || this.input.defaultSlug,
                 type: this.input.teamTypeId
             }
+            // Check if we should set the trial flag
+            if (
+                // TeamType has trial mode enabled
+                this.input.teamType.properties?.trial?.active &&
+                // User has no other teams
+                this.teams.length === 0 &&
+                // User is less than a week old
+                (Date.now() - (new Date(this.user.createdAt)).getTime()) < 1000 * 60 * 60 * 24 * 7
+            ) {
+                opts.trial = true
+            }
 
             teamApi.create(opts).then(async result => {
                 await this.$store.dispatch('account/refreshTeams')
@@ -215,8 +247,8 @@ export default {
     },
     components: {
         FormRow,
-        FormHeading,
-        ExternalLinkIcon
+        ExternalLinkIcon,
+        'team-type-tile': TeamTypeTile
     }
 }
 </script>
diff --git a/frontend/src/stylesheets/layouts.scss b/frontend/src/stylesheets/layouts.scss
index bdc14f699e..0ee01c8e08 100644
--- a/frontend/src/stylesheets/layouts.scss
+++ b/frontend/src/stylesheets/layouts.scss
@@ -17,7 +17,7 @@ $transition_time: .15s;
 $nav_height: 60px;
 
 .ff-layout--box {
-    font-family: 'Heebo';
+    font-family: 'Heebo', system-ui, sans-serif;
     background-color: $ff-white;
     display: flex;
     justify-content: center;
diff --git a/frontend/src/ui-components/stylesheets/ff-components.scss b/frontend/src/ui-components/stylesheets/ff-components.scss
index 505e619cce..bf4c9691df 100644
--- a/frontend/src/ui-components/stylesheets/ff-components.scss
+++ b/frontend/src/ui-components/stylesheets/ff-components.scss
@@ -665,7 +665,7 @@ li.ff-list-item {
     }
     &.active {
       border: 2px solid var(--ff-tile-selection-color);
-      svg {
+      .ff-tile-selection-option--header svg {
         fill: var(--ff-tile-selection-color);
       }
     }
diff --git a/package-lock.json b/package-lock.json
index a69227188a..e267be2e86 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@flowfuse/flowfuse",
-    "version": "2.11.0",
+    "version": "2.12.0",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "@flowfuse/flowfuse",
-            "version": "2.11.0",
+            "version": "2.12.0",
             "license": "SEE LICENSE IN ./LICENSE",
             "dependencies": {
                 "@aws-sdk/client-ses": "^3.352.0",
@@ -23,7 +23,7 @@
                 "@fastify/swagger": "^8.10.1",
                 "@fastify/swagger-ui": "^3.0.0",
                 "@fastify/websocket": "^8.1.0",
-                "@flowfuse/driver-localfs": "^2.11.0",
+                "@flowfuse/driver-localfs": "^2.12.0",
                 "@flowfuse/flow-renderer": "^0.4.1",
                 "@headlessui/vue": "1.7.19",
                 "@heroicons/vue": "1.0.6",
@@ -4259,11 +4259,11 @@
             "integrity": "sha512-X8R8Oj771YRl/w+c1HqAC1szL8zWQRwFvgDwT129k9ACdBoud/+/rX9V0qiMl6LWUdP9voC2nDVZYPMQQsb6eA=="
         },
         "node_modules/@flowfuse/driver-localfs": {
-            "version": "2.11.0",
-            "resolved": "https://registry.npmjs.org/@flowfuse/driver-localfs/-/driver-localfs-2.11.0.tgz",
-            "integrity": "sha512-tzqgDJh8ZXjcSnRXWS6SDHerWE0i5Px6mf5N4Q/VGFU5GHvHeVK7Sg3sueUqVjQvPHWYivuUIEcHh+hQBZN1GA==",
+            "version": "2.12.0",
+            "resolved": "https://registry.npmjs.org/@flowfuse/driver-localfs/-/driver-localfs-2.12.0.tgz",
+            "integrity": "sha512-rXIN7yFzdduxdaWuh1j0x+GIS5XxVaCIGOi4UhrI5sY48WO3feJeN78tmZzbiDD4crYeWm23MaQNruKAxD+l+w==",
             "dependencies": {
-                "@flowfuse/nr-launcher": "^2.11.0",
+                "@flowfuse/nr-launcher": "^2.12.0",
                 "form-data": "^4.0.0",
                 "got": "^11.8.5",
                 "semver": "^7.3.8"
@@ -4289,9 +4289,9 @@
             }
         },
         "node_modules/@flowfuse/nr-file-nodes": {
-            "version": "0.0.7",
-            "resolved": "https://registry.npmjs.org/@flowfuse/nr-file-nodes/-/nr-file-nodes-0.0.7.tgz",
-            "integrity": "sha512-IE6eDzBicnDcYe5T0DKsc/DkEThud7wrIcZCWz581ebhuDNow2H2h6sqkZi8zz0kqW8DsKRAVfoga3Hn/3aztQ==",
+            "version": "0.0.8",
+            "resolved": "https://registry.npmjs.org/@flowfuse/nr-file-nodes/-/nr-file-nodes-0.0.8.tgz",
+            "integrity": "sha512-b1NqQHtWvGqJvqR2PwdcGBZNFnwB780ytnkCoQ9J3K00TVW4kzQLc8Dp4gBgGMSJchfbu+jWUUPSYEjPqt/YGg==",
             "dependencies": {
                 "got": "11.8.5",
                 "iconv-lite": "0.6.3"
@@ -4325,15 +4325,16 @@
             }
         },
         "node_modules/@flowfuse/nr-launcher": {
-            "version": "2.11.0",
-            "resolved": "https://registry.npmjs.org/@flowfuse/nr-launcher/-/nr-launcher-2.11.0.tgz",
-            "integrity": "sha512-FH6sVCrUbwzQecdWwQbNdWTyVPGzKn5jii5yrKAn2K8/rYLs4aTpEfiOI1BCTqwjxGNkX4PWxZgpr82sCRgXYQ==",
+            "version": "2.12.0",
+            "resolved": "https://registry.npmjs.org/@flowfuse/nr-launcher/-/nr-launcher-2.12.0.tgz",
+            "integrity": "sha512-zQEdWVvN20hHouBgBTgaXS/RrTLwqZLzUDgegrcaJLUx2Hw9mtu81Q61jPjaQJW6Q07TiylfwMzyZm4uE4G9sg==",
             "dependencies": {
                 "@flowfuse/nr-assistant": "^0.1.3",
-                "@flowfuse/nr-file-nodes": "^0.0.7",
+                "@flowfuse/nr-file-nodes": "^0.0.8",
                 "@flowfuse/nr-project-nodes": "^0.7.4",
                 "@node-red/util": "^3.1.0",
                 "body-parser": "^1.20.2",
+                "bytes": "^3.1.2",
                 "command-line-args": "^5.2.1",
                 "express": "^4.21.0",
                 "express-session": "^1.18.0",
@@ -4354,9 +4355,9 @@
             }
         },
         "node_modules/@flowfuse/nr-launcher/node_modules/@node-red/util": {
-            "version": "3.1.14",
-            "resolved": "https://registry.npmjs.org/@node-red/util/-/util-3.1.14.tgz",
-            "integrity": "sha512-VGnWyRY2mGIX3I+hAUZk6Risii9bphDdAkL2/l8lcu5BMMLuKzszNSbSYXRR1apcyF3wWm0AbJdS8DjcuQVTCQ==",
+            "version": "3.1.15",
+            "resolved": "https://registry.npmjs.org/@node-red/util/-/util-3.1.15.tgz",
+            "integrity": "sha512-vuNBpyiyYNMVumzDYdEg1V/cJkuz74Dq+P90nWVBK4stqpmgD0/v1ntrUGhHBaSfeLXx/GmfMQk70n8ew3dlFA==",
             "dependencies": {
                 "fs-extra": "11.1.1",
                 "i18next": "21.10.0",
@@ -4404,12 +4405,9 @@
             }
         },
         "node_modules/@flowfuse/nr-project-nodes/node_modules/agent-base": {
-            "version": "7.1.1",
-            "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
-            "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
-            "dependencies": {
-                "debug": "^4.3.4"
-            },
+            "version": "7.1.3",
+            "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
+            "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
             "engines": {
                 "node": ">= 14"
             }
@@ -4475,11 +4473,11 @@
             }
         },
         "node_modules/@flowfuse/nr-project-nodes/node_modules/https-proxy-agent": {
-            "version": "7.0.5",
-            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
-            "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
+            "version": "7.0.6",
+            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+            "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
             "dependencies": {
-                "agent-base": "^7.0.2",
+                "agent-base": "^7.1.2",
                 "debug": "4"
             },
             "engines": {
@@ -20443,12 +20441,9 @@
             }
         },
         "node_modules/semver": {
-            "version": "7.6.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-            "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-            "dependencies": {
-                "lru-cache": "^6.0.0"
-            },
+            "version": "7.6.3",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+            "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
             "bin": {
                 "semver": "bin/semver.js"
             },
@@ -20456,17 +20451,6 @@
                 "node": ">=10"
             }
         },
-        "node_modules/semver/node_modules/lru-cache": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-            "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-            "dependencies": {
-                "yallist": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
         "node_modules/send": {
             "version": "0.19.0",
             "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
@@ -26654,11 +26638,11 @@
             "integrity": "sha512-X8R8Oj771YRl/w+c1HqAC1szL8zWQRwFvgDwT129k9ACdBoud/+/rX9V0qiMl6LWUdP9voC2nDVZYPMQQsb6eA=="
         },
         "@flowfuse/driver-localfs": {
-            "version": "2.11.0",
-            "resolved": "https://registry.npmjs.org/@flowfuse/driver-localfs/-/driver-localfs-2.11.0.tgz",
-            "integrity": "sha512-tzqgDJh8ZXjcSnRXWS6SDHerWE0i5Px6mf5N4Q/VGFU5GHvHeVK7Sg3sueUqVjQvPHWYivuUIEcHh+hQBZN1GA==",
+            "version": "2.12.0",
+            "resolved": "https://registry.npmjs.org/@flowfuse/driver-localfs/-/driver-localfs-2.12.0.tgz",
+            "integrity": "sha512-rXIN7yFzdduxdaWuh1j0x+GIS5XxVaCIGOi4UhrI5sY48WO3feJeN78tmZzbiDD4crYeWm23MaQNruKAxD+l+w==",
             "requires": {
-                "@flowfuse/nr-launcher": "^2.11.0",
+                "@flowfuse/nr-launcher": "^2.12.0",
                 "form-data": "^4.0.0",
                 "got": "^11.8.5",
                 "semver": "^7.3.8"
@@ -26678,9 +26662,9 @@
             }
         },
         "@flowfuse/nr-file-nodes": {
-            "version": "0.0.7",
-            "resolved": "https://registry.npmjs.org/@flowfuse/nr-file-nodes/-/nr-file-nodes-0.0.7.tgz",
-            "integrity": "sha512-IE6eDzBicnDcYe5T0DKsc/DkEThud7wrIcZCWz581ebhuDNow2H2h6sqkZi8zz0kqW8DsKRAVfoga3Hn/3aztQ==",
+            "version": "0.0.8",
+            "resolved": "https://registry.npmjs.org/@flowfuse/nr-file-nodes/-/nr-file-nodes-0.0.8.tgz",
+            "integrity": "sha512-b1NqQHtWvGqJvqR2PwdcGBZNFnwB780ytnkCoQ9J3K00TVW4kzQLc8Dp4gBgGMSJchfbu+jWUUPSYEjPqt/YGg==",
             "requires": {
                 "got": "11.8.5",
                 "iconv-lite": "0.6.3"
@@ -26707,15 +26691,16 @@
             }
         },
         "@flowfuse/nr-launcher": {
-            "version": "2.11.0",
-            "resolved": "https://registry.npmjs.org/@flowfuse/nr-launcher/-/nr-launcher-2.11.0.tgz",
-            "integrity": "sha512-FH6sVCrUbwzQecdWwQbNdWTyVPGzKn5jii5yrKAn2K8/rYLs4aTpEfiOI1BCTqwjxGNkX4PWxZgpr82sCRgXYQ==",
+            "version": "2.12.0",
+            "resolved": "https://registry.npmjs.org/@flowfuse/nr-launcher/-/nr-launcher-2.12.0.tgz",
+            "integrity": "sha512-zQEdWVvN20hHouBgBTgaXS/RrTLwqZLzUDgegrcaJLUx2Hw9mtu81Q61jPjaQJW6Q07TiylfwMzyZm4uE4G9sg==",
             "requires": {
                 "@flowfuse/nr-assistant": "^0.1.3",
-                "@flowfuse/nr-file-nodes": "^0.0.7",
+                "@flowfuse/nr-file-nodes": "^0.0.8",
                 "@flowfuse/nr-project-nodes": "^0.7.4",
                 "@node-red/util": "^3.1.0",
                 "body-parser": "^1.20.2",
+                "bytes": "^3.1.2",
                 "command-line-args": "^5.2.1",
                 "express": "^4.21.0",
                 "express-session": "^1.18.0",
@@ -26732,9 +26717,9 @@
             },
             "dependencies": {
                 "@node-red/util": {
-                    "version": "3.1.14",
-                    "resolved": "https://registry.npmjs.org/@node-red/util/-/util-3.1.14.tgz",
-                    "integrity": "sha512-VGnWyRY2mGIX3I+hAUZk6Risii9bphDdAkL2/l8lcu5BMMLuKzszNSbSYXRR1apcyF3wWm0AbJdS8DjcuQVTCQ==",
+                    "version": "3.1.15",
+                    "resolved": "https://registry.npmjs.org/@node-red/util/-/util-3.1.15.tgz",
+                    "integrity": "sha512-vuNBpyiyYNMVumzDYdEg1V/cJkuz74Dq+P90nWVBK4stqpmgD0/v1ntrUGhHBaSfeLXx/GmfMQk70n8ew3dlFA==",
                     "requires": {
                         "fs-extra": "11.1.1",
                         "i18next": "21.10.0",
@@ -26775,12 +26760,9 @@
             },
             "dependencies": {
                 "agent-base": {
-                    "version": "7.1.1",
-                    "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
-                    "integrity": "sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==",
-                    "requires": {
-                        "debug": "^4.3.4"
-                    }
+                    "version": "7.1.3",
+                    "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
+                    "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw=="
                 },
                 "bl": {
                     "version": "4.1.0",
@@ -26833,11 +26815,11 @@
                     }
                 },
                 "https-proxy-agent": {
-                    "version": "7.0.5",
-                    "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
-                    "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
+                    "version": "7.0.6",
+                    "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+                    "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
                     "requires": {
-                        "agent-base": "^7.0.2",
+                        "agent-base": "^7.1.2",
                         "debug": "4"
                     }
                 },
@@ -38566,22 +38548,9 @@
             }
         },
         "semver": {
-            "version": "7.6.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-            "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-            "requires": {
-                "lru-cache": "^6.0.0"
-            },
-            "dependencies": {
-                "lru-cache": {
-                    "version": "6.0.0",
-                    "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-                    "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-                    "requires": {
-                        "yallist": "^4.0.0"
-                    }
-                }
-            }
+            "version": "7.6.3",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+            "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A=="
         },
         "send": {
             "version": "0.19.0",
diff --git a/package.json b/package.json
index e74bae7323..01ccfc8842 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@flowfuse/flowfuse",
-    "version": "2.11.0",
+    "version": "2.12.0",
     "description": "An open source low-code development platform",
     "homepage": "https://flowfuse.com",
     "bugs": {
@@ -67,7 +67,7 @@
         "@fastify/swagger": "^8.10.1",
         "@fastify/swagger-ui": "^3.0.0",
         "@fastify/websocket": "^8.1.0",
-        "@flowfuse/driver-localfs": "^2.11.0",
+        "@flowfuse/driver-localfs": "^2.12.0",
         "@flowfuse/flow-renderer": "^0.4.1",
         "@headlessui/vue": "1.7.19",
         "@heroicons/vue": "1.0.6",
diff --git a/test/e2e/frontend/cypress/tests/invitations.spec.js b/test/e2e/frontend/cypress/tests/invitations.spec.js
index 7071a71f93..ff0b769e75 100644
--- a/test/e2e/frontend/cypress/tests/invitations.spec.js
+++ b/test/e2e/frontend/cypress/tests/invitations.spec.js
@@ -21,14 +21,15 @@ describe('FlowFuse platform invitees', () => {
     })
 
     it('can reject an invitation to a new team', () => {
-        // should show one pending invite
         cy.get('[data-el="desktop-nav-right"]').within(() => {
             cy.get('[data-el="notification-pill"]').should('have.text', '2')
+            cy.get('[data-el="notifications-button"]').click()
         })
 
+        cy.get('[data-el="notifications-drawer"]').should('be.visible')
+        cy.get('[data-el="invitation-message"]').eq(0).click()
+
         // user should see a message
-        cy.get('[data-nav="team-invites"]').should('be.visible')
-        cy.get('[data-nav="team-invites"]').click()
 
         cy.url().should('include', '/account/teams/invitations')
 
@@ -49,12 +50,12 @@ describe('FlowFuse platform invitees', () => {
     it('can accept an invitation to a new team and is navigated to the team\'s dashboard', () => {
         // should show one pending invite
         cy.get('[data-el="desktop-nav-right"]').within(() => {
-            cy.get('[data-el="notification-pill"]').should('have.text', '1')
+            cy.get('[data-el="notifications-button"]').click()
         })
 
-        // user should see a message
-        cy.get('[data-nav="team-invites"]').should('be.visible')
-        cy.get('[data-nav="team-invites"]').click()
+        cy.get('[data-el="notifications-drawer"]').should('be.visible')
+        cy.get('[data-action="show-read-check"]').click()
+        cy.get('[data-el="invitation-message"]').eq(0).click()
 
         cy.url().should('include', '/account/teams/invitations')
 
diff --git a/test/unit/forge/routes/api/project_spec.js b/test/unit/forge/routes/api/project_spec.js
index 3d9623c841..23bd4b1c54 100644
--- a/test/unit/forge/routes/api/project_spec.js
+++ b/test/unit/forge/routes/api/project_spec.js
@@ -10,7 +10,7 @@ const setup = require('../setup')
 
 const FF_UTIL = require('flowforge-test-utils')
 const { Roles } = FF_UTIL.require('forge/lib/roles')
-const { KEY_HEALTH_CHECK_INTERVAL } = FF_UTIL.require('forge/db/models/ProjectSettings')
+const { KEY_HEALTH_CHECK_INTERVAL, KEY_DISABLE_AUTO_SAFE_MODE } = FF_UTIL.require('forge/db/models/ProjectSettings')
 const { START_DELAY, STOP_DELAY } = FF_UTIL.require('forge/containers/stub/index.js')
 
 describe('Project API', function () {
@@ -1691,7 +1691,7 @@ describe('Project API', function () {
                 { name: 'two', value: '2' }
             ]) // should be unchanged
         })
-        it('Change launcher health check interval - owner', async function () {
+        it('Change launcher settings - owner', async function () {
             // Setup some flows/credentials
             await addFlowsToProject(app,
                 TestObjects.project1.id,
@@ -1708,15 +1708,18 @@ describe('Project API', function () {
                 url: `/api/v1/projects/${TestObjects.project1.id}`,
                 payload: {
                     launcherSettings: {
-                        healthCheckInterval: 9876
+                        healthCheckInterval: 9876,
+                        disableAutoSafeMode: true
                     }
                 },
                 cookies: { sid: TestObjects.tokens.alice }
             })
             response.statusCode.should.equal(200)
 
-            const newValue = await TestObjects.project1.getSetting(KEY_HEALTH_CHECK_INTERVAL)
-            should(newValue).equal(9876)
+            const healthValue = await TestObjects.project1.getSetting(KEY_HEALTH_CHECK_INTERVAL)
+            should(healthValue).equal(9876)
+            const safeModeValue = await TestObjects.project1.getSetting(KEY_DISABLE_AUTO_SAFE_MODE)
+            should(safeModeValue).equal(true)
         })
         it('Change launcher health check interval bad value - owner', async function () {
             // Setup some flows/credentials