diff --git a/sabayon-buildpackages b/sabayon-buildpackages
index c097628..7e14455 100755
--- a/sabayon-buildpackages
+++ b/sabayon-buildpackages
@@ -1,6 +1,7 @@
 #!/bin/bash
 set -e
 ROOT="${ROOT:-$PWD}"
+DOCKER_IMAGE="${DOCKER_IMAGE:-sabayon/builder-amd64}"
 
 if [ $# -eq 0 ]
   then
@@ -12,4 +13,4 @@ if [ "$(id -u)" != "0" ]; then
   echo "!! If you are not running the script as root, your user should be in the docker group to use it. (sudo gpasswd -a $USER docker) !!"
 fi
 
-docker run --rm -v "$ROOT"/portage_artifacts:/usr/portage/packages -ti sabayon/builder-amd64 $@
+docker run --rm -v "$ROOT"/portage_artifacts:/usr/portage/packages -ti $DOCKER_IMAGE $@
diff --git a/sabayon-createrepo b/sabayon-createrepo
index 5584b5f..6b2eb21 100755
--- a/sabayon-createrepo
+++ b/sabayon-createrepo
@@ -5,6 +5,7 @@ entropysrv=$(mktemp)
 createrepo=$(mktemp)
 REPOSITORY_NAME="${REPOSITORY_NAME:-default}"
 REPOSITORY_DESCRIPTION="${REPOSITORY_DESCRIPTION:-My Sabayon repository}"
+DOCKER_IMAGE="${DOCKER_IMAGE:-sabayon/builder-amd64}"
 EDITOR=cat
 
 if [ "$(id -u)" != "0" ]; then
@@ -72,6 +73,6 @@ docker run --rm --entrypoint /bin/bash -e REPOSITORY=$REPOSITORY_NAME -e EDITOR=
 		-v $createrepo:/sabayon/bin/create_repo.sh \
 		-v $entropysrv:/etc/entropy/server.conf \
 		-v "$ROOT"/portage_artifacts:/usr/portage/packages \
-		-ti sabayon/builder-amd64 /sabayon/bin/create_repo.sh || true
+		-ti $DOCKER_IMAGE /sabayon/bin/create_repo.sh || true
 rm -rf $createrepo
 rm -rf $entropysrv