diff --git a/acme/challenge.go b/acme/challenge.go
index c7b4a4b50..bc21d0010 100644
--- a/acme/challenge.go
+++ b/acme/challenge.go
@@ -512,6 +512,8 @@ func wireDPOP01Validate(ctx context.Context, ch *Challenge, db DB, jwk *jose.JSO
 		"verify-access",
 		"--client-id",
 		challengeValues.ClientID,
+		"--handle",
+		challengeValues.Handle,
 		"--challenge",
 		ch.Token,
 		"--leeway",
diff --git a/docker/Dockerfile.step-ca b/docker/Dockerfile.step-ca
index a8211acd5..2d0d31aca 100644
--- a/docker/Dockerfile.step-ca
+++ b/docker/Dockerfile.step-ca
@@ -12,7 +12,7 @@ RUN make V=1 bin/step-ca
 FROM rust:alpine AS rustbuilder
 
 RUN apk add --no-cache git musl-dev perl
-RUN git clone https://github.com/wireapp/rusty-jwt-tools.git /src
+RUN git clone --branch feat/dpop-handle-teams https://github.com/wireapp/rusty-jwt-tools.git /src
 
 RUN cd /src && \
     cargo build --release --verbose