diff --git a/build_iso.sh b/build_iso.sh
index 91da6cb..c3f3c18 100755
--- a/build_iso.sh
+++ b/build_iso.sh
@@ -75,10 +75,17 @@ echo "*** Copying isolinux.cfg to syslinux.cfg for grml2usb support ***"
 cp ${TEMPLATES}/boot/isolinux/isolinux.cfg ${TEMPLATES}/boot/isolinux/syslinux.cfg
 
 echo "*** Generating Sipwise ISO ***"
-sudo /usr/sbin/grml2iso -c ./${TEMPLATES} -o "${SIPWISE_ISO}" "${GRML_ISO}"
 
-echo "*** Generating dd-able ISO ***"
-sudo /usr/bin/isohybrid "${SIPWISE_ISO}"
+if [[ ! -d grml2usb.git ]] ; then
+  GRML2USB_VERSION='v0.17.0'
+  if ! git clone -b "${GRML2USB_VERSION}" --single-branch --depth 1 https://github.com/grml/grml2usb grml2usb.git ; then
+    echo "Cloning grml2usb from github failed, falling back to git.grml.org"
+    git clone -b "${GRML2USB_VERSION}" --single-branch --depth 1 git://git.grml.org/grml2usb.git
+  fi
+fi
+GRML2USB_DIR=$(pwd)/grml2usb.git
+
+sudo GRML2USB="${GRML2USB_DIR}/grml2usb" "${GRML2USB_DIR}/grml2iso" -c ./${TEMPLATES} -o "${SIPWISE_ISO}" "${GRML_ISO}"
 
 sudo implantisomd5 "${SIPWISE_ISO}"
 
diff --git a/t/Dockerfile b/t/Dockerfile
index 8209160..5ba5a23 100644
--- a/t/Dockerfile
+++ b/t/Dockerfile
@@ -19,13 +19,13 @@ WORKDIR /code/
 # When you want to build the base image from scratch
 # jump to the next section if you don't want to build yourself!:
 #
-# % docker build --tag="lua-ngcp-kamailio-stretch" -f t/Dockerfile .
-# % docker run --rm -i -t -v $(pwd):/code:rw lua-ngcp-kamailio-stretch:latest bash
+# % docker build --tag="deployment-iso-buster" -f t/Dockerfile .
+# % docker run --rm -i -t -v $(pwd):/code:rw deployment-iso-buster:latest bash
 #
 # Use the existing docker image:
-# % docker pull docker.mgm.sipwise.com/lua-ngcp-kamailio-stretch
+# % docker pull docker.mgm.sipwise.com/deployment-iso-buster
 # NOTE: run the following command from root folder of git repository:
-# % docker run --rm -i -t -v $(pwd):/code:rw docker.mgm.sipwise.com/lua-ngcp-kamailio-stretch:latest bash
+# % docker run --rm -i -t -v $(pwd):/code:rw docker.mgm.sipwise.com/deployment-iso-buster:latest bash
 #
 # Inside docker (the command is in history, just press UP button):
 #   ./t/testrunner