diff --git a/Dockerfile.x86_64 b/Dockerfile.amd64
similarity index 95%
rename from Dockerfile.x86_64
rename to Dockerfile.amd64
index a08a8d3f..91b1b0cb 100644
--- a/Dockerfile.x86_64
+++ b/Dockerfile.amd64
@@ -32,7 +32,7 @@ RUN chmod +x /app/src/enterContainer.sh \
 	&& /app/node_modules/.bin/coffee -c /app/src \
 	&& ln -sf /app/entry.sh /start # Needed for legacy
 
-ENV SUPERVISOR_IMAGE resin/x86_64-supervisor
+ENV SUPERVISOR_IMAGE resin/amd64-supervisor
 ENV CONFIG_MOUNT_POINT /boot/config.json
 ENV LED_FILE /dev/null
 
diff --git a/Makefile b/Makefile
index fd78f680..6d05bf01 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 DISABLE_CACHE = 'false'
 
-ARCH = rpi# rpi/x86_64/i386/armv7hf
+ARCH = rpi# rpi/amd64/i386/armv7hf
 
 DEPLOY_REGISTRY = registry.resindev.io:5000/