diff --git a/db/migrate/20240702133021_add_workspace_termination_timeouts_to_remote_development_agent_configs.rb b/db/migrate/20240702133021_add_workspace_termination_timeouts_to_remote_development_agent_configs.rb
new file mode 100644
index 0000000000000000000000000000000000000000..7fd0ae5a10e7370200cee55cd97a72af6b97a023
--- /dev/null
+++ b/db/migrate/20240702133021_add_workspace_termination_timeouts_to_remote_development_agent_configs.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+class AddWorkspaceTerminationTimeoutsToRemoteDevelopmentAgentConfigs < Gitlab::Database::Migration[2.2]
+  milestone '17.2'
+
+  def change
+    add_column :remote_development_agent_configs, :default_max_hours_before_termination, :smallint, default: 24,
+      null: false
+    add_column :remote_development_agent_configs, :max_hours_before_termination_limit, :smallint, default: 120,
+      null: false
+  end
+end
diff --git a/db/schema_migrations/20240702133021 b/db/schema_migrations/20240702133021
new file mode 100644
index 0000000000000000000000000000000000000000..4e650c7e81f1eb437398ed5534629d5e3c335015
--- /dev/null
+++ b/db/schema_migrations/20240702133021
@@ -0,0 +1 @@
+42a5682dec709c27537549bf4ea2de908df9f283143b795dfc67610438df2ece
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index b6ac1d911d2e6032f50017b1dca453dd9ae6cbf5..51e5a6a8e4bc70d999f17c8a7c092a31ccfbea87 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -16561,6 +16561,8 @@ CREATE TABLE remote_development_agent_configs (
     workspaces_quota bigint DEFAULT '-1'::integer NOT NULL,
     workspaces_per_user_quota bigint DEFAULT '-1'::integer NOT NULL,
     project_id bigint,
+    default_max_hours_before_termination smallint DEFAULT 24 NOT NULL,
+    max_hours_before_termination_limit smallint DEFAULT 120 NOT NULL,
     CONSTRAINT check_72947a4495 CHECK ((char_length(gitlab_workspaces_proxy_namespace) <= 63)),
     CONSTRAINT check_9f5cd54d1c CHECK ((char_length(dns_zone) <= 256))
 );