diff --git a/api/overlay.yaml b/api/overlay.yaml
index 7843f3d86b..b59831268b 100644
--- a/api/overlay.yaml
+++ b/api/overlay.yaml
@@ -41,6 +41,9 @@ actions:
 - target: $.components.schemas.DiskRequestBody.properties.attributes.discriminator
   description: Replaces discriminated union with concrete type
   remove: true
+- target: $.components.schemas.JitStateResponse.discriminator
+  description: Replaces discriminated union with concrete type
+  remove: true
 - target: $.paths.*.*.parameters[?(@.name=='branch_id_or_ref')]
   update:
     schema:
diff --git a/pkg/api/client.gen.go b/pkg/api/client.gen.go
index 5d7941a128..ed33fb4585 100644
--- a/pkg/api/client.gen.go
+++ b/pkg/api/client.gen.go
@@ -14260,7 +14260,7 @@ func (r V1GetServicesHealthResponse) StatusCode() int {
 type V1GetJitAccessConfigResponse struct {
 	Body         []byte
 	HTTPResponse *http.Response
-	JSON200      *JitAccessResponse
+	JSON200      *JitStateResponse
 }
 
 // Status returns HTTPResponse.Status
@@ -14282,7 +14282,7 @@ func (r V1GetJitAccessConfigResponse) StatusCode() int {
 type V1UpdateJitAccessConfigResponse struct {
 	Body         []byte
 	HTTPResponse *http.Response
-	JSON200      *JitAccessResponse
+	JSON200      *JitStateResponse
 }
 
 // Status returns HTTPResponse.Status
@@ -19925,7 +19925,7 @@ func ParseV1GetJitAccessConfigResponse(rsp *http.Response) (*V1GetJitAccessConfi
 
 	switch {
 	case strings.Contains(rsp.Header.Get("Content-Type"), "json") && rsp.StatusCode == 200:
-		var dest JitAccessResponse
+		var dest JitStateResponse
 		if err := json.Unmarshal(bodyBytes, &dest); err != nil {
 			return nil, err
 		}
@@ -19951,7 +19951,7 @@ func ParseV1UpdateJitAccessConfigResponse(rsp *http.Response) (*V1UpdateJitAcces
 
 	switch {
 	case strings.Contains(rsp.Header.Get("Content-Type"), "json") && rsp.StatusCode == 200:
-		var dest JitAccessResponse
+		var dest JitStateResponse
 		if err := json.Unmarshal(bodyBytes, &dest); err != nil {
 			return nil, err
 		}
diff --git a/pkg/api/types.gen.go b/pkg/api/types.gen.go
index 637dcad9b5..89211a3a2e 100644
--- a/pkg/api/types.gen.go
+++ b/pkg/api/types.gen.go
@@ -492,8 +492,26 @@ const (
 
 // Defines values for JitAccessRequestRequestState.
 const (
-	Disabled JitAccessRequestRequestState = "disabled"
-	Enabled  JitAccessRequestRequestState = "enabled"
+	JitAccessRequestRequestStateDisabled JitAccessRequestRequestState = "disabled"
+	JitAccessRequestRequestStateEnabled  JitAccessRequestRequestState = "enabled"
+)
+
+// Defines values for JitStateResponse0State.
+const (
+	JitStateResponse0StateDisabled JitStateResponse0State = "disabled"
+	JitStateResponse0StateEnabled  JitStateResponse0State = "enabled"
+)
+
+// Defines values for JitStateResponse1State.
+const (
+	Unavailable JitStateResponse1State = "unavailable"
+)
+
+// Defines values for JitStateResponse1UnavailableReason.
+const (
+	ManualMigrationRequired JitStateResponse1UnavailableReason = "manual_migration_required"
+	PostgresUpgradeRequired JitStateResponse1UnavailableReason = "postgres_upgrade_required"
+	TemporarilyUnavailable  JitStateResponse1UnavailableReason = "temporarily_unavailable"
 )
 
 // Defines values for ListActionRunResponseRunStepsName.
@@ -2856,6 +2874,32 @@ type JitListAccessResponse struct {
 	} `json:"items"`
 }
 
+// JitStateResponse defines model for JitStateResponse.
+type JitStateResponse struct {
+	union json.RawMessage
+}
+
+// JitStateResponse0 defines model for .
+type JitStateResponse0 struct {
+	AppliedSuccessfully *bool                  `json:"appliedSuccessfully,omitempty"`
+	State               JitStateResponse0State `json:"state"`
+}
+
+// JitStateResponse0State defines model for JitStateResponse.0.State.
+type JitStateResponse0State string
+
+// JitStateResponse1 defines model for .
+type JitStateResponse1 struct {
+	State             JitStateResponse1State             `json:"state"`
+	UnavailableReason JitStateResponse1UnavailableReason `json:"unavailableReason"`
+}
+
+// JitStateResponse1State defines model for JitStateResponse.1.State.
+type JitStateResponse1State string
+
+// JitStateResponse1UnavailableReason defines model for JitStateResponse.1.UnavailableReason.
+type JitStateResponse1UnavailableReason string
+
 // LegacyApiKeysResponse defines model for LegacyApiKeysResponse.
 type LegacyApiKeysResponse struct {
 	Enabled bool `json:"enabled"`
@@ -5938,6 +5982,68 @@ func (t *DiskResponse_Attributes) UnmarshalJSON(b []byte) error {
 	return err
 }
 
+// AsJitStateResponse0 returns the union data inside the JitStateResponse as a JitStateResponse0
+func (t JitStateResponse) AsJitStateResponse0() (JitStateResponse0, error) {
+	var body JitStateResponse0
+	err := json.Unmarshal(t.union, &body)
+	return body, err
+}
+
+// FromJitStateResponse0 overwrites any union data inside the JitStateResponse as the provided JitStateResponse0
+func (t *JitStateResponse) FromJitStateResponse0(v JitStateResponse0) error {
+	b, err := json.Marshal(v)
+	t.union = b
+	return err
+}
+
+// MergeJitStateResponse0 performs a merge with any union data inside the JitStateResponse, using the provided JitStateResponse0
+func (t *JitStateResponse) MergeJitStateResponse0(v JitStateResponse0) error {
+	b, err := json.Marshal(v)
+	if err != nil {
+		return err
+	}
+
+	merged, err := runtime.JSONMerge(t.union, b)
+	t.union = merged
+	return err
+}
+
+// AsJitStateResponse1 returns the union data inside the JitStateResponse as a JitStateResponse1
+func (t JitStateResponse) AsJitStateResponse1() (JitStateResponse1, error) {
+	var body JitStateResponse1
+	err := json.Unmarshal(t.union, &body)
+	return body, err
+}
+
+// FromJitStateResponse1 overwrites any union data inside the JitStateResponse as the provided JitStateResponse1
+func (t *JitStateResponse) FromJitStateResponse1(v JitStateResponse1) error {
+	b, err := json.Marshal(v)
+	t.union = b
+	return err
+}
+
+// MergeJitStateResponse1 performs a merge with any union data inside the JitStateResponse, using the provided JitStateResponse1
+func (t *JitStateResponse) MergeJitStateResponse1(v JitStateResponse1) error {
+	b, err := json.Marshal(v)
+	if err != nil {
+		return err
+	}
+
+	merged, err := runtime.JSONMerge(t.union, b)
+	t.union = merged
+	return err
+}
+
+func (t JitStateResponse) MarshalJSON() ([]byte, error) {
+	b, err := t.union.MarshalJSON()
+	return b, err
+}
+
+func (t *JitStateResponse) UnmarshalJSON(b []byte) error {
+	err := t.union.UnmarshalJSON(b)
+	return err
+}
+
 // AsListProjectAddonsResponseAvailableAddonsVariantsId0 returns the union data inside the ListProjectAddonsResponse_AvailableAddons_Variants_Id as a ListProjectAddonsResponseAvailableAddonsVariantsId0
 func (t ListProjectAddonsResponse_AvailableAddons_Variants_Id) AsListProjectAddonsResponseAvailableAddonsVariantsId0() (ListProjectAddonsResponseAvailableAddonsVariantsId0, error) {
 	var body ListProjectAddonsResponseAvailableAddonsVariantsId0