diff --git a/.drone.yml b/.drone.yml
index e51f2ec1..82b45498 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -21,7 +21,7 @@ steps:
     GOARCH: amd64
     GOOS: linux
 
-- name: publish_drone
+- name: publish
   image: plugins/docker:18
   settings:
     auto_tag: true
@@ -37,38 +37,6 @@ steps:
     - push
     - tag
 
-- name: publish_agent
-  image: plugins/docker:18
-  settings:
-    auto_tag: true
-    auto_tag_suffix: linux-amd64
-    dockerfile: docker/Dockerfile.agent.linux.amd64
-    repo: drone/agent
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-  when:
-    event:
-    - push
-    - tag
-
-- name: publish_controller
-  image: plugins/docker:18
-  settings:
-    auto_tag: true
-    auto_tag_suffix: linux-amd64
-    dockerfile: docker/Dockerfile.controller.linux.amd64
-    repo: drone/controller
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-  when:
-    event:
-    - push
-    - tag
-
 ---
 kind: pipeline
 type: docker
@@ -87,7 +55,7 @@ steps:
     GOARCH: arm64
     GOOS: linux
 
-- name: publish_drone
+- name: publish
   image: plugins/docker:18
   settings:
     auto_tag: true
@@ -99,30 +67,6 @@ steps:
     password:
       from_secret: docker_password
 
-- name: publish_agent
-  image: plugins/docker:18
-  settings:
-    auto_tag: true
-    auto_tag_suffix: linux-arm64
-    dockerfile: docker/Dockerfile.agent.linux.arm64
-    repo: drone/agent
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-
-- name: publish_controller
-  image: plugins/docker:18
-  settings:
-    auto_tag: true
-    auto_tag_suffix: linux-arm64
-    dockerfile: docker/Dockerfile.controller.linux.arm64
-    repo: drone/controller
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-
 trigger:
   event:
   - push
@@ -149,7 +93,7 @@ steps:
     GOARCH: arm
     GOOS: linux
 
-- name: publish_drone
+- name: publish
   image: plugins/docker:18
   settings:
     auto_tag: true
@@ -161,30 +105,6 @@ steps:
     password:
       from_secret: docker_password
 
-- name: publish_agent
-  image: plugins/docker:18
-  settings:
-    auto_tag: true
-    auto_tag_suffix: linux-arm
-    dockerfile: docker/Dockerfile.agent.linux.arm
-    repo: drone/agent
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-
-- name: publish_controller
-  image: plugins/docker:18
-  settings:
-    auto_tag: true
-    auto_tag_suffix: linux-arm
-    dockerfile: docker/Dockerfile.controller.linux.arm
-    repo: drone/controller
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-
 trigger:
   event:
   - push
@@ -193,83 +113,13 @@ trigger:
 depends_on:
 - linux-amd64
 
----
-kind: pipeline
-type: ssh
-name: windows-1809-amd64
-
-platform:
-  os: windows
-
-server:
-  host: windows.1809.amd64.ssh.pipeline.drone.ci
-  password:
-    from_secret: windows_password
-  user:
-    from_secret: windows_username
-
-steps:
-- name: build
-  commands:
-  - powershell.exe scripts/build.ps1
-  - docker login -u $env:USERNAME -p $env:PASSWORD
-  - docker build -f docker/Dockerfile.agent.windows.1809 -t drone/agent:windows-1809-amd64 .
-  - docker push drone/agent:windows-1809-amd64
-  environment:
-    PASSWORD:
-      from_secret: docker_password
-    USERNAME:
-      from_secret: docker_username
-
-trigger:
-  event:
-  - push
-
-depends_on:
-- linux-amd64
-
----
-kind: pipeline
-type: ssh
-name: windows-1903-amd64
-
-platform:
-  os: windows
-
-server:
-  host: windows.1903.amd64.ssh.pipeline.drone.ci
-  password:
-    from_secret: windows_password
-  user:
-    from_secret: windows_username
-
-steps:
-- name: build
-  commands:
-  - powershell.exe scripts/build.ps1
-  - docker login -u $env:USERNAME -p $env:PASSWORD
-  - docker build -f docker/Dockerfile.agent.windows.1903 -t drone/agent:windows-1903-amd64 .
-  - docker push drone/agent:windows-1903-amd64
-  environment:
-    PASSWORD:
-      from_secret: docker_password
-    USERNAME:
-      from_secret: docker_username
-
-trigger:
-  event:
-  - push
-
-depends_on:
-- linux-amd64
-
 ---
 kind: pipeline
 type: docker
 name: manifest
 
 steps:
-- name: publish_server
+- name: publish
   image: plugins/manifest:1.2
   settings:
     auto_tag: true
@@ -280,28 +130,6 @@ steps:
     password:
       from_secret: docker_password
 
-- name: publish_agent
-  image: plugins/manifest:1.2
-  settings:
-    auto_tag: true
-    ignore_missing: true
-    spec: docker/manifest.agent.tmpl
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-
-- name: publish_controller
-  image: plugins/manifest:1.2
-  settings:
-    auto_tag: true
-    ignore_missing: true
-    spec: docker/manifest.controller.tmpl
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-
 trigger:
   event:
   - push
@@ -310,5 +138,3 @@ trigger:
 depends_on:
 - linux-arm64
 - linux-arm
-- windows-1903-amd64
-- windows-1809-amd64
\ No newline at end of file
diff --git a/version/version.go b/version/version.go
index c373c59d..c08869f6 100644
--- a/version/version.go
+++ b/version/version.go
@@ -27,7 +27,7 @@ var (
 	// VersionMinor is for functionality in a backwards-compatible manner.
 	VersionMinor int64 = 6
 	// VersionPatch is for backwards-compatible bug fixes.
-	VersionPatch int64 = 2
+	VersionPatch int64 = 3
 	// VersionPre indicates prerelease.
 	VersionPre = ""
 	// VersionDev indicates development branch. Releases will be empty string.
diff --git a/version/version_test.go b/version/version_test.go
index 81411b08..628513ec 100644
--- a/version/version_test.go
+++ b/version/version_test.go
@@ -9,7 +9,7 @@ package version
 import "testing"
 
 func TestVersion(t *testing.T) {
-	if got, want := Version.String(), "1.6.2"; got != want {
+	if got, want := Version.String(), "1.6.3"; got != want {
 		t.Errorf("Want version %s, got %s", want, got)
 	}
 }