diff --git a/api/gen/proto/go/teleport/autoupdate/v1/autoupdate.pb.go b/api/gen/proto/go/teleport/autoupdate/v1/autoupdate.pb.go
index 2d6d897ce03b1..63c77d21f97d3 100644
--- a/api/gen/proto/go/teleport/autoupdate/v1/autoupdate.pb.go
+++ b/api/gen/proto/go/teleport/autoupdate/v1/autoupdate.pb.go
@@ -483,7 +483,7 @@ type AgentAutoUpdateGroup struct {
 	StartHour int32 `protobuf:"varint,3,opt,name=start_hour,json=startHour,proto3" json:"start_hour,omitempty"`
 	// wait_hours after last group succeeds before this group can run. This can only be used when the strategy is "halt-on-failure".
 	// This field must be positive.
-	WaitHours int64 `protobuf:"varint,5,opt,name=wait_hours,json=waitHours,proto3" json:"wait_hours,omitempty"`
+	WaitHours int32 `protobuf:"varint,5,opt,name=wait_hours,json=waitHours,proto3" json:"wait_hours,omitempty"`
 }
 
 func (x *AgentAutoUpdateGroup) Reset() {
@@ -537,7 +537,7 @@ func (x *AgentAutoUpdateGroup) GetStartHour() int32 {
 	return 0
 }
 
-func (x *AgentAutoUpdateGroup) GetWaitHours() int64 {
+func (x *AgentAutoUpdateGroup) GetWaitHours() int32 {
 	if x != nil {
 		return x.WaitHours
 	}
@@ -1088,7 +1088,7 @@ type AutoUpdateAgentRolloutStatusGroup struct {
 	ConfigStartHour int32 `protobuf:"varint,7,opt,name=config_start_hour,json=configStartHour,proto3" json:"config_start_hour,omitempty"`
 	// config_wait_hours after last group succeeds before this group can run. This can only be used when the strategy is "halt-on-failure".
 	// This field must be positive.
-	ConfigWaitHours int64 `protobuf:"varint,9,opt,name=config_wait_hours,json=configWaitHours,proto3" json:"config_wait_hours,omitempty"`
+	ConfigWaitHours int32 `protobuf:"varint,9,opt,name=config_wait_hours,json=configWaitHours,proto3" json:"config_wait_hours,omitempty"`
 }
 
 func (x *AutoUpdateAgentRolloutStatusGroup) Reset() {
@@ -1170,7 +1170,7 @@ func (x *AutoUpdateAgentRolloutStatusGroup) GetConfigStartHour() int32 {
 	return 0
 }
 
-func (x *AutoUpdateAgentRolloutStatusGroup) GetConfigWaitHours() int64 {
+func (x *AutoUpdateAgentRolloutStatusGroup) GetConfigWaitHours() int32 {
 	if x != nil {
 		return x.ConfigWaitHours
 	}
@@ -1249,7 +1249,7 @@ var file_teleport_autoupdate_v1_autoupdate_proto_rawDesc = []byte{
 	0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x64, 0x61, 0x79, 0x73, 0x12, 0x1d, 0x0a, 0x0a,
 	0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x68, 0x6f, 0x75, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
 	0x52, 0x09, 0x73, 0x74, 0x61, 0x72, 0x74, 0x48, 0x6f, 0x75, 0x72, 0x12, 0x1d, 0x0a, 0x0a, 0x77,
-	0x61, 0x69, 0x74, 0x5f, 0x68, 0x6f, 0x75, 0x72, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52,
+	0x61, 0x69, 0x74, 0x5f, 0x68, 0x6f, 0x75, 0x72, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52,
 	0x09, 0x77, 0x61, 0x69, 0x74, 0x48, 0x6f, 0x75, 0x72, 0x73, 0x4a, 0x04, 0x08, 0x04, 0x10, 0x05,
 	0x52, 0x09, 0x77, 0x61, 0x69, 0x74, 0x5f, 0x64, 0x61, 0x79, 0x73, 0x22, 0xd9, 0x01, 0x0a, 0x11,
 	0x41, 0x75, 0x74, 0x6f, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f,
@@ -1370,7 +1370,7 @@ var file_teleport_autoupdate_v1_autoupdate_proto_rawDesc = []byte{
 	0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x68, 0x6f, 0x75, 0x72, 0x18, 0x07, 0x20, 0x01, 0x28,
 	0x05, 0x52, 0x0f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x74, 0x61, 0x72, 0x74, 0x48, 0x6f,
 	0x75, 0x72, 0x12, 0x2a, 0x0a, 0x11, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x77, 0x61, 0x69,
-	0x74, 0x5f, 0x68, 0x6f, 0x75, 0x72, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x63,
+	0x74, 0x5f, 0x68, 0x6f, 0x75, 0x72, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0f, 0x63,
 	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x57, 0x61, 0x69, 0x74, 0x48, 0x6f, 0x75, 0x72, 0x73, 0x4a, 0x04,
 	0x08, 0x08, 0x10, 0x09, 0x52, 0x10, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x77, 0x61, 0x69,
 	0x74, 0x5f, 0x64, 0x61, 0x79, 0x73, 0x2a, 0xf7, 0x01, 0x0a, 0x19, 0x41, 0x75, 0x74, 0x6f, 0x55,
diff --git a/api/proto/teleport/autoupdate/v1/autoupdate.proto b/api/proto/teleport/autoupdate/v1/autoupdate.proto
index c0655308b5677..0257ec3e023b7 100644
--- a/api/proto/teleport/autoupdate/v1/autoupdate.proto
+++ b/api/proto/teleport/autoupdate/v1/autoupdate.proto
@@ -82,7 +82,7 @@ message AgentAutoUpdateGroup {
   int32 start_hour = 3;
   // wait_hours after last group succeeds before this group can run. This can only be used when the strategy is "halt-on-failure".
   // This field must be positive.
-  int64 wait_hours = 5;
+  int32 wait_hours = 5;
 }
 
 // AutoUpdateVersion is a resource singleton with version required for
@@ -204,7 +204,7 @@ message AutoUpdateAgentRolloutStatusGroup {
   int32 config_start_hour = 7;
   // config_wait_hours after last group succeeds before this group can run. This can only be used when the strategy is "halt-on-failure".
   // This field must be positive.
-  int64 config_wait_hours = 9;
+  int32 config_wait_hours = 9;
 }
 
 // AutoUpdateAgentGroupState represents the agent group state. This state controls whether the agents from this group