diff --git a/.github/workflows/build-tnc.yml b/.github/workflows/build-tnc.yml
index c9265df4..7e0bc641 100644
--- a/.github/workflows/build-tnc.yml
+++ b/.github/workflows/build-tnc.yml
@@ -1,67 +1,49 @@
-name: Build
 
-on:
-  push:
-#    tags:
-#      - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+name: Build/TNC
+on: push
 
 jobs:
-
-  createrelease:
-    name: Create Release
-    runs-on: [ubuntu-latest]
+  ubuntu-latest:
+    runs-on: ubuntu-latest
     steps:
-    - name: Create Release
-      id: create_release
-      uses: actions/create-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: ${{ github.ref }}
-        release_name: Release ${{ github.ref }}
-        draft: false
-        prerelease: false
-    - name: Output Release URL File
-      run: echo "${{ steps.create_release.outputs.upload_url }}" > release_url.txt
-    - name: Save Release URL File for publish
-      uses: actions/upload-artifact@v1
-      with:
-        name: release_url
-        path: release_url.txt
+      - name: Check out Git repository
+        uses: actions/checkout@v2
+      - name: Set up Python 3.8
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+      - name: Install dependencies
+        run: |
+          sudo apt install portaudio19-dev
+          python -m pip install --upgrade pip
+          pip3 install pyaudio
+          pip3 install psutil
+          pip3 install crcengine
+          pip3 install pyinstaller
+      - name: Build with Pyinstaller
+        working-directory: tnc
+        run: |      
+          pyinstaller -F daemon.py -n daemon
+          pyinstaller -F main.py -n tnc
+          cd dist
+          ls -R
 
-  build:
-    name: Build packages
-    needs: createrelease
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        include:
-          - os: macos-latest
-            TARGET: macos
-            CMD_BUILD: >
-                pyinstaller -F -w -n daemon daemon.py &&
-                cd dist/ &&
-                zip -r9 daemon daemon.app/
-            OUT_FILE_NAME: daemon.zip
-            ASSET_MIME: application/zip
-          - os: windows-latest
-            TARGET: windows
-            CMD_BUILD: pyinstaller -F -w -n daemon daemon.py
-            OUT_FILE_NAME: daemon.exe
-            ASSET_MIME: application/vnd.microsoft.portable-executable
-    steps:
-    - uses: actions/checkout@v1
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.8
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip3 install pyaudio
-        pip3 install psutil
-        pip3 install crcengine
-        pip3 install threading
-    - name: Build with pyinstaller for ${{matrix.TARGET}}
-      run: ${{matrix.CMD_BUILD}}
-   
+
+
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          prerelease: false
+          files: |
+            dist/daemon
+            dist/tnc
+            LICENSE
+
+
+      #- name: Save build artifacts to Action
+      #  uses: actions/upload-artifact@v2
+      #  with:
+      #    name: ubuntu-latest
+      #    path: ./tnc/dist/
+      #    if-no-files-found: error # 'warn' or 'ignore' are also available, defaults to `warn`