diff --git a/libs/pages/services/src/lib/feature/page-database-create-feature/step-general-feature/step-general-feature.tsx b/libs/pages/services/src/lib/feature/page-database-create-feature/step-general-feature/step-general-feature.tsx
index 7538e9f07f3..abda2100704 100644
--- a/libs/pages/services/src/lib/feature/page-database-create-feature/step-general-feature/step-general-feature.tsx
+++ b/libs/pages/services/src/lib/feature/page-database-create-feature/step-general-feature/step-general-feature.tsx
@@ -123,7 +123,7 @@ export function StepGeneralFeature() {
     defaultValues: {
       ...generalData,
       accessibility: 'PRIVATE',
-      mode: match({ cloudProvider, cluster, generalData })
+      mode: match({ cloudProvider, cluster, generalData, showManagedWithVpcOptions })
         // If 'generalData' has 'mode', use it
         .with({ generalData: { mode: 'CONTAINER' } }, () => DatabaseModeEnum.CONTAINER)
         .with({ generalData: { mode: 'MANAGED' } }, () => DatabaseModeEnum.MANAGED)
@@ -132,8 +132,12 @@ export function StepGeneralFeature() {
           { cloudProvider: 'AWS', cluster: { kubernetes: P.not('SELF_MANAGED') } },
           () => DatabaseModeEnum.CONTAINER
         )
-        // If 'cloudProvider' is 'ON_PREMISE', return 'CONTAINER'
-        .with({ cloudProvider: 'ON_PREMISE' }, () => DatabaseModeEnum.CONTAINER)
+        .with(P.union({ cloudProvider: 'AWS' }, { showManagedWithVpcOptions: true }), () => DatabaseModeEnum.CONTAINER)
+        // If 'cloudProvider' is 'ON_PREMISE', 'GCP' or 'SCW' return 'CONTAINER'
+        .with(
+          P.union({ cloudProvider: 'ON_PREMISE' }, { cloudProvider: 'GCP' }, { cloudProvider: 'SCW' }),
+          () => DatabaseModeEnum.CONTAINER
+        )
         .otherwise(() => DatabaseModeEnum.MANAGED),
     },
     mode: 'onChange',