diff --git a/.circleci/config.yml b/.circleci/config.yml
index 05157590..41c1f182 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -157,12 +157,15 @@ jobs:
       - store_artifacts:
           path: ~/Cider/dist/artifacts
       - run:
-          name: Set App Version
-          command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV
+          name: Fix Versioning and Add Channel
+          command: yarn circle:script
+      # - run:
+      #     name: Set App Version
+      #     command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV
       - run:
           name: Publish Release
           command: |
-            gh release create "v${APP_VERSION}.${CIRCLE_BUILD_NUM}" --title "Cider Version ${APP_VERSION} - Build ${CIRCLE_BUILD_NUM} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap
+            gh release create "v${APP_VERSION}" --title "Cider Version ${APP_VERSION} (${CIRCLE_BRANCH})" --generate-notes -R ciderapp/cider-releases ~/Cider/dist/artifacts/*.deb ~/Cider/dist/artifacts/*.AppImage ~/Cider/dist/artifacts/*.snap ~/Cider/dist/artifacts/*.exe ~/Cider/dist/artifacts/*.yml ~/Cider/dist/artifacts/*.blockmap
 
 # Orchestrate our job run sequence
 workflows:
diff --git a/resources/circle.js b/resources/circle.js
index 3c56bc92..4cbac3bf 100644
--- a/resources/circle.js
+++ b/resources/circle.js
@@ -5,7 +5,6 @@ if (!process.env['CIRCLECI']) {
 
 const {readFileSync, writeFile} = require('fs')
 const pkg = JSON.parse(readFileSync('package.json').toString());
-
 let channel = process.env['CIRCLE_BRANCH'];
 
 if (process.env['CIRCLE_BRANCH'] === 'lts') {
@@ -20,7 +19,8 @@ channel = channel.split('/').join('-')
 
 // https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables
 const version = pkg.version.split('.');
-pkg.version = `${version[0]}.${version[1]}.${version[2]}-${channel}.${version[3]}`
+const patch = version[2].split('-');
+pkg.version = `${version[0]}.${version[1]}.${patch[0]}-${channel}.${patch[1]}`
 // package.build.channel = channel
 pkg.publish = {
 	"provider": "github",
@@ -34,7 +34,7 @@ pkg.publish = {
 
 const {exec} = require('child_process')
 
-exec('echo $APP_VERSION', {env: {'APP_VERSION': pkg.version}}, function (error, stdout, stderr) {
+exec(`export APP_VERSION=${pkg.version} && echo $APP_VERSION`, {env: {'APP_VERSION': pkg.version}}, function (error, stdout, stderr) {
 	console.log(stdout, stderr, error);
 });