diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 91b5e529..3814fd1b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -26,13 +26,14 @@ on:
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a single job called "build"
-  Build-Linux:
+  Build-XMLConverter-Linux:
     # The type of runner that the job will run on
     runs-on: ubuntu-20.04
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout repository
+        uses: actions/checkout@v2
 
       - name: Create the Output Directory
         run: mkdir -v -p output
@@ -45,12 +46,16 @@ jobs:
           sudo apt-get install iwyu
           sudo apt-get install clang-9
 
+      - name: Install protoc
+        run: sudo apt-get install protobuf-compiler
+
+      - name: Install gtest
+        run: sudo apt-get install libgtest-dev
 
       - name: Install cpplint
         run: |
           pip3 install cpplint
 
-
       - name: Install xml_converter/generators Dependencies
         run: |
           cd xml_converter/generators
@@ -58,13 +63,6 @@ jobs:
           source venv/bin/activate
           pip install -r requirements.txt
 
-
-      - name: Install protoc
-        run: sudo apt-get install protobuf-compiler 
-
-      - name: Install gtest
-        run: sudo apt-get install libgtest-dev
-
       - name: Build xml_converter
         run: |
           cd xml_converter
@@ -75,12 +73,48 @@ jobs:
           mv xml_converter ../../output/
           cp compile_commands.json ../compile_commands.json
 
-
       - name: Validate xml_converter
         run: |
           cd xml_converter
           ./presubmit.sh
 
+      - name: Upload created file
+        uses: actions/upload-artifact@v2
+        with:
+          name: xml_converter
+          path: build/xml_converter
+
+  Build-BurritoLink-Linux:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Create the Output Directory
+        run: mkdir -v -p output
+
+      - name: Install mingw
+        run: sudo apt-get install gcc-mingw-w64
+
+      - name: Build Burrito Link
+        run: |
+          cd burrito_link
+          make
+
+      - name: Upload created file
+        uses: actions/upload-artifact@v2
+        with:
+          name: burrito_link.exe
+          path: burrito_link/burrito_link.exe
+
+  Build-BurritoUI-Linux:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Create the Output Directory
+        run: mkdir -v -p output
 
       # - name: Cache Godot
       #   id: cache-godot
@@ -116,10 +150,6 @@ jobs:
           unzip Godot_v${GODOT_VERSION}-stable_export_templates.tpz
           mv templates/* ~/.local/share/godot/templates/${GODOT_VERSION}.stable/
           ls ~/.local/share/godot/templates/${GODOT_VERSION}.stable/
-
-
-      - name: Install mingw
-        run: sudo apt-get install gcc-mingw-w64
       
 
       - name: Build X11_FG
@@ -133,14 +163,6 @@ jobs:
             cd taco_parser
             cargo build --release
 
-
-      - name: Build Burrito Link
-        run: |
-          cd burrito_link
-          make
-          mv burrito_link.exe ../output
-
-
       - name: Build Burrito
         run: |
           mkdir -v -p build
@@ -150,6 +172,39 @@ jobs:
           mv build/libburrito_fg.so output/
           mv build/libgw2_taco_parser.so output/
 
+      - uses: actions/upload-artifact@v2
+        with:
+          # Artifact name
+          name: "Burrito_UI" # optional, default is artifact
+          # A file, directory or wildcard pattern that describes what to upload
+          path:  "output/*"
+          # The desired behavior if no files are found using the provided path.
+          if-no-files-found: error
+
+  Package-Burrito-Linux:
+    runs-on: ubuntu-20.04
+    needs:
+      - Build-XMLConverter-Linux
+      - Build-BurritoLink-Linux
+      - Build-BurritoUI-Linux
+    steps:
+      - name: Download Burrito UI
+        uses: actions/download-artifact@v2
+        with:
+          name: Brrito_UI
+
+      - name: Download XML Converter
+        uses: actions/download-artifact@v2
+        with:
+          name: xml_converter
+
+      - name: Download XML Converter
+        uses: actions/download-artifact@v2
+        with:
+          name: burrito_link.exe
+
+      - name: Move Burrito Link
+        run: mv burrito_link/burrito_link.exe output/
 
       - uses: actions/upload-artifact@v2.2.4
         with: