diff --git a/.github/workflows/branch_build.yml b/.github/workflows/branch_build.yml
deleted file mode 100644
index eac995619..000000000
--- a/.github/workflows/branch_build.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-name: "Branch build"
-on:
-  push:
-    branches-ignore:
-      - master
-      - develop
-      - release/*
-jobs:
-  install-notest:
-    runs-on: ubuntu-latest
-    name: "Package and linting"
-    steps:
-      - uses: actions/checkout@v2
-      - name: set up JDK 16
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'zulu'
-          java-version: 16
-          architecture: x64
-      - name: Cache Maven packages
-        uses: actions/cache@v2.1.5
-        with:
-          path: ~/.m2
-          key: ubuntu-latest-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ubuntu-latest-m2
-      - name: Test with Maven
-        run: mvn install -DskipTests
-
-  testing:
-    needs: install-notest
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        args:
-          - mvn -pl '!webgoat-integration-tests' test
-          - mvn -pl webgoat-integration-tests test
-    steps:
-      - uses: actions/checkout@v2
-      - name: set up JDK 16
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'zulu'
-          java-version: 16
-          architecture: x64
-      - name: Cache Maven packages
-        uses: actions/cache@v2.1.5
-        with:
-          path: ~/.m2
-          key: ubuntu-latest-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ubuntu-latest-m2
-      - name: Test with Maven
-        run: ${{ matrix.args }}
diff --git a/.github/workflows/pr_build.yml b/.github/workflows/build.yml
similarity index 79%
rename from .github/workflows/pr_build.yml
rename to .github/workflows/build.yml
index e1b51e9e1..39a7ded3f 100644
--- a/.github/workflows/pr_build.yml
+++ b/.github/workflows/build.yml
@@ -1,4 +1,4 @@
-name: "Pull request build"
+name: "Build"
 on:
   pull_request:
     paths-ignore:
@@ -8,10 +8,6 @@ on:
       - 'LICENSE'
       - 'docs/**'
   push:
-    branches:
-      - master
-      - develop
-      - release/*
     tags-ignore:
       - '*'
     paths-ignore:
@@ -23,6 +19,12 @@ on:
 
 jobs:
   build:
+    if: |
+      ${{
+      github.event_name == 'pull_request' ||
+      (github.event_name == 'push' &&
+      github.event.pull_request.head.repo.full_name != github.repository)
+      }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -43,4 +45,4 @@ jobs:
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
       - name: Build with Maven
-        run: mvn clean install
+        run: mvn package
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e48bc8500..57d612527 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -39,7 +39,7 @@ jobs:
       - name: Build with Maven
         run: |
           mvn versions:set -DnewVersion=${{ env.WEBGOAT_MAVEN_VERSION }}
-          mvn clean install -DskipTests
+          mvn install -DskipTests
 
       - name: "Create release"
         uses: softprops/action-gh-release@v1