1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sidebars/projects/menus/infrastructure_menu.rb b/lib/sidebars/projects/menus/infrastructure_menu.rb
index 060a5be5f57..c012b3bb627 100644
--- a/lib/sidebars/projects/menus/infrastructure_menu.rb
+++ b/lib/sidebars/projects/menus/infrastructure_menu.rb
@@ -64,7 +64,7 @@ module Sidebars
         end
 
         def serverless_menu_item
-          unless can?(context.current_user, :read_cluster, context.project)
+          unless Feature.enabled?(:deprecated_serverless, context.project, default_enabled: :yaml, type: :ops) && can?(context.current_user, :read_cluster, context.project)
             return ::Sidebars::NilMenuItem.new(item_id: :serverless)
           end
 
@@ -100,7 +100,7 @@ module Sidebars
           ::Sidebars::MenuItem.new(
             title: _('Google Cloud'),
             link: project_google_cloud_index_path(context.project),
-            active_routes: { controller: [:google_cloud, :service_accounts, :deployments] },
+            active_routes: { controller: [:google_cloud, :service_accounts, :deployments, :gcp_regions] },
             item_id: :google_cloud
           )
         end