diff --git a/doc/api/graphql/reference/_index.md b/doc/api/graphql/reference/_index.md
index e1041061937f0f993b07fc2e56f36f8048360300..27e723b6a8dadd61b46e22796335338d16bcd249 100644
--- a/doc/api/graphql/reference/_index.md
+++ b/doc/api/graphql/reference/_index.md
@@ -41776,7 +41776,6 @@ Represents a workspaces agent config.
 | <a id="workspacesagentconfigannotations"></a>`annotations` | [`[KubernetesAnnotation!]!`](#kubernetesannotation) | Annotations to apply to Kubernetes objects. |
 | <a id="workspacesagentconfigclusteragent"></a>`clusterAgent` | [`ClusterAgent!`](#clusteragent) | Cluster agent that the workspaces agent config belongs to. |
 | <a id="workspacesagentconfigcreatedat"></a>`createdAt` | [`Time!`](#time) | Timestamp of when the workspaces agent config was created. |
-| <a id="workspacesagentconfigdefaultmaxhoursbeforetermination"></a>`defaultMaxHoursBeforeTermination` {{< icon name="warning-solid" >}} | [`Int!`](#int) | **Deprecated** in GitLab 17.9. Field is not used. |
 | <a id="workspacesagentconfigdefaultresourcesperworkspacecontainer"></a>`defaultResourcesPerWorkspaceContainer` {{< icon name="warning-solid" >}} | [`WorkspaceResources!`](#workspaceresources) | **Introduced** in GitLab 17.9. **Status**: Experiment. Default cpu and memory resources of the workspace container. |
 | <a id="workspacesagentconfigdefaultruntimeclass"></a>`defaultRuntimeClass` | [`String!`](#string) | Default Kubernetes RuntimeClass. |
 | <a id="workspacesagentconfigdnszone"></a>`dnsZone` | [`String!`](#string) | DNS zone where workspaces are available. |
@@ -41785,7 +41784,6 @@ Represents a workspaces agent config.
 | <a id="workspacesagentconfigid"></a>`id` | [`RemoteDevelopmentWorkspacesAgentConfigID!`](#remotedevelopmentworkspacesagentconfigid) | Global ID of the workspaces agent config. |
 | <a id="workspacesagentconfigimagepullsecrets"></a>`imagePullSecrets` {{< icon name="warning-solid" >}} | [`[ImagePullSecrets!]!`](#imagepullsecrets) | **Introduced** in GitLab 17.9. **Status**: Experiment. Kubernetes secrets to pull private images for a workspace. |
 | <a id="workspacesagentconfiglabels"></a>`labels` | [`[KubernetesLabel!]!`](#kuberneteslabel) | Labels to apply to Kubernetes objects. |
-| <a id="workspacesagentconfigmaxhoursbeforeterminationlimit"></a>`maxHoursBeforeTerminationLimit` {{< icon name="warning-solid" >}} | [`Int!`](#int) | **Deprecated** in GitLab 17.9. Field is not used. |
 | <a id="workspacesagentconfigmaxresourcesperworkspace"></a>`maxResourcesPerWorkspace` {{< icon name="warning-solid" >}} | [`WorkspaceResources!`](#workspaceresources) | **Introduced** in GitLab 17.9. **Status**: Experiment. Maximum cpu and memory resources of the workspace. |
 | <a id="workspacesagentconfignetworkpolicyegress"></a>`networkPolicyEgress` {{< icon name="warning-solid" >}} | [`[NetworkPolicyEgress!]!`](#networkpolicyegress) | **Introduced** in GitLab 17.9. **Status**: Experiment. IP CIDR range specifications for egress destinations from a workspace. |
 | <a id="workspacesagentconfignetworkpolicyenabled"></a>`networkPolicyEnabled` | [`Boolean!`](#boolean) | Whether the network policy of the workspaces agent config is enabled. |
diff --git a/ee/app/graphql/types/remote_development/workspaces_agent_config_type.rb b/ee/app/graphql/types/remote_development/workspaces_agent_config_type.rb
index c78c9f4fe239c53772222ec11f33247084c63b69..f04642c302129ffc660a5ea598a0416561570518 100644
--- a/ee/app/graphql/types/remote_development/workspaces_agent_config_type.rb
+++ b/ee/app/graphql/types/remote_development/workspaces_agent_config_type.rb
@@ -35,14 +35,6 @@ class WorkspacesAgentConfigType < ::Types::BaseObject
       field :workspaces_per_user_quota, GraphQL::Types::Int, # rubocop:disable GraphQL/ExtractType -- We don't want to extract this to a type, it's just an integer field
         null: false, description: 'Maximum number of workspaces per user.'
 
-      field :default_max_hours_before_termination, GraphQL::Types::Int, null: false,
-        description: 'Default max hours before workspace termination of the workspaces agent config.',
-        deprecated: { reason: 'Field is not used', milestone: '17.9' }
-
-      field :max_hours_before_termination_limit, GraphQL::Types::Int, null: false,
-        description: 'Max hours before workspace termination limit of the workspaces agent config.',
-        deprecated: { reason: 'Field is not used', milestone: '17.9' }
-
       field :allow_privilege_escalation, GraphQL::Types::Boolean,
         null: false, description: 'Allow privilege escalation.'
 
@@ -79,16 +71,6 @@ class WorkspacesAgentConfigType < ::Types::BaseObject
 
       field :updated_at, Types::TimeType, null: false,
         description: 'Timestamp of the last update to any mutable workspaces agent config property.'
-
-      # @return [Integer]
-      def max_hours_before_termination_limit
-        120
-      end
-
-      # @return [Integer]
-      def default_max_hours_before_termination
-        24
-      end
     end
   end
 end
diff --git a/ee/lib/remote_development/README.md b/ee/lib/remote_development/README.md
index fc295f945a91358c78604f9086337be33003c160..1529522c91873eeedb8a40984d067383bb7e4c15 100644
--- a/ee/lib/remote_development/README.md
+++ b/ee/lib/remote_development/README.md
@@ -1216,8 +1216,8 @@ allow them to be specified as a new field in the defaults declaration:
         # third/last field is "sources to read from and their order"
         {
           default_branch_name: [UNDEFINED, String, [:env, :current_settings]], # reads ENV var first, which can be overridden by CurrentSettings
-          default_max_hours_before_termination: [24, Integer, [:current_settings, :env]], # reads CurrentSettings first, which can be overridden by ENV var
-          max_hours_before_termination_limit: [120, Integer] # Uses default precedence
+          max_stopped_hours_before_termination: [744, Integer, [:current_settings, :env]], # reads CurrentSettings first, which can be overridden by ENV var
+          max_active_hours_before_stop: [36, Integer] # Uses default precedence
         }
       end
 ```
diff --git a/ee/spec/graphql/types/remote_development/workspaces_agent_config_type_spec.rb b/ee/spec/graphql/types/remote_development/workspaces_agent_config_type_spec.rb
index 347426a77cffdbb68477628408be554b3c6a1586..10020ede3c816c13c8f0f3f021b332286756192b 100644
--- a/ee/spec/graphql/types/remote_development/workspaces_agent_config_type_spec.rb
+++ b/ee/spec/graphql/types/remote_development/workspaces_agent_config_type_spec.rb
@@ -7,10 +7,9 @@
   let(:fields) do
     %i[
       id cluster_agent project_id enabled dns_zone network_policy_enabled gitlab_workspaces_proxy_namespace
-      workspaces_quota workspaces_per_user_quota default_max_hours_before_termination max_hours_before_termination_limit
-      allow_privilege_escalation use_kubernetes_user_namespaces default_runtime_class annotations labels
-      default_resources_per_workspace_container max_resources_per_workspace network_policy_egress
-      image_pull_secrets created_at updated_at
+      workspaces_quota workspaces_per_user_quota allow_privilege_escalation use_kubernetes_user_namespaces
+      default_runtime_class annotations labels default_resources_per_workspace_container
+      max_resources_per_workspace network_policy_egress image_pull_secrets created_at updated_at
     ]
   end
 
@@ -30,7 +29,7 @@
             remoteDevelopmentClusterAgents(filter: AVAILABLE) {
               nodes {
                 workspacesAgentConfig {
-                  defaultMaxHoursBeforeTermination
+                  workspacesPerUserQuota
                 }
               }
             }