diff --git a/cmd/rdpgw/main.go b/cmd/rdpgw/main.go
index c894c349c5a48c7929f641196991ba206193c989..2f26673d1c7f898b1acd77f09833a6cd2906f587 100644
--- a/cmd/rdpgw/main.go
+++ b/cmd/rdpgw/main.go
@@ -155,7 +155,7 @@ func main() {
 		ReceiveBuf: conf.Server.ReceiveBuf,
 	}
 	if conf.Caps.TokenAuth {
-		gwConfig.VerifyTunnelAuthFunc = security.VerifyPAAToken
+		gwConfig.VerifyTunnelCreate = security.VerifyPAAToken
 		gwConfig.VerifyServerFunc = security.CheckSession(security.CheckHost)
 	} else {
 		gwConfig.VerifyServerFunc = security.CheckHost
diff --git a/dev/docker/Dockerfile b/dev/docker/Dockerfile
index 31505f14e08cd7b7935bd35a65800e4f6ba9085e..64d4f72011b46f5fcc6626615939c9525b5f906a 100644
--- a/dev/docker/Dockerfile
+++ b/dev/docker/Dockerfile
@@ -28,7 +28,7 @@ RUN git clone https://github.com/bolkedebruin/rdpgw.git /app && \
     chmod u+s /opt/rdpgw/rdpgw-auth && \
     chown -R 1001 /opt/rdpgw
 
-FROM busybox 
+FROM scratch 
 
 # make tempdir in case filestore is used
 ADD tmp.tar /