diff --git a/impl-endpoints/cloudflare-go/Dockerfile b/impl-endpoints/cloudflare-go/Dockerfile
index c7a7a8a..49990c3 100644
--- a/impl-endpoints/cloudflare-go/Dockerfile
+++ b/impl-endpoints/cloudflare-go/Dockerfile
@@ -4,8 +4,9 @@
 FROM golang:latest AS builder
 
 RUN apt-get update && \
-    apt-get install git && \
-    git clone --depth 1 --branch cf-delegated-credentials https://github.com/cloudflare/go /cf-go
+    apt-get install git
+
+RUN rm -fr /cf-go && git clone --depth 1 --branch cf https://github.com/cloudflare/go /cf-go
 
 WORKDIR /cf-go/src
 RUN ./make.bash
@@ -19,7 +20,7 @@ COPY --from=builder /cf-go /cf-go
 
 COPY runner.go config.go /
 
-RUN /cf-go/bin/go build -o /usr/bin/runner
+RUN /cf-go/bin/go build -o /usr/bin/runner runner.go config.go
 
 COPY run_endpoint.sh /
 RUN chmod +x /run_endpoint.sh
diff --git a/impl-endpoints/cloudflare-go/runner.go b/impl-endpoints/cloudflare-go/runner.go
index 1ebe543..5d79af0 100644
--- a/impl-endpoints/cloudflare-go/runner.go
+++ b/impl-endpoints/cloudflare-go/runner.go
@@ -35,7 +35,7 @@ func (t *dcClientHandler) ConnectionHandler(conn *tls.Conn, err error) error {
 	if err != nil {
 		return fmt.Errorf("Unexpected error: \"%s\"", err)
 	}
-	if conn.ConnectionState().VerifiedDC == nil {
+	if !conn.ConnectionState().VerifiedDC {
 		return errors.New("Failed to verify a delegated credential")
 	}
 	return nil