diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
deleted file mode 100644
index 8a26d2e..0000000
--- a/.github/workflows/main.yml
+++ /dev/null
@@ -1,145 +0,0 @@
-name: Build for CI
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-  schedule:
-    - cron: '0 3 * * *'
-
-jobs:
-  build-f31-x64:
-    runs-on: ubuntu-20.04
-    container: vathpela/efi-ci:f31
-    name: A job to test building on Fedora 31
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Do the build
-        run: make
-                  PREFIX=/usr
-                  LIBDIR=/usr/lib64
-                  DESTDIR=/destdir
-                  EFIDIR=test
-                  ENABLE_HTTPBOOT=true
-                  ENABLE_SHIM_HASH=true
-                  clean all
-        id: build
-      - name: Install in /destdir
-        run: make
-                  PREFIX=/usr
-                  LIBDIR=/usr/lib64
-                  DESTDIR=/destdir
-                  EFIDIR=test
-                  ENABLE_HTTPBOOT=true
-                  ENABLE_SHIM_HASH=true
-                  install
-        id: install
-#      - name: Archive production artifacts
-#        uses: actions/upload-artifact@v2
-#        with:
-#          name: shim
-#          path: |
-#            /destdir
-  build-f32-x64:
-    runs-on: ubuntu-20.04
-    container: vathpela/efi-ci:f32
-    name: A job to test building on Fedora 32
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Do the build
-        run: make
-                  PREFIX=/usr
-                  LIBDIR=/usr/lib64
-                  DESTDIR=/destdir
-                  EFIDIR=test
-                  ENABLE_HTTPBOOT=true
-                  ENABLE_SHIM_HASH=true
-                  clean all
-        id: build
-      - name: Install in /destdir
-        run: make
-                  PREFIX=/usr
-                  LIBDIR=/usr/lib64
-                  DESTDIR=/destdir
-                  EFIDIR=test
-                  ENABLE_HTTPBOOT=true
-                  ENABLE_SHIM_HASH=true
-                  install
-        id: install
-#      - name: Archive production artifacts
-#        uses: actions/upload-artifact@v2
-#        with:
-#          name: shim
-#          path: |
-#            /destdir
-  build-f33-x64:
-    runs-on: ubuntu-20.04
-    container: vathpela/efi-ci:f33
-    name: A job to test building on Fedora 33
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Do the build
-        run: make
-                  PREFIX=/usr
-                  LIBDIR=/usr/lib64
-                  DESTDIR=/destdir
-                  EFIDIR=test
-                  ENABLE_HTTPBOOT=true
-                  ENABLE_SHIM_HASH=true
-                  clean all
-        id: build
-      - name: Install in /destdir
-        run: make
-                  PREFIX=/usr
-                  LIBDIR=/usr/lib64
-                  DESTDIR=/destdir
-                  EFIDIR=test
-                  ENABLE_HTTPBOOT=true
-                  ENABLE_SHIM_HASH=true
-                  install
-        id: install
-#      - name: Archive production artifacts
-#        uses: actions/upload-artifact@v2
-#        with:
-#          name: shim
-#          path: |
-#            /destdir
-  build-f34-x64:
-    runs-on: ubuntu-20.04
-    container: vathpela/efi-ci:f34
-    name: A job to test building on Fedora 34
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Do the build
-        run: make
-                  PREFIX=/usr
-                  LIBDIR=/usr/lib64
-                  DESTDIR=/destdir
-                  EFIDIR=test
-                  ENABLE_HTTPBOOT=true
-                  ENABLE_SHIM_HASH=true
-                  clean all
-        id: build
-      - name: Install in /destdir
-        run: make
-                  PREFIX=/usr
-                  LIBDIR=/usr/lib64
-                  DESTDIR=/destdir
-                  EFIDIR=test
-                  ENABLE_HTTPBOOT=true
-                  ENABLE_SHIM_HASH=true
-                  install
-        id: install
-#      - name: Archive production artifacts
-#        uses: actions/upload-artifact@v2
-#        with:
-#          name: shim
-#          path: |
-#            /destdir
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
new file mode 100644
index 0000000..6008a27
--- /dev/null
+++ b/.github/workflows/pull-request.yml
@@ -0,0 +1,83 @@
+name: pull-request-builds
+
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  pull-request-f34-x64:
+    runs-on: ubuntu-20.04
+    container: vathpela/efi-ci:f34
+    name: f34 build
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Do the build
+        run: git rebase --exec "make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_HTTPBOOT=true ENABLE_SHIM_HASH=true clean all" "${GITHUB_BASE_REF}"
+        id: build
+      - name: Install in /destdir
+        run: make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_HTTPBOOT=true ENABLE_SHIM_HASH=true install
+        id: install
+#      - name: Archive production artifacts
+#        uses: actions/upload-artifact@v2
+#        with:
+#          name: shim
+#          path: |
+#            /destdir
+  pull-request-f33-x64:
+    runs-on: ubuntu-20.04
+    container: vathpela/efi-ci:f33
+    name: f33 build
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Do the build
+        run: git rebase --exec "make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_HTTPBOOT=true ENABLE_SHIM_HASH=true clean all" "${GITHUB_BASE_REF}"
+        id: build
+      - name: Install in /destdir
+        run: make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_HTTPBOOT=true ENABLE_SHIM_HASH=true install
+        id: install
+#      - name: Archive production artifacts
+#        uses: actions/upload-artifact@v2
+#        with:
+#          name: shim
+#          path: |
+#            /destdir
+  pull-request-f32-x64:
+    runs-on: ubuntu-20.04
+    container: vathpela/efi-ci:f32
+    name: f32 build
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Do the build
+        run: git rebase --exec "make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_HTTPBOOT=true ENABLE_SHIM_HASH=true clean all" "${GITHUB_BASE_REF}"
+        id: build
+      - name: Install in /destdir
+        run: make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_HTTPBOOT=true ENABLE_SHIM_HASH=true install
+        id: install
+#      - name: Archive production artifacts
+#        uses: actions/upload-artifact@v2
+#        with:
+#          name: shim
+#          path: |
+#            /destdir
+  pull-request-f31-x64:
+    runs-on: ubuntu-20.04
+    container: vathpela/efi-ci:f31
+    name: f31 build
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Do the build
+        run: git rebase --exec "make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_HTTPBOOT=true ENABLE_SHIM_HASH=true clean all" "${GITHUB_BASE_REF}"
+        id: build
+      - name: Install in /destdir
+        id: install
+#      - name: Archive production artifacts
+#        uses: actions/upload-artifact@v2
+#        with:
+#          name: shim
+#          path: |
+#            /destdir
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
new file mode 100644
index 0000000..d3ebbbf
--- /dev/null
+++ b/.github/workflows/push.yml
@@ -0,0 +1,86 @@
+name: push-builds
+
+on:
+  push:
+    branches:
+      - main
+  schedule:
+    - cron: '0 3 * * *'
+
+jobs:
+  push-f34-x64:
+    runs-on: ubuntu-20.04
+    container: vathpela/efi-ci:f34
+    name: f34 build
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Do the build
+        run: make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_HTTPBOOT=true ENABLE_SHIM_HASH=true clean all
+        id: build
+      - name: Install in /destdir
+        run: make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_HTTPBOOT=true ENABLE_SHIM_HASH=true install
+        id: install
+#      - name: Archive production artifacts
+#        uses: actions/upload-artifact@v2
+#        with:
+#          name: shim
+#          path: |
+#            /destdir
+  push-f33-x64:
+    runs-on: ubuntu-20.04
+    container: vathpela/efi-ci:f33
+    name: f33 build
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Do the build
+        run: make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_HTTPBOOT=true ENABLE_SHIM_HASH=true clean all
+        id: build
+      - name: Install in /destdir
+        run: make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_HTTPBOOT=true ENABLE_SHIM_HASH=true install
+        id: install
+#      - name: Archive production artifacts
+#        uses: actions/upload-artifact@v2
+#        with:
+#          name: shim
+#          path: |
+#            /destdir
+  push-f32-x64:
+    runs-on: ubuntu-20.04
+    container: vathpela/efi-ci:f32
+    name: f32 build
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Do the build
+        run: make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_HTTPBOOT=true ENABLE_SHIM_HASH=true clean all
+        id: build
+      - name: Install in /destdir
+        run: make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_HTTPBOOT=true ENABLE_SHIM_HASH=true install
+        id: install
+#      - name: Archive production artifacts
+#        uses: actions/upload-artifact@v2
+#        with:
+#          name: shim
+#          path: |
+#            /destdir
+  push-f31-x64:
+    runs-on: ubuntu-20.04
+    container: vathpela/efi-ci:f31
+    name: f31 build
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Do the build
+        run: make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_HTTPBOOT=true ENABLE_SHIM_HASH=true clean all
+        id: build
+      - name: Install in /destdir
+        run: make PREFIX=/usr LIBDIR=/usr/lib64 DESTDIR=/destdir EFIDIR=test ENABLE_HTTPBOOT=true ENABLE_SHIM_HASH=true install
+        id: install
+#      - name: Archive production artifacts
+#        uses: actions/upload-artifact@v2
+#        with:
+#          name: shim
+#          path: |
+#            /destdir