diff --git a/.drone.yml b/.drone.yml
index d1e5f4e852d..bbcbbd1f111 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -105,6 +105,26 @@ steps:
     event:
     - tag
 
+- name: ghcr-publish
+  image: plugins/docker
+  settings:
+    registry: ghcr.io
+    dockerfile: package/Dockerfile
+    username: "k3s-io"
+    password:
+      from_secret: github_token
+    repo: "ghcr.io/k3s-io/k3s"
+    build_args_from_env:
+      - DRONE_TAG
+  when:
+    instance:
+    - drone-publish.k3s.io
+    ref:
+    - refs/head/master
+    - refs/tags/*
+    event:
+    - tag
+
 - name: test
   image: rancher/dapper:v0.6.0
   secrets: [ AWS_SECRET_ACCESS_KEY-k3s-ci-uploader, AWS_ACCESS_KEY_ID-k3s-ci-uploader ]
@@ -258,6 +278,26 @@ steps:
     event:
     - tag
 
+- name: ghcr-publish
+  image: plugins/docker
+  settings:
+    registry: ghcr.io
+    dockerfile: package/Dockerfile
+    username: "k3s-io"
+    password:
+      from_secret: github_token
+    repo: "ghcr.io/k3s-io/k3s"
+    build_args_from_env:
+      - DRONE_TAG
+  when:
+    instance:
+    - drone-publish.k3s.io
+    ref:
+    - refs/head/master
+    - refs/tags/*
+    event:
+    - tag
+
 - name: test
   image: rancher/dapper:v0.6.0
   secrets: [ AWS_SECRET_ACCESS_KEY-k3s-ci-uploader, AWS_ACCESS_KEY_ID-k3s-ci-uploader ]
@@ -374,6 +414,26 @@ steps:
     event:
     - tag
 
+- name: ghcr-publish
+  image: plugins/docker:linux-arm
+  settings:
+    registry: ghcr.io
+    dockerfile: package/Dockerfile
+    username: "k3s-io"
+    password:
+      from_secret: github_token
+    repo: "ghcr.io/k3s-io/k3s"
+    build_args_from_env:
+      - DRONE_TAG
+  when:
+    instance:
+    - drone-publish.k3s.io
+    ref:
+    - refs/head/master
+    - refs/tags/*
+    event:
+    - tag
+
 - name: test
   # Refer to comment for arm/build.
   image: rancher/dapper:v0.5.0