diff --git a/supervisor/addons/validate.py b/supervisor/addons/validate.py
index 73d4af9ee..341dcd050 100644
--- a/supervisor/addons/validate.py
+++ b/supervisor/addons/validate.py
@@ -143,6 +143,8 @@ RE_MACHINE = re.compile(
     r"|raspberrypi3"
     r"|raspberrypi4-64"
     r"|raspberrypi4"
+    r"|yellow"
+    r"|green"
     r"|tinker"
     r")$"
 )
diff --git a/supervisor/data/arch.json b/supervisor/data/arch.json
index 9792e96c1..69cc86047 100644
--- a/supervisor/data/arch.json
+++ b/supervisor/data/arch.json
@@ -6,6 +6,7 @@
   "raspberrypi4": ["armv7", "armhf"],
   "raspberrypi4-64": ["aarch64", "armv7", "armhf"],
   "yellow": ["aarch64", "armv7", "armhf"],
+  "green": ["aarch64", "armv7", "armhf"],
   "tinker": ["armv7", "armhf"],
   "odroid-c2": ["aarch64", "armv7", "armhf"],
   "odroid-c4": ["aarch64", "armv7", "armhf"],
diff --git a/tests/test_arch.py b/tests/test_arch.py
index 2eb074257..cb9a9a86f 100644
--- a/tests/test_arch.py
+++ b/tests/test_arch.py
@@ -103,6 +103,26 @@ async def test_raspberrypi4_64_arch(coresys, sys_machine, sys_supervisor):
     assert coresys.arch.supported == ["aarch64", "armv7", "armhf"]
 
 
+async def test_yellow_arch(coresys, sys_machine, sys_supervisor):
+    """Test arch for yellow."""
+    sys_machine.return_value = "yellow"
+    sys_supervisor.arch = "aarch64"
+    await coresys.arch.load()
+
+    assert coresys.arch.default == "aarch64"
+    assert coresys.arch.supported == ["aarch64", "armv7", "armhf"]
+
+
+async def test_green_arch(coresys, sys_machine, sys_supervisor):
+    """Test arch for green."""
+    sys_machine.return_value = "green"
+    sys_supervisor.arch = "aarch64"
+    await coresys.arch.load()
+
+    assert coresys.arch.default == "aarch64"
+    assert coresys.arch.supported == ["aarch64", "armv7", "armhf"]
+
+
 async def test_tinker_arch(coresys, sys_machine, sys_supervisor):
     """Test arch for tinker."""
     sys_machine.return_value = "tinker"