diff --git a/api/CHANGELOG.md b/api/CHANGELOG.md
index 61b9ed4773..14cb1d027c 100644
--- a/api/CHANGELOG.md
+++ b/api/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All notable changes to the **Prowler API** are documented in this file.
 
+## [1.12.0] (Prowler 5.11.0 - UNRELEASED)
+
+### Added
+- Lighthouse support for OpenAI GPT-5 [(#8527)](https://github.com/prowler-cloud/prowler/pull/8527)
+
 ## [1.11.0] (Prowler 5.10.0)
 
 ### Added
diff --git a/api/src/backend/api/models.py b/api/src/backend/api/models.py
index 97d10efc57..e08f9919a8 100644
--- a/api/src/backend/api/models.py
+++ b/api/src/backend/api/models.py
@@ -1752,6 +1752,10 @@ class LighthouseConfiguration(RowLevelSecurityProtectedModel):
         GPT_4O = "gpt-4o", _("GPT-4o Default")
         GPT_4O_MINI_2024_07_18 = "gpt-4o-mini-2024-07-18", _("GPT-4o Mini v2024-07-18")
         GPT_4O_MINI = "gpt-4o-mini", _("GPT-4o Mini Default")
+        GPT_5_2025_08_07 = "gpt-5-2025-08-07", _("GPT-5 v2025-08-07")
+        GPT_5 = "gpt-5", _("GPT-5 Default")
+        GPT_5_MINI_2025_08_07 = "gpt-5-mini-2025-08-07", _("GPT-5 Mini v2025-08-07")
+        GPT_5_MINI = "gpt-5-mini", _("GPT-5 Mini Default")
 
     id = models.UUIDField(primary_key=True, default=uuid4, editable=False)
     inserted_at = models.DateTimeField(auto_now_add=True, editable=False)
diff --git a/ui/CHANGELOG.md b/ui/CHANGELOG.md
index 6e5521eb28..ee939ada4e 100644
--- a/ui/CHANGELOG.md
+++ b/ui/CHANGELOG.md
@@ -9,6 +9,7 @@ All notable changes to the **Prowler UI** are documented in this file.
 - `Cloud Provider` type filter to providers page [(#8473)](https://github.com/prowler-cloud/prowler/pull/8473)
 - New menu item under Configuration section for quick access to the Mutelist [(#8444)](https://github.com/prowler-cloud/prowler/pull/8444)
 - Resource agent to Lighthouse for querying resource information [(#8509)](https://github.com/prowler-cloud/prowler/pull/8509)
+- Lighthouse support for OpenAI GPT-5 [(#8527)](https://github.com/prowler-cloud/prowler/pull/8527)
 
 ### 🔄 Changed
 
diff --git a/ui/components/lighthouse/chatbot-config.tsx b/ui/components/lighthouse/chatbot-config.tsx
index 4ad5d46d4e..159722a501 100644
--- a/ui/components/lighthouse/chatbot-config.tsx
+++ b/ui/components/lighthouse/chatbot-config.tsx
@@ -124,6 +124,15 @@ export const ChatbotConfig = ({
                 >
                   GPT-4o Mini
                 </SelectItem>
+                <SelectItem key="gpt-5-2025-08-07" value="gpt-5-2025-08-07">
+                  GPT-5
+                </SelectItem>
+                <SelectItem
+                  key="gpt-5-mini-2025-08-07"
+                  value="gpt-5-mini-2025-08-07"
+                >
+                  GPT-5 Mini
+                </SelectItem>
               </Select>
             )}
           />