diff --git a/.travis.yml b/.travis.yml
index a7d5c9a..e9dd133 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,5 @@
 language: node_js
 
-deploy:
-  skip_cleanup: true
-    provider: script
-  script: echo $SNAP_TOKEN | snap run snapcraft login --with - && snap run snapcraft push build/clean/build/*.snap --release edge"
-  on:
-    branch: master
-
 services:
   - xvfb
 
@@ -40,6 +33,5 @@ script:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run -e GH_TOKEN=$GH_TOKEN -e GIT_TAG=$TRAVIS_TAG --rm -v `pwd`:/app uitest sh -c "cd app && docker/testMounted.sh"; fi
   - if [[ "$TRAVIS_TAG" != "" ]]; then yarn run prepare-release; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$TRAVIS_TAG" != "" ]]; then yarn run package linux; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then yarn run package snap; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$TRAVIS_TAG" != "" ]]; then yarn run package -- mac; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$TRAVIS_TAG" != "" ]]; then yarn run package -- win; fi
diff --git a/package.json b/package.json
index 2b06c3c..56899fe 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "MQTT-Explorer",
-  "version": "0.2.1",
+  "version": "0.2.1-alpha6",
   "description": "Explore your message queues",
   "main": "dist/src/electron.js",
   "scripts": {
diff --git a/package.ts b/package.ts
index 0245dbb..8268e44 100644
--- a/package.ts
+++ b/package.ts
@@ -7,7 +7,6 @@ const linuxAppImage: builder.CliOptions = {
   ia32: true,
   armv7l: true,
   arm64: false,
-  linux: ['AppImage'],
   projectDir: './build/clean',
   publish: 'always',
 }
@@ -17,7 +16,6 @@ const linuxSnap: builder.CliOptions = {
   ia32: false,
   armv7l: false,
   arm64: false,
-  linux: ['snap'],
   projectDir: './build/clean',
   publish: 'always',
 }
@@ -27,7 +25,6 @@ const winPortable: builder.CliOptions = {
   ia32: true,
   armv7l: false,
   arm64: false,
-  win: ['portable'],
   projectDir: './build/clean',
   publish: 'always',
 }
@@ -37,7 +34,6 @@ const winNsis: builder.CliOptions = {
   ia32: true,
   armv7l: false,
   arm64: false,
-  win: ['nsis'],
   projectDir: './build/clean',
   publish: 'always',
 }
@@ -47,9 +43,8 @@ const winAppx: builder.CliOptions = {
   ia32: true,
   armv7l: false,
   arm64: false,
-  win: ['appx'],
   projectDir: './build/clean',
-  publish: 'never',
+  publish: 'onTag',
 }
 
 const mac: builder.CliOptions = {
@@ -57,7 +52,6 @@ const mac: builder.CliOptions = {
   ia32: true,
   armv7l: false,
   arm64: false,
-  mac: ['dmg'],
   projectDir: './build/clean',
   publish: 'always',
 }
@@ -73,19 +67,15 @@ async function executeBuild() {
       break
     case 'linux':
       await buildWithOptions(linuxAppImage, { platform: 'linux', package: 'AppImage' })
-      break
-    case 'snap':
-      try {
-        await buildWithOptions(linuxSnap, { platform: 'linux', package: 'snap' })
-      } catch {
-        // ignore
-      }
+      await buildWithOptions(linuxSnap, { platform: 'linux', package: 'snap' })
       break
     case 'mac':
+      await buildWithOptions(mac, { platform: 'mac', package: 'mas' })
       await buildWithOptions(mac, { platform: 'mac', package: 'dmg' })
+      await buildWithOptions(mac, { platform: 'mac', package: 'zip' })
       break
     default:
-      await buildWithOptions(mac, { platform: 'mac', package: 'dmg' })
+      throw new Error('No target selected')
   }
 }
 
@@ -96,7 +86,11 @@ export interface BuildInfo {
 
 async function buildWithOptions(options: builder.CliOptions, buildInfo: BuildInfo) {
   fs.writeFileSync(path.join(options.projectDir!, 'buildOptions.json'), JSON.stringify(buildInfo))
-  await builder.build(options)
+
+  await builder.build({
+    ...options,
+    [buildInfo.platform]: [buildInfo.package],
+  })
 }
 
 function build() {
diff --git a/res/mac-certificates.p12 b/res/mac-certificates.p12
new file mode 100644
index 0000000..cfda5d3
Binary files /dev/null and b/res/mac-certificates.p12 differ
diff --git a/src/spec/webdriverio.ts b/src/spec/webdriverio.ts
index 1e5085b..8f36e3e 100644
--- a/src/spec/webdriverio.ts
+++ b/src/spec/webdriverio.ts
@@ -57,7 +57,7 @@ async function doStuff() {
   await sleep(1000)
 
   await sleep(1000)
-  await showText('Topics overview', 2000, browser, 'top')
+  await showText('Topic overview', 2000, browser, 'top')
   await sleep(2000)
   await showText('Indicate topic updates', 2000, browser, 'bottom')
   await sleep(3000)