diff --git a/.github/workflows/codacy-analysis.yml b/.github/workflows/codacy-analysis.yml
index 6b818a9f..e5aa4641 100644
--- a/.github/workflows/codacy-analysis.yml
+++ b/.github/workflows/codacy-analysis.yml
@@ -25,7 +25,7 @@ jobs:
 
       # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
       - name: Run Codacy Analysis CLI
-        uses: codacy/codacy-analysis-cli-action@1.1.0
+        uses: codacy/codacy-analysis-cli-action@4.0.0
         with:
           # Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
           # You can also omit the token and run the tools that support default configurations
diff --git a/.github/workflows/java11-maven.yml b/.github/workflows/java11-maven.yml
new file mode 100644
index 00000000..10c5ffc2
--- /dev/null
+++ b/.github/workflows/java11-maven.yml
@@ -0,0 +1,21 @@
+name: Java11-Maven-Build
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    # Checkout the code
+    - uses: actions/checkout@v1
+    
+    # Java 11 Builds
+    - name: Set up JDK 11
+      uses: actions/setup-java@v2.2.0
+      with:
+        java-version: 11
+        distribution: 'adopt'
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
diff --git a/.github/workflows/java16-maven.yml b/.github/workflows/java16-maven.yml
new file mode 100644
index 00000000..4b992498
--- /dev/null
+++ b/.github/workflows/java16-maven.yml
@@ -0,0 +1,21 @@
+name: Java16-Maven-Build
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    # Checkout the code
+    - uses: actions/checkout@v1
+
+    # Java 16 Builds
+    - name: Set up JDK 16
+      uses: actions/setup-java@v2.2.0
+      with:
+        java-version: 16
+        distribution: 'adopt'
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
deleted file mode 100644
index 603989a1..00000000
--- a/.github/workflows/maven.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-name: Maven-Build
-
-on: [push]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    # Java 11 Builds
-    - uses: actions/checkout@v1
-    - name: Set up JDK 11
-      uses: actions/setup-java@v2.2.0
-      with:
-        java-version: 11
-        distribution: 'adopt'
-    - name: Build with Maven
-      run: mvn -B package --file pom.xml
-
-    # Java 16 Builds
-    - uses: actions/checkout@v1
-    - name: Set up JDK 16
-      uses: actions/setup-java@v2.2.0
-      with:
-        java-version: 16
-        distribution: 'adopt'
-    - name: Build with Maven
-      run: mvn -B package --file pom.xml
-
-    # Java 16 Builds
-    - uses: actions/checkout@v1
-    - name: Set up JDK 16
-      uses: actions/setup-java@v1
-      with:
-        java-version: 16
-    - name: Build with Maven
-      run: mvn -B package --file pom.xml