diff --git a/deployment/fedora-package-x64/clean.sh b/deployment/fedora-package-x64/clean.sh
index d0f487648a..001f568dda 100755
--- a/deployment/fedora-package-x64/clean.sh
+++ b/deployment/fedora-package-x64/clean.sh
@@ -8,7 +8,7 @@ package_temporary_dir="`pwd`/pkg-dist-tmp"
 pkg_src_dir="`pwd`/pkg-src"
 image_name="jellyfin-rpmbuild"
 docker_sudo=""
-if ! $(id -Gn | grep -q 'docker') && [ ! $EUID -eq 0 ]; then
+if ! $(id -Gn | grep -q 'docker') && [ ! ${EUID:-1000} -eq 0 ] && [ ! $USER == "root" ]; then
     docker_sudo=sudo
 fi
 
diff --git a/deployment/fedora-package-x64/package.sh b/deployment/fedora-package-x64/package.sh
index 390c2d9b70..6942240066 100755
--- a/deployment/fedora-package-x64/package.sh
+++ b/deployment/fedora-package-x64/package.sh
@@ -19,7 +19,7 @@ pkg_src_dir="`pwd`/pkg-src"
 current_user="`whoami`"
 image_name="jellyfin-rpmbuild"
 docker_sudo=""
-if ! $(id -Gn | grep -q 'docker') && [ ! $EUID -eq 0 ]; then
+if ! $(id -Gn | grep -q 'docker') && [ ! ${EUID:-1000} -eq 0 ] && [ ! $USER == "root" ]; then
     docker_sudo=sudo
 fi