diff --git a/.drone.yml b/.drone.yml
index 10975dc..6b6e5ba 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -10,7 +10,7 @@ platform:
 steps:
 - name: build
   pull: always
-  image: rancher/hardened-build-base:v1.21.8b1
+  image: rancher/hardened-build-base:v1.22.2b1
   commands:
   - make DRONE_TAG=${DRONE_TAG}
   volumes:
@@ -18,7 +18,7 @@ steps:
     path: /var/run/docker.sock
 
 - name: publish
-  image: rancher/hardened-build-base:v1.21.8b1
+  image: rancher/hardened-build-base:v1.22.2b1
   commands:
   - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
   - make DRONE_TAG=${DRONE_TAG} image-push
@@ -37,7 +37,7 @@ steps:
       - drone-publish.rancher.io
 
 - name: scan
-  image: rancher/hardened-build-base:v1.21.8b1
+  image: rancher/hardened-build-base:v1.22.2b1
   commands:
   - make DRONE_TAG=${DRONE_TAG} image-scan
   volumes:
diff --git a/Dockerfile b/Dockerfile
index 02e5a96..2e4fd8d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILDER_IMAGE=rancher/hardened-build-base:v1.21.8b1
+ARG BUILDER_IMAGE=rancher/hardened-build-base:v1.22.2b1
 ARG BASE_IMAGE_MINIMAL=registry.suse.com/bci/bci-micro:latest
 
 ######
@@ -16,7 +16,7 @@ RUN go-assert-boring.sh bin/*
 
 # Build node feature discovery
 ARG ARCH="amd64"
-ARG TAG="v0.15.3"
+ARG TAG="v0.15.4"
 ARG PKG="github.com/kubernetes-sigs/node-feature-discovery"
 RUN git clone --depth=1 https://${PKG}.git $GOPATH/src/${PKG}
 WORKDIR $GOPATH/src/${PKG}
diff --git a/Makefile b/Makefile
index 8f75c0a..dea9793 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ BUILD_META=-build$(shell date +%Y%m%d)
 ORG ?= rancher
 PKG ?= "github.com/kubernetes-sigs/node-feature-discovery"
 SRC ?= "github.com/kubernetes-sigs/node-feature-discovery"
-TAG ?= v0.15.3$(BUILD_META)
+TAG ?= v0.15.4$(BUILD_META)
 
 ifneq ($(DRONE_TAG),)
 TAG := $(DRONE_TAG)