diff --git a/.github/workflows/building.yml b/.github/workflows/building.yml
index 4fa608a..9411d31 100644
--- a/.github/workflows/building.yml
+++ b/.github/workflows/building.yml
@@ -1,12 +1,12 @@
-name: C/C++ CI
+name: Build GodMode9i
 
 on:
   push:
-    branches: [ master ]
+    branches: ["*"]
     paths-ignore:
       - 'README.md'
   pull_request:
-    branches: [ master ]
+    branches: ["*"]
     paths-ignore:
       - 'README.md'
   release:
@@ -15,20 +15,20 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: devkitpro/devkitarm:20200730
-    name: "Build with Docker using devKitARM r55"
+    container: devkitpro/devkitarm
+    name: "Build with Docker using devkitARM"
     outputs:
-      commit_tag: ${{ steps.make-cias.outputs.commit_tag }}
-      commit_message: ${{ steps.make-cias.outputs.commit_message }}
+      commit_tag: ${{ steps.build.outputs.commit_tag }}
+      commit_message: ${{ steps.build.outputs.commit_message }}
     steps:
       - name: "Checkout repo"
         uses: actions/checkout@v1
       - name: "Install tools"
         run: |
           sudo apt-get update
-          sudo apt-get install p7zip-full python jq -y
+          sudo apt-get install p7zip-full python -y
       - name: "Build & Package GodMode9i"
-        id: make-gm9i
+        id: build
         run: |
           make
           chmod +x make_cia
@@ -40,6 +40,9 @@ jobs:
           
           mkdir -p ~/artifacts
           cp GodMode9i.7z ~/artifacts
+
+          echo "::set-output name=commit_tag::$(git log --format=%h -1)"
+          echo "::set-output name=commit_message::$(git log --pretty=format:'%an - %s' -1)"
       - name: "Publish build to GH Actions"
         uses: actions/upload-artifact@v2
         with:
@@ -49,7 +52,7 @@ jobs:
   # Only run this for non-PR jobs.
   publish_build_twlbot:
     runs-on: ubuntu-latest
-    name: "Publish build to TWLBot"
+    name: "Publish build to TWLBot/Builds"
     if: ${{ success() && !startsWith(github.ref, 'refs/pull') }}
     needs: build
     env:
@@ -57,7 +60,6 @@ jobs:
       COMMIT_MESSAGE: ${{ needs.build.outputs.commit_message }}
     outputs:
       current_date: ${{ steps.commit.outputs.current_date }}
-      twlbot_commit: ${{ steps.commit.outputs.twlbot_commit }}
     steps:
       - name: "Checkout repo"
         uses: actions/checkout@v1
@@ -66,7 +68,7 @@ jobs:
         with:
           name: "build"
           path: "build"
-      - name: Upload to RocketRobz/GodMode9i release
+      - name: Upload to ${{ github.repository }} release
         if: ${{ startsWith(github.ref, 'refs/tags') }}
         run: |
           ID=$(jq --raw-output '.release.id' $GITHUB_EVENT_PATH)
@@ -94,13 +96,12 @@ jobs:
           git commit -m "GodMode9i | $COMMIT_TAG"
           git tag v$CURRENT_DATE
           git push origin v$CURRENT_DATE master
-          echo "::set-output name=twlbot_commit::$(git log --format=%H -1)"
       - name: Release to TWLBot/Builds
         run: |
           AUTH_HEADER="Authorization: token ${{ secrets.TWLBOT_TOKEN }}"
           CONTENT_TYPE="Content-Type: application/json"
           API_URL="https://api.github.com/repos/TWLBot/Builds/releases"
-          RELEASE_INFO="{\"tag_name\": \"v${{ steps.commit.outputs.current_date }}\", \"name\": \"GodMode9i | $COMMIT_TAG\", \"body\": \"$COMMIT_MESSAGE\", "prerelease": true}"
+          RELEASE_INFO="{\"tag_name\": \"v${{ steps.commit.outputs.current_date }}\", \"name\": \"GodMode9i | $COMMIT_TAG\", \"body\": \"$COMMIT_MESSAGE\", \"prerelease\": true}"
 
           RESPONSE=$(curl -XPOST -H "$AUTH_HEADER" -H "$CONTENT_TYPE" "$API_URL" -d "$RELEASE_INFO")
 
@@ -121,10 +122,7 @@ jobs:
     name: "Send Discord success webhook"
     if: ${{ success() && !startsWith(github.ref, 'refs/pull') }}
     env:
-      COMMIT_TAG: ${{ needs.build.outputs.commite_tag }}
-      COMMIT_MESSAGE: ${{ needs.build.outputs.commit_message }}
       CURRENT_DATE: ${{ needs.publish_build_twlbot.outputs.current_date }}
-      TWLBOT_COMMIT: ${{ needs.publish_build_twlbot.outputs.twlbot_commit }}
     steps:
       - name: "Checkout repo"
         uses: actions/checkout@v1
@@ -140,10 +138,7 @@ jobs:
     name: "Send Discord failure webhook"
     if: ${{ failure() && !startsWith(github.ref, 'refs/pull') }}
     env:
-      COMMIT_TAG: ${{ needs.build.outputs.commite_tag }}
-      COMMIT_MESSAGE: ${{ needs.build.outputs.commit_message }}
       CURRENT_DATE: ${{ needs.publish_build_twlbot.outputs.current_date }}
-      TWLBOT_COMMIT: ${{ needs.publish_build_twlbot.outputs.twlbot_commit }}
     steps:
       - name: "Checkout repo"
         uses: actions/checkout@v1