diff --git a/sabayon-createrepo b/sabayon-createrepo
index f4f73a9..9645ecf 100755
--- a/sabayon-createrepo
+++ b/sabayon-createrepo
@@ -10,7 +10,7 @@ REPOSITORY_DESCRIPTION="${REPOSITORY_DESCRIPTION:-My Sabayon repository}"
 DOCKER_IMAGE="${DOCKER_IMAGE:-sabayon/eit-amd64}"
 PORTAGE_ARTIFACTS="${PORTAGE_ARTIFACTS:-$SAB_WORKSPACE/portage_artifacts}"
 OUTPUT_DIR="${OUTPUT_DIR:-$SAB_WORKSPACE/entropy_artifacts}"
-DOCKER_OPTS="${DOCKER_OPTS:--ti --rm --entrypoint /bin/bash}"
+DOCKER_OPTS="${DOCKER_OPTS:--ti --rm}"
 
 args=("$@")
 EDITOR=cat
@@ -98,7 +98,7 @@ trap cleanup EXIT
 
 echo "docker $DOCKER_OPTS  ${docker_env[@]} ${docker_volumes[@]} $DOCKER_IMAGE /sabayon/bin/create_repo.sh"
 
-docker run $DOCKER_OPTS "${docker_env[@]}" "${docker_volumes[@]}" $DOCKER_IMAGE /sabayon/bin/create_repo.sh || true
+docker run  $DOCKER_OPTS --entrypoint /bin/bash "${docker_env[@]}" "${docker_volumes[@]}" $DOCKER_IMAGE /sabayon/bin/create_repo.sh || true
 
 if [ -d "$OUTPUT_DIR/standard" ]; then
   echo "The Sabayon repository files are in $SAB_WORKSPACE/entropy_artifacts"