diff --git a/packages/core/ui-settings/core-ui-settings-common/src/theme.ts b/packages/core/ui-settings/core-ui-settings-common/src/theme.ts
index 73b465d5b192f..6622c05cb8f20 100644
--- a/packages/core/ui-settings/core-ui-settings-common/src/theme.ts
+++ b/packages/core/ui-settings/core-ui-settings-common/src/theme.ts
@@ -35,7 +35,8 @@ export type ThemeTags = readonly ThemeTag[];
  * An array of theme tags available in Kibana by default when not customized
  * using KBN_OPTIMIZER_THEMES environment variable.
  */
-export const DEFAULT_THEME_TAGS: ThemeTags = ThemeAmsterdamTags;
+export const DEFAULT_THEME_TAGS: ThemeTags = SUPPORTED_THEME_TAGS; // TODO: (Viduni) remove after design QA on deployment
+// export const DEFAULT_THEME_TAGS: ThemeTags = ThemeAmsterdamTags; // TODO: (Viduni) uncomment after design QA on deployment
 
 export const FALLBACK_THEME_TAG: ThemeTag = 'v8light';
 
diff --git a/packages/core/ui-settings/core-ui-settings-server-internal/src/settings/theme.ts b/packages/core/ui-settings/core-ui-settings-server-internal/src/settings/theme.ts
index 36324f951952e..f00e0ce1a89bc 100644
--- a/packages/core/ui-settings/core-ui-settings-server-internal/src/settings/theme.ts
+++ b/packages/core/ui-settings/core-ui-settings-server-internal/src/settings/theme.ts
@@ -104,9 +104,10 @@ export const getThemeSettings = (
         }),
       },
       value: 'amsterdam',
-      readonly: Object.hasOwn(options, 'isThemeSwitcherEnabled')
-        ? !options.isThemeSwitcherEnabled
-        : true,
+      // TODO: (Viduni) Remove after design QA on deployment
+      // readonly: Object.hasOwn(options, 'isThemeSwitcherEnabled')
+      //   ? !options.isThemeSwitcherEnabled
+      //   : true,
       requiresPageReload: true,
       schema: schema.oneOf([
         schema.literal('amsterdam'),