diff --git a/Makefile b/Makefile
index c98537681..20cba880e 100644
--- a/Makefile
+++ b/Makefile
@@ -211,6 +211,12 @@ build-linux-mipsle: generate
 build-pi-zero: build-linux-arm build-linux-arm64
 	@echo "Pi Zero 2 W builds: $(BUILD_DIR)/$(BINARY_NAME)-linux-arm (32-bit), $(BUILD_DIR)/$(BINARY_NAME)-linux-arm64 (64-bit)"
 
+## build-raspberry-pi: Alias for build-pi-zero
+build-raspberry-pi: build-pi-zero
+
+## build-rpi: Alias for build-pi-zero
+build-rpi: build-pi-zero
+
 ## build-all: Build picoclaw for all platforms
 build-all: generate
 	@echo "Building for multiple platforms..."
@@ -332,6 +338,9 @@ docker-push-rpi:
 	@echo "Pushing Raspberry Pi Docker image (ARM64)..."
 	docker push $(DOCKER_USER)/picoclaw-rpi:latest
 
+docker-build-raspberry-pi: docker-build-rpi
+docker-push-raspberry-pi: docker-push-rpi
+
 ## docker-run-full: Run picoclaw gateway in Docker (full-featured)
 docker-run-full:
 	docker compose -f docker/docker-compose.full.yml --profile gateway up