diff --git a/.github/workflows/build_addon.yml b/.github/workflows/build_addon.yml
index ec617cd..85fd51c 100644
--- a/.github/workflows/build_addon.yml
+++ b/.github/workflows/build_addon.yml
@@ -18,15 +18,26 @@ jobs:
   build-dockers:
     runs-on: ubuntu-latest
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
-        arch: [ aarch64, amd64, armv7, i386 ]
+        arch: [ aarch64, amd64, armv7, i386, armhf ]
+        include:
+          - arch: aarch64
+            arch_value: linux/arm64/v8
+          - arch: amd64
+            arch_value: linux/amd64  
+          - arch: armv7
+            arch_value: linux/arm/v7
+          - arch: i386
+            arch_value: linux/386 
+          - arch: armhf
+            arch_value: linux/arm/v6 
     steps:
 
       - uses: actions/checkout@v2
 
-      - name: Add Qemu-user-static ${{matrix.arch}}
-        run: docker run --rm --privileged hassioaddons/qemu-user-static:latest
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
 
       - name: Set up Docker Buildx ${{matrix.arch}}
         uses: docker/setup-buildx-action@v1
@@ -93,3 +104,4 @@ jobs:
           cache-from: type=registry,ref=${{env.REPOSITORY}}/${{env.IMAGE}}/${{matrix.arch}}:latest
           cache-to: type=inline
           context: ./${{env.TARGET}}/
+          platforms: ${{ matrix.arch_value }}
diff --git a/nextcloud_backup/.base_version b/nextcloud_backup/.base_version
index 7e2df97..e9ac13b 100644
--- a/nextcloud_backup/.base_version
+++ b/nextcloud_backup/.base_version
@@ -1 +1 @@
-10.0.2
+11.1.2
diff --git a/nextcloud_backup/Dockerfile b/nextcloud_backup/Dockerfile
index a7c4973..8908bc2 100644
--- a/nextcloud_backup/Dockerfile
+++ b/nextcloud_backup/Dockerfile
@@ -6,8 +6,11 @@ COPY rootfs/etc /etc/
 COPY rootfs/usr /usr/
 
 # Setup base
-RUN apk add --no-cache \
-    nodejs-current 
+RUN apk add --no-cache nodejs-current
+
+# Fix for arm/v7
+RUN mkdir -p  /usr/local/sbin/
+RUN ln -s /usr/bin/node /usr/local/sbin/node
 
 # Copy only package*.json
 COPY rootfs/opt/nextcloud_backup/package*.json /opt/nextcloud_backup/