diff --git a/Jenkinsfile.baguette b/Jenkinsfile.baguette
index 6bd33aa89..729440983 100644
--- a/Jenkinsfile.baguette
+++ b/Jenkinsfile.baguette
@@ -62,15 +62,13 @@ pipeline {
                     }
                     steps {
                         withCredentials([
-                            usernamePassword(credentialsId: 'dockerbuildbot-hub.docker.com', usernameVariable: 'REGISTRY_USERNAME', passwordVariable: 'REGISTRY_PASSWORD'),
                             string(credentialsId: 'fossa-api-key', variable: 'FOSSA_API_KEY')
                         ]) {
                             dir('src/github.com/docker/app') {
                                 checkout scm
                                 ansiColor('xterm') {
-                                    sh "docker login -u $REGISTRY_USERNAME -p $REGISTRY_PASSWORD"
-                                    sh "FOSSA_API_KEY=$FOSSA_API_KEY BRANCH_NAME='${BRANCH_NAME}' make fossa-analyze"
-                                    sh "FOSSA_API_KEY=$FOSSA_API_KEY make fossa-test"
+                                    sh "BRANCH_NAME='${BRANCH_NAME}' make fossa-analyze"
+                                    sh "make fossa-test"
                                 }
                             }
                         }
diff --git a/Makefile b/Makefile
index 25697917e..08e35aa4b 100644
--- a/Makefile
+++ b/Makefile
@@ -122,7 +122,7 @@ fossa-test:
 	docker run -i --rm -e FOSSA_API_KEY=$(FOSSA_API_KEY) \
 	-v $(CURDIR)/$*:/go/src/github.com/docker/app \
 	-w /go/src/github.com/docker/app \
-	$(BUILD_ANALYZER) test --debug
+	$(BUILD_ANALYZER) test
 
 clean: ## clean build artifacts
 	$(call rmdir,bin)
diff --git a/vars.mk b/vars.mk
index fa3b90ebe..60e28810d 100644
--- a/vars.mk
+++ b/vars.mk
@@ -4,7 +4,7 @@ BIN_STANDALONE_NAME := ${BIN_NAME}-standalone
 E2E_NAME := $(BIN_NAME)-e2e
 
 # Variables for fossa scan
-BUILD_ANALYZER?=dockereng/fossa-analyzer
+BUILD_ANALYZER?=docker/fossa-analyzer
 FOSSA_OPTS?=--option all-tags:true --option allow-unresolved:true
 
 # Enable experimental features. "on" or "off"