diff --git a/alluxio/hooks/post_build b/alluxio/hooks/post_build
index 8c9d46088..b4d4de743 100755
--- a/alluxio/hooks/post_build
+++ b/alluxio/hooks/post_build
@@ -16,7 +16,11 @@
 set -euo pipefail
 [ -n "${DEBUG:-}" ] && set -x
 
-docker_branch_base="$(basename "$(dirname "${BASH_SOURCE[0]}")/..")"
+if [ -z "${SOURCE_BRANCH:-}" ]; then
+    SOURCE_BRANCH="$(git branch  | sed -n 's/*[[:space:]]*//p')"
+fi
+# readlink is not portable across Linux + Mac
+docker_branch_base="$(basename "$(cd "$(dirname "${BASH_SOURCE[0]}")/.."; echo "$PWD")")"
 docker_branch_base="${docker_branch_base%-dev}"
 docker_branch_base="${docker_branch_base%-cluster}"
 if [ "$docker_branch_base" = "kafka" ]; then
diff --git a/apache-drill/hooks/post_build b/apache-drill/hooks/post_build
index 8c9d46088..b4d4de743 100755
--- a/apache-drill/hooks/post_build
+++ b/apache-drill/hooks/post_build
@@ -16,7 +16,11 @@
 set -euo pipefail
 [ -n "${DEBUG:-}" ] && set -x
 
-docker_branch_base="$(basename "$(dirname "${BASH_SOURCE[0]}")/..")"
+if [ -z "${SOURCE_BRANCH:-}" ]; then
+    SOURCE_BRANCH="$(git branch  | sed -n 's/*[[:space:]]*//p')"
+fi
+# readlink is not portable across Linux + Mac
+docker_branch_base="$(basename "$(cd "$(dirname "${BASH_SOURCE[0]}")/.."; echo "$PWD")")"
 docker_branch_base="${docker_branch_base%-dev}"
 docker_branch_base="${docker_branch_base%-cluster}"
 if [ "$docker_branch_base" = "kafka" ]; then
diff --git a/cassandra-dev/hooks/post_build b/cassandra-dev/hooks/post_build
index 8c9d46088..b4d4de743 100755
--- a/cassandra-dev/hooks/post_build
+++ b/cassandra-dev/hooks/post_build
@@ -16,7 +16,11 @@
 set -euo pipefail
 [ -n "${DEBUG:-}" ] && set -x
 
-docker_branch_base="$(basename "$(dirname "${BASH_SOURCE[0]}")/..")"
+if [ -z "${SOURCE_BRANCH:-}" ]; then
+    SOURCE_BRANCH="$(git branch  | sed -n 's/*[[:space:]]*//p')"
+fi
+# readlink is not portable across Linux + Mac
+docker_branch_base="$(basename "$(cd "$(dirname "${BASH_SOURCE[0]}")/.."; echo "$PWD")")"
 docker_branch_base="${docker_branch_base%-dev}"
 docker_branch_base="${docker_branch_base%-cluster}"
 if [ "$docker_branch_base" = "kafka" ]; then
diff --git a/consul-dev/hooks/post_build b/consul-dev/hooks/post_build
index 8c9d46088..b4d4de743 100755
--- a/consul-dev/hooks/post_build
+++ b/consul-dev/hooks/post_build
@@ -16,7 +16,11 @@
 set -euo pipefail
 [ -n "${DEBUG:-}" ] && set -x
 
-docker_branch_base="$(basename "$(dirname "${BASH_SOURCE[0]}")/..")"
+if [ -z "${SOURCE_BRANCH:-}" ]; then
+    SOURCE_BRANCH="$(git branch  | sed -n 's/*[[:space:]]*//p')"
+fi
+# readlink is not portable across Linux + Mac
+docker_branch_base="$(basename "$(cd "$(dirname "${BASH_SOURCE[0]}")/.."; echo "$PWD")")"
 docker_branch_base="${docker_branch_base%-dev}"
 docker_branch_base="${docker_branch_base%-cluster}"
 if [ "$docker_branch_base" = "kafka" ]; then
diff --git a/consul/hooks/post_build b/consul/hooks/post_build
index 8c9d46088..b4d4de743 100755
--- a/consul/hooks/post_build
+++ b/consul/hooks/post_build
@@ -16,7 +16,11 @@
 set -euo pipefail
 [ -n "${DEBUG:-}" ] && set -x
 
-docker_branch_base="$(basename "$(dirname "${BASH_SOURCE[0]}")/..")"
+if [ -z "${SOURCE_BRANCH:-}" ]; then
+    SOURCE_BRANCH="$(git branch  | sed -n 's/*[[:space:]]*//p')"
+fi
+# readlink is not portable across Linux + Mac
+docker_branch_base="$(basename "$(cd "$(dirname "${BASH_SOURCE[0]}")/.."; echo "$PWD")")"
 docker_branch_base="${docker_branch_base%-dev}"
 docker_branch_base="${docker_branch_base%-cluster}"
 if [ "$docker_branch_base" = "kafka" ]; then
diff --git a/h2o/hooks/post_build b/h2o/hooks/post_build
index 8c9d46088..b4d4de743 100755
--- a/h2o/hooks/post_build
+++ b/h2o/hooks/post_build
@@ -16,7 +16,11 @@
 set -euo pipefail
 [ -n "${DEBUG:-}" ] && set -x
 
-docker_branch_base="$(basename "$(dirname "${BASH_SOURCE[0]}")/..")"
+if [ -z "${SOURCE_BRANCH:-}" ]; then
+    SOURCE_BRANCH="$(git branch  | sed -n 's/*[[:space:]]*//p')"
+fi
+# readlink is not portable across Linux + Mac
+docker_branch_base="$(basename "$(cd "$(dirname "${BASH_SOURCE[0]}")/.."; echo "$PWD")")"
 docker_branch_base="${docker_branch_base%-dev}"
 docker_branch_base="${docker_branch_base%-cluster}"
 if [ "$docker_branch_base" = "kafka" ]; then
diff --git a/hadoop-dev/hooks/post_build b/hadoop-dev/hooks/post_build
index 8c9d46088..b4d4de743 100755
--- a/hadoop-dev/hooks/post_build
+++ b/hadoop-dev/hooks/post_build
@@ -16,7 +16,11 @@
 set -euo pipefail
 [ -n "${DEBUG:-}" ] && set -x
 
-docker_branch_base="$(basename "$(dirname "${BASH_SOURCE[0]}")/..")"
+if [ -z "${SOURCE_BRANCH:-}" ]; then
+    SOURCE_BRANCH="$(git branch  | sed -n 's/*[[:space:]]*//p')"
+fi
+# readlink is not portable across Linux + Mac
+docker_branch_base="$(basename "$(cd "$(dirname "${BASH_SOURCE[0]}")/.."; echo "$PWD")")"
 docker_branch_base="${docker_branch_base%-dev}"
 docker_branch_base="${docker_branch_base%-cluster}"
 if [ "$docker_branch_base" = "kafka" ]; then
diff --git a/hadoop/hooks/post_build b/hadoop/hooks/post_build
index 8c9d46088..b4d4de743 100755
--- a/hadoop/hooks/post_build
+++ b/hadoop/hooks/post_build
@@ -16,7 +16,11 @@
 set -euo pipefail
 [ -n "${DEBUG:-}" ] && set -x
 
-docker_branch_base="$(basename "$(dirname "${BASH_SOURCE[0]}")/..")"
+if [ -z "${SOURCE_BRANCH:-}" ]; then
+    SOURCE_BRANCH="$(git branch  | sed -n 's/*[[:space:]]*//p')"
+fi
+# readlink is not portable across Linux + Mac
+docker_branch_base="$(basename "$(cd "$(dirname "${BASH_SOURCE[0]}")/.."; echo "$PWD")")"
 docker_branch_base="${docker_branch_base%-dev}"
 docker_branch_base="${docker_branch_base%-cluster}"
 if [ "$docker_branch_base" = "kafka" ]; then
diff --git a/hbase-dev/hooks/post_build b/hbase-dev/hooks/post_build
index 8c9d46088..b4d4de743 100755
--- a/hbase-dev/hooks/post_build
+++ b/hbase-dev/hooks/post_build
@@ -16,7 +16,11 @@
 set -euo pipefail
 [ -n "${DEBUG:-}" ] && set -x
 
-docker_branch_base="$(basename "$(dirname "${BASH_SOURCE[0]}")/..")"
+if [ -z "${SOURCE_BRANCH:-}" ]; then
+    SOURCE_BRANCH="$(git branch  | sed -n 's/*[[:space:]]*//p')"
+fi
+# readlink is not portable across Linux + Mac
+docker_branch_base="$(basename "$(cd "$(dirname "${BASH_SOURCE[0]}")/.."; echo "$PWD")")"
 docker_branch_base="${docker_branch_base%-dev}"
 docker_branch_base="${docker_branch_base%-cluster}"
 if [ "$docker_branch_base" = "kafka" ]; then
diff --git a/jython/hooks/post_build b/jython/hooks/post_build
index 8c9d46088..b4d4de743 100755
--- a/jython/hooks/post_build
+++ b/jython/hooks/post_build
@@ -16,7 +16,11 @@
 set -euo pipefail
 [ -n "${DEBUG:-}" ] && set -x
 
-docker_branch_base="$(basename "$(dirname "${BASH_SOURCE[0]}")/..")"
+if [ -z "${SOURCE_BRANCH:-}" ]; then
+    SOURCE_BRANCH="$(git branch  | sed -n 's/*[[:space:]]*//p')"
+fi
+# readlink is not portable across Linux + Mac
+docker_branch_base="$(basename "$(cd "$(dirname "${BASH_SOURCE[0]}")/.."; echo "$PWD")")"
 docker_branch_base="${docker_branch_base%-dev}"
 docker_branch_base="${docker_branch_base%-cluster}"
 if [ "$docker_branch_base" = "kafka" ]; then
diff --git a/kafka/hooks/post_build b/kafka/hooks/post_build
index 8c9d46088..b4d4de743 100755
--- a/kafka/hooks/post_build
+++ b/kafka/hooks/post_build
@@ -16,7 +16,11 @@
 set -euo pipefail
 [ -n "${DEBUG:-}" ] && set -x
 
-docker_branch_base="$(basename "$(dirname "${BASH_SOURCE[0]}")/..")"
+if [ -z "${SOURCE_BRANCH:-}" ]; then
+    SOURCE_BRANCH="$(git branch  | sed -n 's/*[[:space:]]*//p')"
+fi
+# readlink is not portable across Linux + Mac
+docker_branch_base="$(basename "$(cd "$(dirname "${BASH_SOURCE[0]}")/.."; echo "$PWD")")"
 docker_branch_base="${docker_branch_base%-dev}"
 docker_branch_base="${docker_branch_base%-cluster}"
 if [ "$docker_branch_base" = "kafka" ]; then
diff --git a/mesos/hooks/post_build b/mesos/hooks/post_build
index 8c9d46088..b4d4de743 100755
--- a/mesos/hooks/post_build
+++ b/mesos/hooks/post_build
@@ -16,7 +16,11 @@
 set -euo pipefail
 [ -n "${DEBUG:-}" ] && set -x
 
-docker_branch_base="$(basename "$(dirname "${BASH_SOURCE[0]}")/..")"
+if [ -z "${SOURCE_BRANCH:-}" ]; then
+    SOURCE_BRANCH="$(git branch  | sed -n 's/*[[:space:]]*//p')"
+fi
+# readlink is not portable across Linux + Mac
+docker_branch_base="$(basename "$(cd "$(dirname "${BASH_SOURCE[0]}")/.."; echo "$PWD")")"
 docker_branch_base="${docker_branch_base%-dev}"
 docker_branch_base="${docker_branch_base%-cluster}"
 if [ "$docker_branch_base" = "kafka" ]; then
diff --git a/nifi/hooks/post_build b/nifi/hooks/post_build
index 8c9d46088..b4d4de743 100755
--- a/nifi/hooks/post_build
+++ b/nifi/hooks/post_build
@@ -16,7 +16,11 @@
 set -euo pipefail
 [ -n "${DEBUG:-}" ] && set -x
 
-docker_branch_base="$(basename "$(dirname "${BASH_SOURCE[0]}")/..")"
+if [ -z "${SOURCE_BRANCH:-}" ]; then
+    SOURCE_BRANCH="$(git branch  | sed -n 's/*[[:space:]]*//p')"
+fi
+# readlink is not portable across Linux + Mac
+docker_branch_base="$(basename "$(cd "$(dirname "${BASH_SOURCE[0]}")/.."; echo "$PWD")")"
 docker_branch_base="${docker_branch_base%-dev}"
 docker_branch_base="${docker_branch_base%-cluster}"
 if [ "$docker_branch_base" = "kafka" ]; then
diff --git a/rabbitmq-cluster/hooks/post_build b/rabbitmq-cluster/hooks/post_build
index 8c9d46088..b4d4de743 100755
--- a/rabbitmq-cluster/hooks/post_build
+++ b/rabbitmq-cluster/hooks/post_build
@@ -16,7 +16,11 @@
 set -euo pipefail
 [ -n "${DEBUG:-}" ] && set -x
 
-docker_branch_base="$(basename "$(dirname "${BASH_SOURCE[0]}")/..")"
+if [ -z "${SOURCE_BRANCH:-}" ]; then
+    SOURCE_BRANCH="$(git branch  | sed -n 's/*[[:space:]]*//p')"
+fi
+# readlink is not portable across Linux + Mac
+docker_branch_base="$(basename "$(cd "$(dirname "${BASH_SOURCE[0]}")/.."; echo "$PWD")")"
 docker_branch_base="${docker_branch_base%-dev}"
 docker_branch_base="${docker_branch_base%-cluster}"
 if [ "$docker_branch_base" = "kafka" ]; then
diff --git a/ranger/hooks/post_build b/ranger/hooks/post_build
new file mode 100755
index 000000000..b4d4de743
--- /dev/null
+++ b/ranger/hooks/post_build
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+#  vim:ts=4:sts=4:sw=4:et
+#
+#  Author: Hari Sekhon
+#  Date: 2016-12-17 19:47:36 +0000 (Sat, 17 Dec 2016)
+#
+#  https://github.com/harisekhon/Dockerfiles
+#
+#  License: see accompanying Hari Sekhon LICENSE file
+#
+#  If you're using my code you're welcome to connect with me on LinkedIn and optionally send me feedback to help steer this or other code I publish
+#
+#  https://www.linkedin.com/in/harisekhon
+#
+
+set -euo pipefail
+[ -n "${DEBUG:-}" ] && set -x
+
+if [ -z "${SOURCE_BRANCH:-}" ]; then
+    SOURCE_BRANCH="$(git branch  | sed -n 's/*[[:space:]]*//p')"
+fi
+# readlink is not portable across Linux + Mac
+docker_branch_base="$(basename "$(cd "$(dirname "${BASH_SOURCE[0]}")/.."; echo "$PWD")")"
+docker_branch_base="${docker_branch_base%-dev}"
+docker_branch_base="${docker_branch_base%-cluster}"
+if [ "$docker_branch_base" = "kafka" ]; then
+    latest_tag="2.11-0.9"
+else
+    latest_tag="$(grep ARG.*_VERSION= Dockerfile | sed -n '$s/.*=//p' | awk -F. '{print $1"."$2}')"
+fi
+
+if [ "$SOURCE_BRANCH" = "$docker_branch_base-$latest_tag" ]; then
+    for tag in latest ${latest_tag%%.*}; do
+        docker tag "$IMAGE_NAME" "$DOCKER_REPO:$tag"
+        docker push "$DOCKER_REPO:$tag"
+    done
+fi
diff --git a/riak-dev/hooks/post_build b/riak-dev/hooks/post_build
index 8c9d46088..b4d4de743 100755
--- a/riak-dev/hooks/post_build
+++ b/riak-dev/hooks/post_build
@@ -16,7 +16,11 @@
 set -euo pipefail
 [ -n "${DEBUG:-}" ] && set -x
 
-docker_branch_base="$(basename "$(dirname "${BASH_SOURCE[0]}")/..")"
+if [ -z "${SOURCE_BRANCH:-}" ]; then
+    SOURCE_BRANCH="$(git branch  | sed -n 's/*[[:space:]]*//p')"
+fi
+# readlink is not portable across Linux + Mac
+docker_branch_base="$(basename "$(cd "$(dirname "${BASH_SOURCE[0]}")/.."; echo "$PWD")")"
 docker_branch_base="${docker_branch_base%-dev}"
 docker_branch_base="${docker_branch_base%-cluster}"
 if [ "$docker_branch_base" = "kafka" ]; then
diff --git a/riak/hooks/post_build b/riak/hooks/post_build
index 8c9d46088..b4d4de743 100755
--- a/riak/hooks/post_build
+++ b/riak/hooks/post_build
@@ -16,7 +16,11 @@
 set -euo pipefail
 [ -n "${DEBUG:-}" ] && set -x
 
-docker_branch_base="$(basename "$(dirname "${BASH_SOURCE[0]}")/..")"
+if [ -z "${SOURCE_BRANCH:-}" ]; then
+    SOURCE_BRANCH="$(git branch  | sed -n 's/*[[:space:]]*//p')"
+fi
+# readlink is not portable across Linux + Mac
+docker_branch_base="$(basename "$(cd "$(dirname "${BASH_SOURCE[0]}")/.."; echo "$PWD")")"
 docker_branch_base="${docker_branch_base%-dev}"
 docker_branch_base="${docker_branch_base%-cluster}"
 if [ "$docker_branch_base" = "kafka" ]; then
diff --git a/serf/hooks/post_build b/serf/hooks/post_build
index 8c9d46088..b4d4de743 100755
--- a/serf/hooks/post_build
+++ b/serf/hooks/post_build
@@ -16,7 +16,11 @@
 set -euo pipefail
 [ -n "${DEBUG:-}" ] && set -x
 
-docker_branch_base="$(basename "$(dirname "${BASH_SOURCE[0]}")/..")"
+if [ -z "${SOURCE_BRANCH:-}" ]; then
+    SOURCE_BRANCH="$(git branch  | sed -n 's/*[[:space:]]*//p')"
+fi
+# readlink is not portable across Linux + Mac
+docker_branch_base="$(basename "$(cd "$(dirname "${BASH_SOURCE[0]}")/.."; echo "$PWD")")"
 docker_branch_base="${docker_branch_base%-dev}"
 docker_branch_base="${docker_branch_base%-cluster}"
 if [ "$docker_branch_base" = "kafka" ]; then
diff --git a/solr/hooks/post_build b/solr/hooks/post_build
index 8c9d46088..b4d4de743 100755
--- a/solr/hooks/post_build
+++ b/solr/hooks/post_build
@@ -16,7 +16,11 @@
 set -euo pipefail
 [ -n "${DEBUG:-}" ] && set -x
 
-docker_branch_base="$(basename "$(dirname "${BASH_SOURCE[0]}")/..")"
+if [ -z "${SOURCE_BRANCH:-}" ]; then
+    SOURCE_BRANCH="$(git branch  | sed -n 's/*[[:space:]]*//p')"
+fi
+# readlink is not portable across Linux + Mac
+docker_branch_base="$(basename "$(cd "$(dirname "${BASH_SOURCE[0]}")/.."; echo "$PWD")")"
 docker_branch_base="${docker_branch_base%-dev}"
 docker_branch_base="${docker_branch_base%-cluster}"
 if [ "$docker_branch_base" = "kafka" ]; then
diff --git a/solrcloud-dev/hooks/post_build b/solrcloud-dev/hooks/post_build
index 8c9d46088..b4d4de743 100755
--- a/solrcloud-dev/hooks/post_build
+++ b/solrcloud-dev/hooks/post_build
@@ -16,7 +16,11 @@
 set -euo pipefail
 [ -n "${DEBUG:-}" ] && set -x
 
-docker_branch_base="$(basename "$(dirname "${BASH_SOURCE[0]}")/..")"
+if [ -z "${SOURCE_BRANCH:-}" ]; then
+    SOURCE_BRANCH="$(git branch  | sed -n 's/*[[:space:]]*//p')"
+fi
+# readlink is not portable across Linux + Mac
+docker_branch_base="$(basename "$(cd "$(dirname "${BASH_SOURCE[0]}")/.."; echo "$PWD")")"
 docker_branch_base="${docker_branch_base%-dev}"
 docker_branch_base="${docker_branch_base%-cluster}"
 if [ "$docker_branch_base" = "kafka" ]; then
diff --git a/solrcloud/hooks/post_build b/solrcloud/hooks/post_build
index 8c9d46088..b4d4de743 100755
--- a/solrcloud/hooks/post_build
+++ b/solrcloud/hooks/post_build
@@ -16,7 +16,11 @@
 set -euo pipefail
 [ -n "${DEBUG:-}" ] && set -x
 
-docker_branch_base="$(basename "$(dirname "${BASH_SOURCE[0]}")/..")"
+if [ -z "${SOURCE_BRANCH:-}" ]; then
+    SOURCE_BRANCH="$(git branch  | sed -n 's/*[[:space:]]*//p')"
+fi
+# readlink is not portable across Linux + Mac
+docker_branch_base="$(basename "$(cd "$(dirname "${BASH_SOURCE[0]}")/.."; echo "$PWD")")"
 docker_branch_base="${docker_branch_base%-dev}"
 docker_branch_base="${docker_branch_base%-cluster}"
 if [ "$docker_branch_base" = "kafka" ]; then
diff --git a/spark/hooks/post_build b/spark/hooks/post_build
index 8c9d46088..b4d4de743 100755
--- a/spark/hooks/post_build
+++ b/spark/hooks/post_build
@@ -16,7 +16,11 @@
 set -euo pipefail
 [ -n "${DEBUG:-}" ] && set -x
 
-docker_branch_base="$(basename "$(dirname "${BASH_SOURCE[0]}")/..")"
+if [ -z "${SOURCE_BRANCH:-}" ]; then
+    SOURCE_BRANCH="$(git branch  | sed -n 's/*[[:space:]]*//p')"
+fi
+# readlink is not portable across Linux + Mac
+docker_branch_base="$(basename "$(cd "$(dirname "${BASH_SOURCE[0]}")/.."; echo "$PWD")")"
 docker_branch_base="${docker_branch_base%-dev}"
 docker_branch_base="${docker_branch_base%-cluster}"
 if [ "$docker_branch_base" = "kafka" ]; then
diff --git a/tachyon/hooks/post_build b/tachyon/hooks/post_build
index 8c9d46088..b4d4de743 100755
--- a/tachyon/hooks/post_build
+++ b/tachyon/hooks/post_build
@@ -16,7 +16,11 @@
 set -euo pipefail
 [ -n "${DEBUG:-}" ] && set -x
 
-docker_branch_base="$(basename "$(dirname "${BASH_SOURCE[0]}")/..")"
+if [ -z "${SOURCE_BRANCH:-}" ]; then
+    SOURCE_BRANCH="$(git branch  | sed -n 's/*[[:space:]]*//p')"
+fi
+# readlink is not portable across Linux + Mac
+docker_branch_base="$(basename "$(cd "$(dirname "${BASH_SOURCE[0]}")/.."; echo "$PWD")")"
 docker_branch_base="${docker_branch_base%-dev}"
 docker_branch_base="${docker_branch_base%-cluster}"
 if [ "$docker_branch_base" = "kafka" ]; then
diff --git a/teamcity/hooks/post_build b/teamcity/hooks/post_build
index 8c9d46088..b4d4de743 100755
--- a/teamcity/hooks/post_build
+++ b/teamcity/hooks/post_build
@@ -16,7 +16,11 @@
 set -euo pipefail
 [ -n "${DEBUG:-}" ] && set -x
 
-docker_branch_base="$(basename "$(dirname "${BASH_SOURCE[0]}")/..")"
+if [ -z "${SOURCE_BRANCH:-}" ]; then
+    SOURCE_BRANCH="$(git branch  | sed -n 's/*[[:space:]]*//p')"
+fi
+# readlink is not portable across Linux + Mac
+docker_branch_base="$(basename "$(cd "$(dirname "${BASH_SOURCE[0]}")/.."; echo "$PWD")")"
 docker_branch_base="${docker_branch_base%-dev}"
 docker_branch_base="${docker_branch_base%-cluster}"
 if [ "$docker_branch_base" = "kafka" ]; then
diff --git a/zookeeper-dev/hooks/post_build b/zookeeper-dev/hooks/post_build
index 8c9d46088..b4d4de743 100755
--- a/zookeeper-dev/hooks/post_build
+++ b/zookeeper-dev/hooks/post_build
@@ -16,7 +16,11 @@
 set -euo pipefail
 [ -n "${DEBUG:-}" ] && set -x
 
-docker_branch_base="$(basename "$(dirname "${BASH_SOURCE[0]}")/..")"
+if [ -z "${SOURCE_BRANCH:-}" ]; then
+    SOURCE_BRANCH="$(git branch  | sed -n 's/*[[:space:]]*//p')"
+fi
+# readlink is not portable across Linux + Mac
+docker_branch_base="$(basename "$(cd "$(dirname "${BASH_SOURCE[0]}")/.."; echo "$PWD")")"
 docker_branch_base="${docker_branch_base%-dev}"
 docker_branch_base="${docker_branch_base%-cluster}"
 if [ "$docker_branch_base" = "kafka" ]; then
diff --git a/zookeeper/hooks/post_build b/zookeeper/hooks/post_build
index 8c9d46088..b4d4de743 100755
--- a/zookeeper/hooks/post_build
+++ b/zookeeper/hooks/post_build
@@ -16,7 +16,11 @@
 set -euo pipefail
 [ -n "${DEBUG:-}" ] && set -x
 
-docker_branch_base="$(basename "$(dirname "${BASH_SOURCE[0]}")/..")"
+if [ -z "${SOURCE_BRANCH:-}" ]; then
+    SOURCE_BRANCH="$(git branch  | sed -n 's/*[[:space:]]*//p')"
+fi
+# readlink is not portable across Linux + Mac
+docker_branch_base="$(basename "$(cd "$(dirname "${BASH_SOURCE[0]}")/.."; echo "$PWD")")"
 docker_branch_base="${docker_branch_base%-dev}"
 docker_branch_base="${docker_branch_base%-cluster}"
 if [ "$docker_branch_base" = "kafka" ]; then