diff --git a/.drone.yml b/.drone.yml
index 75a493993..67f2aeedf 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -14,38 +14,38 @@ pipeline:
       - ./build/drone/create_release.sh
     when:
       event: tag
-  build_ubuntu_oss:
+  build_ubuntu:
     image: ubuntu:xenial
     environment:
       - CPPFLAGS=-P
+      - PHAROS_NON_OSS=true
     commands:
-      - ./build/drone/ubuntu_oss.sh
+      - ./build/drone/ubuntu.sh
     when:
       event: tag
-  release_binary_oss:
+  release_binary:
     image: plugins/s3
     secrets: [ aws_access_key_id, aws_secret_access_key ]
     bucket: pharos-cluster-binaries
     region: eu-west-1
-    source: "pharos-cluster-linux-amd64-${DRONE_TAG##v}+oss"
+    source: "pharos-cluster-linux-amd64-${DRONE_TAG##v}"
     target: /
     when:
       event: tag
-  build_ubuntu:
+  build_ubuntu_oss:
     image: ubuntu:xenial
     environment:
       - CPPFLAGS=-P
-      - PHAROS_NON_OSS=true
     commands:
-      - ./build/drone/ubuntu.sh
+      - ./build/drone/ubuntu_oss.sh
     when:
       event: tag
-  release_binary:
+  release_binary_oss:
     image: plugins/s3
     secrets: [ aws_access_key_id, aws_secret_access_key ]
     bucket: pharos-cluster-binaries
     region: eu-west-1
-    source: "pharos-cluster-linux-amd64-${DRONE_TAG##v}"
+    source: "pharos-cluster-linux-amd64-${DRONE_TAG##v}+oss"
     target: /
     when:
       event: tag
diff --git a/.travis.yml b/.travis.yml
index c2cb835ca..21f89eb57 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ stages:
 jobs:
   include:
     - stage: publish binary
-      script: ./build/travis/macos_oss.sh
+      script: ./build/travis/macos.sh
       rvm: 2.4
       os: osx
       deploy:
@@ -27,7 +27,7 @@ jobs:
         on:
           all_branches: true
     - stage: publish binary
-      script: ./build/travis/macos.sh
+      script: ./build/travis/macos_oss.sh
       rvm: 2.4
       os: osx
       deploy:
diff --git a/build/drone/ubuntu_oss.sh b/build/drone/ubuntu_oss.sh
index d60c5a73e..3b0295022 100755
--- a/build/drone/ubuntu_oss.sh
+++ b/build/drone/ubuntu_oss.sh
@@ -5,7 +5,7 @@ set -ue
 apt-get update -y
 apt-get install -y -q squashfs-tools build-essential ruby bison ruby-dev git-core texinfo curl
 
-git rm -r non-oss/
+rm -rf non-oss/
 
 # build binary
 curl -sL https://dl.bintray.com/kontena/ruby-packer/0.5.0-dev/rubyc-linux-amd64.gz | gunzip > /usr/local/bin/rubyc
diff --git a/build/travis/macos_oss.sh b/build/travis/macos_oss.sh
index 30d5ab46d..3fd913af3 100755
--- a/build/travis/macos_oss.sh
+++ b/build/travis/macos_oss.sh
@@ -2,7 +2,7 @@
 
 set -ue
 
-git rm -r non-oss/
+rm -rf non-oss/
 
 brew install squashfs
 curl -sL https://dl.bintray.com/kontena/ruby-packer/0.5.0-dev/rubyc-darwin-amd64.gz | gunzip > /usr/local/bin/rubyc