diff --git a/apps/desktop/src/app/accounts/settings.component.ts b/apps/desktop/src/app/accounts/settings.component.ts
index 066b33e4b08..3d230805c91 100644
--- a/apps/desktop/src/app/accounts/settings.component.ts
+++ b/apps/desktop/src/app/accounts/settings.component.ts
@@ -18,7 +18,6 @@ import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { AutofillSettingsServiceAbstraction } from "@bitwarden/common/autofill/services/autofill-settings.service";
 import { DomainSettingsService } from "@bitwarden/common/autofill/services/domain-settings.service";
 import { DeviceType } from "@bitwarden/common/enums";
-import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { PinServiceAbstraction } from "@bitwarden/common/key-management/pin/pin.service.abstraction";
 import {
   VaultTimeout,
@@ -267,10 +266,7 @@ export class SettingsComponent implements OnInit, OnDestroy {
 
     // Autotype is for Windows initially
     const isWindows = this.platformUtilsService.getDevice() === DeviceType.WindowsDesktop;
-    const windowsDesktopAutotypeFeatureFlag = await this.configService.getFeatureFlag(
-      FeatureFlag.WindowsDesktopAutotype,
-    );
-    this.showEnableAutotype = isWindows && windowsDesktopAutotypeFeatureFlag;
+    this.showEnableAutotype = isWindows;
 
     this.userHasMasterPassword = await this.userVerificationService.hasMasterPassword();
 
diff --git a/apps/desktop/src/app/app.component.ts b/apps/desktop/src/app/app.component.ts
index b0c5eb03723..ae6ba4b6387 100644
--- a/apps/desktop/src/app/app.component.ts
+++ b/apps/desktop/src/app/app.component.ts
@@ -100,6 +100,8 @@ const SyncInterval = 6 * 60 * 60 * 1000; // 6 hours
     <ng-template #loginApproval></ng-template>
     <app-header></app-header>
 
+    <div class="test-banner">This is a test build, do not use production data.</div>
+
     <div id="container">
       <div class="loading" *ngIf="loading">
         <i class="bwi bwi-spinner bwi-spin bwi-3x" aria-hidden="true"></i>
diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts
index deb09d2f335..15c84573556 100644
--- a/apps/desktop/src/main.ts
+++ b/apps/desktop/src/main.ts
@@ -350,7 +350,7 @@ export class Main {
           await this.trayMain.hideToTray();
         }
         this.powerMonitorMain.init();
-        await this.updaterMain.init();
+        //await this.updaterMain.init();
 
         const [browserIntegrationEnabled, ddgIntegrationEnabled] = await Promise.all([
           firstValueFrom(this.desktopSettingsService.browserIntegrationEnabled$),
diff --git a/apps/desktop/src/scss/vault.scss b/apps/desktop/src/scss/vault.scss
index 88216a2b926..3877940f4d9 100644
--- a/apps/desktop/src/scss/vault.scss
+++ b/apps/desktop/src/scss/vault.scss
@@ -11,6 +11,16 @@ app-root {
   min-height: 0;
 }
 
+.test-banner {
+  height: 5%;
+  background-color: #ffe478;
+  color: #000000;
+  padding: 8px 16px;
+  text-align: center;
+  font-weight: 500;
+  border-bottom: 1px solid #e4c76e;
+}
+
 .vault {
   height: 100%;
   display: flex;