diff --git a/createrepo.sh b/createrepo.sh
index 933920b..0e6455a 100644
--- a/createrepo.sh
+++ b/createrepo.sh
@@ -8,9 +8,12 @@ CREATEREPO_IMAGE_VERSION=0.17.2
 CUSTOM_UID=$(getent passwd ${USER} | cut -d ':' -f 3)
 CUSTOM_GID=$(getent passwd ${USER} | cut -d ':' -f 4)
 
+# Extract last element of passed arguments
+REPO_DIR=${@: -1}
+
 ${CONTAINER_RUNTIME} run \
   --rm \
-  --volume ${PWD}:${PWD} \
-  --workdir ${PWD} \
+  --volume ${REPO_DIR}:${REPO_DIR} \
+  --workdir ${REPO_DIR} \
   --user ${CUSTOM_UID}:${CUSTOM_GID} \
   docker.io/volkerraschek/createrepo:${CREATEREPO_IMAGE_VERSION} ${@}