diff --git a/.github/actions/config/action.yml b/.github/actions/config/action.yml
index 6fbdf85..ed10df1 100644
--- a/.github/actions/config/action.yml
+++ b/.github/actions/config/action.yml
@@ -56,7 +56,7 @@ runs:
         REGISTRY_USER="almalinuxorg+airibarr_bot"
         IMAGE_PATH="almalinuxorg"
         IMAGE_NAME="atomic-desktop"
-        PLATFORMS="amd64,amd64/v2"
+        PLATFORMS="arm64,amd64,amd64/v2"
         VARIANTS="gnome,kde"
 
         echo "REGISTRY=${REGISTRY}" >> $GITHUB_OUTPUT
diff --git a/Dockerfile b/Dockerfile
index d93d112..676c87d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,6 +12,7 @@ FROM quay.io/almalinuxorg/almalinux-bootc:10@sha256:33cdd2cd472e007b7e14c8d534de
 ARG IMAGE_NAME
 ARG IMAGE_REGISTRY
 ARG VARIANT
+ARG TARGETARCH
 
 RUN --mount=type=tmpfs,dst=/opt \
     --mount=type=tmpfs,dst=/tmp \
diff --git a/files/scripts/20-desktop.sh b/files/scripts/20-desktop.sh
index f62bf7e..66f07c7 100755
--- a/files/scripts/20-desktop.sh
+++ b/files/scripts/20-desktop.sh
@@ -3,8 +3,24 @@
 set -xeuo pipefail
 
 if [[ "${VARIANT}" == "gnome" ]]; then
-    dnf install -y \
-        @"Workstation"
+    # aarch64 doesn't have @workstation group
+    if [[ "${TARGETARCH}" == "arm64" ]]; then
+        dnf install -y \
+            @core \
+            @fonts \
+            @gnome-desktop \
+            @guest-desktop-agents \
+            @hardware-support \
+            @internet-browser \
+            @multimedia \
+            @networkmanager-submodules \
+            @print-client \
+            @standard \
+            @workstation-product
+    else
+        dnf install -y \
+            @"Workstation"
+    fi
 
     systemctl enable gdm