diff --git a/docs/_data/firmware_controls.json b/docs/_data/firmware_controls.json
index a5b24f396..0aa235524 100644
--- a/docs/_data/firmware_controls.json
+++ b/docs/_data/firmware_controls.json
@@ -58,6 +58,8 @@
     "ThinkNode_M7_room_server": "thinknode-m7-room-server",
     "ThinkNode_M9_repeater_": "thinknode-m9-repeater",
     "ThinkNode_M9_room_server_": "thinknode-m9-room-server",
+    "Waveshare_S3_LR1121_repeater_observer_mqtt": "waveshare-s3-lr1121-observer-repeater",
+    "Waveshare_S3_LR1121_room_server_observer_mqtt": "waveshare-s3-lr1121-observer-room-server",
     "Xiao_C3_repeater": "xiao-c3-repeater",
     "Xiao_C3_room_server": "xiao-c3-room-server",
     "Xiao_S3_WIO_repeater": "xiao-s3-wio",
diff --git a/test/test_picker_controls_generator.py b/test/test_picker_controls_generator.py
index d3d21a6d1..860c4f804 100644
--- a/test/test_picker_controls_generator.py
+++ b/test/test_picker_controls_generator.py
@@ -23,6 +23,15 @@ class PickerControlsTests(unittest.TestCase):
         self.assertEqual(expected['Station_G2_repeater'], 'station-g2-repeater')
         self.assertEqual(expected['Station_G2_logging_repeater'], 'station-g2-logging-repeater')
         self.assertEqual(expected['nibble_zero_connect_room_server_'], 'nibble-zero-room-server')
+        self.assertEqual(expected['Waveshare_S3_LR1121_repeater_observer_mqtt'],
+                         'waveshare-s3-lr1121-observer-repeater')
+        self.assertEqual(expected['Waveshare_S3_LR1121_room_server_observer_mqtt'],
+                         'waveshare-s3-lr1121-observer-room-server')
+        # Only observer roles use the enlarged layout. Do not advertise an
+        # observer migration package for ordinary fixed-layout firmware.
+        for role in ('repeater', 'room_server', 'sensor',
+                     'companion_radio_usb', 'companion_radio_ble'):
+            self.assertNotIn('Waveshare_S3_LR1121_' + role, expected)
 
     def test_runtime_metadata_uses_verified_image_capabilities(self):
         source = 'a' * 40