diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index d828422..d97e8dd 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -1,69 +1,49 @@
-# This is a basic workflow to help you get started with Actions
-
+---
 name: CI
-
-# Controls when the workflow will run
+# yamllint disable-line rule:truthy
 on:
   [push]
 
-  # Allows you to run this workflow manually from the Actions tab
-
-# 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:
-    # The type of runner that the job will run on
     runs-on: ubuntu-latest
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
 
-      # Runs a single command using the runners shell
       - name: Build
         run: sudo ./build.sh
 
-      # Runs a set of commands using the runners shell
       - name: print sha256sum
         run: cat output/sha256
-        
+
       - name: Generate Tag
         id: tag
         run: |
           VER=$(egrep ^KERNEL_VERSION build.sh|cut -d= -f2)
           echo Version is $VER
           echo "::set-output name=tag::${VER}"
-        
-      - name: Upload iso artifact part 1
+
+      - name: Upload iso artifact
         uses: actions/upload-artifact@v2
         with:
           name: mbp-ubuntu-${{ steps.tag.outputs.tag }}.z01
-          path: ${{ github.workspace }}/output/livecd-${{ steps.tag.outputs.tag }}-mbp.z01
-          
-      - name: Upload iso artifact part 2
-        uses: actions/upload-artifact@v2
-        with:
-          name: mbp-ubuntu-${{ steps.tag.outputs.tag }}.z02
-          path: ${{ github.workspace }}/output/livecd-${{ steps.tag.outputs.tag }}-mbp.z02
-          
-      - name: Upload iso artifact part 3
-        uses: actions/upload-artifact@v2
-        with:
-          name: mbp-ubuntu-${{ steps.tag.outputs.tag }}.z03
-          path: ${{ github.workspace }}/output/livecd-${{ steps.tag.outputs.tag }}-mbp.z03
-          
-      - name: Upload iso artifact final part
-        if:  always()
-        uses: actions/upload-artifact@v2
-        with:
-          name: mbp-ubuntu-${{ steps.tag.outputs.tag }}.zip
-          path: ${{ github.workspace }}/output/livecd-${{ steps.tag.outputs.tag }}-mbp.zip
+          path: ${{ github.workspace }}/output/*
 
       - name: Instructions for putting it back together
         run: |
-          echo Download all the artifacts, and put them in a folder without other files. Then run:
-          echo 'unzip "*.z??.zip"'
-          echo 'cat livecd-${{ steps.tag.outputs.tag }}-mbp.z?? > cd.zip'
+          cat << EOF
+          Download all the artifacts, and put them in a folder
+          without other files. Then run:"
+          unzip "*.z??.zip"
+          cat livecd-${{ steps.tag.outputs.tag }}-mbp.z?? > cd.zip
           echo unzip cd.zip
-          
+          EOF
+      - name: Release
+        if: github.ref == 'refs/heads/master'
+        uses: softprops/action-gh-release@v1
+        with:
+          files: ${{ github.workspace }}/output/*
+          tag_name: v${{ steps.tag.outputs.tag }}
+          draft: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
index 53752db..b0e16d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 output
+/.idea
diff --git a/.travis.yml b/.travis.yml
index 18d2774..80f4515 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ os:
 services:
   - docker
 
-#branches:
+# branches:
 #  only:
 #    - master
 
@@ -44,5 +44,6 @@ jobs:
         file_glob: true
         file: "output/*"
         skip_cleanup: true
+        # yamllint disable-line rule:truthy
         on:
           tags: true
diff --git a/build.sh b/build.sh
index 708b5cc..fa99ab6 100755
--- a/build.sh
+++ b/build.sh
@@ -33,7 +33,7 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="
   syslinux
 
 echo >&2 "===]> Info: Start loop... "
-for ALTERNATIVE in mbp
+for ALTERNATIVE in mbp mbp-16x-wifi
 do
   echo >&2 "===]> Info: Start building ${ALTERNATIVE}... "
 
diff --git a/files/chroot_build.sh b/files/chroot_build.sh
index 7cae309..59c272c 100755
--- a/files/chroot_build.sh
+++ b/files/chroot_build.sh
@@ -63,16 +63,11 @@ apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="
   linux-generic \
   linux-headers-generic \
   grub-efi-amd64-signed \
+  "linux-image-${KERNEL_VERSION}" \
+  "linux-headers-${KERNEL_VERSION}" \
   intel-microcode \
   thermald
 
-# This is not ideal, but it should work until the apt repo gets updated.
-
-curl -L https://github.com/marcosfad/mbp-ubuntu-kernel/releases/download/v5.10.47/linux-headers-5.10.47-mbp_5.10.47-1_amd64.deb > /tmp/headers.deb
-curl -L https://github.com/marcosfad/mbp-ubuntu-kernel/releases/download/v5.10.47/linux-image-5.10.47-mbp_5.10.47-1_amd64.deb > /tmp/image.deb
-file /tmp/*
-apt install /tmp/headers.deb /tmp/image.deb
-
 echo >&2 "===]> Info: Install window manager... "
 
 apt-get install -y -qq -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" \