diff --git a/nextcloud/Dockerfile.arm64v8 b/nextcloud/Dockerfile.arm64v8
index e5c7900..4062a6a 100644
--- a/nextcloud/Dockerfile.arm64v8
+++ b/nextcloud/Dockerfile.arm64v8
@@ -1,6 +1,6 @@
 FROM linuxserver/nextcloud:BASE_TAG
 
-ADD https://github.com/nextcloud/notify_push/releases/download/v0.2.0/notify_push-aarch64-unknown-linux-musl /usr/local/bin/notify_push
+ADD https://github.com/nextcloud/notify_push/releases/download/v0.2.4/notify_push-aarch64-unknown-linux-musl /usr/local/bin/notify_push
 RUN chmod +x /usr/local/bin/notify_push
 
 COPY root/ /
diff --git a/nextcloud/Dockerfile.arm64v8.php8-22.1.1.ls153 b/nextcloud/Dockerfile.arm64v8.php8-22.1.1.ls153
new file mode 100644
index 0000000..0a69b6f
--- /dev/null
+++ b/nextcloud/Dockerfile.arm64v8.php8-22.1.1.ls153
@@ -0,0 +1,6 @@
+FROM linuxserver/nextcloud:arm64v8-php8-22.1.1-ls153
+
+ADD https://github.com/nextcloud/notify_push/releases/download/v0.2.4/notify_push-aarch64-unknown-linux-musl /usr/local/bin/notify_push
+RUN chmod +x /usr/local/bin/notify_push
+
+COPY root/ /
diff --git a/nextcloud/build.sh b/nextcloud/build.sh
index 1941fc3..56758b0 100755
--- a/nextcloud/build.sh
+++ b/nextcloud/build.sh
@@ -29,7 +29,7 @@ function build_image() {
     sed "s/BASE_TAG/${ARCH}-${NEXTCLOUD_RELEASE}-${VERSION}/g" "Dockerfile.${ARCH}" \
         > "Dockerfile.${ARCH}.${NEXTCLOUD_RELEASE}.${VERSION}"
 
-    docker build \
+    sudo docker build \
         --pull \
         --no-cache \
         -f "Dockerfile.${ARCH}.${NEXTCLOUD_RELEASE}.${VERSION}" \
@@ -38,9 +38,9 @@ function build_image() {
         -t "${IMAGE}:latest" \
         .
 
-    docker push "${IMAGE}:${NEXTCLOUD_RELEASE}-${VERSION}-${ARCH}"
-    docker push "${IMAGE}:latest-${ARCH}"
-    docker push "${IMAGE}:latest"
+    sudo docker push "${IMAGE}:${NEXTCLOUD_RELEASE}-${VERSION}-${ARCH}"
+    sudo docker push "${IMAGE}:latest-${ARCH}"
+    sudo docker push "${IMAGE}:latest"
 
     rm "Dockerfile.${ARCH}.${NEXTCLOUD_RELEASE}.${VERSION}"
 }
@@ -48,6 +48,11 @@ function build_image() {
 require "$VERSION" "version"
 require "$NEXTCLOUD_RELEASE" "nextcloud release"
 
+if ! sudo docker run --rm -it arm64v8/ubuntu:19.10 /bin/bash -c 'echo "docker is configured correctly"'; then
+    echo "docker is not configured to run on qemu-emulated architectures, fixing will require sudo"
+    sudo docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+fi
+
 set -xe
 
 build_image asonix/nextcloud arm64v8