diff --git a/.drone.yml b/.drone.yml
index 274d68c0..3c1d688e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -12,14 +12,17 @@ steps:
   image: rancher/dapper:1.11.2
   commands:
   - dapper ci
-  - ls -lR dist/artifacts
+  - ls -lR build/bin
   environment:
     CROSS: 1
   privileged: true
   volumes:
   - name: socket
     path: /var/run/docker.sock
-
+  when:
+    event:
+    - pull_request
+    - tag
 
 - name: stage-binaries
   pull: default
@@ -43,10 +46,12 @@ steps:
     - sha256
     files:
     - "build/bin/rke_*"
-    - "dist/artifacts/${DRONE_TAG}/*"
     prerelease: true
     title: "Pre-release ${DRONE_TAG}"
   when:
+    instance:
+      include:
+      - drone-publish.rancher.io
     event:
     - tag
     ref:
@@ -62,11 +67,13 @@ steps:
     - sha256
     files:
     - "build/bin/rke_*"
-    - "dist/artifacts/${DRONE_TAG}/*"
     api_key:
       from_secret: github_token
     title: "Release ${DRONE_TAG}"
   when:
+    instance:
+      include:
+      - drone-publish.rancher.io
     event:
     - tag
     ref:
@@ -97,6 +104,10 @@ steps:
   volumes:
   - name: socket
     path: /var/run/docker.sock
+  when:
+    event:
+    - pull_request
+    - tag
 
 - name: integration-flannel
   pull: default
@@ -107,6 +118,10 @@ steps:
   volumes:
   - name: socket
     path: /var/run/docker.sock
+  when:
+    event:
+    - pull_request
+    - tag
 
 - name: integration-calico
   pull: default
@@ -117,6 +132,10 @@ steps:
   volumes:
   - name: socket
     path: /var/run/docker.sock
+  when:
+    event:
+    - pull_request
+    - tag
 
 - name: integration-weave
   pull: default
@@ -127,6 +146,10 @@ steps:
   volumes:
   - name: socket
     path: /var/run/docker.sock
+  when:
+    event:
+    - pull_request
+    - tag
 
 volumes:
 - name: socket
diff --git a/scripts/package b/scripts/package
index 412694f6..d22c2b7a 100755
--- a/scripts/package
+++ b/scripts/package
@@ -5,59 +5,6 @@ source $(dirname $0)/version
 
 cd $(dirname $0)/..
 
-DIST=$(pwd)/dist/artifacts
-
-mkdir -p $DIST/${VERSION} $DIST/latest
-
-for i in build/bin/*; do
-    if [ ! -e $i ]; then
-        continue
-    fi
-
-    BASE=build/archive
-    DIR=${BASE}/rke-${VERSION}
-
-    rm -rf $BASE
-    mkdir -p $BASE $DIR
-
-    EXT=
-    if [[ $i =~ .*windows.* ]]; then
-        EXT=.exe
-    fi
-
-    cp $i ${DIR}/rke${EXT}
-
-    arch=$(echo $i | cut -f2 -d_)
-    mkdir -p $DIST/${VERSION}/binaries/$arch
-    mkdir -p $DIST/latest/binaries/$arch
-    cp $i $DIST/${VERSION}/binaries/$arch/rke${EXT}
-    if [ -z "${EXT}" ]; then
-        gzip -c $i > $DIST/${VERSION}/binaries/$arch/rke.gz
-        xz -c $i > $DIST/${VERSION}/binaries/$arch/rke.xz
-    fi
-
-    rm -rf $DIST/latest/binaries/$arch
-    mkdir -p $DIST/latest/binaries
-    cp -rf $DIST/${VERSION}/binaries/$arch $DIST/latest/binaries
-
-    (
-        cd $BASE
-        NAME=$(basename $i | sed 's/_/-/g')
-        if [ -z "$EXT" ]; then
-            tar cvzf $DIST/${VERSION}/${NAME}-${VERSION}.tar.gz .
-            cp $DIST/${VERSION}/${NAME}-${VERSION}.tar.gz $DIST/latest/${NAME}.tar.gz
-
-            tar cvJf $DIST/${VERSION}/${NAME}-${VERSION}.tar.xz .
-            cp $DIST/${VERSION}/${NAME}-${VERSION}.tar.xz $DIST/latest/${NAME}.tar.xz
-        else
-            NAME=$(echo $NAME | sed 's/'${EXT}'//g')
-            zip -r $DIST/${VERSION}/${NAME}-${VERSION}.zip *
-            cp $DIST/${VERSION}/${NAME}-${VERSION}.zip $DIST/latest/${NAME}.zip
-        fi
-    )
-done
-
-
 ARCH=${ARCH:-"amd64"}
 SUFFIX=""
 [ "${ARCH}" != "amd64" ] && SUFFIX="_${ARCH}"