diff --git a/.drone.yml b/.drone.yml
index 20ef2cde..64661b82 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -136,57 +136,17 @@ steps:
     event:
     - tag
 
-volumes:
-- name: docker
-  host:
-    path: /var/run/docker.sock
-
----
-kind: pipeline
-name: arm
-
-platform:
-  os: linux
-  arch: arm
-
-steps:
-- name: build
-  image: rancher/dapper:v0.4.1
-  commands:
-  - dapper ci
+- name: docker-publish-suc
+  image: rancher/drone-images:docker-arm64
   volumes:
-  - name: docker
-    path: /var/run/docker.sock
-
-- name: github_binary_release
-  image: plugins/github-release
-  settings:
-    api_key:
-      from_secret: github_token
-    prerelease: true
-    checksum:
-    - sha256
-    checksum_file: CHECKSUMsum-arm.txt
-    checksum_flatten: true
-    files:
-    - "dist/artifacts/*"
-  when:
-    instance:
-    - drone-publish.rancher.io
-    ref:
-    - refs/head/master
-    - refs/tags/*
-    event:
-    - tag
-
-- name: docker-publish
-  image: plugins/docker
+    - name: docker
+      path: /var/run/docker.sock
   settings:
-    dockerfile: package/Dockerfile
+    dockerfile: package/Dockerfile.suc
     password:
       from_secret: docker_password
     repo: "rancher/system-agent"
-    tag: "${DRONE_TAG}-arm"
+    tag: "${DRONE_TAG}-suc-arm64"
     username:
       from_secret: docker_username
   when:
@@ -313,7 +273,6 @@ steps:
     platforms:
       - linux/amd64
       - linux/arm64
-      - linux/arm
       - linux/s390x
     target: "rancher/system-agent:${DRONE_TAG}"
     template: "rancher/system-agent:${DRONE_TAG}-ARCH"
@@ -329,7 +288,6 @@ steps:
 depends_on:
 - amd64
 - arm64
-- arm
 - s390x
 
 ---
@@ -350,6 +308,7 @@ steps:
       from_secret: docker_password
     platforms:
       - linux/amd64
+      - linux/arm64
       - linux/s390x
     target: "rancher/system-agent:${DRONE_TAG}-suc"
     template: "rancher/system-agent:${DRONE_TAG}-suc-ARCH"
@@ -364,4 +323,5 @@ steps:
 
 depends_on:
 - amd64
+- arm64
 - s390x