diff --git a/build_helpers/lib.sh b/build_helpers/lib.sh
index 182d7c5f..90cb44a8 100755
--- a/build_helpers/lib.sh
+++ b/build_helpers/lib.sh
@@ -29,15 +29,13 @@ lib::setup::smb_server() {
         export SMB_USER=smbuser
         export SMB_PASSWORD=smbpass
 
-        # Uses Archlinux as it usually contains the latest Samba release
-        # available allowing us to test more features
         docker run \
             --detach \
             --rm \
             --publish ${SMB_PORT}:445 \
             --volume $( pwd )/build_helpers:/app:z \
             --workdir /app \
-            archlinux:latest \
+            fedora:36 \
             /bin/bash \
             /app/samba-setup.sh \
             ${SMB_SHARE} \
diff --git a/build_helpers/samba-setup.sh b/build_helpers/samba-setup.sh
index 619a6c0e..a218293a 100755
--- a/build_helpers/samba-setup.sh
+++ b/build_helpers/samba-setup.sh
@@ -4,8 +4,7 @@ SMB_SHARE="$1"
 SMB_USER="$2"
 SMB_PASSWORD="$3"
 
-pacman -Syu \
-    --noconfirm \
+dnf install -y \
     samba
 
 cat > /etc/samba/smb.conf << EOL