diff --git a/Makefile b/Makefile
index 645fbea46..14f752ba8 100644
--- a/Makefile
+++ b/Makefile
@@ -23,11 +23,11 @@ typecheck:
 _buf: clean
 	rm -rf src/viam/gen
 	chmod +x plugin/main.py
+	pip install protoletariat mypy-protobuf
+	poetry install
 	$(eval API_VERSION := $(shell grep 'API_VERSION' src/viam/version_metadata.py | awk -F '"' '{print $$2}'))
 	buf generate buf.build/viamrobotics/api:${API_VERSION}
 	buf generate buf.build/viamrobotics/goutils
-	pip install protoletariat mypy-protobuf
-	poetry install
 	protol -e googl* --in-place -s _grpc.py -s _pb2.py -s _pb2.pyi -o src/viam/gen buf buf.build/viamrobotics/api
 	protol -e googl* --in-place -s _grpc.py -s _pb2.py -s _pb2.pyi -o src/viam/gen buf buf.build/viamrobotics/goutils
 	find src/viam/gen -type d -exec touch {}/__init__.py \;
diff --git a/src/viam/app/app_client.py b/src/viam/app/app_client.py
index 24c3e1e8e..d00d6320a 100644
--- a/src/viam/app/app_client.py
+++ b/src/viam/app/app_client.py
@@ -1,7 +1,7 @@
 import json
 from datetime import datetime
 from enum import Enum
-from typing import Any, AsyncIterator, List, Literal, Mapping, Optional, Tuple, Union
+from typing import Any, AsyncIterator, Dict, List, Literal, Mapping, Optional, Tuple, Union
 
 from grpclib.client import Channel
 from typing_extensions import Self
@@ -205,9 +205,9 @@ def from_proto(cls, robot_part: RobotPartPB) -> Self:
     secret: str
     robot: str
     location_id: str
-    robot_config: Optional[Mapping[str, Any]]
+    robot_config: Optional[Dict[str, Any]]
     last_access: Optional[datetime]
-    user_supplied_info: Optional[Mapping[str, Any]]
+    user_supplied_info: Optional[Dict[str, Any]]
     main_part: bool
     fqdn: str
     local_fqdn: str