diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb
index 12c49efd5b9a1321972bfd83f1f77aa94c2a07c0..7c1450c20cdb4f39b859c2cf04d29d4ab6eabbe0 100644
--- a/app/policies/project_policy.rb
+++ b/app/policies/project_policy.rb
@@ -15,7 +15,6 @@ class ProjectPolicy < BasePolicy
     note
     pipeline
     pipeline_schedule
-    feature_flags
     build
     trigger
     environment
@@ -307,7 +306,6 @@ class ProjectPolicy < BasePolicy
     prevent(*create_read_update_admin_destroy(:build))
     prevent(*create_read_update_admin_destroy(:pipeline_schedule))
     prevent(*create_read_update_admin_destroy(:environment))
-    prevent(*create_read_update_admin_destroy(:feature_flags))
     prevent(*create_read_update_admin_destroy(:cluster))
     prevent(*create_read_update_admin_destroy(:deployment))
   end
diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml
index e1346ef857a906147bc017ba4758a162156af609..c904798883ce8db57c8f8c90d5528b8ea61a2426 100644
--- a/app/views/layouts/nav/sidebar/_project.html.haml
+++ b/app/views/layouts/nav/sidebar/_project.html.haml
@@ -196,7 +196,7 @@
 
       - if project_nav_tab? :operations
         = nav_link(controller: [:environments, :clusters, :user, :gcp, :feature_flags]) do
-          = link_to project_environments_path(@project), class: 'shortcuts-operations' do
+          = link_to metrics_project_environments_path(@project), class: 'shortcuts-operations' do
             .nav-icon-container
               = sprite_icon('cloud-gear')
             %span.nav-item-name
@@ -204,7 +204,7 @@
 
           %ul.sidebar-sub-level-items
             = nav_link(controller: [:environments, :clusters, :user, :gcp, :feature_flags], html_options: { class: "fly-out-top-item" } ) do
-              = link_to project_environments_path(@project) do
+              = link_to metrics_project_environments_path(@project) do
                 %strong.fly-out-top-item-name
                   =  _('Operations')
             %li.divider.fly-out-top-item
diff --git a/ee/app/policies/ee/project_policy.rb b/ee/app/policies/ee/project_policy.rb
index 9c7f33f1f1a6d4a76181416abefdd5937605cae4..d00084ca27688c2fcb28ef23d0b1d574dd48e880 100644
--- a/ee/app/policies/ee/project_policy.rb
+++ b/ee/app/policies/ee/project_policy.rb
@@ -8,6 +8,7 @@ module EE
       approvers
       vulnerability_feedback
       license_management
+      feature_flag
     ].freeze
 
     prepended do
diff --git a/lib/api/api.rb b/lib/api/api.rb
index de8f96c658e8febd4dd29ab70405bada00bb0135..3bcb8e7cc083f4846327cc17f76dd0e38b600879 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -166,7 +166,7 @@ module API
     ## EE-specific API V4 endpoints START
     mount ::EE::API::Boards
     mount ::EE::API::GroupBoards
-    
+
     mount ::API::Unleash
     mount ::API::EpicIssues
     mount ::API::Epics