diff --git a/libs/pages/services/src/lib/feature/page-application-create-feature/page-application-create-feature.tsx b/libs/pages/services/src/lib/feature/page-application-create-feature/page-application-create-feature.tsx
index d1151134b45..a3d81fc0e32 100644
--- a/libs/pages/services/src/lib/feature/page-application-create-feature/page-application-create-feature.tsx
+++ b/libs/pages/services/src/lib/feature/page-application-create-feature/page-application-create-feature.tsx
@@ -70,8 +70,8 @@ export function PageApplicationCreateFeature() {
     cpu: 500,
     gpu: 0,
     min_running_instances: 1,
-    max_running_instances: 2,
-    autoscaling_mode: 'HPA',
+    max_running_instances: 1,
+    autoscaling_mode: 'NONE',
     hpa_metric_type: 'CPU',
     hpa_cpu_average_utilization_percent: 60,
   })
diff --git a/libs/shared/console-shared/src/lib/application-settings/ui/application-settings-resources/application-settings-resources.tsx b/libs/shared/console-shared/src/lib/application-settings/ui/application-settings-resources/application-settings-resources.tsx
index 785ad94a861..9cd06c79a4e 100644
--- a/libs/shared/console-shared/src/lib/application-settings/ui/application-settings-resources/application-settings-resources.tsx
+++ b/libs/shared/console-shared/src/lib/application-settings/ui/application-settings-resources/application-settings-resources.tsx
@@ -73,17 +73,25 @@ export function ApplicationSettingsResources({
   const hpaMemoryAverageUtilizationPercent = watch('hpa_memory_average_utilization_percent') ?? 60
   const previousAutoscalingModeRef = useRef(autoscalingMode)
 
-  // Adjust min/max values when switching from NONE to HPA or KEDA
+  // Adjust min/max values when switching between autoscaling modes
   useEffect(() => {
     const previousMode = previousAutoscalingModeRef.current
+
+    // When switching from no autoscaling to HPA/KEDA, set min=1 and max=2
     if (previousMode === 'NONE' && (autoscalingMode === 'HPA' || autoscalingMode === 'KEDA')) {
-      // When switching from no autoscaling to HPA/KEDA, set min=1 and max=2
       if (minRunningInstances === maxRunningInstances) {
         setValue('min_running_instances', 1)
         setValue('max_running_instances', 2)
       }
     }
 
+    // When switching to no autoscaling (NONE), ensure max equals min
+    if ((previousMode === 'HPA' || previousMode === 'KEDA') && autoscalingMode === 'NONE') {
+      if (minRunningInstances !== maxRunningInstances) {
+        setValue('max_running_instances', minRunningInstances)
+      }
+    }
+
     // Set default HPA settings when switching to HPA mode
     if (autoscalingMode === 'HPA' && !hpaMetricTypeRaw) {
       const hpaSettings = loadHpaSettingsFromAdvancedSettings(advancedSettings)
@@ -322,7 +330,7 @@ export function ApplicationSettingsResources({
                   { label: 'HPA (Horizontal Pod Autoscaler)', value: 'HPA' },
                 ]
 
-                if (cloudProvider === 'AWS' && isKedaCluster && isKedaFeatureEnabled) {
+                if ((cloudProvider === 'AWS' || cloudProvider === 'GCP') && isKedaCluster && isKedaFeatureEnabled) {
                   options.push({ label: 'KEDA (Event-driven autoscaling)', value: 'KEDA' })
                 }
 
diff --git a/libs/shared/console-shared/src/lib/cluster-settings/ui/cluster-general-settings/cluster-general-settings.tsx b/libs/shared/console-shared/src/lib/cluster-settings/ui/cluster-general-settings/cluster-general-settings.tsx
index f3cc2dac617..c591dcbf160 100644
--- a/libs/shared/console-shared/src/lib/cluster-settings/ui/cluster-general-settings/cluster-general-settings.tsx
+++ b/libs/shared/console-shared/src/lib/cluster-settings/ui/cluster-general-settings/cluster-general-settings.tsx
@@ -135,7 +135,7 @@ export function ClusterGeneralSettings(props: ClusterGeneralSettingsProps) {
           )}
         </>
       )}
-      {fromDetail && cloudProvider === 'AWS' && isKedaFeatureEnabled && (
+      {fromDetail && (cloudProvider === 'AWS' || cloudProvider === 'GCP') && isKedaFeatureEnabled && (
         <Controller
           name="keda.enabled"
           control={control}