diff --git a/api/src/backend/api/specs/v1.yaml b/api/src/backend/api/specs/v1.yaml
index cd5e9d4af1..3f0005726b 100644
--- a/api/src/backend/api/specs/v1.yaml
+++ b/api/src/backend/api/specs/v1.yaml
@@ -12010,20 +12010,22 @@ components:
                         type: string
                         description: The Azure application (client) ID for authentication
                           in Azure AD.
-                      client_secret:
-                        type: string
-                        description: The client secret associated with the application
-                          (client) ID, providing secure access.
                       tenant_id:
                         type: string
                         description: The Azure tenant ID, representing the directory
                           where the application is registered.
+                      client_secret:
+                        type: string
+                        description: The client secret associated with the application
+                          (client) ID, providing secure access.
                       user:
                         type: email
-                        description: 'Deprecated: User microsoft email address.'
+                        description: User microsoft email address.
+                        deprecated: true
                       password:
                         type: string
-                        description: 'Deprecated: User password.'
+                        description: User password.
+                        deprecated: true
                     required:
                     - client_id
                     - client_secret
@@ -12045,18 +12047,10 @@ components:
                         type: string
                         description: The certificate content in base64 format for
                           certificate-based authentication.
-                      user:
-                        type: email
-                        description: User microsoft email address.
-                      password:
-                        type: string
-                        description: User password.
                     required:
                     - client_id
                     - tenant_id
                     - certificate_content
-                    - user
-                    - password
                   - type: object
                     title: GCP Static Credentials
                     properties:
@@ -13903,20 +13897,22 @@ components:
                     type: string
                     description: The Azure application (client) ID for authentication
                       in Azure AD.
-                  client_secret:
-                    type: string
-                    description: The client secret associated with the application
-                      (client) ID, providing secure access.
                   tenant_id:
                     type: string
                     description: The Azure tenant ID, representing the directory where
                       the application is registered.
+                  client_secret:
+                    type: string
+                    description: The client secret associated with the application
+                      (client) ID, providing secure access.
                   user:
                     type: email
-                    description: 'Deprecated: User microsoft email address.'
+                    description: User microsoft email address.
+                    deprecated: true
                   password:
                     type: string
-                    description: 'Deprecated: User password.'
+                    description: User password.
+                    deprecated: true
                 required:
                 - client_id
                 - client_secret
@@ -13938,18 +13934,10 @@ components:
                     type: string
                     description: The certificate content in base64 format for certificate-based
                       authentication.
-                  user:
-                    type: email
-                    description: User microsoft email address.
-                  password:
-                    type: string
-                    description: User password.
                 required:
                 - client_id
                 - tenant_id
                 - certificate_content
-                - user
-                - password
               - type: object
                 title: GCP Static Credentials
                 properties:
@@ -14178,20 +14166,22 @@ components:
                         type: string
                         description: The Azure application (client) ID for authentication
                           in Azure AD.
-                      client_secret:
-                        type: string
-                        description: The client secret associated with the application
-                          (client) ID, providing secure access.
                       tenant_id:
                         type: string
                         description: The Azure tenant ID, representing the directory
                           where the application is registered.
+                      client_secret:
+                        type: string
+                        description: The client secret associated with the application
+                          (client) ID, providing secure access.
                       user:
                         type: email
-                        description: 'Deprecated: User microsoft email address.'
+                        description: User microsoft email address.
+                        deprecated: true
                       password:
                         type: string
-                        description: 'Deprecated: User password.'
+                        description: User password.
+                        deprecated: true
                     required:
                     - client_id
                     - client_secret
@@ -14213,18 +14203,10 @@ components:
                         type: string
                         description: The certificate content in base64 format for
                           certificate-based authentication.
-                      user:
-                        type: email
-                        description: User microsoft email address.
-                      password:
-                        type: string
-                        description: User password.
                     required:
                     - client_id
                     - tenant_id
                     - certificate_content
-                    - user
-                    - password
                   - type: object
                     title: GCP Static Credentials
                     properties:
@@ -14469,20 +14451,22 @@ components:
                     type: string
                     description: The Azure application (client) ID for authentication
                       in Azure AD.
-                  client_secret:
-                    type: string
-                    description: The client secret associated with the application
-                      (client) ID, providing secure access.
                   tenant_id:
                     type: string
                     description: The Azure tenant ID, representing the directory where
                       the application is registered.
+                  client_secret:
+                    type: string
+                    description: The client secret associated with the application
+                      (client) ID, providing secure access.
                   user:
                     type: email
-                    description: 'Deprecated: User microsoft email address.'
+                    description: User microsoft email address.
+                    deprecated: true
                   password:
                     type: string
-                    description: 'Deprecated: User password.'
+                    description: User password.
+                    deprecated: true
                 required:
                 - client_id
                 - client_secret
@@ -14504,18 +14488,10 @@ components:
                     type: string
                     description: The certificate content in base64 format for certificate-based
                       authentication.
-                  user:
-                    type: email
-                    description: User microsoft email address.
-                  password:
-                    type: string
-                    description: User password.
                 required:
                 - client_id
                 - tenant_id
                 - certificate_content
-                - user
-                - password
               - type: object
                 title: GCP Static Credentials
                 properties:
diff --git a/api/src/backend/api/v1/serializer_utils/providers.py b/api/src/backend/api/v1/serializer_utils/providers.py
index 522df89ee6..6dfaca794c 100644
--- a/api/src/backend/api/v1/serializer_utils/providers.py
+++ b/api/src/backend/api/v1/serializer_utils/providers.py
@@ -105,23 +105,25 @@ from rest_framework_json_api import serializers
                         "type": "string",
                         "description": "The Azure application (client) ID for authentication in Azure AD.",
                     },
-                    "client_secret": {
-                        "type": "string",
-                        "description": "The client secret associated with the application (client) ID, providing "
-                        "secure access.",
-                    },
                     "tenant_id": {
                         "type": "string",
                         "description": "The Azure tenant ID, representing the directory where the application is "
                         "registered.",
                     },
+                    "client_secret": {
+                        "type": "string",
+                        "description": "The client secret associated with the application (client) ID, providing "
+                        "secure access.",
+                    },
                     "user": {
                         "type": "email",
-                        "description": "Deprecated: User microsoft email address.",
+                        "description": "User microsoft email address.",
+                        "deprecated": True,
                     },
                     "password": {
                         "type": "string",
-                        "description": "Deprecated: User password.",
+                        "description": "User password.",
+                        "deprecated": True,
                     },
                 },
                 "required": [
@@ -149,21 +151,11 @@ from rest_framework_json_api import serializers
                         "type": "string",
                         "description": "The certificate content in base64 format for certificate-based authentication.",
                     },
-                    "user": {
-                        "type": "email",
-                        "description": "User microsoft email address.",
-                    },
-                    "password": {
-                        "type": "string",
-                        "description": "User password.",
-                    },
                 },
                 "required": [
                     "client_id",
                     "tenant_id",
                     "certificate_content",
-                    "user",
-                    "password",
                 ],
             },
             {