diff --git a/.drone.yml b/.drone.yml
index 242c20b..77e1f47 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -10,7 +10,7 @@ platform:
 steps:
 - name: build
   pull: always
-  image: rancher/hardened-build-base:v1.17.13b7
+  image: rancher/hardened-build-base:v1.19.7b1
   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.17.13b7
+  image: rancher/hardened-build-base:v1.19.7b1
   commands:
   - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
   - make DRONE_TAG=${DRONE_TAG} image-push
@@ -35,7 +35,7 @@ steps:
     - tag
 
 - name: scan
-  image: rancher/hardened-build-base:v1.17.13b7
+  image: rancher/hardened-build-base:v1.19.7b1
   commands:
   - make DRONE_TAG=${DRONE_TAG} image-scan
   volumes:
diff --git a/Dockerfile b/Dockerfile
index 216f92b..9b201ef 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
-ARG BCI_IMAGE=registry.suse.com/bci/bci-base:15.3.17.20.12
-ARG GO_IMAGE=rancher/hardened-build-base:v1.17.13b7
+ARG BCI_IMAGE=registry.suse.com/bci/bci-base:15.4
+ARG GO_IMAGE=rancher/hardened-build-base:v1.19.7b1
 FROM ${BCI_IMAGE} as bci
 
 FROM ${GO_IMAGE} as builder
 ARG ARCH="amd64"
-ARG TAG="v0.6"
+ARG TAG="v0.6.1"
 ARG PKG="github.com/k8snetworkplumbingwg/whereabouts"
 ARG SRC="github.com/k8snetworkplumbingwg/whereabouts"
 RUN git clone --depth=1 https://${SRC}.git $GOPATH/src/${PKG}
diff --git a/Makefile b/Makefile
index 18826be..763e44c 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ BUILD_META=-build$(shell date +%Y%m%d)
 ORG ?= rancher
 PKG ?= github.com/k8snetworkplumbingwg/whereabouts
 SRC ?= github.com/k8snetworkplumbingwg/whereabouts
-TAG ?= v0.6$(BUILD_META)
+TAG ?= v0.6.1$(BUILD_META)
 
 ifneq ($(DRONE_TAG),)
 TAG := $(DRONE_TAG)