diff --git a/.appveyor.yml b/.appveyor.yml
index f4a85ee..91ba07c 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -26,11 +26,11 @@ build_script:
       }
 
       docker pull microsoft/nanoserver:10.0.14393.1593
-      docker build -f Dockerfile.windows -t plugins/matrix:windows .
+      docker build -f Dockerfile.windows -t plugins/matrix:windows-amd64 .
 
 test_script:
   - ps: |
-      docker run --rm plugins/matrix:windows --version
+      docker run --rm plugins/matrix:windows-amd64 --version
 
 deploy_script:
   - ps: |
@@ -47,16 +47,16 @@ deploy_script:
           docker push plugins/matrix:windows
 
           docker tag plugins/matrix:windows plugins/matrix:$major.$minor.$patch-windows
-          docker push plugins/matrix:$major.$minor.$patch-windows
+          docker push plugins/matrix:$major.$minor.$patch-windows-amd64
 
           docker tag plugins/matrix:windows plugins/matrix:$major.$minor-windows
-          docker push plugins/matrix:$major.$minor-windows
+          docker push plugins/matrix:$major.$minor-windows-amd64
 
           docker tag plugins/matrix:windows plugins/matrix:$major-windows
-          docker push plugins/matrix:$major-windows
+          docker push plugins/matrix:$major-windows-amd64
         } else {
           if ( $env:APPVEYOR_REPO_BRANCH -eq 'master' ) {
-            docker push plugins/matrix:windows
+            docker push plugins/matrix:windows-amd64
           }
         }
       }
diff --git a/.drone.yml b/.drone.yml
index de2e203..8ea74cf 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -10,7 +10,7 @@ pipeline:
       - go vet
       - |
         for PKG in $(go list ./... | grep -v /vendor/); do
-          go test -cover -coverprofile $PKG/coverage.out $PKG
+          go test -cover -coverprofile $GOPATH/src/$PKG/coverage.out $PKG
         done
 
   build_linux_amd64:
@@ -85,7 +85,7 @@ pipeline:
     group: docker
     repo: plugins/matrix
     auto_tag: true
-    auto_tag_suffix: amd64
+    auto_tag_suffix: linux-amd64
     dockerfile: Dockerfile
     when:
       event: [ push, tag ]
@@ -97,7 +97,7 @@ pipeline:
     group: docker
     repo: plugins/matrix
     auto_tag: true
-    auto_tag_suffix: i386
+    auto_tag_suffix: linux-i386
     dockerfile: Dockerfile.i386
     when:
       event: [ push, tag ]
@@ -109,7 +109,7 @@ pipeline:
     group: docker
     repo: plugins/matrix
     auto_tag: true
-    auto_tag_suffix: arm64
+    auto_tag_suffix: linux-arm64
     dockerfile: Dockerfile.arm64
     when:
       event: [ push, tag ]
@@ -121,7 +121,7 @@ pipeline:
     group: docker
     repo: plugins/matrix
     auto_tag: true
-    auto_tag_suffix: arm
+    auto_tag_suffix: linux-arm
     dockerfile: Dockerfile.arm
     when:
       event: [ push, tag ]
diff --git a/Dockerfile.windows b/Dockerfile.windows
index 9de0dbe..910e01d 100644
--- a/Dockerfile.windows
+++ b/Dockerfile.windows
@@ -6,5 +6,5 @@ LABEL maintainer="Drone.IO Community <drone-dev@googlegroups.com>" `
   org.label-schema.vendor="Drone.IO Community" `
   org.label-schema.schema-version="1.0"
 
-ADD drone-matrix.exe /drone-matrix.exe
-ENTRYPOINT [ "\\drone-matrix.exe" ]
+ADD drone-matrix.exe c:\drone-matrix.exe
+ENTRYPOINT [ "c:\\drone-matrix.exe" ]
diff --git a/README.md b/README.md
index 161fb7c..379b89d 100644
--- a/README.md
+++ b/README.md
@@ -33,5 +33,7 @@ docker run --rm \
   -e PLUGIN_ROOMID=0123456789abcdef:matrix.org \
   -e PLUGIN_USERNAME=yourbot \
   -e PLUGIN_PASSWORD=p455w0rd \
+  -v $(pwd):$(pwd) \
+  -w $(pwd) \
   plugins/matrix
 ```
diff --git a/manifest.tmpl b/manifest.tmpl
index b3013a7..e8efec2 100644
--- a/manifest.tmpl
+++ b/manifest.tmpl
@@ -7,27 +7,27 @@ tags:
 {{/if}}
 manifests:
   -
-    image: plugins/matrix:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}amd64
+    image: plugins/matrix:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}linux-amd64
     platform:
       architecture: amd64
       os: linux
   -
-    image: plugins/matrix:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}i386
+    image: plugins/matrix:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}linux-i386
     platform:
       architecture: 386
       os: linux
   -
-    image: plugins/matrix:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}arm64
+    image: plugins/matrix:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}linux-arm64
     platform:
       architecture: arm64
       os: linux
   -
-    image: plugins/matrix:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}arm
+    image: plugins/matrix:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}linux-arm
     platform:
       architecture: arm
       os: linux
   -
-    image: plugins/matrix:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}windows
+    image: plugins/matrix:{{#if build.tag}}{{trimPrefix build.tag "v"}}-{{/if}}windows-amd64
     platform:
       architecture: amd64
       os: windows