diff --git a/src/feedback_plugin/data_processing/extractors.py b/src/feedback_plugin/data_processing/extractors.py
index 394448d..99f8fad 100644
--- a/src/feedback_plugin/data_processing/extractors.py
+++ b/src/feedback_plugin/data_processing/extractors.py
@@ -87,10 +87,8 @@ def extract_machine_architecture(upload: dict[str, list[str]]) -> str:
         elif re.match('^[ix][3-6]*86$', machine):
             # This check must happen after x86_64
             machine_architecture = 'x86'
-        elif re.match('^armv[5-7]', machine):
-            machine_architecture = 'ARM 32Bit'
-        elif re.match('^aarch64$', machine):
-            machine_architecture = 'ARM 64Bit'
+        elif re.match('^(aarch64|arm64)$', machine):
+            machine_architecture = 'armv8'
         elif re.match('^hp_', machine):
             machine_architecture = 'HP Itanium'
         elif re.match('^alpha', machine):