diff --git a/builder.sh b/builder.sh
index 6e8c587..24c6cf7 100755
--- a/builder.sh
+++ b/builder.sh
@@ -177,10 +177,6 @@ function start_docker() {
         fi
     done
     bashio::log.info "Docker was initialized"
-
-    if [ "$DOCKER_LOGIN" == "true" ]; then
-        docker login
-    fi
 }
 
 
@@ -970,6 +966,11 @@ mkdir -p /data
 init_crosscompile
 start_docker
 
+# Login into dockerhub
+if [ "$DOCKER_LOGIN" == "true" ]; then
+    docker login
+fi
+
 # Load external repository
 if [ -n "$GIT_REPOSITORY" ]; then
     bashio::log.info "Checkout repository $GIT_REPOSITORY"