diff --git a/docs/_static/llama-stack-spec.html b/docs/_static/llama-stack-spec.html
index 3c222412c..3b9afed6d 100644
--- a/docs/_static/llama-stack-spec.html
+++ b/docs/_static/llama-stack-spec.html
@@ -6797,6 +6797,10 @@
                     },
                     "token": {
                         "type": "string"
+                    },
+                    "expires_at": {
+                        "type": "string",
+                        "format": "date-time"
                     }
                 },
                 "additionalProperties": false,
@@ -6804,7 +6808,8 @@
                     "credential_id",
                     "provider_id",
                     "token_type",
-                    "token"
+                    "token",
+                    "expires_at"
                 ],
                 "title": "ProviderCredential"
             },
diff --git a/docs/_static/llama-stack-spec.yaml b/docs/_static/llama-stack-spec.yaml
index 2d49e032a..0ae699c15 100644
--- a/docs/_static/llama-stack-spec.yaml
+++ b/docs/_static/llama-stack-spec.yaml
@@ -4815,12 +4815,16 @@ components:
           description: The type of credential token.
         token:
           type: string
+        expires_at:
+          type: string
+          format: date-time
       additionalProperties: false
       required:
         - credential_id
         - provider_id
         - token_type
         - token
+        - expires_at
       title: ProviderCredential
     OpenAIResponseInput:
       oneOf:
diff --git a/llama_stack/apis/credentials/credentials.py b/llama_stack/apis/credentials/credentials.py
index 4811b4d79..10debee47 100644
--- a/llama_stack/apis/credentials/credentials.py
+++ b/llama_stack/apis/credentials/credentials.py
@@ -4,6 +4,7 @@
 # This source code is licensed under the terms described in the LICENSE file in
 # the root directory of this source tree.
 
+from datetime import datetime
 from enum import Enum
 from typing import Protocol, runtime_checkable
 
@@ -30,6 +31,7 @@ class ProviderCredential(BaseModel):
     provider_id: str
     token_type: CredentialTokenType
     token: str
+    expires_at: datetime
 
 
 @runtime_checkable