diff --git a/.github/workflows/fedora-mate-build.yml b/.github/workflows/fedora-mate-build.yml
index 1c9c559..52e44ca 100644
--- a/.github/workflows/fedora-mate-build.yml
+++ b/.github/workflows/fedora-mate-build.yml
@@ -69,8 +69,7 @@ jobs:
         with:
           context: ./mate
           file: ./mate/Dockerfile
-          # platforms: linux/amd64,linux/arm64
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/fedora-xfce-build.yml b/.github/workflows/fedora-xfce-build.yml
index e52ad02..a0718fa 100644
--- a/.github/workflows/fedora-xfce-build.yml
+++ b/.github/workflows/fedora-xfce-build.yml
@@ -119,8 +119,7 @@ jobs:
         with:
           context: ./xfce
           file: ./xfce/Dockerfile
-          # platforms: linux/amd64,linux/arm64
-          platforms: linux/arm64
+          platforms: linux/amd64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/ubuntu-mate-build.yml b/.github/workflows/ubuntu-mate-build.yml
index aa1c8cf..b0a0b01 100644
--- a/.github/workflows/ubuntu-mate-build.yml
+++ b/.github/workflows/ubuntu-mate-build.yml
@@ -69,7 +69,6 @@ jobs:
         with:
           context: ./ubuntu-mate
           file: ./ubuntu-mate/Dockerfile
-          # platforms: linux/amd64,linux/arm64
           platforms: linux/amd64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
diff --git a/mate/Dockerfile b/mate/Dockerfile
index 56e962c..f46f611 100644
--- a/mate/Dockerfile
+++ b/mate/Dockerfile
@@ -4,21 +4,19 @@ FROM docker.io/linuxserver/rdesktop:fedora-mate
 ARG BUILD_DATE
 ARG VERSION
 ARG BUILDARCH
+ARG TARGETARCH
 
 LABEL build_version="based on Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="Michael Trip"
 WORKDIR /tmp
 
-RUN \
-    dnf install -y wget && \
-    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 architecture: $BUILDARCH"; \
-        exit 1; \
-    fi
+RUN dnf install -y wget && \
+      case ${TARGETARCH} in \
+            "amd64")  DOWNLOAD_ARCH=amd64  ;; \
+            "arm64")  DOWNLOAD_ARCH=aarch64  ;; \
+        esac \
+        && wget -O /tmp/openlens.rpm https://github.com/MuhammedKalkan/OpenLens/releases/download/v6.5.2-366/OpenLens-6.5.2-366.${DOWNLOAD_ARCH}.rpm
+
 
 
 RUN \
diff --git a/ubuntu-mate/Dockerfile b/ubuntu-mate/Dockerfile
index 31fed34..d9c538d 100644
--- a/ubuntu-mate/Dockerfile
+++ b/ubuntu-mate/Dockerfile
@@ -2,6 +2,7 @@ FROM ghcr.io/linuxserver/rdesktop:ubuntu-mate
 # set version label
 ARG BUILD_DATE
 ARG BUILDARCH
+ARG TARGETARCH
 ARG VERSION
 LABEL build_version="based on Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="Michael Trip"