diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/CronSchedulerImpl.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/CronSchedulerImpl.java
index addd24d6bc9..83fd5934934 100644
--- a/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/CronSchedulerImpl.java
+++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/internal/scheduler/CronSchedulerImpl.java
@@ -107,7 +107,7 @@ void removeSchedule(CronJob s) {
             for (Iterator<Cron> cron = crons.iterator(); cron.hasNext();) {
                 final Cron c = cron.next();
 
-                if (c.target == s) {
+                if (c.target.equals(s)) {
                     cron.remove();
                     c.schedule.cancel(true);
                 }
diff --git a/bundles/pom.xml b/bundles/pom.xml
index 92b8cca3683..59da5879650 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -276,6 +276,10 @@
           <exists>model.profile-marker</exists>
         </file>
       </activation>
+      <properties>
+        <!-- workaround for Java 21 build, necessary until xtend supports Java 21 -->
+        <maven.compiler.release>17</maven.compiler.release>
+      </properties>
       <dependencies>
         <dependency>
           <groupId>org.openhab.core.bom</groupId>
diff --git a/pom.xml b/pom.xml
index d8814e8d0be..51d4f6ace0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,17 +64,14 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <oh.java.version>17</oh.java.version>
-    <maven.compiler.source>${oh.java.version}</maven.compiler.source>
-    <maven.compiler.target>${oh.java.version}</maven.compiler.target>
-    <maven.compiler.compilerVersion>${oh.java.version}</maven.compiler.compilerVersion>
+    <maven.compiler.release>17</maven.compiler.release>
 
     <bnd.version>7.0.0</bnd.version>
     <commons.net.version>3.7.2</commons.net.version>
     <eea.version>2.3.0</eea.version>
     <karaf.compile.version>4.4.5</karaf.compile.version>
     <karaf.tooling.version>4.4.5</karaf.tooling.version>
-    <sat.version>0.15.0</sat.version>
+    <sat.version>0.16.0</sat.version>
     <slf4j.version>2.0.7</slf4j.version>
     <xtext.version>2.34.0</xtext.version>
     <spotless.version>2.38.0</spotless.version>
@@ -670,7 +667,7 @@ Import-Package: \\
             <configuration>
               <rules>
                 <requireJavaVersion>
-                  <version>[17.0,18.0)</version>
+                  <version>[17.0,18.0),[21.0,22.0)</version>
                 </requireJavaVersion>
               </rules>
             </configuration>
@@ -845,5 +842,11 @@ Import-Package: \\
         </pluginManagement>
       </build>
     </profile>
+    <profile>
+      <id>j21</id>
+      <properties>
+        <maven.compiler.release>21</maven.compiler.release>
+      </properties>
+    </profile>
   </profiles>
 </project>