diff --git a/components/packaging/deb/ubuntu-xenial/Dockerfile.aarch64 b/components/packaging/deb/ubuntu-xenial/Dockerfile.aarch64
index fd2ca681d2..cfa8db3e65 100644
--- a/components/packaging/deb/ubuntu-xenial/Dockerfile.aarch64
+++ b/components/packaging/deb/ubuntu-xenial/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM aarch64/ubuntu:xenial
+FROM arm64v8/ubuntu:xenial
 
 RUN apt-get update && apt-get install -y golang-go apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
 
diff --git a/components/packaging/detect_alpine_image b/components/packaging/detect_alpine_image
index 06ec609e7e..4efa32e4aa 100755
--- a/components/packaging/detect_alpine_image
+++ b/components/packaging/detect_alpine_image
@@ -10,7 +10,7 @@ elif [ "$arch" = "armv7l" ]; then
 elif [ "$arch" = "s390x" ]; then
     img="s390x/alpine"
 elif [ "$arch" = "aarch64" ]; then
-    img="aarch64/alpine"
+    img="arm64v8/alpine"
 elif [ "$arch" = "ppc64le" ]; then
     img="ppc64le/alpine"
 else