diff --git a/.drone.starlark b/.drone.starlark
index 5376cd73b82..7d060b415c5 100644
--- a/.drone.starlark
+++ b/.drone.starlark
@@ -161,10 +161,10 @@ def build():
 			'path': config['app']
 		},
 		'steps':
-			buildDockerImage() +
 			installNPM() +
 			buildRelease() +
-			deployStaging(),
+			deployStaging() +
+			buildDockerImage(),
 		'services':
 			dockerInDockerService(),
 		'depends_on': [],
diff --git a/.drone.yml b/.drone.yml
index 2533bdd2588..44093afd995 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -4958,19 +4958,6 @@ workspace:
   path: phoenix
 
 steps:
-- name: build-docker-image
-  pull: always
-  image: toolhippie/docker:latest
-  commands:
-  - docker build -t owncloud/phoenix:${DRONE_COMMIT_SHA}-${DRONE_BUILD_NUMBER} .
-  - docker tag owncloud/phoenix:${DRONE_COMMIT_SHA}-${DRONE_BUILD_NUMBER} owncloud/phoenix:latest
-  - docker push owncloud/phoenix:latest
-  environment:
-    DOCKER_HOST: tcp://docker:2375
-  when:
-    event:
-    - push
-
 - name: npm-install
   pull: always
   image: owncloudci/php:7.1
@@ -5012,6 +4999,19 @@ steps:
     event:
     - push
 
+- name: build-docker-image
+  pull: always
+  image: toolhippie/docker:latest
+  commands:
+  - docker build -t owncloud/phoenix:${DRONE_COMMIT_SHA}-${DRONE_BUILD_NUMBER} .
+  - docker tag owncloud/phoenix:${DRONE_COMMIT_SHA}-${DRONE_BUILD_NUMBER} owncloud/phoenix:latest
+  - docker push owncloud/phoenix:latest
+  environment:
+    DOCKER_HOST: tcp://docker:2375
+  when:
+    event:
+    - push
+
 services:
 - name: docker
   pull: if-not-exists