diff --git a/openapi-specs/scm/config/cloudngfw/identity/identity-services-march.yaml b/openapi-specs/scm/config/cloudngfw/identity/identity-services.yaml
similarity index 99%
rename from openapi-specs/scm/config/cloudngfw/identity/identity-services-march.yaml
rename to openapi-specs/scm/config/cloudngfw/identity/identity-services.yaml
index 86fde0382..dc867abc5 100644
--- a/openapi-specs/scm/config/cloudngfw/identity/identity-services-march.yaml
+++ b/openapi-specs/scm/config/cloudngfw/identity/identity-services.yaml
@@ -3435,8 +3435,6 @@ components:
         - rulebase
     authentication-portals:
       type: object
-      required:
-        - redirect_host
       properties:
         id:
           type: string
diff --git a/openapi-specs/scm/config/cloudngfw/security/security-services.yaml b/openapi-specs/scm/config/cloudngfw/security/security-services.yaml
index 84d639c3e..acb29d7d4 100644
--- a/openapi-specs/scm/config/cloudngfw/security/security-services.yaml
+++ b/openapi-specs/scm/config/cloudngfw/security/security-services.yaml
@@ -5828,7 +5828,12 @@ components:
       type: object
       required:
         - name
-        - type
+        - source
+        - from
+        - to
+        - destinattion
+        - service
+        - protection
       properties:
         id:
           type: string
@@ -5951,7 +5956,6 @@ components:
                 classified:
                   type: object
                   required:
-                    - classification-criteria
                     - profile
                   properties:
                     classification-criteria:
diff --git a/openapi-specs/scm/config/ngfw/identity/identity-services-march.yaml b/openapi-specs/scm/config/ngfw/identity/identity-services.yaml
similarity index 99%
rename from openapi-specs/scm/config/ngfw/identity/identity-services-march.yaml
rename to openapi-specs/scm/config/ngfw/identity/identity-services.yaml
index 86fde0382..dc867abc5 100644
--- a/openapi-specs/scm/config/ngfw/identity/identity-services-march.yaml
+++ b/openapi-specs/scm/config/ngfw/identity/identity-services.yaml
@@ -3435,8 +3435,6 @@ components:
         - rulebase
     authentication-portals:
       type: object
-      required:
-        - redirect_host
       properties:
         id:
           type: string
diff --git a/openapi-specs/scm/config/sase/security/security-services-R2-2026.yaml b/openapi-specs/scm/config/ngfw/security/security-services.yaml
similarity index 99%
rename from openapi-specs/scm/config/sase/security/security-services-R2-2026.yaml
rename to openapi-specs/scm/config/ngfw/security/security-services.yaml
index 84d639c3e..acb29d7d4 100644
--- a/openapi-specs/scm/config/sase/security/security-services-R2-2026.yaml
+++ b/openapi-specs/scm/config/ngfw/security/security-services.yaml
@@ -5828,7 +5828,12 @@ components:
       type: object
       required:
         - name
-        - type
+        - source
+        - from
+        - to
+        - destinattion
+        - service
+        - protection
       properties:
         id:
           type: string
@@ -5951,7 +5956,6 @@ components:
                 classified:
                   type: object
                   required:
-                    - classification-criteria
                     - profile
                   properties:
                     classification-criteria:
diff --git a/openapi-specs/scm/config/sase/identity/identity-services-march.yaml b/openapi-specs/scm/config/sase/identity/identity-services.yaml
similarity index 99%
rename from openapi-specs/scm/config/sase/identity/identity-services-march.yaml
rename to openapi-specs/scm/config/sase/identity/identity-services.yaml
index 86fde0382..dc867abc5 100644
--- a/openapi-specs/scm/config/sase/identity/identity-services-march.yaml
+++ b/openapi-specs/scm/config/sase/identity/identity-services.yaml
@@ -3435,8 +3435,6 @@ components:
         - rulebase
     authentication-portals:
       type: object
-      required:
-        - redirect_host
       properties:
         id:
           type: string
diff --git a/openapi-specs/scm/config/ngfw/security/security-services-R2-2026.yaml b/openapi-specs/scm/config/sase/security/security-services.yaml
similarity index 99%
rename from openapi-specs/scm/config/ngfw/security/security-services-R2-2026.yaml
rename to openapi-specs/scm/config/sase/security/security-services.yaml
index 84d639c3e..acb29d7d4 100644
--- a/openapi-specs/scm/config/ngfw/security/security-services-R2-2026.yaml
+++ b/openapi-specs/scm/config/sase/security/security-services.yaml
@@ -5828,7 +5828,12 @@ components:
       type: object
       required:
         - name
-        - type
+        - source
+        - from
+        - to
+        - destinattion
+        - service
+        - protection
       properties:
         id:
           type: string
@@ -5951,7 +5956,6 @@ components:
                 classified:
                   type: object
                   required:
-                    - classification-criteria
                     - profile
                   properties:
                     classification-criteria: