diff --git a/Makefile b/Makefile
index 8f5e9b3e..19fad1f3 100644
--- a/Makefile
+++ b/Makefile
@@ -110,7 +110,7 @@ APPLICATION_NAME = $(shell jq -r '.displayName' package.json)
 APPLICATION_DESCRIPTION = $(shell jq -r '.description' package.json)
 APPLICATION_COPYRIGHT = $(shell cat electron-builder.yml | shyaml get-value copyright)
 
-BINTRAY_ORGANIZATION = resin-io
+BINTRAY_ORGANIZATION = etcher
 BINTRAY_REPOSITORY_DEBIAN = debian
 BINTRAY_REPOSITORY_REDHAT = redhat
 
diff --git a/README.md b/README.md
index 2f2664e4..27430a99 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ installers for all supported operating systems.
 1. Add Etcher debian repository:
 
     ```
-    echo "deb https://dl.bintray.com/resin-io/debian stable etcher" | sudo tee /etc/apt/sources.list.d/etcher.list
+    echo "deb https://deb.etcher.io stable etcher" | sudo tee /etc/apt/sources.list.d/etcher.list
     ```
 
 2. Trust Bintray.com's GPG key:
@@ -72,7 +72,7 @@ sudo apt-get update
 1. Add Etcher rpm repository:
 
     ```sh
-    sudo wget https://bintray.com/resin-io/redhat/rpm -O /etc/yum.repos.d/bintray-resin-io-redhat.repo
+    sudo wget https://etcher.io/static/etcher-rpm.repo -O /etc/yum.repos.d/etcher-rpm.repo
     ```
 
 2. Update and install:
@@ -89,14 +89,14 @@ sudo apt-get update
 
 ```
 sudo yum remove -y etcher-electron
-sudo rm /etc/yum.repos.d/bintray-resin-io-redhat.repo
+sudo rm /etc/yum.repos.d/etcher-rpm.repo
 sudo yum clean all
 sudo yum makecache fast
 ```
 or
 ```
 sudo dnf remove -y etcher-electron
-sudo rm /etc/yum.repos.d/bintray-resin-io-redhat.repo
+sudo rm /etc/yum.repos.d/etcher-rpm.repo
 sudo dnf clean all
 sudo dnf makecache
 ```
diff --git a/docs/MAINTAINERS.md b/docs/MAINTAINERS.md
index b15479e0..fefecf2d 100644
--- a/docs/MAINTAINERS.md
+++ b/docs/MAINTAINERS.md
@@ -166,10 +166,10 @@ export BINTRAY_API_KEY="youruserapikey"
 ```
 
 ```bash
-./scripts/publish/bintray.sh -c "etcher" -t "production" -v "1.2.1" -o "resin-io" -p "debian" -y "debian" -r "x64" -f "dist/etcher-electron_1.2.1_amd64.deb"
-./scripts/publish/bintray.sh -c "etcher" -t "production" -v "1.2.1" -o "resin-io" -p "debian" -y "debian" -r "x86" -f "dist/etcher-electron_1.2.1_i386.deb"
-./scripts/publish/bintray.sh -c "etcher" -t "production" -v "1.2.1" -o "resin-io" -p "redhat" -y "redhat" -r "x64" -f "dist/etcher-electron-1.2.1.x86_64.rpm"
-./scripts/publish/bintray.sh -c "etcher" -t "production" -v "1.2.1" -o "resin-io" -p "redhat" -y "redhat" -r "x86" -f "dist/etcher-electron-1.2.1.i686.rpm"
+./scripts/publish/bintray.sh -c "etcher" -t "production" -v "1.2.1" -o "etcher" -p "debian" -y "debian" -r "x64" -f "dist/etcher-electron_1.2.1_amd64.deb"
+./scripts/publish/bintray.sh -c "etcher" -t "production" -v "1.2.1" -o "etcher" -p "debian" -y "debian" -r "x86" -f "dist/etcher-electron_1.2.1_i386.deb"
+./scripts/publish/bintray.sh -c "etcher" -t "production" -v "1.2.1" -o "etcher" -p "redhat" -y "redhat" -r "x64" -f "dist/etcher-electron-1.2.1.x86_64.rpm"
+./scripts/publish/bintray.sh -c "etcher" -t "production" -v "1.2.1" -o "etcher" -p "redhat" -y "redhat" -r "x86" -f "dist/etcher-electron-1.2.1.i686.rpm"
 ```
 
 ### Uploading binaries to Amazon S3
diff --git a/tests/spectron/runner.spec.js b/tests/spectron/runner.spec.js
index 7e475676..4e37f0c4 100644
--- a/tests/spectron/runner.spec.js
+++ b/tests/spectron/runner.spec.js
@@ -36,7 +36,7 @@ describe('Spectron', function () {
   before('app:start', function () {
     app = new spectron.Application({
       path: entrypoint,
-      port: 9999,
+      port: 9998,
       args: [ '.' ]
     })