diff --git a/Makefile b/Makefile
index f223451e..11f0d658 100755
--- a/Makefile
+++ b/Makefile
@@ -43,11 +43,8 @@ release-build:
 	mkdir -p dist
 	./.dapper release 2>&1 | tee dist/release.log
 
-rpi64:
-	# scripts/images/raspberry-pi-hypriot64/dist/rancheros-raspberry-pi.zip
-	cp dist/artifacts/rootfs_arm64.tar.gz scripts/images/raspberry-pi-hypriot64/
-	cd scripts/images/raspberry-pi-hypriot64/ \
-		&& ../../../.dapper
+rpi64: .dapper
+	./scripts/release-rpi64
 
 vmware: .dapper
 	mkdir -p dist
diff --git a/scripts/images/raspberry-pi-hypriot64/Dockerfile.dapper b/scripts/images/raspberry-pi-hypriot64/Dockerfile.dapper
index d82d93ea..648bfe35 100644
--- a/scripts/images/raspberry-pi-hypriot64/Dockerfile.dapper
+++ b/scripts/images/raspberry-pi-hypriot64/Dockerfile.dapper
@@ -1,5 +1,5 @@
-FROM rancher/os-debianconsole-base
-# FROM amd64=ubuntu:xenial arm64=arm64v8/ubuntu:xenial
+FROM ubuntu:xenial
+# FROM arm64=arm64v8/ubuntu:xenial
 
 ENV DAPPER_RUN_ARGS --privileged
 ENV DAPPER_OUTPUT dist
diff --git a/scripts/release-rpi64 b/scripts/release-rpi64
new file mode 100755
index 00000000..46fb88fe
--- /dev/null
+++ b/scripts/release-rpi64
@@ -0,0 +1,22 @@
+#!/bin/bash
+set -ex
+
+cd $(dirname $0)/..
+
+if [ ! -f ./dist/artifacts/rootfs_arm64.tar.gz ]; then
+    echo "Please run make first"
+    exit 0
+fi
+
+cp ./dist/artifacts/rootfs_arm64.tar.gz ./scripts/images/raspberry-pi-hypriot64/
+pushd ./scripts/images/raspberry-pi-hypriot64/
+./../../../.dapper
+popd
+
+cp ./scripts/images/raspberry-pi-hypriot64/dist/rancheros-raspberry-pi64.zip ./dist/artifacts/
+
+touch dist/publish_gss_${VERSION}.sh dist/publish_gss_latest.sh
+chmod 755 dist/publish_gss_${VERSION}.sh dist/publish_gss_latest.sh
+
+echo "gsutil cp dist/artifacts/rancheros-raspberry-pi64.zip gs://releases.rancher.com/os/latest/arm64/rancheros-raspberry-pi64.zip" >> ./dist/publish_gss_latest.sh
+echo "gsutil cp dist/artifacts/rancheros-raspberry-pi64.zip gs://releases.rancher.com/os/${VERSION}/arm64/rancheros-raspberry-pi64.zip" >> ./dist/publish_gss_${VERSION}.sh