diff --git a/Jaxrs/Basic/pom.xml b/Jaxrs/Basic/pom.xml
index 10dabe8..31fbfde 100644
--- a/Jaxrs/Basic/pom.xml
+++ b/Jaxrs/Basic/pom.xml
@@ -10,6 +10,8 @@
 
     <properties>
         <maven.compiler.release>21</maven.compiler.release>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
     </properties>
 
     <dependencies>
@@ -17,10 +19,7 @@
             <groupId>com.guicedee.servlets</groupId>
             <artifactId>guiced-rest-services</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.guicedee.servlets</groupId>
-            <artifactId>guiced-openapi</artifactId>
-        </dependency>
+
 
         <dependency>
             <groupId>org.junit.jupiter</groupId>
diff --git a/Jaxrs/Basic/src/main/java/module-info.java b/Jaxrs/Basic/src/main/java/module-info.java
index 7dd23be..2212bb6 100644
--- a/Jaxrs/Basic/src/main/java/module-info.java
+++ b/Jaxrs/Basic/src/main/java/module-info.java
@@ -3,10 +3,7 @@
 	requires com.guicedee.guicedservlets.undertow;
 	
 	requires java.net.http;
-	requires jakarta.ws.rs;
-	requires com.google.guice;
-	requires com.guicedee.guicedinjection;
-
+	
 	exports com.guicedee.examples.jaxrs.basic;
 	opens com.guicedee.examples.jaxrs.basic to com.google.guice, com.fasterxml.jackson.databind, org.apache.cxf;
 }
diff --git a/Jaxrs/Basic/src/test/java/com/guicedee/examples/jaxrs/basic/tests/HelloWorldTest.java b/Jaxrs/Basic/src/test/java/com/guicedee/examples/jaxrs/basic/tests/HelloWorldTest.java
index a0c41c8..e97dba4 100644
--- a/Jaxrs/Basic/src/test/java/com/guicedee/examples/jaxrs/basic/tests/HelloWorldTest.java
+++ b/Jaxrs/Basic/src/test/java/com/guicedee/examples/jaxrs/basic/tests/HelloWorldTest.java
@@ -1,6 +1,8 @@
 package com.guicedee.examples.jaxrs.basic.tests;
 
 import com.guicedee.examples.jaxrs.basic.HelloWorld;
+import com.guicedee.guicedinjection.GuiceContext;
+import com.guicedee.guicedservlets.undertow.GuicedUndertow;
 import org.junit.jupiter.api.Test;
 
 import java.net.URI;
@@ -29,5 +31,7 @@ public void testWorld() throws Exception
 						HttpResponse.BodyHandlers.ofString());
 		System.out.println(response.body());
 		assertEquals(200, response.statusCode());
+		
+		GuiceContext.destroy();
 	}
 }
\ No newline at end of file
diff --git a/Jaxrs/Basic/src/test/java/module-info.java b/Jaxrs/Basic/src/test/java/module-info.java
index 491e767..c673775 100644
--- a/Jaxrs/Basic/src/test/java/module-info.java
+++ b/Jaxrs/Basic/src/test/java/module-info.java
@@ -7,4 +7,5 @@
 	requires com.guicedee.guicedservlets.rest;
 	requires com.guicedee.guicedservlets.undertow;
 	
+	opens com.guicedee.examples.jaxrs.basic.tests to com.google.guice, com.fasterxml.jackson.databind, org.apache.cxf,org.junit.platform.commons;
 }
\ No newline at end of file
diff --git a/Jaxrs/BasicJLink/Dockerfile b/Jaxrs/BasicJLink/Dockerfile
new file mode 100644
index 0000000..680dcac
--- /dev/null
+++ b/Jaxrs/BasicJLink/Dockerfile
@@ -0,0 +1,6 @@
+FROM alpine:3.14
+LABEL authors="GedMarc"
+
+COPY target/maven-jlink/default /opt
+
+ENTRYPOINT ["/opt/bin/example"]
\ No newline at end of file
diff --git a/Jaxrs/BasicJLink/pom.xml b/Jaxrs/BasicJLink/pom.xml
index 87b6817..55c75af 100644
--- a/Jaxrs/BasicJLink/pom.xml
+++ b/Jaxrs/BasicJLink/pom.xml
@@ -26,7 +26,7 @@
                     <noManPages>true</noManPages>
                     <stripDebug>true</stripDebug>
                     <verbose>true</verbose>
-                    <compress>2</compress>
+                    <compress>1</compress>
                     <launcher>example=com.guicedee.examples.jaxrs.basic/com.guicedee.examples.jaxrs.basic.HelloWorld</launcher>
                 </configuration>
                 <dependencies>
diff --git a/Jaxrs/Binding/pom.xml b/Jaxrs/Binding/pom.xml
index 22a5e04..00de9e0 100644
--- a/Jaxrs/Binding/pom.xml
+++ b/Jaxrs/Binding/pom.xml
@@ -10,6 +10,8 @@
 
     <properties>
         <maven.compiler.release>21</maven.compiler.release>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
     </properties>
 
     <dependencies>
diff --git a/Jaxrs/Binding/src/test/java/com/guicedee/examples/jaxrs/binding/test/BootJaxRSBindingsTest.java b/Jaxrs/Binding/src/test/java/com/guicedee/examples/jaxrs/binding/test/BootJaxRSBindingsTest.java
index 33b5229..27c3bb9 100644
--- a/Jaxrs/Binding/src/test/java/com/guicedee/examples/jaxrs/binding/test/BootJaxRSBindingsTest.java
+++ b/Jaxrs/Binding/src/test/java/com/guicedee/examples/jaxrs/binding/test/BootJaxRSBindingsTest.java
@@ -41,6 +41,7 @@ public void testRS() throws Exception
 		System.out.println(response.body());
 		
 		assertEquals(200, response.statusCode());
-
+		
+		GuiceContext.destroy();
 	}
 }
\ No newline at end of file
diff --git a/Jpa/HibernateProperties/src/main/java/module-info.java b/Jpa/HibernateProperties/src/main/java/module-info.java
deleted file mode 100644
index b827ff7..0000000
--- a/Jpa/HibernateProperties/src/main/java/module-info.java
+++ /dev/null
@@ -1,3 +0,0 @@
-module com.guicedee.examples. {
-	
-}
\ No newline at end of file
diff --git a/Jpa/SystemProperties/src/main/java/module-info.java b/Jpa/SystemProperties/src/main/java/module-info.java
deleted file mode 100644
index b827ff7..0000000
--- a/Jpa/SystemProperties/src/main/java/module-info.java
+++ /dev/null
@@ -1,3 +0,0 @@
-module com.guicedee.examples. {
-	
-}
\ No newline at end of file