diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index f247bd0..f13625a 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -52,22 +52,29 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - name: Check out
-      uses: actions/checkout@v2
-      with:
-        submodules: "recursive"
-        fetch-depth: 1
+      - name: Check out
+        uses: actions/checkout@v2
+        with:
+          submodules: "recursive"
+          fetch-depth: 1
 
-    - name: Install
-      working-directory: project
-      run: |
-        sudo apt-get install gcc-arm-none-eabi -y
+      - name: Install sdcc
+        run: |
+          wget https://sourceforge.net/projects/sdcc/files/sdcc-linux-amd64/4.0.0/sdcc-4.0.0-amd64-unknown-linux2.5.tar.bz2
+          tar -xf sdcc-4.0.0-amd64-unknown-linux2.5.tar.bz2
+          echo `pwd`/sdcc-4.0.0/bin >> $GITHUB_PATH
+
+      - name: Build project
+        if: success()
+        working-directory: project/JTAG
+        run: |
+          make
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: sdcc_project
+          path: project/JTAG
 
-    - name: Build
-      if: success()
-      working-directory: project/gcc
-      run: |
-        make
 
     # - name: Download
     #   working-directory: src
@@ -99,9 +106,3 @@ jobs:
     #     source-dir: src
     #     build-dir: src/output
     #     parallel: 8
-
-    - name: Upload
-      uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: project/gcc/obj
diff --git a/.github/workflows/linux-sdcc-4.0.0.yml b/.github/workflows/linux-sdcc-4.0.0.yml
index a01c716..832f234 100644
--- a/.github/workflows/linux-sdcc-4.0.0.yml
+++ b/.github/workflows/linux-sdcc-4.0.0.yml
@@ -15,22 +15,23 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-
     steps:
-    - name: Check out
-      uses: actions/checkout@v2
+      - uses: actions/checkout@v2
+        with:
+          submodules: "recursive"
+          fetch-depth: 1
 
-    - name: Download SDCC
-      run: |
-        wget https://sourceforge.net/projects/sdcc/files/sdcc-linux-amd64/4.0.0/sdcc-4.0.0-amd64-unknown-linux2.5.tar.bz2
-        tar -xf sdcc-4.0.0-amd64-unknown-linux2.5.tar.bz2
-        echo `pwd`/sdcc-4.0.0/bin >> $GITHUB_PATH
+      - name: Install sdcc
+        run: |
+          wget https://sourceforge.net/projects/sdcc/files/sdcc-linux-amd64/4.0.0/sdcc-4.0.0-amd64-unknown-linux2.5.tar.bz2
+          tar -xf sdcc-4.0.0-amd64-unknown-linux2.5.tar.bz2
+          echo `pwd`/sdcc-4.0.0/bin >> $GITHUB_PATH
 
-    - name: Build
-      working-directory: src/template
-      run: make
+      - name: Build
+        working-directory: src/template
+        run: make
 
-    - uses: actions/upload-artifact@v2
-      with:
-        name: sdcc_template
-        path: src/template
+      - uses: actions/upload-artifact@v2
+        with:
+          name: sdcc_template
+          path: src/template
diff --git a/src/template/Makefile b/src/template/Makefile
index 801d189..5b4f1ae 100644
--- a/src/template/Makefile
+++ b/src/template/Makefile
@@ -14,9 +14,9 @@ MAIN := $(SRC_DIR)/main.c
 TARGET := flashme
 
 # Point to SDCC toolchain folder
-TOOLCHAIN := ../sdcc-4.0.0/bin
-CC := $(TOOLCHAIN)/sdcc
-OBJCOPY = $(TOOLCHAIN)/sdobjcopy
+# TOOLCHAIN := ../sdcc-4.0.0/bin
+CC :=  sdcc
+OBJCOPY = sdobjcopy
 CFLAGS := \
 	-mmcs51 \
 	--model-large \