diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 3d4f0ec9..7a7c88cd 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.6.0
+current_version = 0.6.1
 commit = True
 message = Bumps version to {new_version}
 tag = False
diff --git a/bootstrap/Makefile.bootstrap b/bootstrap/Makefile.bootstrap
index e6142f8f..3568a73c 100644
--- a/bootstrap/Makefile.bootstrap
+++ b/bootstrap/Makefile.bootstrap
@@ -1,7 +1,7 @@
 export SHELL = /bin/bash
 export TARDIGRADE_CI_ORG ?= plus3it
 export TARDIGRADE_CI_PROJECT ?= tardigrade-ci
-export TARDIGRADE_CI_BRANCH ?= master
+export TARDIGRADE_CI_BRANCH ?= $(or $(shell grep 'FROM $(TARDIGRADE_CI_ORG)/$(TARDIGRADE_CI_PROJECT)' Dockerfile | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' 2> /dev/null),master)
 export TARDIGRADE_CI_PATH ?= $(shell until [ -d "$(TARDIGRADE_CI_PROJECT)" ] || [ "`pwd`" == '/' ]; do cd ..; done; pwd)/$(TARDIGRADE_CI_PROJECT)
 
 -include $(TARDIGRADE_CI_PATH)/Makefile
diff --git a/bootstrap/bin/install.sh b/bootstrap/bin/install.sh
index d090a975..8b355bc5 100755
--- a/bootstrap/bin/install.sh
+++ b/bootstrap/bin/install.sh
@@ -12,4 +12,4 @@ fi
 
 echo "Cloning ${GITHUB_REPO}#${TARDIGRADE_CI_BRANCH}..."
 
-git clone -b "$TARDIGRADE_CI_BRANCH" "$GITHUB_REPO"
+git clone -c advice.detachedHead=false --depth=1 -b "$TARDIGRADE_CI_BRANCH" "$GITHUB_REPO"