diff --git a/.github/workflows/bridge.yml b/.github/workflows/bridge.yml
index 8404c8b..2b8cd56 100644
--- a/.github/workflows/bridge.yml
+++ b/.github/workflows/bridge.yml
@@ -43,38 +43,17 @@ jobs:
 
       - name: Build unstable image
         if: ${{ inputs.event == 'push' }}
-        uses: redhat-actions/buildah-build@v2
-        with:
-          image: ${{ env.IMAGE_NAME }}
-          tags: ${{ matrix.platform.tag }}
-          platform: ${{ matrix.platform.name }}
-          build-args: |
-            FROM_IMAGE=${{ format('ghcr.io/zyclonite/{0}', env.IMAGE_NAME) }}
-            FROM_VERSION=main
-          dockerfiles: |
-            ./Dockerfile.bridge
+        run: buildah bud --platform ${{ matrix.platform.name }} --build-arg FROM_IMAGE=${{ format('ghcr.io/zyclonite/{0}', env.IMAGE_NAME) }} --build-arg FROM_VERSION=main -f ./Dockerfile.bridge -t ${{ env.IMAGE_NAME }}:${{ matrix.platform.tag }} .
 
       - name: Build stable image
         if: ${{ inputs.event == 'release' }}
-        uses: redhat-actions/buildah-build@v2
-        with:
-          image: ${{ env.IMAGE_NAME }}
-          tags: ${{ matrix.platform.tag }}
-          platform: ${{ matrix.platform.name }}
-          build-args: |
-            FROM_IMAGE=${{ format('ghcr.io/zyclonite/{0}', env.IMAGE_NAME) }}
-            FROM_VERSION=${{ inputs.tag }}
-          dockerfiles: |
-            ./Dockerfile.bridge
+        run: buildah bud --platform ${{ matrix.platform.name }} --build-arg FROM_IMAGE=${{ format('ghcr.io/zyclonite/{0}', env.IMAGE_NAME) }} --build-arg FROM_VERSION=${{ inputs.tag }} -f ./Dockerfile.bridge -t ${{ env.IMAGE_NAME }}:${{ matrix.platform.tag }} .
 
       - name: Check images created
         run: buildah images | grep '${{ env.IMAGE_NAME }}'
 
       - name: Check image metadata
-        run: |
-          set -x
-          buildah inspect ${{ env.IMAGE_NAME }}:${{ matrix.platform.tag }} | jq ".OCIv1.architecture"
-          buildah inspect ${{ env.IMAGE_NAME }}:${{ matrix.platform.tag }} | jq ".Docker.architecture"
+        run: buildah inspect ${{ env.IMAGE_NAME }}:${{ matrix.platform.tag }} | jq ".OCIv1.architecture"
 
       - name: Export image
         run: podman save -o /tmp/image.tar ${{ env.IMAGE_NAME }}:${{ matrix.platform.tag }}
diff --git a/.github/workflows/multiarch.yml b/.github/workflows/multiarch.yml
index 5267bb6..d15f746 100644
--- a/.github/workflows/multiarch.yml
+++ b/.github/workflows/multiarch.yml
@@ -38,24 +38,13 @@ jobs:
           sudo apt-get install -y qemu-user-static
 
       - name: Build Image
-        uses: redhat-actions/buildah-build@v2
-        with:
-          image: ${{ env.IMAGE_NAME }}
-          tags: ${{ matrix.platform.tag }}
-          platform: ${{ matrix.platform.name }}
-          build-args: |
-            ALPINE_IMAGE=docker.io/alpine
-          dockerfiles: |
-            ./Dockerfile
+        run: buildah bud --platform ${{ matrix.platform.name }} --build-arg ALPINE_IMAGE=docker.io/alpine -f ./Dockerfile -t ${{ env.IMAGE_NAME }}:${{ matrix.platform.tag }} .
 
       - name: Check images created
         run: buildah images | grep '${{ env.IMAGE_NAME }}'
 
       - name: Check image metadata
-        run: |
-          set -x
-          buildah inspect ${{ env.IMAGE_NAME }}:${{ matrix.platform.tag }} | jq ".OCIv1.architecture"
-          buildah inspect ${{ env.IMAGE_NAME }}:${{ matrix.platform.tag }} | jq ".Docker.architecture"
+        run: buildah inspect ${{ env.IMAGE_NAME }}:${{ matrix.platform.tag }} | jq ".OCIv1.architecture"
 
       - name: Export image
         run: podman save -o /tmp/image.tar ${{ env.IMAGE_NAME }}:${{ matrix.platform.tag }}
diff --git a/Dockerfile b/Dockerfile
index 6b5176a..bac1810 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 ARG ALPINE_IMAGE=alpine
 ARG ALPINE_VERSION=edge
-ARG ZT_COMMIT=7e46c8359231b4aa55c5d739462c4e5682d35755
-ARG ZT_VERSION=1.8.10
+ARG ZT_COMMIT=b4cec0b4a8acb41cc1a52f24e0d423131b5b71df
+ARG ZT_VERSION=1.10.0
 
 FROM ${ALPINE_IMAGE}:${ALPINE_VERSION} as builder
 
diff --git a/patches/disable-sso.patch b/patches/disable-sso.patch
index b9cd8a1..4244ad8 100644
--- a/patches/disable-sso.patch
+++ b/patches/disable-sso.patch
@@ -1,8 +1,8 @@
 diff --git a/make-linux.mk b/make-linux.mk
-index 1caf3acc..ade5809a 100644
+index e902659c..70c94c26 100644
 --- a/make-linux.mk
 +++ b/make-linux.mk
-@@ -274,6 +274,7 @@ ifeq ($(ZT_IA32),1)
+@@ -272,6 +272,7 @@ ifeq ($(ZT_IA32),1)
  	ZT_USE_X64_ASM_ED25519=0
  endif