diff --git a/jenkinsfiles/Jenkinsfile.nightly b/jenkinsfiles/Jenkinsfile.nightly
index b5a27552bcd5..d2d85ef79cae 100644
--- a/jenkinsfiles/Jenkinsfile.nightly
+++ b/jenkinsfiles/Jenkinsfile.nightly
@@ -70,22 +70,6 @@ pipeline {
                 }
             }
         }
-        stage('Nightly-Docker-Image') {
-            when {
-                environment name: 'GIT_BRANCH', value: 'origin/master'
-            }
-            steps {
-                withDockerRegistry([ credentialsId: "NIGHTLY_DOCKER_HUB_CRED", url: "" ]) {
-                    dir('${GOPATH}/${PROJ_PATH}') {
-                        sh 'make docker-image'
-                    }
-                    sh 'docker tag cilium/cilium:latest cilium/nightly:latest'
-                    sh 'docker tag cilium/nightly:latest cilium/nightly:${NIGHTLY_TAG}'
-                    sh 'docker push cilium/nightly:${NIGHTLY_TAG}'
-                    sh 'docker push cilium/nightly:latest'
-                }
-            }
-        }
         stage('Make Cilium images') {
             steps {
                 sh 'cd ${TESTDIR}; ./make-images-push-to-local-registry.sh $(./print-node-ip.sh) latest'
@@ -100,6 +84,19 @@ pipeline {
                 }
             }
         }
+        stage('Nightly-Docker-Image') {
+            when {
+                environment name: 'GIT_BRANCH', value: 'origin/master'
+            }
+            steps {
+                withDockerRegistry([ credentialsId: "NIGHTLY_DOCKER_HUB_CRED", url: "" ]) {
+                    sh 'docker tag cilium/cilium:latest cilium/nightly:latest'
+                    sh 'docker tag cilium/nightly:latest cilium/nightly:${NIGHTLY_TAG}'
+                    sh 'docker push cilium/nightly:${NIGHTLY_TAG}'
+                    sh 'docker push cilium/nightly:latest'
+                }
+            }
+        }
         stage('Nightly-Tests') {
             environment {
                 K8S_NODES=4