diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 00000000..71ca98f2
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,29 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ "master", "development" ]
+  pull_request:
+    branches: [ "master", "development" ]
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 21
+        uses: actions/setup-java@v3
+        with:
+          java-version: '21'
+          cache: maven
+      - name: Build with Maven
+        run: mvn package
\ No newline at end of file
diff --git a/.github/workflows/maven.yml b/.github/workflows/format.yml
similarity index 78%
rename from .github/workflows/maven.yml
rename to .github/workflows/format.yml
index 35aefd98..7910b28b 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/format.yml
@@ -16,36 +16,25 @@ on:
   workflow_dispatch:
 
 jobs:
-  format:
+  frontend:
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
           java-version: '21'
-          distribution: 'temurin'
           cache: maven
       - name: Validate backend format
         run: mvn formatter:validate
+
+  backend:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
       - name: Install frontend dependencies
         run: cd frontend/app && npm install
       - name: Validate frontend linter
         run: cd frontend/app && npm run lint:validate
       - name: Validate frontend prettier
-        run: cd frontend/app && npm run prettier:validate
-
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 21
-        uses: actions/setup-java@v3
-        with:
-          java-version: '21'
-          distribution: 'temurin'
-          cache: maven
-      - name: Build with Maven
-        run: mvn package
\ No newline at end of file
+        run: cd frontend/app && npm run prettier:validate
\ No newline at end of file