diff --git a/ee/app/assets/javascripts/workspaces/common/components/get_project_details_query.vue b/ee/app/assets/javascripts/workspaces/common/components/get_project_details_query.vue
index 836bd88348825dfda8a30acf0d3637d7dd5e8287..765d2d2a3beb01edc349ecaf2060ffc4b68bfde3 100644
--- a/ee/app/assets/javascripts/workspaces/common/components/get_project_details_query.vue
+++ b/ee/app/assets/javascripts/workspaces/common/components/get_project_details_query.vue
@@ -1,12 +1,7 @@
 <script>
-import { uniqBy } from 'lodash';
 import { logError } from '~/lib/logger';
 import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
-import { joinPaths } from '~/lib/utils/url_utility';
-import axios from '~/lib/utils/axios_utils';
-import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import getProjectDetailsQuery from '../graphql/queries/get_project_details.query.graphql';
-import getGroupClusterAgentsQuery from '../graphql/queries/get_group_cluster_agents.query.graphql';
 import getRemoteDevelopmentClusterAgents from '../graphql/queries/get_remote_development_cluster_agents.query.graphql';
 
 export default {
@@ -58,10 +53,9 @@ export default {
           return;
         }
 
-        const { clusterAgents, errors } =
-          (await this.fetchRemoteDevelopmentNamespaceAgentAuthorizationFeatureFlag(group.id))
-            ? await this.fetchRemoteDevelopmentClusterAgents(group.fullPath)
-            : await this.fetchClusterAgentsForGroupHierarchy(group.fullPath);
+        const { clusterAgents, errors } = await this.fetchRemoteDevelopmentClusterAgents(
+          group.fullPath,
+        );
 
         if (Array.isArray(errors) && errors.length) {
           errors.forEach((error) => logError(error));
@@ -80,22 +74,6 @@ export default {
     },
   },
   methods: {
-    async fetchRemoteDevelopmentNamespaceAgentAuthorizationFeatureFlag(namespaceId) {
-      const namespaceIid = getIdFromGraphQLId(namespaceId);
-      const path = joinPaths(
-        gon.relative_url_root || '',
-        '/-/remote_development/workspaces_feature_flag',
-      );
-      return axios
-        .get(path, {
-          params: {
-            flag: 'remote_development_namespace_agent_authorization',
-            namespace_id: namespaceIid,
-          },
-        })
-        .then(({ data }) => data.enabled);
-    },
-
     async fetchRemoteDevelopmentClusterAgents(namespace) {
       try {
         // noinspection JSCheckFunctionSignatures - TODO: Address in https://gitlab.com/gitlab-org/gitlab/-/issues/437600
@@ -127,56 +105,6 @@ export default {
         return { errors: [error] };
       }
     },
-    async fetchClusterAgentsForGroupHierarchy(groupFullPath) {
-      const groupFullPathParts = groupFullPath.split('/') || [];
-      const groupPathsFromRoot = groupFullPathParts.map((_, i, arr) =>
-        arr.slice(0, i + 1).join('/'),
-      );
-      const clusterAgentsResponses = await Promise.all(
-        groupPathsFromRoot.map((groupPath) => this.fetchClusterAgentForGroup(groupPath)),
-      );
-
-      const errors = clusterAgentsResponses.map((response) => response.error).filter(Boolean);
-
-      if (errors.length > 0) {
-        return { errors };
-      }
-
-      const clusterAgents = clusterAgentsResponses.flatMap((response) => response.result);
-
-      return { clusterAgents: uniqBy(clusterAgents, 'value') };
-    },
-    async fetchClusterAgentForGroup(groupPath) {
-      try {
-        // noinspection JSCheckFunctionSignatures - TODO: Address in https://gitlab.com/gitlab-org/gitlab/-/issues/437600
-        const { data, error } = await this.$apollo.query({
-          query: getGroupClusterAgentsQuery,
-          variables: { groupPath },
-        });
-
-        if (error) {
-          // NOTE: It seems to be impossible to have test coverage for this line
-          //       with the current version of mock-apollo-client. Any type of
-          //       mock error is always thrown and caught below instead of
-          //       being returned.
-          return { error };
-        }
-
-        return {
-          result:
-            data.group?.clusterAgents?.nodes.map(
-              ({ id, name, project, workspacesAgentConfig }) => ({
-                value: id,
-                text: `${project.nameWithNamespace} / ${name}`,
-                defaultMaxHoursBeforeTermination:
-                  workspacesAgentConfig.defaultMaxHoursBeforeTermination,
-              }),
-            ) || [],
-        };
-      } catch (error) {
-        return { error };
-      }
-    },
   },
   render() {
     return this.$scopedSlots.default?.();
diff --git a/ee/app/assets/javascripts/workspaces/common/graphql/queries/get_group_cluster_agents.query.graphql b/ee/app/assets/javascripts/workspaces/common/graphql/queries/get_group_cluster_agents.query.graphql
deleted file mode 100644
index e0fff6bbf1572ae7ac90067db82a12503ece2e8d..0000000000000000000000000000000000000000
--- a/ee/app/assets/javascripts/workspaces/common/graphql/queries/get_group_cluster_agents.query.graphql
+++ /dev/null
@@ -1,19 +0,0 @@
-query getGroupClusterAgents($groupPath: ID!) {
-  group(fullPath: $groupPath) {
-    id
-    clusterAgents(hasRemoteDevelopmentEnabled: true) {
-      nodes {
-        id
-        name
-        project {
-          id
-          nameWithNamespace
-        }
-        workspacesAgentConfig {
-          id
-          defaultMaxHoursBeforeTermination
-        }
-      }
-    }
-  }
-}
diff --git a/ee/app/controllers/groups/settings/remote_development/workspaces_controller.rb b/ee/app/controllers/groups/settings/remote_development/workspaces_controller.rb
index ede7797272e056ea2f7528223728c5e315bb973d..8a67fc07fa37ba66478752f8b4f16be5c529bc3d 100644
--- a/ee/app/controllers/groups/settings/remote_development/workspaces_controller.rb
+++ b/ee/app/controllers/groups/settings/remote_development/workspaces_controller.rb
@@ -7,7 +7,6 @@ class WorkspacesController < Groups::ApplicationController
         layout 'group_settings'
 
         before_action :authorize_remote_development!
-        before_action :check_agent_authorization_feature_flag!
 
         feature_category :workspaces
         urgency :low
@@ -19,11 +18,6 @@ def show; end
         def authorize_remote_development!
           render_404 unless can?(current_user, :access_workspaces_feature)
         end
-
-        def check_agent_authorization_feature_flag!
-          render_404 unless
-            Feature.enabled?(:remote_development_namespace_agent_authorization, @group.root_ancestor)
-        end
       end
     end
   end
diff --git a/ee/app/controllers/remote_development/workspaces_feature_flag_controller.rb b/ee/app/controllers/remote_development/workspaces_feature_flag_controller.rb
index 20a252a2cfb96a071618f9808a814568ba5fd40c..507bad2bf4bcc193cc2ded83dc179f7fb9f6937b 100644
--- a/ee/app/controllers/remote_development/workspaces_feature_flag_controller.rb
+++ b/ee/app/controllers/remote_development/workspaces_feature_flag_controller.rb
@@ -1,18 +1,16 @@
 # frozen_string_literal: true
 
 module RemoteDevelopment
+  # This controller exists because the actor for the feature flag is determined on the client side
+  # based on what choices a user makes on the page. As such, we cannot rely on the normal approach
+  # of passing the flag's state in the original body of the page, rather we would need to query
+  # it in realtime based on the current selected actor. In this case, it is the namespace.
+  # TODO: this will be cleaned up as part of gitlab-org/gitlab#482814+
   class WorkspacesFeatureFlagController < ApplicationController
-    # Authentication is being skipped temporarily because of high priority of delivery and low impact
-    # but will be added in the future
-    #   Issue: https://gitlab.com/gitlab-org/gitlab/-/issues/461163
-    skip_before_action :authenticate_user!
-
     feature_category :workspaces
     urgency :low
 
-    ALLOWED_FLAGS = [
-      "remote_development_namespace_agent_authorization"
-    ].freeze
+    ALLOWED_FLAGS = [].freeze
 
     def show
       flag = permitted_params[:flag]
diff --git a/ee/app/graphql/mutations/remote_development/workspace_operations/create.rb b/ee/app/graphql/mutations/remote_development/workspace_operations/create.rb
index aa404bc00a3aa55cf410c90071b8fa0b7599124d..9cbb05da36abf6287f6d252899813ef4feb5932c 100644
--- a/ee/app/graphql/mutations/remote_development/workspace_operations/create.rb
+++ b/ee/app/graphql/mutations/remote_development/workspace_operations/create.rb
@@ -71,45 +71,25 @@ def resolve(args)
           # has the :create_workspace ability on the _agent's_ project, which will be true if the user is a developer
           # on the agent's project.
           agent = authorized_find!(id: cluster_agent_id)
+          relevant_mappings =
+            ::RemoteDevelopment::RemoteDevelopmentNamespaceClusterAgentMapping
+              .for_namespaces(project.project_namespace.traversal_ids)
+              .for_agents([agent.id])
+
+          unless relevant_mappings.present?
+            raise ::Gitlab::Graphql::Errors::ArgumentError,
+              "The provided agent provided must be mapped to an ancestor namespace of the workspace's project."
+          end
+
+          valid_relevant_mappings =
+            ::RemoteDevelopment::NamespaceClusterAgentMappingOperations::Validations
+              .filter_valid_namespace_cluster_agent_mappings(namespace_cluster_agent_mappings: relevant_mappings.to_a)
 
-          root_namespace = project.root_namespace
-
-          if Feature.enabled?(:remote_development_namespace_agent_authorization, root_namespace)
-            relevant_mappings =
-              ::RemoteDevelopment::RemoteDevelopmentNamespaceClusterAgentMapping
-                .for_namespaces(project.project_namespace.traversal_ids)
-                .for_agents([agent.id])
-
-            unless relevant_mappings.present?
-              raise ::Gitlab::Graphql::Errors::ArgumentError,
-                "The provided agent provided must be mapped to an ancestor namespace of the workspace's project."
-            end
-
-            valid_relevant_mappings =
-              ::RemoteDevelopment::NamespaceClusterAgentMappingOperations::Validations
-                .filter_valid_namespace_cluster_agent_mappings(namespace_cluster_agent_mappings: relevant_mappings.to_a)
-
-            unless valid_relevant_mappings.present?
-              raise ::Gitlab::Graphql::Errors::ArgumentError,
-                "#{relevant_mappings.size} mapping(s) exist between the provided agent and the ancestor namespaces " \
-                  "of the workspaces's project, but the agent does not reside within the hierarchy of any of the " \
-                  "mapped ancestor namespaces."
-            end
-          else
-            # NOTE: We only do the common-root-namespace check in the create mutation, because if we did it in the
-            # update mutation too, and the projects got moved to different namespaces, there would be no way to
-            # terminate the workspace via setting the desired state to `Terminated`. However, since the project
-            # and agent associations are immutable (cannot be updated via GraphQL, which is the only update path),
-            # there's no way that a direct update to the workspace associations could cause this to become invalid -
-            # only if the projects or their namespace hierarchies are changed.
-            #
-            # It is only possible to violate this check by directly calling the GraphQL API - the UI will only
-            # present agents for workspace creation which are under the same common root namespace as the
-            # workspace project.
-            unless root_namespace == agent.project.root_namespace
-              raise ::Gitlab::Graphql::Errors::ArgumentError,
-                "Workspace's project and agent's project must both be under the same common root group/namespace."
-            end
+          unless valid_relevant_mappings.present?
+            raise ::Gitlab::Graphql::Errors::ArgumentError,
+              "#{relevant_mappings.size} mapping(s) exist between the provided agent and the ancestor namespaces " \
+                "of the workspaces's project, but the agent does not reside within the hierarchy of any of the " \
+                "mapped ancestor namespaces."
           end
 
           # noinspection RubyNilAnalysis - This is because the superclass #current_user uses #[], which can return nil
diff --git a/ee/app/graphql/resolvers/remote_development/agents_for_namespace_resolver.rb b/ee/app/graphql/resolvers/remote_development/agents_for_namespace_resolver.rb
index 1d1c35e3fe14495c8aca90d8a1afe90bffc3cca6..d67df22afa414524cee822a3c693d3887c6f58f1 100644
--- a/ee/app/graphql/resolvers/remote_development/agents_for_namespace_resolver.rb
+++ b/ee/app/graphql/resolvers/remote_development/agents_for_namespace_resolver.rb
@@ -16,12 +16,6 @@ def resolve(**args)
           raise_resource_not_available_error! "'remote_development' licensed feature is not available"
         end
 
-        unless Feature.enabled?(:remote_development_namespace_agent_authorization, @object.root_ancestor)
-          raise_resource_not_available_error!(
-            "'remote_development_namespace_agent_authorization' feature flag is disabled"
-          )
-        end
-
         raise_resource_not_available_error! unless @object.group_namespace?
 
         ::RemoteDevelopment::ClusterAgentsFinder.execute(
diff --git a/ee/config/feature_flags/beta/remote_development_namespace_agent_authorization.yml b/ee/config/feature_flags/beta/remote_development_namespace_agent_authorization.yml
deleted file mode 100644
index 861dd01ef0e032182b88ab7826206300524c01ce..0000000000000000000000000000000000000000
--- a/ee/config/feature_flags/beta/remote_development_namespace_agent_authorization.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: remote_development_namespace_agent_authorization
-feature_issue_url: https://gitlab.com/groups/gitlab-org/-/epics/12193
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/145481
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/442707
-milestone: '16.11'
-group: group::ide
-type: beta
-default_enabled: true
diff --git a/ee/lib/ee/sidebars/groups/menus/settings_menu.rb b/ee/lib/ee/sidebars/groups/menus/settings_menu.rb
index 2a6d73c90a9c51cfdf4b21ec664326e156af0a8e..1c8a521171b435d37afde49c01527d766c33a3c4 100644
--- a/ee/lib/ee/sidebars/groups/menus/settings_menu.rb
+++ b/ee/lib/ee/sidebars/groups/menus/settings_menu.rb
@@ -172,9 +172,6 @@ def workspaces_menu_item
           end
 
           def workspaces_enabled?
-            return false unless ::Feature.enabled?(:remote_development_namespace_agent_authorization,
-              context.group.root_ancestor)
-
             can?(context.current_user, :access_workspaces_feature)
           end
 
diff --git a/ee/spec/features/groups/settings/remote_development/workspaces_spec.rb b/ee/spec/features/groups/settings/remote_development/workspaces_spec.rb
index cce1a473ba8cfecb9134829bfcda2979f680c275..6864fd88300eb60b3247ccecf5a877cce4992904 100644
--- a/ee/spec/features/groups/settings/remote_development/workspaces_spec.rb
+++ b/ee/spec/features/groups/settings/remote_development/workspaces_spec.rb
@@ -21,7 +21,6 @@
 
   before do
     stub_licensed_features(remote_development: true)
-    stub_feature_flags(remote_development_namespace_agent_authorization: true)
 
     sign_in(user)
     visit group_settings_workspaces_path(group)
diff --git a/ee/spec/features/remote_development/workspaces_dropdown_group_spec.rb b/ee/spec/features/remote_development/workspaces_dropdown_group_spec.rb
index 4b76e1a1d8f544c9c06fb923f03f1a845eef6e07..9bd006362e741b742626eb9d9516eaf0f0b88366 100644
--- a/ee/spec/features/remote_development/workspaces_dropdown_group_spec.rb
+++ b/ee/spec/features/remote_development/workspaces_dropdown_group_spec.rb
@@ -62,6 +62,14 @@
   end
 
   shared_examples 'views and manages workspaces in workspaces dropdown group' do
+    let_it_be(:cluster_agent_mapping) do
+      create(
+        :remote_development_namespace_cluster_agent_mapping,
+        user: user, agent: agent,
+        namespace: group
+      )
+    end
+
     it_behaves_like 'handles workspaces dropdown group visibility', true, true
     it_behaves_like 'handles workspaces dropdown group visibility', false, false
 
@@ -105,42 +113,16 @@ def expect_workspace_state_indicator(state)
     end
   end
 
-  shared_examples 'views and manages workspaces in workspaces dropdown group based on feature flag' do
-    context 'when the remote_development_namespace_agent_authorization feature flag is on' do
-      let_it_be(:cluster_agent_mapping) do
-        create(
-          :remote_development_namespace_cluster_agent_mapping,
-          user: user, agent: agent,
-          namespace: group
-        )
-      end
-
-      before do
-        stub_feature_flags(remote_development_namespace_agent_authorization: true)
-      end
-
-      it_behaves_like 'views and manages workspaces in workspaces dropdown group'
-    end
-
-    context 'when the remote_development_namespace_agent_authorization feature flag is off' do
-      before do
-        stub_feature_flags(remote_development_namespace_agent_authorization: false)
-      end
-
-      it_behaves_like 'views and manages workspaces in workspaces dropdown group'
-    end
-  end
-
   describe 'when viewing project overview page' do
     let(:subject) { project_path(project) }
 
-    it_behaves_like 'views and manages workspaces in workspaces dropdown group based on feature flag'
+    it_behaves_like 'views and manages workspaces in workspaces dropdown group'
   end
 
   describe 'when viewing blob page' do
     # noinspection RubyResolve - https://handbook.gitlab.com/handbook/tools-and-tips/editors-and-ides/jetbrains-ides/tracked-jetbrains-issues/#ruby-31542
     let(:subject) { project_blob_path(project, "#{project.default_branch}/#{devfile_path}") }
 
-    it_behaves_like 'views and manages workspaces in workspaces dropdown group based on feature flag'
+    it_behaves_like 'views and manages workspaces in workspaces dropdown group'
   end
 end
diff --git a/ee/spec/features/remote_development/workspaces_spec.rb b/ee/spec/features/remote_development/workspaces_spec.rb
index e1dbb58eb7d716c3e300ea5f41400c1d3cf21e00..6bcdebc209e5a02d51a2f8cd4b9bc886ac6d1e3f 100644
--- a/ee/spec/features/remote_development/workspaces_spec.rb
+++ b/ee/spec/features/remote_development/workspaces_spec.rb
@@ -10,7 +10,7 @@
   include_context 'file upload requests helpers'
 
   let_it_be(:user) { create(:user) }
-  let_it_be(:group) { create(:group, name: 'test-group', developers: user) }
+  let_it_be(:group) { create(:group, name: 'test-group', developers: user, owners: user) }
   let_it_be(:devfile_path) { '.devfile.yaml' }
 
   let_it_be(:project) do
@@ -26,6 +26,7 @@
 
   let(:variable_key) { "VAR1" }
   let(:variable_value) { "value 1" }
+  let(:workspaces_group_settings_path) { "/groups/#{group.name}/-/settings/workspaces" }
 
   before do
     stub_licensed_features(remote_development: true)
@@ -46,9 +47,12 @@
       # use live_debug to pause when WEBDRIVER_HEADLESS=0
       # live_debug
 
-      # NAVIGATE TO WORKSPACES PAGE
-
       # noinspection RubyResolve - https://handbook.gitlab.com/handbook/tools-and-tips/editors-and-ides/jetbrains-ides/tracked-jetbrains-issues/#ruby-31542
+
+      # ENABLE AGENT FOR GROUP
+      enable_agent_for_group(agent_name: agent.name, group_name: group.name)
+
+      # NAVIGATE TO WORKSPACES PAGE
       visit remote_development_workspaces_path
       wait_for_requests
 
@@ -217,34 +221,7 @@ def simulate_agentk_reconcile_post(agent_token:, workspace_agent_infos:, update_
     end
   end
 
-  describe 'workspaces' do
-    context 'when creating' do
-      context 'when the remote_development_namespace_agent_authorization feature flag is on' do
-        # TODO: When we default-enable the remote_development_namespace_agent_authorization feature flag,
-        #       convert this from a fixture to being created via the UI in the 'creates a workspace' shared example,
-        #       so this test can exercise the UI for agent mapping.
-        let_it_be(:cluster_agent_mapping) do
-          create(
-            :remote_development_namespace_cluster_agent_mapping,
-            user: user, agent: agent,
-            namespace: group
-          )
-        end
-
-        before do
-          stub_feature_flags(remote_development_namespace_agent_authorization: true)
-        end
-
-        it_behaves_like 'creates a workspace'
-      end
-
-      context 'when the remote_development_namespace_agent_authorization feature flag is off' do
-        before do
-          stub_feature_flags(remote_development_namespace_agent_authorization: false)
-        end
-
-        it_behaves_like 'creates a workspace'
-      end
-    end
+  context 'when creating a workspace' do
+    it_behaves_like 'creates a workspace'
   end
 end
diff --git a/ee/spec/frontend/workspaces/common/components/get_project_details_query_spec.js b/ee/spec/frontend/workspaces/common/components/get_project_details_query_spec.js
index 64797527c02141b14c7d784054b88f70e36e006d..33fa26851a537f4ee3eb4ad257775c1e55e6dea0 100644
--- a/ee/spec/frontend/workspaces/common/components/get_project_details_query_spec.js
+++ b/ee/spec/frontend/workspaces/common/components/get_project_details_query_spec.js
@@ -4,9 +4,7 @@ import Vue from 'vue';
 import { cloneDeep } from 'lodash';
 import { logError } from '~/lib/logger';
 import axios from '~/lib/utils/axios_utils';
-import { HTTP_STATUS_OK } from '~/lib/utils/http_status';
 import getProjectDetailsQuery from 'ee/workspaces/common/graphql/queries/get_project_details.query.graphql';
-import getGroupClusterAgentsQuery from 'ee/workspaces/common/graphql/queries/get_group_cluster_agents.query.graphql';
 import getRemoteDevelopmentClusterAgentsQuery from 'ee/workspaces/common/graphql/queries/get_remote_development_cluster_agents.query.graphql';
 import GetProjectDetailsQuery from 'ee/workspaces/common/components/get_project_details_query.vue';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
@@ -15,11 +13,6 @@ import waitForPromises from 'helpers/wait_for_promises';
 
 import {
   GET_PROJECT_DETAILS_QUERY_RESULT,
-  GET_GROUP_CLUSTER_AGENTS_QUERY_RESULT_ROOTGROUP_NO_AGENT,
-  GET_GROUP_CLUSTER_AGENTS_QUERY_RESULT_ROOTGROUP_ONE_AGENT,
-  GET_GROUP_CLUSTER_AGENTS_QUERY_RESULT_SUBGROUP_NO_AGENT,
-  GET_GROUP_CLUSTER_AGENTS_QUERY_RESULT_SUBGROUP_ONE_AGENT,
-  GET_GROUP_CLUSTER_AGENTS_QUERY_RESULT_SUBGROUP_DUPLICATES_ROOTGROUP,
   GET_REMOTE_DEVELOPMENT_CLUSTER_AGENTS_QUERY_RESULT_TWO_AGENTS,
   GET_REMOTE_DEVELOPMENT_CLUSTER_AGENTS_QUERY_RESULT_NO_AGENTS,
 } from '../../mock_data';
@@ -30,30 +23,12 @@ jest.mock('~/lib/logger');
 
 describe('workspaces/common/components/get_project_details_query', () => {
   let getProjectDetailsQueryHandler;
-  let getGroupClusterAgentsQueryHandler;
   let getRemoteDevelopmentClusterAgentsQueryHandler;
   let glFeatures;
   let wrapper;
   let mockAxios;
 
   const projectFullPathFixture = 'gitlab-org/gitlab';
-  const WORKSPACES_FEATURE_FLAG_PATH = '/-/remote_development/workspaces_feature_flag';
-
-  const setupGroupClusterAgentsQueryHandler = (groupResponses) => {
-    getGroupClusterAgentsQueryHandler.mockImplementation(({ groupPath }) => {
-      const matchingResponse = groupResponses.find((x) => x.data.group.fullPath === groupPath);
-
-      if (matchingResponse) {
-        return Promise.resolve(matchingResponse);
-      }
-
-      return Promise.resolve({
-        data: {
-          group: null,
-        },
-      });
-    });
-  };
 
   const setupRemoteDevelopmentClusterAgentsQueryHandler = (responses) => {
     getRemoteDevelopmentClusterAgentsQueryHandler.mockResolvedValueOnce(responses);
@@ -62,7 +37,6 @@ describe('workspaces/common/components/get_project_details_query', () => {
   const buildWrapper = async ({ projectFullPath = projectFullPathFixture } = {}) => {
     const apolloProvider = createMockApollo([
       [getProjectDetailsQuery, getProjectDetailsQueryHandler],
-      [getGroupClusterAgentsQuery, getGroupClusterAgentsQueryHandler],
       [getRemoteDevelopmentClusterAgentsQuery, getRemoteDevelopmentClusterAgentsQueryHandler],
     ]);
 
@@ -71,7 +45,6 @@ describe('workspaces/common/components/get_project_details_query', () => {
       apolloProvider,
       provide: {
         glFeatures,
-        workspacesFeatureFlagPath: WORKSPACES_FEATURE_FLAG_PATH,
       },
       propsData: {
         projectFullPath,
@@ -81,15 +54,6 @@ describe('workspaces/common/components/get_project_details_query', () => {
     await waitForPromises();
   };
 
-  const transformGroupClusterAgentGraphQLResultToClusterAgents = (clusterAgentsGraphQLResult) =>
-    clusterAgentsGraphQLResult.data.group.clusterAgents.nodes.map(
-      ({ id, name, project, workspacesAgentConfig }) => ({
-        text: `${project.nameWithNamespace} / ${name}`,
-        value: id,
-        defaultMaxHoursBeforeTermination: workspacesAgentConfig.defaultMaxHoursBeforeTermination,
-      }),
-    );
-
   const transformRemoveDevelopmentClusterAgentGraphQLResultToClusterAgents = (
     clusterAgentsGraphQLResult,
   ) =>
@@ -103,18 +67,15 @@ describe('workspaces/common/components/get_project_details_query', () => {
 
   beforeEach(() => {
     getProjectDetailsQueryHandler = jest.fn();
-    getGroupClusterAgentsQueryHandler = jest.fn();
     getRemoteDevelopmentClusterAgentsQueryHandler = jest.fn();
 
     logError.mockReset();
 
     getProjectDetailsQueryHandler.mockResolvedValueOnce(GET_PROJECT_DETAILS_QUERY_RESULT);
-    setupGroupClusterAgentsQueryHandler([]);
   });
 
   beforeEach(() => {
     mockAxios = new MockAdapter(axios);
-    mockAxios.onGet(WORKSPACES_FEATURE_FLAG_PATH).reply(HTTP_STATUS_OK, { enabled: false });
   });
 
   afterEach(() => {
@@ -131,206 +92,116 @@ describe('workspaces/common/components/get_project_details_query', () => {
     });
   });
 
-  describe('when both the root group and subgroup return an agent', () => {
+  describe('when the project is null', () => {
     beforeEach(() => {
-      const mockedClusterAgentResponses = [
-        GET_GROUP_CLUSTER_AGENTS_QUERY_RESULT_ROOTGROUP_ONE_AGENT,
-        GET_GROUP_CLUSTER_AGENTS_QUERY_RESULT_SUBGROUP_ONE_AGENT,
-      ];
-      setupGroupClusterAgentsQueryHandler(mockedClusterAgentResponses);
-    });
+      const customMockData = cloneDeep(GET_PROJECT_DETAILS_QUERY_RESULT);
 
-    it('executes get_group_cluster_agents query', async () => {
-      await buildWrapper();
+      customMockData.data.project = null;
 
-      expect(getGroupClusterAgentsQueryHandler).toHaveBeenCalledTimes(2);
-      expect(getGroupClusterAgentsQueryHandler).toHaveBeenCalledWith({
-        groupPath: 'gitlab-org',
-      });
-      expect(getGroupClusterAgentsQueryHandler).toHaveBeenCalledWith({
-        groupPath: 'gitlab-org/subgroup',
-      });
+      getProjectDetailsQueryHandler.mockReset();
+      getProjectDetailsQueryHandler.mockResolvedValueOnce(customMockData);
     });
 
-    it('emits result event with fetched cluster agents, project id, project group, and root files', async () => {
+    it('emits error event', async () => {
       await buildWrapper();
 
-      const expectedClusterAgents = [
-        ...transformGroupClusterAgentGraphQLResultToClusterAgents(
-          GET_GROUP_CLUSTER_AGENTS_QUERY_RESULT_ROOTGROUP_ONE_AGENT,
-        ),
-        ...transformGroupClusterAgentGraphQLResultToClusterAgents(
-          GET_GROUP_CLUSTER_AGENTS_QUERY_RESULT_SUBGROUP_ONE_AGENT,
-        ),
-      ];
-
-      expect(wrapper.emitted('result')[0][0]).toEqual({
-        clusterAgents: expectedClusterAgents,
-        id: GET_PROJECT_DETAILS_QUERY_RESULT.data.project.id,
-        rootRef: GET_PROJECT_DETAILS_QUERY_RESULT.data.project.repository.rootRef,
-        nameWithNamespace: GET_PROJECT_DETAILS_QUERY_RESULT.data.project.nameWithNamespace,
-        fullPath: projectFullPathFixture,
-      });
+      expect(wrapper.emitted('error')).toEqual([[]]);
     });
   });
 
-  describe('when only the subgroup returns an agent', () => {
-    beforeEach(() => {
-      const mockedClusterAgentResponses = [
-        GET_GROUP_CLUSTER_AGENTS_QUERY_RESULT_ROOTGROUP_NO_AGENT,
-        GET_GROUP_CLUSTER_AGENTS_QUERY_RESULT_SUBGROUP_ONE_AGENT,
-      ];
-      setupGroupClusterAgentsQueryHandler(mockedClusterAgentResponses);
+  describe('when project full path is not provided', () => {
+    it('does not execute get_project_details query', async () => {
+      // noinspection JSCheckFunctionSignatures -- This is incorrectly assuming the projectFullPath type is String due to its default value in the declaration
+      await buildWrapper({ projectFullPath: null });
+
+      expect(getProjectDetailsQueryHandler).not.toHaveBeenCalled();
     });
+  });
 
-    it('executes get_group_cluster_agents query', async () => {
+  describe('when the project belongs to a group', () => {
+    beforeEach(async () => {
       await buildWrapper();
+    });
 
-      expect(getGroupClusterAgentsQueryHandler).toHaveBeenCalledTimes(2);
-      expect(getGroupClusterAgentsQueryHandler).toHaveBeenCalledWith({
-        groupPath: 'gitlab-org',
-      });
-      expect(getGroupClusterAgentsQueryHandler).toHaveBeenCalledWith({
-        groupPath: 'gitlab-org/subgroup',
+    it('executes getRemoteDevelopmentClusterAgents query', () => {
+      expect(getRemoteDevelopmentClusterAgentsQueryHandler).toHaveBeenCalledTimes(1);
+      expect(getRemoteDevelopmentClusterAgentsQueryHandler).toHaveBeenCalledWith({
+        namespace: 'gitlab-org/subgroup',
       });
     });
+  });
+
+  describe('when the project does not have a repository', () => {
+    beforeEach(async () => {
+      setupRemoteDevelopmentClusterAgentsQueryHandler(
+        GET_REMOTE_DEVELOPMENT_CLUSTER_AGENTS_QUERY_RESULT_TWO_AGENTS,
+      );
+      const customMockData = cloneDeep(GET_PROJECT_DETAILS_QUERY_RESULT);
+      customMockData.data.project.repository = null;
+
+      getProjectDetailsQueryHandler.mockReset();
+      getProjectDetailsQueryHandler.mockResolvedValueOnce(customMockData);
 
-    it('emits result event with fetched cluster agents, project id, project group, and root files', async () => {
       await buildWrapper();
+    });
 
+    it('emits result event with rootRef null', () => {
       expect(wrapper.emitted('result')[0][0]).toEqual({
-        clusterAgents: transformGroupClusterAgentGraphQLResultToClusterAgents(
-          GET_GROUP_CLUSTER_AGENTS_QUERY_RESULT_SUBGROUP_ONE_AGENT,
+        clusterAgents: transformRemoveDevelopmentClusterAgentGraphQLResultToClusterAgents(
+          GET_REMOTE_DEVELOPMENT_CLUSTER_AGENTS_QUERY_RESULT_TWO_AGENTS,
         ),
         id: GET_PROJECT_DETAILS_QUERY_RESULT.data.project.id,
-        rootRef: GET_PROJECT_DETAILS_QUERY_RESULT.data.project.repository.rootRef,
+        rootRef: null,
         nameWithNamespace: GET_PROJECT_DETAILS_QUERY_RESULT.data.project.nameWithNamespace,
         fullPath: projectFullPathFixture,
       });
     });
   });
 
-  describe('when subgroup returns agent and root group returns null', () => {
-    beforeEach(() => {
-      const mockedClusterAgentResponses = [
-        GET_GROUP_CLUSTER_AGENTS_QUERY_RESULT_SUBGROUP_ONE_AGENT,
-      ];
-      setupGroupClusterAgentsQueryHandler(mockedClusterAgentResponses);
-    });
-
-    it('emits result with just subgroup items', async () => {
+  describe('when getRemoteDevelopmentClusterAgents query contains one or more cluster agents', () => {
+    beforeEach(async () => {
+      setupRemoteDevelopmentClusterAgentsQueryHandler(
+        GET_REMOTE_DEVELOPMENT_CLUSTER_AGENTS_QUERY_RESULT_TWO_AGENTS,
+      );
       await buildWrapper();
+    });
 
+    it('emits result event with the cluster agents', async () => {
       await waitForPromises();
 
       expect(wrapper.emitted('result')[0][0]).toEqual({
-        clusterAgents: [
-          {
-            text: 'GitLab Org / Subgroup / GitLab / subgroup-agent',
-            value: 'gid://gitlab/Clusters::Agent/2',
-            defaultMaxHoursBeforeTermination: 99,
-          },
-        ],
-        fullPath: 'gitlab-org/gitlab',
-        id: 'gid://gitlab/Project/1',
-        nameWithNamespace: 'GitLab Org / Subgroup / GitLab',
-        rootRef: 'main',
+        clusterAgents: transformRemoveDevelopmentClusterAgentGraphQLResultToClusterAgents(
+          GET_REMOTE_DEVELOPMENT_CLUSTER_AGENTS_QUERY_RESULT_TWO_AGENTS,
+        ),
+        id: GET_PROJECT_DETAILS_QUERY_RESULT.data.project.id,
+        rootRef: GET_PROJECT_DETAILS_QUERY_RESULT.data.project.repository.rootRef,
+        fullPath: projectFullPathFixture,
+        nameWithNamespace: GET_PROJECT_DETAILS_QUERY_RESULT.data.project.nameWithNamespace,
       });
     });
   });
 
-  describe('when the subgroup returns a duplicate agent from the root group', () => {
-    beforeEach(() => {
-      const mockedClusterAgentResponses = [
-        GET_GROUP_CLUSTER_AGENTS_QUERY_RESULT_ROOTGROUP_ONE_AGENT,
-        GET_GROUP_CLUSTER_AGENTS_QUERY_RESULT_SUBGROUP_DUPLICATES_ROOTGROUP,
-      ];
-      setupGroupClusterAgentsQueryHandler(mockedClusterAgentResponses);
-    });
-
-    it('executes get_group_cluster_agents query', async () => {
+  describe('when getRemoteDevelopmentClusterAgents query does not contain cluster agents', () => {
+    beforeEach(async () => {
+      setupRemoteDevelopmentClusterAgentsQueryHandler(
+        GET_REMOTE_DEVELOPMENT_CLUSTER_AGENTS_QUERY_RESULT_NO_AGENTS,
+      );
       await buildWrapper();
-
-      expect(getGroupClusterAgentsQueryHandler).toHaveBeenCalledTimes(2);
-      expect(getGroupClusterAgentsQueryHandler).toHaveBeenCalledWith({
-        groupPath: 'gitlab-org',
-      });
-      expect(getGroupClusterAgentsQueryHandler).toHaveBeenCalledWith({
-        groupPath: 'gitlab-org/subgroup',
-      });
     });
 
-    it('emits result event with fetched cluster agents, project id, project group, and root files with no duplicates', async () => {
-      await buildWrapper();
+    it('emits result event with no cluster agents', async () => {
+      await waitForPromises();
 
       expect(wrapper.emitted('result')[0][0]).toEqual({
-        clusterAgents: [
-          ...transformGroupClusterAgentGraphQLResultToClusterAgents(
-            GET_GROUP_CLUSTER_AGENTS_QUERY_RESULT_ROOTGROUP_ONE_AGENT,
-          ),
-          ...transformGroupClusterAgentGraphQLResultToClusterAgents(
-            GET_GROUP_CLUSTER_AGENTS_QUERY_RESULT_SUBGROUP_ONE_AGENT,
-          ),
-        ],
+        clusterAgents: [],
         id: GET_PROJECT_DETAILS_QUERY_RESULT.data.project.id,
         rootRef: GET_PROJECT_DETAILS_QUERY_RESULT.data.project.repository.rootRef,
-        nameWithNamespace: GET_PROJECT_DETAILS_QUERY_RESULT.data.project.nameWithNamespace,
         fullPath: projectFullPathFixture,
-      });
-    });
-
-    describe('when the project is null', () => {
-      beforeEach(() => {
-        const customMockData = cloneDeep(GET_PROJECT_DETAILS_QUERY_RESULT);
-
-        customMockData.data.project = null;
-
-        getProjectDetailsQueryHandler.mockReset();
-        getProjectDetailsQueryHandler.mockResolvedValueOnce(customMockData);
-      });
-
-      it('emits error event', async () => {
-        await buildWrapper();
-
-        expect(wrapper.emitted('error')).toEqual([[]]);
-      });
-    });
-  });
-
-  describe('when the project does not have a repository', () => {
-    beforeEach(() => {
-      const mockedClusterAgentResponses = [
-        GET_GROUP_CLUSTER_AGENTS_QUERY_RESULT_ROOTGROUP_NO_AGENT,
-        GET_GROUP_CLUSTER_AGENTS_QUERY_RESULT_SUBGROUP_NO_AGENT,
-      ];
-      setupGroupClusterAgentsQueryHandler(mockedClusterAgentResponses);
-
-      const customMockData = cloneDeep(GET_PROJECT_DETAILS_QUERY_RESULT);
-
-      customMockData.data.project.repository = null;
-
-      getProjectDetailsQueryHandler.mockReset();
-      getProjectDetailsQueryHandler.mockResolvedValueOnce(customMockData);
-    });
-
-    it('emits result event with rootRef null', async () => {
-      await buildWrapper();
-
-      expect(wrapper.emitted('result')[0][0]).toMatchObject({
-        rootRef: null,
+        nameWithNamespace: GET_PROJECT_DETAILS_QUERY_RESULT.data.project.nameWithNamespace,
       });
     });
   });
 
-  describe('when project full path is not provided', () => {
-    it('does not execute get_project_details query', async () => {
-      // noinspection JSCheckFunctionSignatures -- This is incorrectly assuming the projectFullPath type is String due to its default value in the declaration
-      await buildWrapper({ projectFullPath: null });
-
-      expect(getProjectDetailsQueryHandler).not.toHaveBeenCalled();
-    });
-  });
-
   describe('when a project does not belong to a group', () => {
     beforeEach(async () => {
       const customMockData = cloneDeep(GET_PROJECT_DETAILS_QUERY_RESULT);
@@ -343,9 +214,9 @@ describe('workspaces/common/components/get_project_details_query', () => {
       await buildWrapper();
     });
 
-    it('does not execute the getGroupClusterAgents query', () => {
+    it('does not execute the getRemoteDevelopmentClusterAgents query', () => {
       expect(getProjectDetailsQueryHandler).toHaveBeenCalled();
-      expect(getGroupClusterAgentsQueryHandler).not.toHaveBeenCalled();
+      expect(getRemoteDevelopmentClusterAgentsQueryHandler).not.toHaveBeenCalled();
     });
 
     it('emits result event with the project data', () => {
@@ -359,36 +230,11 @@ describe('workspaces/common/components/get_project_details_query', () => {
     });
   });
 
-  describe('when the project full path changes', () => {
-    it('fetches agents for the entire project group hierarchy', async () => {
-      const customMockData = cloneDeep(GET_PROJECT_DETAILS_QUERY_RESULT);
-
-      await buildWrapper();
-
-      // Called once for each part in group path
-      expect(getGroupClusterAgentsQueryHandler).toHaveBeenCalledTimes(2);
-
-      customMockData.data.project.group.fullPath = 'new';
-
-      getProjectDetailsQueryHandler.mockResolvedValueOnce(customMockData);
-
-      await wrapper.setProps({ projectFullPath: 'new/path' });
-
-      await waitForPromises();
-
-      // Once more because group.fullPath only has 1 part now
-      expect(getGroupClusterAgentsQueryHandler).toHaveBeenCalledTimes(3);
-    });
-  });
-
   describe('when the project full path changes from group to not group', () => {
     beforeEach(async () => {
-      const mockedClusterAgentResponses = [
-        GET_GROUP_CLUSTER_AGENTS_QUERY_RESULT_ROOTGROUP_NO_AGENT,
-        GET_GROUP_CLUSTER_AGENTS_QUERY_RESULT_SUBGROUP_NO_AGENT,
-      ];
-      setupGroupClusterAgentsQueryHandler(mockedClusterAgentResponses);
-
+      setupRemoteDevelopmentClusterAgentsQueryHandler(
+        GET_REMOTE_DEVELOPMENT_CLUSTER_AGENTS_QUERY_RESULT_TWO_AGENTS,
+      );
       await waitForPromises();
     });
 
@@ -397,8 +243,7 @@ describe('workspaces/common/components/get_project_details_query', () => {
 
       await buildWrapper();
 
-      // Called once for each part in group path
-      expect(getGroupClusterAgentsQueryHandler).toHaveBeenCalledTimes(2);
+      expect(getRemoteDevelopmentClusterAgentsQueryHandler).toHaveBeenCalledTimes(1);
 
       const projectWithoutGroup = cloneDeep(GET_PROJECT_DETAILS_QUERY_RESULT);
       projectWithoutGroup.data.project.group = null;
@@ -425,18 +270,17 @@ describe('workspaces/common/components/get_project_details_query', () => {
   });
 
   describe.each`
-    queryName                       | queryHandlerFactory
-    ${'getProjectDetailsQuery'}     | ${() => getProjectDetailsQueryHandler}
-    ${'getGroupClusterAgentsQuery'} | ${() => getGroupClusterAgentsQueryHandler}
+    queryName                                          | queryHandlerFactory
+    ${'getProjectDetailsQuery'}                        | ${() => getProjectDetailsQueryHandler}
+    ${'getRemoteDevelopmentClusterAgentsQueryHandler'} | ${() => getRemoteDevelopmentClusterAgentsQueryHandler}
   `('when the $queryName query fails', ({ queryHandlerFactory }) => {
     const error = new Error();
 
     beforeEach(() => {
       const mockedClusterAgentResponses = [
-        GET_GROUP_CLUSTER_AGENTS_QUERY_RESULT_ROOTGROUP_NO_AGENT,
-        GET_GROUP_CLUSTER_AGENTS_QUERY_RESULT_SUBGROUP_NO_AGENT,
+        GET_REMOTE_DEVELOPMENT_CLUSTER_AGENTS_QUERY_RESULT_NO_AGENTS,
       ];
-      setupGroupClusterAgentsQueryHandler(mockedClusterAgentResponses);
+      setupRemoteDevelopmentClusterAgentsQueryHandler(mockedClusterAgentResponses);
 
       const queryHandler = queryHandlerFactory();
 
@@ -464,100 +308,4 @@ describe('workspaces/common/components/get_project_details_query', () => {
       expect(wrapper.emitted('error')).toEqual([[]]);
     });
   });
-
-  describe('when remote_development_namespace_agent_authorization feature flag is enabled', () => {
-    beforeEach(() => {
-      mockAxios.onGet(WORKSPACES_FEATURE_FLAG_PATH).reply(HTTP_STATUS_OK, { enabled: true });
-    });
-
-    describe('when the project belongs to a group', () => {
-      beforeEach(async () => {
-        await buildWrapper();
-      });
-
-      it('executes getRemoteDevelopmentClusterAgents query', () => {
-        expect(getRemoteDevelopmentClusterAgentsQueryHandler).toHaveBeenCalledTimes(1);
-        expect(getRemoteDevelopmentClusterAgentsQueryHandler).toHaveBeenCalledWith({
-          namespace: 'gitlab-org/subgroup',
-        });
-      });
-
-      it('does not execute getRemoteDevelopmentClusterAgents', () => {
-        expect(getGroupClusterAgentsQueryHandler).toHaveBeenCalledTimes(0);
-      });
-    });
-
-    describe('when getRemoteDevelopmentClusterAgents query contains one or more cluster agents', () => {
-      beforeEach(async () => {
-        setupRemoteDevelopmentClusterAgentsQueryHandler(
-          GET_REMOTE_DEVELOPMENT_CLUSTER_AGENTS_QUERY_RESULT_TWO_AGENTS,
-        );
-        await buildWrapper();
-      });
-
-      it('emits result event with the cluster agents', async () => {
-        await waitForPromises();
-
-        expect(wrapper.emitted('result')[0][0]).toEqual({
-          clusterAgents: transformRemoveDevelopmentClusterAgentGraphQLResultToClusterAgents(
-            GET_REMOTE_DEVELOPMENT_CLUSTER_AGENTS_QUERY_RESULT_TWO_AGENTS,
-          ),
-          id: GET_PROJECT_DETAILS_QUERY_RESULT.data.project.id,
-          rootRef: GET_PROJECT_DETAILS_QUERY_RESULT.data.project.repository.rootRef,
-          fullPath: projectFullPathFixture,
-          nameWithNamespace: GET_PROJECT_DETAILS_QUERY_RESULT.data.project.nameWithNamespace,
-        });
-      });
-    });
-
-    describe('when getRemoteDevelopmentClusterAgents query does not contain cluster agents', () => {
-      beforeEach(async () => {
-        setupRemoteDevelopmentClusterAgentsQueryHandler(
-          GET_REMOTE_DEVELOPMENT_CLUSTER_AGENTS_QUERY_RESULT_NO_AGENTS,
-        );
-        await buildWrapper();
-      });
-
-      it('emits result event with the cluster agents', async () => {
-        await waitForPromises();
-
-        expect(wrapper.emitted('result')[0][0]).toEqual({
-          clusterAgents: [],
-          id: GET_PROJECT_DETAILS_QUERY_RESULT.data.project.id,
-          rootRef: GET_PROJECT_DETAILS_QUERY_RESULT.data.project.repository.rootRef,
-          fullPath: projectFullPathFixture,
-          nameWithNamespace: GET_PROJECT_DETAILS_QUERY_RESULT.data.project.nameWithNamespace,
-        });
-      });
-    });
-
-    describe('when getRemoteDevelopmentClusterAgents query fails', () => {
-      const error = new Error();
-
-      beforeEach(() => {
-        getRemoteDevelopmentClusterAgentsQueryHandler.mockReset();
-        getRemoteDevelopmentClusterAgentsQueryHandler.mockRejectedValueOnce(error);
-      });
-
-      it('logs the error', async () => {
-        expect(logError).not.toHaveBeenCalled();
-
-        await buildWrapper();
-
-        expect(logError).toHaveBeenCalledWith(error);
-      });
-
-      it('does not emit result event', async () => {
-        await buildWrapper();
-
-        expect(wrapper.emitted('result')).toBe(undefined);
-      });
-
-      it('emits error event', async () => {
-        await buildWrapper();
-
-        expect(wrapper.emitted('error')).toEqual([[]]);
-      });
-    });
-  });
 });
diff --git a/ee/spec/frontend/workspaces/mock_data/index.js b/ee/spec/frontend/workspaces/mock_data/index.js
index 62e22f97d982eca666374d1b8bb1f8bec73bbf30..c00193f4a25c2cabc56d68978e0f5f2b0d4f3e53 100644
--- a/ee/spec/frontend/workspaces/mock_data/index.js
+++ b/ee/spec/frontend/workspaces/mock_data/index.js
@@ -345,99 +345,6 @@ export const GET_PROJECTS_DETAILS_QUERY_RESULT = {
   },
 };
 
-export const GET_GROUP_CLUSTER_AGENTS_QUERY_RESULT_ROOTGROUP_NO_AGENT = {
-  data: {
-    group: {
-      id: 'gid://gitlab/Group/80',
-      fullPath: 'gitlab-org',
-      clusterAgents: {
-        nodes: [],
-      },
-    },
-  },
-};
-
-export const GET_GROUP_CLUSTER_AGENTS_QUERY_RESULT_ROOTGROUP_ONE_AGENT = {
-  data: {
-    group: {
-      id: 'gid://gitlab/Group/80',
-      fullPath: 'gitlab-org',
-      clusterAgents: {
-        nodes: [
-          {
-            id: 'gid://gitlab/Clusters::Agent/1',
-            name: 'rootgroup-agent',
-            project: {
-              id: 'gid://gitlab/Project/101',
-              nameWithNamespace: 'GitLab Org / GitLab',
-            },
-            workspacesAgentConfig: {
-              id: 'gid://gitlab/RemoteDevelopment::WorkspacesAgentConfig/999',
-              defaultMaxHoursBeforeTermination: 99,
-              maxHoursBeforeTerminationLimit: 999,
-            },
-          },
-        ],
-      },
-    },
-  },
-};
-
-export const GET_GROUP_CLUSTER_AGENTS_QUERY_RESULT_SUBGROUP_NO_AGENT = {
-  data: {
-    group: {
-      id: 'gid://gitlab/Group/81',
-      fullPath: 'gitlab-org/subgroup',
-      clusterAgents: {
-        nodes: [],
-      },
-    },
-  },
-};
-
-export const GET_GROUP_CLUSTER_AGENTS_QUERY_RESULT_SUBGROUP_ONE_AGENT = {
-  data: {
-    group: {
-      id: 'gid://gitlab/Group/81',
-      fullPath: 'gitlab-org/subgroup',
-      clusterAgents: {
-        nodes: [
-          {
-            id: 'gid://gitlab/Clusters::Agent/2',
-            name: 'subgroup-agent',
-            project: {
-              id: 'gid://gitlab/Project/102',
-              nameWithNamespace: 'GitLab Org / Subgroup / GitLab',
-            },
-            workspacesAgentConfig: {
-              id: 'gid://gitlab/RemoteDevelopment::WorkspacesAgentConfig/999',
-              defaultMaxHoursBeforeTermination: 99,
-              maxHoursBeforeTerminationLimit: 999,
-            },
-          },
-        ],
-      },
-    },
-  },
-};
-
-export const GET_GROUP_CLUSTER_AGENTS_QUERY_RESULT_SUBGROUP_DUPLICATES_ROOTGROUP = {
-  data: {
-    group: {
-      id: 'gid://gitlab/Group/81',
-      fullPath: 'gitlab-org/subgroup',
-      clusterAgents: {
-        nodes: [
-          GET_GROUP_CLUSTER_AGENTS_QUERY_RESULT_ROOTGROUP_ONE_AGENT.data.group.clusterAgents
-            .nodes[0],
-          GET_GROUP_CLUSTER_AGENTS_QUERY_RESULT_SUBGROUP_ONE_AGENT.data.group.clusterAgents
-            .nodes[0],
-        ],
-      },
-    },
-  },
-};
-
 export const GET_REMOTE_DEVELOPMENT_CLUSTER_AGENTS_QUERY_RESULT_NO_AGENTS = {
   data: {
     namespace: {
diff --git a/ee/spec/lib/ee/sidebars/groups/menus/settings_menu_spec.rb b/ee/spec/lib/ee/sidebars/groups/menus/settings_menu_spec.rb
index 956ee0a2c7aecdda3b31090bacaa1aa044fc7987..522c6cbb9fbf7aa966118d8f4240b0bca8b3245b 100644
--- a/ee/spec/lib/ee/sidebars/groups/menus/settings_menu_spec.rb
+++ b/ee/spec/lib/ee/sidebars/groups/menus/settings_menu_spec.rb
@@ -287,27 +287,17 @@
       describe 'Workspaces menu item' do
         let(:item_id) { :workspaces_settings }
 
-        context 'when remote_development_namespace_agent_authorization feature flag is enabled' do
-          context 'when workspaces feature is available' do
-            before do
-              stub_licensed_features(remote_development: true)
-            end
-
-            it { is_expected.to be_present }
+        context 'when workspaces feature is available' do
+          before do
+            stub_licensed_features(remote_development: true)
           end
 
-          context 'when workspaces feature is not available' do
-            before do
-              stub_licensed_features(remote_development: false)
-            end
-
-            it { is_expected.not_to be_present }
-          end
+          it { is_expected.to be_present }
         end
 
-        context 'when remote_development_namespace_agent_authorization feature flag is disabled' do
+        context 'when workspaces feature is not available' do
           before do
-            stub_feature_flags(remote_development_namespace_agent_authorization: false)
+            stub_licensed_features(remote_development: false)
           end
 
           it { is_expected.not_to be_present }
@@ -344,33 +334,6 @@
           expect(menu.renderable_items.length).to equal(1)
         end
       end
-
-      describe 'Workspaces menu item' do
-        let(:item_id) { :workspaces_settings }
-
-        before do
-          stub_licensed_features(remote_development: true)
-        end
-
-        it { is_expected.not_to be_present }
-      end
-    end
-
-    context 'for maintainer user' do
-      let(:user) { maintainer }
-
-      subject { menu.renderable_items.find { |e| e.item_id == item_id } }
-
-      describe 'Workspaces menu item' do
-        let(:item_id) { :workspaces_settings }
-
-        before do
-          stub_feature_flags(remote_development_namespace_agent_authorization: true)
-          stub_licensed_features(remote_development: true)
-        end
-
-        it { is_expected.to be_present }
-      end
     end
 
     describe 'Custom Roles' do
diff --git a/ee/spec/requests/api/graphql/mutations/remote_development/workspace_operations/create_spec.rb b/ee/spec/requests/api/graphql/mutations/remote_development/workspace_operations/create_spec.rb
index 8b88f0c4e8705407749bbf93bd1a62a8ce34106b..d1a7750708427fab2cb6f4ab42a8367e571c95eb 100644
--- a/ee/spec/requests/api/graphql/mutations/remote_development/workspace_operations/create_spec.rb
+++ b/ee/spec/requests/api/graphql/mutations/remote_development/workspace_operations/create_spec.rb
@@ -164,40 +164,6 @@ def mutation_response
     end
   end
 
-  context 'when remote_development_namespace_agent_authorization feature flag is disabled' do
-    before do
-      stub_feature_flags(remote_development_namespace_agent_authorization: false)
-    end
-
-    context 'when workspace project and agent project ARE in the same root namespace' do
-      it 'creates the workspace' do
-        expect(RemoteDevelopment::CommonService).to receive(:execute).with(expected_service_args) do
-          stub_service_response
-        end
-
-        post_graphql_mutation(mutation, current_user: user)
-
-        expect_graphql_errors_to_be_empty
-
-        expect(mutation_response.fetch('workspace')['name']).to eq(created_workspace['name'])
-      end
-    end
-
-    context 'when workspace project and agent project are not in the same root namespace' do
-      let_it_be(:agent_project_in_different_root_namespace, reload: true) do
-        create(:project, :public, :in_group, developers: user)
-      end
-
-      before do
-        agent.update!(project: agent_project_in_different_root_namespace)
-      end
-
-      it_behaves_like 'a mutation that returns top-level errors' do
-        let(:match_errors) { include(/Workspace's project and agent's project must.*be under the same.*namespace./) }
-      end
-    end
-  end
-
   context 'when required arguments are missing' do
     let(:mutation_args) { all_mutation_args.except(:desired_state) }
 
diff --git a/ee/spec/requests/api/graphql/remote_development/namespace/remote_development_cluster_agents/shared.rb b/ee/spec/requests/api/graphql/remote_development/namespace/remote_development_cluster_agents/shared.rb
index 6707baf464f5dfaffb1f6a0ec4b9d6ac74e274a1..ce2105928dd2d60bb7d47b1a3511ac958d823bbb 100644
--- a/ee/spec/requests/api/graphql/remote_development/namespace/remote_development_cluster_agents/shared.rb
+++ b/ee/spec/requests/api/graphql/remote_development/namespace/remote_development_cluster_agents/shared.rb
@@ -15,17 +15,3 @@
     end
   end
 end
-
-RSpec.shared_examples 'checks whether the feature flag is enabled' do
-  context 'when the feature flag is disabled' do
-    before do
-      stub_feature_flags(remote_development_namespace_agent_authorization: false)
-    end
-
-    it 'returns an error' do
-      post_graphql(query, current_user: current_user)
-
-      expect_graphql_errors_to_include "'remote_development_namespace_agent_authorization' feature flag is disabled"
-    end
-  end
-end
diff --git a/ee/spec/requests/api/graphql/remote_development/namespace/remote_development_cluster_agents/with_available_filter_arg_spec.rb b/ee/spec/requests/api/graphql/remote_development/namespace/remote_development_cluster_agents/with_available_filter_arg_spec.rb
index 9a3b82e7b94609096eb4b0b856002e1ae35b2a81..5070cc13212628ca7bfc72a433dff3674d5bdd5c 100644
--- a/ee/spec/requests/api/graphql/remote_development/namespace/remote_development_cluster_agents/with_available_filter_arg_spec.rb
+++ b/ee/spec/requests/api/graphql/remote_development/namespace/remote_development_cluster_agents/with_available_filter_arg_spec.rb
@@ -65,7 +65,6 @@
   end
 
   include_examples "checks for remote_development licensed feature"
-  include_examples "checks whether the feature flag is enabled"
 
   context 'when the provided namespace is not a group namespace' do
     let(:namespace) { agent.project.project_namespace }
diff --git a/ee/spec/requests/api/graphql/remote_development/namespace/remote_development_cluster_agents/with_directly_mapped_filter_arg_spec.rb b/ee/spec/requests/api/graphql/remote_development/namespace/remote_development_cluster_agents/with_directly_mapped_filter_arg_spec.rb
index dcee5e58b5503dfcdc1a4bf196fccb56d533f5bb..0d3d602a3732f532133dab610d3eee5ab7c1edcd 100644
--- a/ee/spec/requests/api/graphql/remote_development/namespace/remote_development_cluster_agents/with_directly_mapped_filter_arg_spec.rb
+++ b/ee/spec/requests/api/graphql/remote_development/namespace/remote_development_cluster_agents/with_directly_mapped_filter_arg_spec.rb
@@ -79,7 +79,6 @@
   end
 
   include_examples "checks for remote_development licensed feature"
-  include_examples "checks whether the feature flag is enabled"
 
   context 'when user does not have access to view the mappings' do
     # simulate test conditions by creating the maximum privileged user that does/should
diff --git a/ee/spec/requests/api/graphql/remote_development/namespace/remote_development_cluster_agents/with_unmapped_filter_arg_spec.rb b/ee/spec/requests/api/graphql/remote_development/namespace/remote_development_cluster_agents/with_unmapped_filter_arg_spec.rb
index e3171021b12ac519b4b14065439e707ad645f6d4..6f8e8bd6e190c0cd182f21a532ce859835821768 100644
--- a/ee/spec/requests/api/graphql/remote_development/namespace/remote_development_cluster_agents/with_unmapped_filter_arg_spec.rb
+++ b/ee/spec/requests/api/graphql/remote_development/namespace/remote_development_cluster_agents/with_unmapped_filter_arg_spec.rb
@@ -66,7 +66,6 @@
   end
 
   include_examples "checks for remote_development licensed feature"
-  include_examples "checks whether the feature flag is enabled"
 
   context 'when the passed namespace is not a group' do
     let(:namespace) { mapped_agent.project.project_namespace }
diff --git a/ee/spec/requests/groups/settings/remote_development/workspaces_controller_spec.rb b/ee/spec/requests/groups/settings/remote_development/workspaces_controller_spec.rb
index b68816e3ef0cf7b7f5e47e77236ef9512c40a934..747d1988872d078d30c37f1874ad084e6d96d5c8 100644
--- a/ee/spec/requests/groups/settings/remote_development/workspaces_controller_spec.rb
+++ b/ee/spec/requests/groups/settings/remote_development/workspaces_controller_spec.rb
@@ -14,55 +14,29 @@
 
   subject(:request) { get group_settings_workspaces_path(group) }
 
-  shared_examples 'index responds not found status' do
-    it 'responds with the not found status' do
-      request
-
-      expect(response).to have_gitlab_http_status(:not_found)
-    end
-  end
-
   describe 'GET #index' do
     context 'when user can read remote agent mapping configuration' do
-      context 'with remote_development_namespace_agent_authorization feature flag on' do
+      context 'with remote development feature licensed' do
         before do
-          stub_feature_flags(remote_development_namespace_agent_authorization: true)
+          stub_licensed_features(remote_development: true)
         end
 
-        context 'with remote development feature licensed' do
-          before do
-            stub_licensed_features(remote_development: true)
-          end
-
-          it "responds OK status" do
-            request
+        it "responds OK status" do
+          request
 
-            expect(response).to have_gitlab_http_status(:ok)
-          end
-        end
-
-        context 'with remote development not licensed' do
-          before do
-            stub_licensed_features(remote_development: false)
-          end
-
-          it_behaves_like 'index responds not found status'
+          expect(response).to have_gitlab_http_status(:ok)
         end
       end
 
-      context 'with remote_development_namespace_agent_authorization feature flag off' do
+      context 'with remote development not licensed' do
         before do
-          stub_feature_flags(remote_development_namespace_agent_authorization: false)
+          stub_licensed_features(remote_development: false)
         end
 
-        it_behaves_like 'index responds not found status'
-
-        context 'with remote development feature licensed' do
-          before do
-            stub_licensed_features(remote_development: true)
-          end
+        it 'responds with the not found status' do
+          request
 
-          it_behaves_like 'index responds not found status'
+          expect(response).to have_gitlab_http_status(:not_found)
         end
       end
     end
diff --git a/ee/spec/support/helpers/remote_development/integration_spec_helpers.rb b/ee/spec/support/helpers/remote_development/integration_spec_helpers.rb
index 2a05b7514a2ce3aa5570049fd8001c087fb245c9..36309aa7b5ad7d505eeb9fc9689810a24b30ebeb 100644
--- a/ee/spec/support/helpers/remote_development/integration_spec_helpers.rb
+++ b/ee/spec/support/helpers/remote_development/integration_spec_helpers.rb
@@ -2,6 +2,25 @@
 
 module RemoteDevelopment
   module IntegrationSpecHelpers
+    def enable_agent_for_group(agent_name:, group_name:)
+      workspaces_group_settings_path = "/groups/#{group_name}/-/settings/workspaces"
+      gitlab_badge_selector = '.gl-badge-content'
+      visit workspaces_group_settings_path
+      wait_for_requests
+
+      # enable agent for group
+      click_link 'All agents'
+      expect(page).to have_content agent_name
+      first_agent_row_selector = 'tbody tr:first-child'
+      expect(page).not_to have_selector(gitlab_badge_selector, text: 'Allowed')
+      within first_agent_row_selector do
+        click_button 'Allow'
+        wait_for_requests
+      end
+      click_button 'Allow agent'
+      expect(page).to have_selector(gitlab_badge_selector, text: 'Allowed')
+    end
+
     def build_additional_args_for_expected_config_to_apply(
       network_policy_enabled:,
       dns_zone:,