diff --git a/.github/workflows/fedora-xfce-build.yml b/.github/workflows/fedora-xfce-build.yml
index 2eaaf61..efb6014 100644
--- a/.github/workflows/fedora-xfce-build.yml
+++ b/.github/workflows/fedora-xfce-build.yml
@@ -89,10 +89,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Setup qemu
-        uses: docker/setup-qemu-action@v2
-        with:
-          platforms: 'arm64,amd64'
       # Workaround: https://github.com/docker/build-push-action/issues/461
       - name: Setup Docker buildx
         uses: docker/setup-buildx-action@v2
diff --git a/mate/Dockerfile b/mate/Dockerfile
index 192545b..fbb40d8 100644
--- a/mate/Dockerfile
+++ b/mate/Dockerfile
@@ -3,6 +3,8 @@ FROM docker.io/linuxserver/rdesktop:fedora-mate
 # set version label
 ARG BUILD_DATE
 ARG VERSION
+ARG BUILDARCH
+
 LABEL build_version="based on Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="Michael Trip"
 WORKDIR /tmp
@@ -12,7 +14,7 @@ RUN \
   echo -e "[code]\nname=Visual Studio Code\nbaseurl=https://packages.microsoft.com/yumrepos/vscode\nenabled=1\ngpgcheck=1\ngpgkey=https://packages.microsoft.com/keys/microsoft.asc" > /etc/yum.repos.d/vscode.repo && \
   dnf install -y wget && \
   echo "Install and download OpenLens" && \
-  if [ "$BUILDARCH" = "amd64" ]; then wget -O https://github.com/MuhammedKalkan/OpenLens/releases/download/v6.5.2-366/OpenLens-6.5.2-366.x86_64.rpm; elif [ "$BUILDARCH" = "arm64" ]; then wget -O https://github.com/MuhammedKalkan/OpenLens/releases/download/v6.5.2-366/OpenLens-6.5.2-366.aarch64.rpm; fi && \
+  if [ "$BUILDARCH" = "amd64" ]; then wget -O /tmp/openlens.rpm https://github.com/MuhammedKalkan/OpenLens/releases/download/v6.5.2-366/OpenLens-6.5.2-366.x86_64.rpm; elif [ "$BUILDARCH" = "arm64" ]; then wget -O /tmp/openlens.rpm https://github.com/MuhammedKalkan/OpenLens/releases/download/v6.5.2-366/OpenLens-6.5.2-366.aarch64.rpm; else echo "Unsupported"; exit 1; fi && \
   echo "Install and download k9s" && \
   wget https://github.com/derailed/k9s/releases/download/v0.27.4/k9s_Linux_$BUILDARCH.tar.gz && \
   dnf install -y --setopt=install_weak_deps=False --best \