diff --git a/circle.yml b/circle.yml
index 414bab57..a229b755 100644
--- a/circle.yml
+++ b/circle.yml
@@ -14,29 +14,14 @@ dependencies:
     - echo "deb http://download.mono-project.com/repo/debian wheezy main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list
 
     - sudo apt-get update
-    - sudo apt-get install --no-install-recommends -y icnsutils graphicsmagick xz-utils
+    - sudo apt-get install --no-install-recommends -y icnsutils graphicsmagick xz-utils jq
     - sudo apt-get install --no-install-recommends -y wine1.8 mono-devel ca-certificates-mono
     - sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib
     - unset DISPLAY && wineboot --init
 
     - npm run package:all
-    - npm run package:linux
-    - npm run installer
 
-    - mv release/Mattermost-win32-ia32 release/mattermost-desktop-win32
-    - mv release/Mattermost-win32-x64  release/mattermost-desktop-win64
-    - mv release/Mattermost-darwin-x64 release/mattermost-desktop-osx
-    - mv release/Mattermost-linux-ia32 release/mattermost-desktop-linux-ia32
-    - mv release/Mattermost-linux-x64  release/mattermost-desktop-linux-x64
-
-    - cd release && zip -9 -r $CIRCLE_ARTIFACTS/mattermost-desktop-win32.zip mattermost-desktop-win32
-    - cd release && zip -9 -r $CIRCLE_ARTIFACTS/mattermost-desktop-win64.zip mattermost-desktop-win64
-    - tar zcvf $CIRCLE_ARTIFACTS/mattermost-desktop-osx.tar.gz -C release mattermost-desktop-osx
-    - tar zcvf $CIRCLE_ARTIFACTS/mattermost-desktop-linux-ia32.tar.gz -C release mattermost-desktop-linux-ia32
-    - tar zcvf $CIRCLE_ARTIFACTS/mattermost-desktop-linux-x64.tar.gz -C release mattermost-desktop-linux-x64
-    - cp release/*.deb $CIRCLE_ARTIFACTS/
-    - cp release/windows-installer-ia32/mattermost-setup-ia32.exe $CIRCLE_ARTIFACTS/
-    - cp release/windows-installer-x64/mattermost-setup-x64.exe $CIRCLE_ARTIFACTS/
+    - sh -x ./scripts/cp_artifacts.sh release $CIRCLE_ARTIFACTS
 
 test:
   post:
diff --git a/package.json b/package.json
index a9a3141a..c9fe0fb3 100644
--- a/package.json
+++ b/package.json
@@ -28,9 +28,7 @@
     "package:windows": "build --win --x64 --ia32",
     "package:osx": "build --mac --x64 --ia32",
     "package:linux": "build --linux --x64 --ia32",
-    "linux-additions": "cp resources/icon.png resources/linux/create_desktop_file.sh release/linux/ && cp resources/icon.png resources/linux/create_desktop_file.sh release/linux-ia32/",
-    "prettify": "gulp prettify",
-    "installer": "node ./script/installer.js"
+    "prettify": "gulp prettify"
   },
   "devDependencies": {
     "babel-core": "^6.7.5",
diff --git a/scripts/cp_artifacts.sh b/scripts/cp_artifacts.sh
new file mode 100644
index 00000000..bc0de647
--- /dev/null
+++ b/scripts/cp_artifacts.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+set -eu
+
+VERSION=`cat package.json | jq -r '.version'`
+SRC=$1
+DEST=$2
+
+cp "${SRC}/Mattermost-${VERSION}-win.zip" "${DEST}/mattermost-desktop-${VERSION}-win64.zip"
+cp "${SRC}/Mattermost-${VERSION}-ia32-win.zip" "${DEST}/mattermost-desktop-${VERSION}-win32.zip"
+cp "${SRC}/win/Mattermost Setup ${VERSION}.exe" "${DEST}/mattermost-setup-${VERSION}-win64.exe"
+cp "${SRC}/win-ia32/Mattermost Setup ${VERSION}-ia32.exe" "${DEST}/mattermost-setup-${VERSION}-win32.exe"
+
+cp "${SRC}/mac/Mattermost-${VERSION}-mac.tar.gz" "${DEST}/mattermost-desktop-${VERSION}-mac.tar.gz"
+
+cp "${SRC}/mattermost-${VERSION}.tar.gz" "${DEST}/mattermost-desktop-${VERSION}-linux-x64.tar.gz"
+cp "${SRC}/mattermost-${VERSION}-ia32.tar.gz" "${DEST}/mattermost-desktop-${VERSION}-linux-ia32.tar.gz"
+cp "${SRC}/mattermost-${VERSION}-amd64.deb" "${DEST}/mattermost-desktop-${VERSION}-linux-x64.deb"
+cp "${SRC}/mattermost-${VERSION}-ia32.deb" "${DEST}/mattermost-desktop-${VERSION}-linux-ia32.deb"