diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
new file mode 100644
index 0000000..01eb905
--- /dev/null
+++ b/.github/workflows/cli.yml
@@ -0,0 +1,51 @@
+name: CLI Build
+
+on: [push, pull_request]
+
+jobs:
+  build-and-upload:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: '20'
+
+      - name: Install dependencies (CLI)
+        run: cd cli && npm install
+
+      - name: Install pkg globally
+        run: npm install -g pkg
+
+      - name: Build CLI executables
+        run: |
+          cd cli
+          pkg kuzco-cli.js --targets node18-linux-x64,node18-macos-x64,node18-win-x64
+
+      - name: Rename executables
+        run: |
+          cd cli
+          mv kuzco-cli-linux kuzco-cli-linux-x64
+          mv kuzco-cli-macos kuzco-cli-macos-x64
+          mv kuzco-cli-win.exe kuzco-cli-win-x64.exe
+
+      - name: Upload Linux Executable
+        uses: actions/upload-artifact@v2
+        with:
+          name: kuzco-cli-linux-x64
+          path: cli/kuzco-cli-linux-x64
+
+      - name: Upload macOS Executable
+        uses: actions/upload-artifact@v2
+        with:
+          name: kuzco-cli-macos-x64
+          path: cli/kuzco-cli-macos-x64
+
+      - name: Upload Windows Executable
+        uses: actions/upload-artifact@v2
+        with:
+          name: kuzco-cli-win-x64.exe
+          path: cli/kuzco-cli-win-x64.exe
\ No newline at end of file
diff --git a/.github/workflows/gui.yml b/.github/workflows/gui.yml
index ce2ade8..5e14a02 100644
--- a/.github/workflows/gui.yml
+++ b/.github/workflows/gui.yml
@@ -11,7 +11,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: '14'
+          node-version: '20'
 
       - name: Install dependencies (GUI)
         run: cd gui && npm install
@@ -27,7 +27,7 @@ jobs:
       - name: Upload Linux AppImage
         uses: actions/upload-artifact@v2
         with:
-          name: KuzcoChat-Linux
+          name: KuzcoChat-Linux-Appimage
           path: gui/dist/*.AppImage
 
       - name: Upload Linux DEB
@@ -50,7 +50,7 @@ jobs:
       - name: Set up Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: '14'
+          node-version: '20'
 
       - name: Install dependencies (GUI)
         run: cd gui && npm install