diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index c8bbbb5f1..adea5337d 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -17,7 +17,7 @@ Describe the Homme Assistant image you are using and the hardare environemnt
 - [ ] Raspberry Pi [1/2/3/4]
 - [ ] ODROID [C2/C4/N2(+)/XU4]
 - [ ] ASUS Tinker [S]
-- [ ] Intel NUC (or compatible)
+- [ ] Generic x86-64 (like Intel NUC)
 - [ ] OVA (Open Virtualization Applicance, on Intel NUC or any other hardware, please add the Hypervisor you are using)
 
 **Home Assistant OS release:**
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index 2f4cb4106..e1869ecc1 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -7,8 +7,8 @@ categories:
     label: 'board/raspberrypi'
   - title: 'Open Virtual Appliance'
     label: 'board/ova'
-  - title: 'Intel NUC'
-    label: 'board/intel-nuc'
+  - title: 'Generic x86-64'
+    label: 'board/generic-x86-64'
   - title: 'Hardkernel ODROID'
     label: 'board/odroid'
   - title: 'ASUS Tinker'
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index 0df359d51..02e692e0d 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -37,7 +37,7 @@ jobs:
       matrix:
         board:
           - {"name": "ova", "output": "ova", "runner": "x86-64-runner"}
-          - {"name": "intel_nuc", "output": "intel-nuc", "runner": "x86-64-runner"}
+          - {"name": "generic_x86_64", "output": "generic-x86-64", "runner": "x86-64-runner"}
           - {"name": "odroid_c2", "output": "odroid-c2", "runner": "aarch64-runner"}
           - {"name": "odroid_c4", "output": "odroid-c4", "runner": "aarch64-runner"}
           - {"name": "odroid_n2", "output": "odroid-n2", "runner": "aarch64-runner"}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7375f9ed0..e53debf29 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,7 +32,7 @@ jobs:
       matrix:
         board:
           - {"name": "ova", "output": "ova", "runner": "x86-64-runner"}
-          - {"name": "intel_nuc", "output": "intel-nuc", "runner": "x86-64-runner"}
+          - {"name": "generic_x86_64", "output": "generic-x86-64", "runner": "x86-64-runner"}
           - {"name": "odroid_c2", "output": "odroid-c2", "runner": "aarch64-runner"}
           - {"name": "odroid_c4", "output": "odroid-c4", "runner": "aarch64-runner"}
           - {"name": "odroid_n2", "output": "odroid-n2", "runner": "aarch64-runner"}