diff --git a/.github/workflows/build-java21.yml b/.github/workflows/build-java21.yml
index ac4516ea6c..2db045b216 100644
--- a/.github/workflows/build-java21.yml
+++ b/.github/workflows/build-java21.yml
@@ -1,4 +1,4 @@
-name: Build IPF with Maven Java 21
+name: Build IPF with Java 21
 
 on: [push, pull_request, workflow_dispatch]
 
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0676468a02..2e7e230760 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,4 +1,4 @@
-name: Build IPF with Maven with Java 17
+name: Build IPF with Java 17
 
 on: [push, pull_request, workflow_dispatch]
 
diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/requests/query/SubscriptionForDocumentEntryQuery.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/requests/query/SubscriptionForDocumentEntryQuery.java
index 9d02512201..63bc1edc37 100644
--- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/requests/query/SubscriptionForDocumentEntryQuery.java
+++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/requests/query/SubscriptionForDocumentEntryQuery.java
@@ -23,7 +23,7 @@
 import org.openehealth.ipf.commons.ihe.xds.core.metadata.ReferenceId;
 import org.openehealth.ipf.commons.ihe.xds.core.transform.requests.query.QuerySlotHelper;
 
-import javax.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.*;
 
 /**
  * Represents a stored query for SubscriptionFilterQuery used for ITI-52 filters
diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/requests/query/SubscriptionForFolderQuery.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/requests/query/SubscriptionForFolderQuery.java
index c6d381d3fc..0183d26d65 100644
--- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/requests/query/SubscriptionForFolderQuery.java
+++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/requests/query/SubscriptionForFolderQuery.java
@@ -22,7 +22,7 @@
 import org.openehealth.ipf.commons.ihe.xds.core.metadata.Code;
 import org.openehealth.ipf.commons.ihe.xds.core.metadata.Identifiable;
 
-import javax.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.*;
 import java.util.List;
 
 /**
diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/requests/query/SubscriptionForPatientIndependentDocumentEntryQuery.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/requests/query/SubscriptionForPatientIndependentDocumentEntryQuery.java
index e01acafb6f..29acc976d0 100644
--- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/requests/query/SubscriptionForPatientIndependentDocumentEntryQuery.java
+++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/requests/query/SubscriptionForPatientIndependentDocumentEntryQuery.java
@@ -18,10 +18,10 @@
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 
 /**
  * Represents a stored query for SubscriptionForPatientIndependentDocumentEntryQuery used for ITI-52 filters
diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/requests/query/SubscriptionForPatientIndependentSubmissionSetQuery.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/requests/query/SubscriptionForPatientIndependentSubmissionSetQuery.java
index f8543861ed..08fb7d811e 100644
--- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/requests/query/SubscriptionForPatientIndependentSubmissionSetQuery.java
+++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/requests/query/SubscriptionForPatientIndependentSubmissionSetQuery.java
@@ -20,7 +20,7 @@
 import lombok.Setter;
 import lombok.ToString;
 
-import javax.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.*;
 import java.util.List;
 
 /**
diff --git a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/requests/query/SubscriptionForSubmissionSetQuery.java b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/requests/query/SubscriptionForSubmissionSetQuery.java
index 7a82bc0049..3637aa59e6 100644
--- a/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/requests/query/SubscriptionForSubmissionSetQuery.java
+++ b/commons/ihe/xds/src/main/java/org/openehealth/ipf/commons/ihe/xds/core/requests/query/SubscriptionForSubmissionSetQuery.java
@@ -21,7 +21,7 @@
 import lombok.ToString;
 import org.openehealth.ipf.commons.ihe.xds.core.metadata.Identifiable;
 
-import javax.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.*;
 import java.util.List;
 
 /**