diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index c0890c952..81f37541f 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -38,6 +38,7 @@ body:
         - rpi3-64 (Raspberry Pi 3 64-bit OS)
         - rpi4  (Raspberry Pi 4/400 32-bit OS)
         - rpi4-64  (Raspberry Pi 4/400 64-bit OS)
+        - rpi5-64  (Raspberry Pi 5 64-bit OS)
         - tinker (ASUS Tinker Board/Tinker Board S)
         - yellow (Home Assistant Yellow)
         - green (Home Assistant Green)
diff --git a/.github/workflows/matrix.json b/.github/workflows/matrix.json
index 4eda690ea..d258ac594 100644
--- a/.github/workflows/matrix.json
+++ b/.github/workflows/matrix.json
@@ -83,6 +83,12 @@
     "architecture": "aarch64",
     "label": "board/raspberrypi"
   },
+  {
+    "id": "rpi5-64",
+    "defconfig": "rpi5_64",
+    "architecture": "aarch64",
+    "label": "board/raspberrypi"
+  },
   {
     "id": "yellow",
     "defconfig": "yellow",