diff --git a/.drone.yml b/.drone.yml
index 5ea05c5..8242fc3 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -14,37 +14,6 @@ steps:
   - ./scripts/ci
 
 - name: docker-build
-  image: plugins/docker
-  settings:
-    dockerfile: Dockerfile
-    repo: "rancher/harvester-os"
-    tag: "dev-head"
-    dry_run: true
-  when:
-    instance:
-      - drone-pr.rancher.io
-    branch:
-      - dev
-
-- name: docker-publish-dev
-  image: plugins/docker
-  settings:
-    dockerfile: Dockerfile
-    repo: "rancher/harvester-os"
-    tag: "dev-head"
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-  when:
-    instance:
-      - drone-publish.rancher.io
-    ref:
-      - refs/heads/dev
-    event:
-      - push
-
-- name: docker-build-sle-micro
   image: plugins/docker
   settings:
     dockerfile: Dockerfile
@@ -56,8 +25,9 @@ steps:
       - drone-pr.rancher.io
     branch:
       - sle-micro
+      - harvester-*
 
-- name: docker-publish-sle-micro
+- name: docker-publish
   image: plugins/docker
   settings:
     dockerfile: Dockerfile
@@ -72,10 +42,11 @@ steps:
       - drone-publish.rancher.io
     ref:
       - refs/heads/sle-micro
+      - refs/heads/harvester-*
     event:
       - push
 
-- name: docker-publish
+- name: docker-publish-tag
   image: plugins/docker
   settings:
     dockerfile: Dockerfile