diff --git a/docker/main/Dockerfile b/docker/main/Dockerfile
index 06c54f680..7f90254a8 100644
--- a/docker/main/Dockerfile
+++ b/docker/main/Dockerfile
@@ -119,7 +119,7 @@ RUN apt-get -qq update \
     apt-transport-https \
     gnupg \
     wget \
-    && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 9165938D90FDDD2E \
+    && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 \
     && echo "deb http://deb.debian.org/debian bullseye main contrib non-free" | tee /etc/apt/sources.list.d/raspi.list \
     && apt-get -qq update \
     && apt-get -qq install -y \
diff --git a/docker/rpi/rpi.mk b/docker/rpi/rpi.mk
index 243963fdb..44c105622 100644
--- a/docker/rpi/rpi.mk
+++ b/docker/rpi/rpi.mk
@@ -1,7 +1,7 @@
 BOARDS += rpi
 
 local-rpi: version
-	docker buildx bake --file=docker/rpi/bake.hcl --set rpi.tagsfrigate:latest-rpi rpi
+	docker buildx bake --file=docker/rpi/bake.hcl --set rpi.tags=frigate:latest-rpi rpi
 
 build-rpi: version
 	docker buildx bake --file=docker/rpi/bake.hcl --set rpi.tags=$(IMAGE_REPO):${GITHUB_REF_NAME}-$(COMMIT_HASH)-rpi rpi