diff --git a/.classpath b/.classpath
index f0257c5a..123ad540 100644
--- a/.classpath
+++ b/.classpath
@@ -31,6 +31,19 @@
 			<attribute name="m2e-apt" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
 		<attributes>
 			<attribute name="optional" value="true"/>
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9fcbed76..4963b002 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,8 +23,8 @@ jobs:
           persist-credentials: false
       - uses: actions/setup-java@v3
         with:
-          java-version: "18"
-          distribution: "adopt"
+          java-version: ${{ vars.RTLDEV_MW_CI_JAVA_VERSION }}
+          distribution: ${{ vars.RTLDEV_MW_CI_JAVA_DISTRO }}
       - name: Setup NodeJS ${{ vars.RTLDEV_MW_CI_NODE_VERSION }}
         uses: actions/setup-node@v3
         with:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9d587378..b1dd5621 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,7 +15,7 @@ on:
 jobs:
   # separate job to set as required in branch protection,
   # as the build names above change each time Node versions change
-  test:
+  lint:
     name: Linting
     runs-on: ubuntu-latest
     steps:
@@ -35,16 +35,14 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   test_matrix:
+    runs-on: ubuntu-latest
+
     strategy:
       matrix:
-        java-version:
-          - 16
-          - 17
-          - 18
+        java-version: ${{ fromJson(vars.RTLDEV_MW_CI_JAVA_MATRIX) }}
 
-    runs-on: ubuntu-latest
-    needs: test
     name: Test @ Java JDK ${{ matrix.java-version }}
+    needs: lint    
 
     steps:
       - name: Checkout
@@ -56,7 +54,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.java-version }}
-          distribution: "temurin"
+          distribution: ${{ vars.RTLDEV_MW_CI_JAVA_DISTRO }}
       - name: Validate & Coverage Report
         run: |
           mvn -B clean site package