diff --git a/koji-setup/deploy-koji-builder.sh b/koji-setup/deploy-koji-builder.sh
index 2e0a585..2a1b5eb 100755
--- a/koji-setup/deploy-koji-builder.sh
+++ b/koji-setup/deploy-koji-builder.sh
@@ -20,12 +20,17 @@ useradd -r kojibuilder
 usermod -G mock kojibuilder
 
 # Kojid Configuration Files
+if [[ "$KOJI_SLAVE_FQDN" = "$KOJI_MASTER_FQDN" ]]; then
+	KOJI_TOP_DIR="$KOJI_DIR"
+else
+	KOJI_TOP_DIR="$KOJI_MOUNT_DIR"
+fi
 mkdir -p /etc/kojid
 cat > /etc/kojid/kojid.conf <<- EOF
 [kojid]
 sleeptime=5
 maxjobs=16
-topdir=$KOJI_DIR
+topdir=$KOJI_TOP_DIR
 workdir=/tmp/koji
 mockdir=/var/lib/mock
 mockuser=kojibuilder
diff --git a/koji-setup/deploy-koji-nfs-client.sh b/koji-setup/deploy-koji-nfs-client.sh
index b9fd263..2274166 100755
--- a/koji-setup/deploy-koji-nfs-client.sh
+++ b/koji-setup/deploy-koji-nfs-client.sh
@@ -7,7 +7,6 @@ SCRIPT_DIR="$(dirname "$(realpath "$0")")"
 source "$SCRIPT_DIR"/globals.sh
 source "$SCRIPT_DIR"/parameters.sh
 
-KOJI_MOUNT_DIR=/mnt/koji
 KOJI_MOUNT_SERVICE="${KOJI_MOUNT_DIR:1}"
 KOJI_MOUNT_SERVICE="${KOJI_MOUNT_SERVICE/\//-}".mount
 mkdir -p /etc/systemd/system
diff --git a/koji-setup/parameters.sh b/koji-setup/parameters.sh
index 6167544..ccf0fd8 100644
--- a/koji-setup/parameters.sh
+++ b/koji-setup/parameters.sh
@@ -4,6 +4,7 @@
 
 ## KOJI RPM BUILD AND TRACKER
 export KOJI_DIR=/srv/koji
+export KOJI_MOUNT_DIR=/mnt/koji
 export KOJI_MASTER_FQDN="$(hostname -f)"
 export KOJI_URL=https://"$KOJI_MASTER_FQDN"
 export KOJI_MOUNT_DIR=/mnt/koji