diff --git a/Makefile b/Makefile
index 454c30d65..a9b16ffbf 100644
--- a/Makefile
+++ b/Makefile
@@ -67,9 +67,11 @@ TARBALL=$(NPD_NAME_VERSION).tar.gz
 IMAGE_TAGS=--tag $(REGISTRY)/node-problem-detector:$(TAG)
 IMAGE_TAGS_WINDOWS=--tag $(REGISTRY)/node-problem-detector-windows:$(TAG)
 ifeq ($(REGISTRY), gcr.io/k8s-staging-npd)
+ifeq (,$(findstring heads,$(BRANCH)))
   IMAGE_TAGS+= --tag $(REGISTRY)/node-problem-detector:$(BRANCH)
   IMAGE_TAGS_WINDOWS+= --tag $(REGISTRY)/node-problem-detector-windows:$(BRANCH)
 endif
+endif
 
 # ENABLE_JOURNALD enables build journald support or not. Building journald
 # support needs libsystemd-dev or libsystemd-journal-dev.
diff --git a/version.txt b/version.txt
index 419298c88..fee5b0273 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-v0.8.23
+v0.8.24