diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d262077d..af59287f 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -14,7 +14,7 @@ permissions:
   contents: read
 
 env:
-  MAVEN_VERSION: 3.9.12
+  MAVEN_VERSION: 3.9.14
 
 jobs:
   build_and_test:
@@ -28,7 +28,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           architecture: x64
 
diff --git a/org.eclipse.mat.product/mat-2026-03.p2.inf b/org.eclipse.mat.product/mat-2026-03.p2.inf
new file mode 100644
index 00000000..2a15d023
--- /dev/null
+++ b/org.eclipse.mat.product/mat-2026-03.p2.inf
@@ -0,0 +1,15 @@
+properties.0.name = org.eclipse.equinox.p2.description
+properties.0.value = Eclipse Memory Analyzer tool is a fast and feature-rich Java heap analyzer \
+that helps you find memory leaks and reduce memory consumption.\n\
+Use the Memory Analyzer to analyze production heap dumps with hundreds of millions of objects, quickly calculate the retained sizes of objects, see who is preventing the Garbage Collector from collecting objects, run a report to automatically extract leak suspects.
+properties.1.name = org.eclipse.equinox.p2.provider
+properties.1.value = Eclipse Memory Analyzer
+requires.2.namespace = org.eclipse.equinox.p2.iu
+requires.2.name = org.eclipse.ui.themes
+requires.2.range = [1.0.0, 2.0.0)
+instructions.configure=\
+    org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/readme);\
+    org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/artifacts.xml);\
+    addRepository(type:0,name:Eclipse 2026-03,location:https${#58}//download.eclipse.org/releases/2026-03/,enabled:true);\
+    addRepository(type:1,name:Eclipse 2026-03,location:https${#58}//download.eclipse.org/releases/2026-03/,enabled:true);\
+    setProgramProperty(propName:osgi.requiredJavaVersion,propValue:21);
diff --git a/org.eclipse.mat.product/mat.p2.inf b/org.eclipse.mat.product/mat.p2.inf
index d4b5bfb9..2a15d023 100644
--- a/org.eclipse.mat.product/mat.p2.inf
+++ b/org.eclipse.mat.product/mat.p2.inf
@@ -10,6 +10,6 @@ requires.2.range = [1.0.0, 2.0.0)
 instructions.configure=\
     org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/readme);\
     org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/artifacts.xml);\
-    addRepository(type:0,name:Eclipse 2024-12,location:https${#58}//download.eclipse.org/releases/2024-12/,enabled:true);\
-    addRepository(type:1,name:Eclipse 2024-12,location:https${#58}//download.eclipse.org/releases/2024-12/,enabled:true);\
-    setProgramProperty(propName:osgi.requiredJavaVersion,propValue:17);
+    addRepository(type:0,name:Eclipse 2026-03,location:https${#58}//download.eclipse.org/releases/2026-03/,enabled:true);\
+    addRepository(type:1,name:Eclipse 2026-03,location:https${#58}//download.eclipse.org/releases/2026-03/,enabled:true);\
+    setProgramProperty(propName:osgi.requiredJavaVersion,propValue:21);
diff --git a/org.eclipse.mat.targetdef/mat-2026-03.target b/org.eclipse.mat.targetdef/mat-2026-03.target
new file mode 100644
index 00000000..6d3bfbe8
--- /dev/null
+++ b/org.eclipse.mat.targetdef/mat-2026-03.target
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.6"?>
+<target name="MAT 2026-03 Target" sequenceNumber="2">
+<locations>
+	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+		<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+		<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
+		<unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
+		<unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="0.0.0"/>
+		<unit id="org.eclipse.help.feature.group" version="0.0.0"/>
+		<unit id="org.junit" version="0.0.0"/>
+		<!-- <unit id="org.eclipse.platform.feature.group" version="0.0.0"/> -->
+		<unit id="org.eclipse.ui.themes" version="0.0.0"/>
+		<unit id="org.eclipse.ui.net" version="0.0.0"/>
+		<unit id="org.eclipse.platform" version="0.0.0"/>
+		<unit id="org.eclipse.ui.ide.application" version="0.0.0"/>
+		<unit id="org.eclipse.ui.views.log" version="0.0.0"/>
+		<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
+		<repository location="https://download.eclipse.org/eclipse/updates/4.39/R-4.39-202602260420/"/>
+	</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.birt.core" version="0.0.0"/>
+<unit id="org.eclipse.birt.chart.engine" version="0.0.0"/>
+<unit id="org.eclipse.birt.chart.device.extension" version="0.0.0"/>
+<unit id="org.eclipse.birt.chart.device.swt" version="0.0.0"/>
+<unit id="org.eclipse.birt.chart.engine.extension" version="0.0.0"/>
+<repository location="https://download.eclipse.org/birt/updates/release/4.23.0/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="com.ibm.dtfj.feature.feature.group" version="0.0.0"/>
+<repository location="https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/runtimes/tools/dtfj/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<repository location="https://download.eclipse.org/technology/swtbot/releases/latest/"/>
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>
+</location>
+</locations>
+<implicitDependencies>
+<plugin id="org.eclipse.ui.views.log"/>
+<plugin id="org.eclipse.equinox.event"/>
+<plugin id="org.eclipse.equinox.ds"/>
+</implicitDependencies>
+</target>
\ No newline at end of file