diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7a2a45c..ef2f95f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+* Bump minimum required Java for server from 17 to 21
+
 ## [0.2.0] - 2024-09-24
 * Bump minimum required Java from 17 to 21
 * Bump version of Gradle used to build projects from 8.9 to 8.10.2
diff --git a/vividus-studio-server/vividus-studio-plugin/META-INF/MANIFEST.MF b/vividus-studio-server/vividus-studio-plugin/META-INF/MANIFEST.MF
index 6ee6b7d6..83201772 100644
--- a/vividus-studio-server/vividus-studio-plugin/META-INF/MANIFEST.MF
+++ b/vividus-studio-server/vividus-studio-plugin/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.vividus.studio.plugin;singleton:=true
 Automatic-Module-Name: org.vividus.studio.plugin
 Bundle-Version: 0.1.0.qualifier
 Bundle-Activator: org.vividus.studio.plugin.VividusStudioActivator
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Import-Package: org.osgi.framework;version="1.3.0"
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.27.0",
diff --git a/vividus-studio-server/vividus-studio-plugin/pom.xml b/vividus-studio-server/vividus-studio-plugin/pom.xml
index 0637e4db..497fc12a 100644
--- a/vividus-studio-server/vividus-studio-plugin/pom.xml
+++ b/vividus-studio-server/vividus-studio-plugin/pom.xml
@@ -12,8 +12,8 @@
     <name>${base.name} Plugin</name>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <org.mockito.version>5.13.0</org.mockito.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <checkstyle.version>10.18.1</checkstyle.version>