diff --git a/emulators/groovymame.yml b/emulators/groovymame.yml
index 187622a6..670e3344 100644
--- a/emulators/groovymame.yml
+++ b/emulators/groovymame.yml
@@ -3288,7 +3288,7 @@ files:
   - name: astrocde.zip
     required: true
     category: bios_zip
-    system: astrocde
+    system: bally-astrocade
     source_ref: "upstream src/mame/bally/astrohome.cpp:295"
     contents:
       - name: astro.bin
@@ -3299,7 +3299,7 @@ files:
   - name: astrocdl.zip
     required: true
     category: bios_zip
-    system: astrocde
+    system: bally-astrocade
     source_ref: "upstream src/mame/bally/astrohome.cpp:296"
     contents:
       - name: ballyhlc.bin
@@ -3310,7 +3310,7 @@ files:
   - name: astrocdw.zip
     required: true
     category: bios_zip
-    system: astrocde
+    system: bally-astrocade
     source_ref: "upstream src/mame/bally/astrohome.cpp:297"
     contents:
       - name: bioswhit.bin
diff --git a/emulators/mame.yml b/emulators/mame.yml
index 4f5e6199..5143dd5e 100644
--- a/emulators/mame.yml
+++ b/emulators/mame.yml
@@ -84,6 +84,10 @@ systems:
   - xegs
   - dragon64
   - acorn-archimedes
+  - acorn-bbc-micro
+  - elektronika-bk
+  - enterprise-64-128
+  - vectrex
   - vgmplay
 
 notes: |
@@ -3521,7 +3525,7 @@ files:
   - name: astrocde.zip
     required: true
     category: bios_zip
-    system: astrocde
+    system: bally-astrocade
     source_ref: "upstream src/mame/bally/astrohome.cpp:244-247"
     contents:
       - name: "astro.bin"
@@ -3532,7 +3536,7 @@ files:
   - name: astrocdl.zip
     required: false
     category: bios_zip
-    system: astrocde
+    system: bally-astrocade
     source_ref: "upstream src/mame/bally/astrohome.cpp:249-251"
     contents:
       - name: "ballyhlc.bin"
@@ -3543,7 +3547,7 @@ files:
   - name: astrocdw.zip
     required: false
     category: bios_zip
-    system: astrocde
+    system: bally-astrocade
     source_ref: "upstream src/mame/bally/astrohome.cpp:254-257"
     contents:
       - name: "bioswhit.bin"