diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 22a602ab..37cb4aae 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,10 +36,40 @@ jobs:
         node-version: ${{ matrix.node-version }}
     - run: npm ci
     - run: npm run lint
+    - name: Get Version Number
+      uses: nyaayaya/package-version@v1
+      with:
+        path: 'package.json'
+        follow-symlinks: false
+        
+    - name: Set Version Number Variable
+      id: versionNumber
+      uses: actions/github-script@v3
+      env:
+        IS_DEV: ${{ contains(github.ref, 'development') }}
+        VERSION_NUMBER_NIGHTLY: ${{ env.PACKAGE_VERSION }}-nightly-${{ github.run_number }}
+        VERSION_NUMBER: ${{ env.PACKAGE_VERSION }}
+      with:
+        result-encoding: string
+        script: |
+          if (${{ env.IS_DEV }}) {
+            return "${{ env.VERSION_NUMBER_NIGHTLY }}"
+          } else {
+           return "${{env.VERSION_NUMBER }}"
+          }
+        # script: if ${{ env.IS_DEV }} then echo "::set-output name=VERSION_NUMBER::${{ env.VERSION_NUMBER_NIGHTLY }}" else echo "::set-output name=VERSION_NUMBER::${{ env.VERSION_NUMBER }}" fi
+    
+    - name: Update package.json version
+      uses: jossef/action-set-json-field@v1
+      with:
+        file: package.json
+        field: version
+        value: ${{ steps.versionNumber.outputs.result }} 
+
 
     - name: Install libarchive-tools
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
-      run: sudo apt -y install libarchive-tools
+      run: sudo apt -y install libarchive-tools; echo "Version Number ${{ toJson(job) }} ${{ toJson(needs) }}"
 
     - name: Build x64 with Node.js ${{ matrix.node-version}}
       if: contains(matrix.runtime, 'x64')
@@ -53,110 +83,110 @@ jobs:
       uses: actions/upload-artifact@v2
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
       with:
-        name: freetube_0.9.2_linux_portable_x64
-        path: build/freetube-0.9.2.zip
+        name: freetube_${{ steps.versionNumber.outputs.result }}_linux_portable_x64
+        path: build/freetube-${{ steps.versionNumber.outputs.result }}.zip
 
     - name: Upload Linux .zip ARM Artifact
       uses: actions/upload-artifact@v2
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
       with:
-        name: freetube_0.9.2_linux_portable_arm64
-        path: build/freetube-0.9.2-arm64.zip
+        name: freetube_${{ steps.versionNumber.outputs.result }}_linux_portable_arm64
+        path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.zip
 
     - name: Upload .deb x64 Artifact
       uses: actions/upload-artifact@v2
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
       with:
-        name: freetube_0.9.2_amd64.deb
-        path: build/freetube_0.9.2_amd64.deb
+        name: freetube_${{ steps.versionNumber.outputs.result }}_amd64.deb
+        path: build/freetube_${{ steps.versionNumber.outputs.result }}_amd64.deb
 
     - name: Upload .deb ARM Artifact
       uses: actions/upload-artifact@v2
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
       with:
-        name: freetube_0.9.2_arm64.deb
-        path: build/freetube_0.9.2_arm64.deb
+        name: freetube_${{ steps.versionNumber.outputs.result }}_arm64.deb
+        path: build/freetube_${{ steps.versionNumber.outputs.result }}_arm64.deb
 
     - name: Upload AppImage x64 Artifact
       uses: actions/upload-artifact@v2
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
       with:
-        name: freetube_0.9.2_amd64.AppImage
-        path: build/FreeTube-0.9.2.AppImage
+        name: freetube_${{ steps.versionNumber.outputs.result }}_amd64.AppImage
+        path: build/FreeTube-${{ steps.versionNumber.outputs.result }}.AppImage
 
     - name: Upload AppImage ARM Artifact
       uses: actions/upload-artifact@v2
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
       with:
-        name: freetube_0.9.2_arm64.AppImage
-        path: build/FreeTube-0.9.2-arm64.AppImage
+        name: freetube_${{ steps.versionNumber.outputs.result }}_arm64.AppImage
+        path: build/FreeTube-${{ steps.versionNumber.outputs.result }}-arm64.AppImage
 
     - name: Upload .rpm x64 Artifact
       uses: actions/upload-artifact@v2
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
       with:
-        name: freetube_0.9.2_amd64.rpm
-        path: build/freetube-0.9.2.x86_64.rpm
+        name: freetube_${{ steps.versionNumber.outputs.result }}_amd64.rpm
+        path: build/freetube-${{ steps.versionNumber.outputs.result }}.x86_64.rpm
 
     - name: Upload .rpm ARM Artifact
       uses: actions/upload-artifact@v2
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
       with:
-        name: freetube_0.9.2_arm64.rpm
-        path: build/freetube-0.9.2.arm64.rpm
+        name: freetube_${{ steps.versionNumber.outputs.result }}_arm64.rpm
+        path: build/freetube-${{ steps.versionNumber.outputs.result }}.arm64.rpm
 
     - name: Upload Alpine .apk x64 Artifact
       uses: actions/upload-artifact@v2
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
       with:
-        name: freetube_0.9.2_alpine_amd64.apk
-        path: build/freetube-0.9.2.apk
+        name: freetube_${{ steps.versionNumber.outputs.result }}_alpine_amd64.apk
+        path: build/freetube-${{ steps.versionNumber.outputs.result }}.apk
 
     - name: Upload Alpine .apk ARM Artifact
       uses: actions/upload-artifact@v2
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-arm64')
       with:
-        name: freetube_0.9.2_alpine_arm64.apk
-        path: build/freetube-0.9.2-arm64.apk
+        name: freetube_${{ steps.versionNumber.outputs.result }}_alpine_arm64.apk
+        path: build/freetube-${{ steps.versionNumber.outputs.result }}-arm64.apk
 
     - name: Upload Pacman .pacman x64 Artifact
       uses: actions/upload-artifact@v2
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
       with:
-        name: freetube_0.9.2_pacman_amd64.pacman
-        path: build/freetube-0.9.2.pacman
+        name: freetube_${{ steps.versionNumber.outputs.result }}_amd64.pacman
+        path: build/freetube-${{ steps.versionNumber.outputs.result }}.pacman
 
     - name: Upload Web Build
       uses: actions/upload-artifact@v2
       if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.runtime, 'linux-x64')
       with:
-        name: freetube_0.9.2_static_web
+        name: freetube_${{ steps.versionNumber.outputs.result }}_static_web
         path: dist/web
 
     - name: Upload Windows .exe Artifact
       uses: actions/upload-artifact@v2
       if: startsWith(matrix.os, 'windows')
       with:
-        name: freetube-0.9.2-win-x64-portable
-        path: build/freetube-0.9.2-win.zip
+        name: freetube-${{ steps.versionNumber.outputs.result }}-win-x64-portable
+        path: build/freetube-${{ steps.versionNumber.outputs.result }}-win.zip
 
     - name: Upload Windows .zip Artifact
       uses: actions/upload-artifact@v2
       if: startsWith(matrix.os, 'windows')
       with:
-        name: freetube-0.9.2-setup-x64.exe
-        path: build/freetube Setup 0.9.2.exe
+        name: freetube-${{ steps.versionNumber.outputs.result }}-setup-x64.exe
+        path: build/freetube Setup ${{ steps.versionNumber.outputs.result }}.exe
 
     - name: Upload Windows Portable Artifact
       uses: actions/upload-artifact@v2
       if: startsWith(matrix.os, 'windows')
       with:
-        name: freetube-0.9.2-portable-x64.exe
-        path: build/freetube 0.9.2.exe
+        name: freetube-${{ steps.versionNumber.outputs.result }}-portable-x64.exe
+        path: build/freetube ${{ steps.versionNumber.outputs.result }}.exe
 
     - name: Upload Mac .dmg Artifact
       uses: actions/upload-artifact@v2
       if: startsWith(matrix.os, 'macos')
       with:
-        name: freetube-0.9.2-mac.dmg
-        path: build/freetube-0.9.2.dmg
+        name: freetube-${{ steps.versionNumber.outputs.result }}-mac.dmg
+        path: build/freetube-${{ steps.versionNumber.outputs.result }}.dmg