diff --git a/.github/workflows/api-server.yml b/.github/workflows/api-server.yml
index 201892142..8de08c7ab 100644
--- a/.github/workflows/api-server.yml
+++ b/.github/workflows/api-server.yml
@@ -34,7 +34,7 @@ jobs:
         uses: ./.github/actions/bootstrap
         with:
           package: api-server
-          skip-build: true
+          skip-build: 'true'
       - name: tests
         run: |
           . /opt/ros/rolling/setup.bash
diff --git a/packages/api-server/api_server/models/beacons.py b/packages/api-server/api_server/models/beacons.py
index d3ad0bc39..c9c77cd4c 100644
--- a/packages/api-server/api_server/models/beacons.py
+++ b/packages/api-server/api_server/models/beacons.py
@@ -1,9 +1,3 @@
-from pydantic import BaseModel
+from .ros_pydantic import rmf_fleet_msgs
 
-
-class BeaconState(BaseModel):
-    id: str
-    online: bool
-    category: str
-    activated: bool
-    level: str
+BeaconState = rmf_fleet_msgs.msg.BeaconState
diff --git a/packages/api-server/api_server/repositories/rmf.py b/packages/api-server/api_server/repositories/rmf.py
index c8256e10f..db55ca0cd 100644
--- a/packages/api-server/api_server/repositories/rmf.py
+++ b/packages/api-server/api_server/repositories/rmf.py
@@ -116,7 +116,7 @@ async def get_ingestor_state(self, guid: str) -> IngestorState | None:
     async def save_beacon_state(self, beacon_state: BeaconState) -> None:
         d = beacon_state.model_dump()
         del d["id"]
-        await ttm.BeaconState.update_or_create(d, id_=beacon_state.id)
+        await ttm.BeaconState.update_or_create(d, id=beacon_state.id)
 
     async def query_users(
         self,