diff --git a/.circleci/config.yml b/.circleci/config.yml
index 704e74f..e329e9c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -133,12 +133,15 @@ jobs:
             DOCKERHUB_REPO="btcpayserver/$NODE_NAME"
             DOCKERHUB_REPO="${DOCKERHUB_REPO,,}"
             DOCKERHUB_DESTINATION="$DOCKERHUB_REPO:$LATEST_TAG"
+            DOCKERHUB_DOCKEFILE_ARM64="$NODE_NAME/$NODE_VERSION/linuxarm64v8.Dockerfile"
             #
             sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS
             sudo docker manifest create --amend $DOCKERHUB_DESTINATION $DOCKERHUB_DESTINATION-amd64 $DOCKERHUB_DESTINATION-arm32v7 $DOCKERHUB_DESTINATION-arm64v8
             sudo docker manifest annotate $DOCKERHUB_DESTINATION $DOCKERHUB_DESTINATION-amd64 --os linux --arch amd64
             sudo docker manifest annotate $DOCKERHUB_DESTINATION $DOCKERHUB_DESTINATION-arm32v7 --os linux --arch arm --variant v7
+            if [ -f $DOCKERHUB_DOCKEFILE_ARM64 ]; then
             sudo docker manifest annotate $DOCKERHUB_DESTINATION $DOCKERHUB_DESTINATION-arm64v8 --os linux --arch arm64 --variant v8
+            fi
             sudo docker manifest push $DOCKERHUB_DESTINATION -p
 
 workflows: