diff --git a/.github/workflows/buildrom.yml b/.github/workflows/buildrom.yml
index cd98c8daf6..e59b124970 100644
--- a/.github/workflows/buildrom.yml
+++ b/.github/workflows/buildrom.yml
@@ -1,17 +1,20 @@
 name: Build ROM
 
-on:
-  push:
-      tags:
-        - 'v*'
+on: push
+  # push:
+      # tags:
+      #   - 'v*'
 
 jobs:
   build_rom:
     runs-on: ubuntu-latest
-    container:
-      image: arantonitis/devkitgba
+    # container:
+    #   image: arantonitis/devkitgba
     steps:
       - uses: actions/checkout@v2
+      - name: Install dependencies
+        run: |
+          sudo apt-get install binutils-arm-none-eabi gcc-arm-none-eabi
       - name: Build & install agbcc
         run: |
           cd ..
diff --git a/remote_build.sh b/remote_build.sh
index ddbcf599fb..c9b492628f 100644
--- a/remote_build.sh
+++ b/remote_build.sh
@@ -4,6 +4,7 @@
 
 set +v
 set -e
+git_branch=$(git branch --show-current)
 git push build --force # ssh://merrbot:/home/ubuntu/pokeemerald
-ssh merrbot "source /etc/profile.d/devkit-env.sh && cd pokeemerald && git reset --hard && git checkout dexnav && make"
+ssh merrbot "cd pokeemerald && git reset --hard && git checkout $git_branch && make"
 scp merrbot:pokeemerald/pokeemerald.gba romhack.gba