diff --git a/Makefile b/Makefile
index a8c971dbe..002d053cb 100644
--- a/Makefile
+++ b/Makefile
@@ -25,10 +25,14 @@ hubble:
 	$(GO_BUILD) $(if $(GO_TAGS),-tags $(GO_TAGS)) -ldflags "-w -s -X 'github.com/cilium/hubble/pkg.GitBranch=${GIT_BRANCH}' -X 'github.com/cilium/hubble/pkg.GitHash=$(GIT_HASH)' -X 'github.com/cilium/hubble/pkg.Version=${VERSION}'" -o $(TARGET)
 
 release:
-	docker run --env "RELEASE_UID=$(RELEASE_UID)" --env "RELEASE_GID=$(RELEASE_GID)" --rm --workdir /hubble --volume `pwd`:/hubble docker.io/library/golang:1.18.3-alpine3.16 \
-		sh -c "apk add --no-cache make git && make local-release"
+	docker run --rm --workdir /hubble --volume `pwd`:/hubble docker.io/library/golang:1.18.3-alpine3.16 \
+		sh -c "apk add --no-cache make git && \
+			addgroup -g $(RELEASE_GID) release && \
+			adduser -u $(RELEASE_UID) -D -G release release && \
+			su release -c 'make local-release'"
 
 local-release: clean
+	set -o errexit; \
 	for OS in darwin linux windows; do \
 		EXT=; \
 		ARCHS=; \
@@ -52,10 +56,7 @@ local-release: clean
 			(cd release && sha256sum $(TARGET)-$$OS-$$ARCH.tar.gz > $(TARGET)-$$OS-$$ARCH.tar.gz.sha256sum); \
 		done; \
 		rm -r release/$$OS; \
-	done; \
-	if [ $$(id -u) -eq 0 -a -n "$$RELEASE_UID" -a -n "$$RELEASE_GID" ]; then \
-		chown -R "$$RELEASE_UID:$$RELEASE_GID" release; \
-	fi
+	done;
 
 install: hubble
 	$(INSTALL) -m 0755 -d $(DESTDIR)$(BINDIR)