diff --git a/.buildkite/hooks/post-command b/.buildkite/hooks/post-command
index 3a0d43448..85e963d27 100755
--- a/.buildkite/hooks/post-command
+++ b/.buildkite/hooks/post-command
@@ -10,6 +10,10 @@ if [[ $BUILDKITE_LABEL =~ ":selenium:" ]] || [[ $BUILDKITE_LABEL =~ ":docker: Bu
   fi
 fi
 
+if [[ $BUILDKITE_LABEL =~ ":docker: Deploy" ]]; then
+  docker logout
+fi
+
 if [[ $BUILDKITE_BRANCH == "master" ]] || [[ $BUILDKITE_BRANCH =~ ^v.* ]] && [[ $BUILDKITE_PULL_REQUEST == "false" ]]; then
   if [[ $BUILDKITE_LABEL == ":docker: Deploy Manifests" ]]; then
     echo "--- :docker: Removing tags for deleted branches"
diff --git a/cmd/authelia-scripts/cmd_docker.go b/cmd/authelia-scripts/cmd_docker.go
index c9033739e..7384130d6 100644
--- a/cmd/authelia-scripts/cmd_docker.go
+++ b/cmd/authelia-scripts/cmd_docker.go
@@ -16,7 +16,6 @@ var arch string
 
 var supportedArch = []string{"amd64", "arm32v7", "arm64v8"}
 var defaultArch = "amd64"
-var buildkite = os.Getenv("BUILDKITE")
 var buildkiteQEMU = os.Getenv("BUILDKITE_AGENT_META_DATA_QEMU")
 var ciBranch = os.Getenv("BUILDKITE_BRANCH")
 var ciPullRequest = os.Getenv("BUILDKITE_PULL_REQUEST")
@@ -145,10 +144,6 @@ func login(docker *Docker) {
 	username := os.Getenv("DOCKER_USERNAME")
 	password := os.Getenv("DOCKER_PASSWORD")
 
-	if buildkite == "true" {
-		return
-	}
-
 	if username == "" {
 		log.Fatal(errors.New("DOCKER_USERNAME is empty"))
 	}