diff --git a/bin/sahara-image-create b/bin/sahara-image-create
new file mode 100755
index 00000000..0ba1f6e6
--- /dev/null
+++ b/bin/sahara-image-create
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -eu
+set -o pipefail
+
+SCRIPT_HOME=$(dirname $(readlink -f $0))
+if [ -d $SCRIPT_HOME/../share/sahara-elements ]; then
+    _PREFIX=$SCRIPT_HOME/../share/sahara-elements
+elif [ -d $SCRIPT_HOME/../../../elements ]; then
+    _PREFIX=$SCRIPT_HOME/../../..
+else
+    _PREFIX=$SCRIPT_HOME/..
+fi
+export ELEMENTS_PATH=$_PREFIX/elements
+
+diskimage-create.sh $@
diff --git a/setup.cfg b/setup.cfg
index 2619438b..ab3eab4a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -14,6 +14,10 @@ author-email = openstack-dev@lists.openstack.org
 home-page = https://docs.openstack.org/developer/sahara
 
 [files]
+scripts =
+    bin/sahara-image-create
+    diskimage-create/diskimage-create.sh
+
 data_files =
     share/sahara-elements = elements/*
 
diff --git a/tools/gate/build-images b/tools/gate/build-images
index 23d8e188..8d861828 100755
--- a/tools/gate/build-images
+++ b/tools/gate/build-images
@@ -1,6 +1,5 @@
 #!/bin/bash -xe
 
 PLUGIN=$1
-export SIM_REPO_PATH=$(pwd)
 
-./diskimage-create/diskimage-create.sh -u -p $PLUGIN
+tox -e venv -- sahara-image-create -u -p $PLUGIN