diff --git a/exercises/automatic-instrumentation/initial/todobackend-springboot/Dockerfile b/exercises/automatic-instrumentation/initial/todobackend-springboot/Dockerfile
index a314289..5893092 100644
--- a/exercises/automatic-instrumentation/initial/todobackend-springboot/Dockerfile
+++ b/exercises/automatic-instrumentation/initial/todobackend-springboot/Dockerfile
@@ -20,4 +20,4 @@ COPY --from=build ${DEPENDENCY}/BOOT-INF/classes /opt/todobackend/app
 
 ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v2.8.0/opentelemetry-javaagent.jar /opt/todobackend
 
-ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*",  "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","com.example.todobackend.TodobackendApplication"]
\ No newline at end of file
+ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*",  "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","io.novatec.todobackend.TodobackendApplication"]
\ No newline at end of file
diff --git a/exercises/automatic-instrumentation/initial/todobackend-springboot/pom.xml b/exercises/automatic-instrumentation/initial/todobackend-springboot/pom.xml
index 0f9798f..c4869bc 100644
--- a/exercises/automatic-instrumentation/initial/todobackend-springboot/pom.xml
+++ b/exercises/automatic-instrumentation/initial/todobackend-springboot/pom.xml
@@ -11,7 +11,7 @@
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
-	<groupId>com.example</groupId>
+	<groupId>io.novatec</groupId>
 	<artifactId>todobackend-automatic</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>todobackend-automatic</name>
diff --git a/exercises/automatic-instrumentation/initial/todobackend-springboot/src/main/java/com/example/todobackend/TodobackendApplication.java b/exercises/automatic-instrumentation/initial/todobackend-springboot/src/main/java/io/novatec/todobackend/TodobackendApplication.java
similarity index 98%
rename from exercises/automatic-instrumentation/initial/todobackend-springboot/src/main/java/com/example/todobackend/TodobackendApplication.java
rename to exercises/automatic-instrumentation/initial/todobackend-springboot/src/main/java/io/novatec/todobackend/TodobackendApplication.java
index fa6560f..bf16e17 100644
--- a/exercises/automatic-instrumentation/initial/todobackend-springboot/src/main/java/com/example/todobackend/TodobackendApplication.java
+++ b/exercises/automatic-instrumentation/initial/todobackend-springboot/src/main/java/io/novatec/todobackend/TodobackendApplication.java
@@ -1,4 +1,4 @@
-package com.example.todobackend;
+package io.novatec.todobackend;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/exercises/automatic-instrumentation/initial/todobackend-springboot/src/test/java/io/novatec/todobackend/TodobackendApplicationIntegrationTests.java b/exercises/automatic-instrumentation/initial/todobackend-springboot/src/test/java/io/novatec/todobackend/TodobackendApplicationIntegrationTests.java
index 97a63c0..b18589d 100755
--- a/exercises/automatic-instrumentation/initial/todobackend-springboot/src/test/java/io/novatec/todobackend/TodobackendApplicationIntegrationTests.java
+++ b/exercises/automatic-instrumentation/initial/todobackend-springboot/src/test/java/io/novatec/todobackend/TodobackendApplicationIntegrationTests.java
@@ -1,4 +1,4 @@
-package com.example.todobackend;
+package io.novatec.todobackend;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/exercises/automatic-instrumentation/solution/todobackend-springboot/Dockerfile b/exercises/automatic-instrumentation/solution/todobackend-springboot/Dockerfile
index a314289..5893092 100644
--- a/exercises/automatic-instrumentation/solution/todobackend-springboot/Dockerfile
+++ b/exercises/automatic-instrumentation/solution/todobackend-springboot/Dockerfile
@@ -20,4 +20,4 @@ COPY --from=build ${DEPENDENCY}/BOOT-INF/classes /opt/todobackend/app
 
 ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v2.8.0/opentelemetry-javaagent.jar /opt/todobackend
 
-ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*",  "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","com.example.todobackend.TodobackendApplication"]
\ No newline at end of file
+ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*",  "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","io.novatec.todobackend.TodobackendApplication"]
\ No newline at end of file
diff --git a/exercises/automatic-instrumentation/solution/todobackend-springboot/pom.xml b/exercises/automatic-instrumentation/solution/todobackend-springboot/pom.xml
index 70707c5..7faad91 100644
--- a/exercises/automatic-instrumentation/solution/todobackend-springboot/pom.xml
+++ b/exercises/automatic-instrumentation/solution/todobackend-springboot/pom.xml
@@ -11,7 +11,7 @@
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
-	<groupId>com.example</groupId>
+	<groupId>io.novatec</groupId>
 	<artifactId>todobackend-automatic-solution</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>todobackend-automatic-solution</name>
diff --git a/exercises/automatic-instrumentation/solution/todobackend-springboot/src/main/java/com/example/todobackend/TodobackendApplication.java b/exercises/automatic-instrumentation/solution/todobackend-springboot/src/main/java/io/novatec/todobackend/TodobackendApplication.java
similarity index 98%
rename from exercises/automatic-instrumentation/solution/todobackend-springboot/src/main/java/com/example/todobackend/TodobackendApplication.java
rename to exercises/automatic-instrumentation/solution/todobackend-springboot/src/main/java/io/novatec/todobackend/TodobackendApplication.java
index 1761cc8..c655cd2 100644
--- a/exercises/automatic-instrumentation/solution/todobackend-springboot/src/main/java/com/example/todobackend/TodobackendApplication.java
+++ b/exercises/automatic-instrumentation/solution/todobackend-springboot/src/main/java/io/novatec/todobackend/TodobackendApplication.java
@@ -1,4 +1,4 @@
-package com.example.todobackend;
+package io.novatec.todobackend;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/exercises/automatic-instrumentation/solution/todobackend-springboot/src/test/java/io/novatec/todobackend/TodobackendApplicationIntegrationTests.java b/exercises/automatic-instrumentation/solution/todobackend-springboot/src/test/java/io/novatec/todobackend/TodobackendApplicationIntegrationTests.java
index 97a63c0..b18589d 100755
--- a/exercises/automatic-instrumentation/solution/todobackend-springboot/src/test/java/io/novatec/todobackend/TodobackendApplicationIntegrationTests.java
+++ b/exercises/automatic-instrumentation/solution/todobackend-springboot/src/test/java/io/novatec/todobackend/TodobackendApplicationIntegrationTests.java
@@ -1,4 +1,4 @@
-package com.example.todobackend;
+package io.novatec.todobackend;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/exercises/manual-instrumentation-java/initial/todobackend-springboot/Dockerfile b/exercises/manual-instrumentation-java/initial/todobackend-springboot/Dockerfile
index a314289..5893092 100644
--- a/exercises/manual-instrumentation-java/initial/todobackend-springboot/Dockerfile
+++ b/exercises/manual-instrumentation-java/initial/todobackend-springboot/Dockerfile
@@ -20,4 +20,4 @@ COPY --from=build ${DEPENDENCY}/BOOT-INF/classes /opt/todobackend/app
 
 ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v2.8.0/opentelemetry-javaagent.jar /opt/todobackend
 
-ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*",  "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","com.example.todobackend.TodobackendApplication"]
\ No newline at end of file
+ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*",  "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","io.novatec.todobackend.TodobackendApplication"]
\ No newline at end of file
diff --git a/exercises/manual-instrumentation-java/initial/todobackend-springboot/pom.xml b/exercises/manual-instrumentation-java/initial/todobackend-springboot/pom.xml
index af9e7d2..fb87a78 100644
--- a/exercises/manual-instrumentation-java/initial/todobackend-springboot/pom.xml
+++ b/exercises/manual-instrumentation-java/initial/todobackend-springboot/pom.xml
@@ -11,7 +11,7 @@
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
-	<groupId>com.example</groupId>
+	<groupId>io.novatec</groupId>
 	<artifactId>todobackend-manual</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>todobackend-manual</name>
diff --git a/exercises/manual-instrumentation-java/initial/todobackend-springboot/src/main/java/com/example/todobackend/TodobackendApplication.java b/exercises/manual-instrumentation-java/initial/todobackend-springboot/src/main/java/io/novatec/todobackend/TodobackendApplication.java
similarity index 98%
rename from exercises/manual-instrumentation-java/initial/todobackend-springboot/src/main/java/com/example/todobackend/TodobackendApplication.java
rename to exercises/manual-instrumentation-java/initial/todobackend-springboot/src/main/java/io/novatec/todobackend/TodobackendApplication.java
index bdb237b..fd3bd5a 100644
--- a/exercises/manual-instrumentation-java/initial/todobackend-springboot/src/main/java/com/example/todobackend/TodobackendApplication.java
+++ b/exercises/manual-instrumentation-java/initial/todobackend-springboot/src/main/java/io/novatec/todobackend/TodobackendApplication.java
@@ -1,4 +1,4 @@
-package com.example.todobackend;
+package io.novatec.todobackend;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/exercises/manual-instrumentation-java/initial/todobackend-springboot/src/test/java/io/novatec/todobackend/TodobackendApplicationIntegrationTests.java b/exercises/manual-instrumentation-java/initial/todobackend-springboot/src/test/java/io/novatec/todobackend/TodobackendApplicationIntegrationTests.java
index 97a63c0..b18589d 100755
--- a/exercises/manual-instrumentation-java/initial/todobackend-springboot/src/test/java/io/novatec/todobackend/TodobackendApplicationIntegrationTests.java
+++ b/exercises/manual-instrumentation-java/initial/todobackend-springboot/src/test/java/io/novatec/todobackend/TodobackendApplicationIntegrationTests.java
@@ -1,4 +1,4 @@
-package com.example.todobackend;
+package io.novatec.todobackend;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/exercises/manual-instrumentation-java/initial/todoui-thymeleaf/Dockerfile b/exercises/manual-instrumentation-java/initial/todoui-thymeleaf/Dockerfile
index 709f225..be98665 100644
--- a/exercises/manual-instrumentation-java/initial/todoui-thymeleaf/Dockerfile
+++ b/exercises/manual-instrumentation-java/initial/todoui-thymeleaf/Dockerfile
@@ -21,6 +21,6 @@ COPY --from=build ${DEPENDENCY}/BOOT-INF/classes /opt/todoui/app
 
 ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v2.8.0/opentelemetry-javaagent.jar /opt/todoui
 
-ENTRYPOINT ["java","-cp","/opt/todoui/app:/opt/todoui/app/lib/*", "-javaagent:/opt/todoui/opentelemetry-javaagent.jar", "com.example.todoui.TodouiApplication"]
-#ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*",  "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","com.example.todobackend.TodobackendApplication"]
+ENTRYPOINT ["java","-cp","/opt/todoui/app:/opt/todoui/app/lib/*", "-javaagent:/opt/todoui/opentelemetry-javaagent.jar", "io.novatec.todoui.TodouiApplication"]
+#ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*",  "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","io.novatec.todobackend.TodobackendApplication"]
 
diff --git a/exercises/manual-instrumentation-java/initial/todoui-thymeleaf/pom.xml b/exercises/manual-instrumentation-java/initial/todoui-thymeleaf/pom.xml
index 5874662..3887156 100644
--- a/exercises/manual-instrumentation-java/initial/todoui-thymeleaf/pom.xml
+++ b/exercises/manual-instrumentation-java/initial/todoui-thymeleaf/pom.xml
@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>com.example</groupId>
+	<groupId>io.novatec</groupId>
 	<artifactId>todoui-manual</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
diff --git a/exercises/manual-instrumentation-java/initial/todoui-thymeleaf/src/main/java/com/example/todoui/OpenTelemetryConfiguration.java b/exercises/manual-instrumentation-java/initial/todoui-thymeleaf/src/main/java/io/novatec/todoui/OpenTelemetryConfiguration.java
similarity index 98%
rename from exercises/manual-instrumentation-java/initial/todoui-thymeleaf/src/main/java/com/example/todoui/OpenTelemetryConfiguration.java
rename to exercises/manual-instrumentation-java/initial/todoui-thymeleaf/src/main/java/io/novatec/todoui/OpenTelemetryConfiguration.java
index 1e74296..460262c 100644
--- a/exercises/manual-instrumentation-java/initial/todoui-thymeleaf/src/main/java/com/example/todoui/OpenTelemetryConfiguration.java
+++ b/exercises/manual-instrumentation-java/initial/todoui-thymeleaf/src/main/java/io/novatec/todoui/OpenTelemetryConfiguration.java
@@ -1,4 +1,4 @@
-package com.example.todoui;
+package io.novatec.todoui;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/exercises/manual-instrumentation-java/initial/todoui-thymeleaf/src/main/java/com/example/todoui/TodouiApplication.java b/exercises/manual-instrumentation-java/initial/todoui-thymeleaf/src/main/java/io/novatec/todoui/TodouiApplication.java
similarity index 99%
rename from exercises/manual-instrumentation-java/initial/todoui-thymeleaf/src/main/java/com/example/todoui/TodouiApplication.java
rename to exercises/manual-instrumentation-java/initial/todoui-thymeleaf/src/main/java/io/novatec/todoui/TodouiApplication.java
index 43dd542..4ea1206 100644
--- a/exercises/manual-instrumentation-java/initial/todoui-thymeleaf/src/main/java/com/example/todoui/TodouiApplication.java
+++ b/exercises/manual-instrumentation-java/initial/todoui-thymeleaf/src/main/java/io/novatec/todoui/TodouiApplication.java
@@ -1,4 +1,4 @@
-package com.example.todoui;
+package io.novatec.todoui;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/exercises/manual-instrumentation-java/solution/todobackend-springboot/Dockerfile b/exercises/manual-instrumentation-java/solution/todobackend-springboot/Dockerfile
index a314289..5893092 100644
--- a/exercises/manual-instrumentation-java/solution/todobackend-springboot/Dockerfile
+++ b/exercises/manual-instrumentation-java/solution/todobackend-springboot/Dockerfile
@@ -20,4 +20,4 @@ COPY --from=build ${DEPENDENCY}/BOOT-INF/classes /opt/todobackend/app
 
 ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v2.8.0/opentelemetry-javaagent.jar /opt/todobackend
 
-ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*",  "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","com.example.todobackend.TodobackendApplication"]
\ No newline at end of file
+ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*",  "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","io.novatec.todobackend.TodobackendApplication"]
\ No newline at end of file
diff --git a/exercises/manual-instrumentation-java/solution/todobackend-springboot/pom.xml b/exercises/manual-instrumentation-java/solution/todobackend-springboot/pom.xml
index f2c968d..f966fe8 100644
--- a/exercises/manual-instrumentation-java/solution/todobackend-springboot/pom.xml
+++ b/exercises/manual-instrumentation-java/solution/todobackend-springboot/pom.xml
@@ -11,7 +11,7 @@
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
-	<groupId>com.example</groupId>
+	<groupId>io.novatec</groupId>
 	<artifactId>todobackend-manual-solution</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>todobackend-manual-solution</name>
diff --git a/exercises/manual-instrumentation-java/solution/todobackend-springboot/src/main/java/com/example/todobackend/OpenTelemetryConfiguration.java b/exercises/manual-instrumentation-java/solution/todobackend-springboot/src/main/java/io/novatec/todobackend/OpenTelemetryConfiguration.java
similarity index 98%
rename from exercises/manual-instrumentation-java/solution/todobackend-springboot/src/main/java/com/example/todobackend/OpenTelemetryConfiguration.java
rename to exercises/manual-instrumentation-java/solution/todobackend-springboot/src/main/java/io/novatec/todobackend/OpenTelemetryConfiguration.java
index 3151318..e4026e9 100644
--- a/exercises/manual-instrumentation-java/solution/todobackend-springboot/src/main/java/com/example/todobackend/OpenTelemetryConfiguration.java
+++ b/exercises/manual-instrumentation-java/solution/todobackend-springboot/src/main/java/io/novatec/todobackend/OpenTelemetryConfiguration.java
@@ -1,4 +1,4 @@
-package com.example.todobackend;
+package io.novatec.todobackend;
 
 import java.time.Duration;
 
diff --git a/exercises/manual-instrumentation-java/solution/todobackend-springboot/src/main/java/com/example/todobackend/TodobackendApplication.java b/exercises/manual-instrumentation-java/solution/todobackend-springboot/src/main/java/io/novatec/todobackend/TodobackendApplication.java
similarity index 99%
rename from exercises/manual-instrumentation-java/solution/todobackend-springboot/src/main/java/com/example/todobackend/TodobackendApplication.java
rename to exercises/manual-instrumentation-java/solution/todobackend-springboot/src/main/java/io/novatec/todobackend/TodobackendApplication.java
index 3c6112f..c51907d 100644
--- a/exercises/manual-instrumentation-java/solution/todobackend-springboot/src/main/java/com/example/todobackend/TodobackendApplication.java
+++ b/exercises/manual-instrumentation-java/solution/todobackend-springboot/src/main/java/io/novatec/todobackend/TodobackendApplication.java
@@ -1,4 +1,4 @@
-package com.example.todobackend;
+package io.novatec.todobackend;
 
 import static io.opentelemetry.api.common.AttributeKey.stringKey;
 
diff --git a/exercises/manual-instrumentation-java/solution/todobackend-springboot/src/test/java/io/novatec/todobackend/TodobackendApplicationIntegrationTests.java b/exercises/manual-instrumentation-java/solution/todobackend-springboot/src/test/java/io/novatec/todobackend/TodobackendApplicationIntegrationTests.java
index 97a63c0..b18589d 100755
--- a/exercises/manual-instrumentation-java/solution/todobackend-springboot/src/test/java/io/novatec/todobackend/TodobackendApplicationIntegrationTests.java
+++ b/exercises/manual-instrumentation-java/solution/todobackend-springboot/src/test/java/io/novatec/todobackend/TodobackendApplicationIntegrationTests.java
@@ -1,4 +1,4 @@
-package com.example.todobackend;
+package io.novatec.todobackend;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/exercises/manual-instrumentation-java/steps b/exercises/manual-instrumentation-java/steps
index b48a626..05f164a 100644
--- a/exercises/manual-instrumentation-java/steps
+++ b/exercises/manual-instrumentation-java/steps
@@ -105,7 +105,7 @@ export BACKEND_URL=http://localhost:8080
 
 Put everything in own Config class:
 
-package com.example.todobackend;
+package io.novatec.todobackend;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/exercises/otel-in-action/todobackend-springboot/Dockerfile b/exercises/otel-in-action/todobackend-springboot/Dockerfile
index a314289..5893092 100644
--- a/exercises/otel-in-action/todobackend-springboot/Dockerfile
+++ b/exercises/otel-in-action/todobackend-springboot/Dockerfile
@@ -20,4 +20,4 @@ COPY --from=build ${DEPENDENCY}/BOOT-INF/classes /opt/todobackend/app
 
 ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v2.8.0/opentelemetry-javaagent.jar /opt/todobackend
 
-ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*",  "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","com.example.todobackend.TodobackendApplication"]
\ No newline at end of file
+ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*",  "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","io.novatec.todobackend.TodobackendApplication"]
\ No newline at end of file
diff --git a/exercises/otel-in-action/todobackend-springboot/pom.xml b/exercises/otel-in-action/todobackend-springboot/pom.xml
index 26562c6..35daed3 100644
--- a/exercises/otel-in-action/todobackend-springboot/pom.xml
+++ b/exercises/otel-in-action/todobackend-springboot/pom.xml
@@ -11,7 +11,7 @@
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
-	<groupId>com.example</groupId>
+	<groupId>io.novatec</groupId>
 	<artifactId>todobackend</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>todobackend</name>
diff --git a/exercises/otel-in-action/todobackend-springboot/src/main/java/com/example/todobackend/TodobackendApplication.java b/exercises/otel-in-action/todobackend-springboot/src/main/java/io/novatec/todobackend/TodobackendApplication.java
similarity index 98%
rename from exercises/otel-in-action/todobackend-springboot/src/main/java/com/example/todobackend/TodobackendApplication.java
rename to exercises/otel-in-action/todobackend-springboot/src/main/java/io/novatec/todobackend/TodobackendApplication.java
index abc271b..34629b5 100644
--- a/exercises/otel-in-action/todobackend-springboot/src/main/java/com/example/todobackend/TodobackendApplication.java
+++ b/exercises/otel-in-action/todobackend-springboot/src/main/java/io/novatec/todobackend/TodobackendApplication.java
@@ -1,4 +1,4 @@
-package com.example.todobackend;
+package io.novatec.todobackend;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/exercises/otel-in-action/todobackend-springboot/src/test/java/io/novatec/todobackend/TodobackendApplicationIntegrationTests.java b/exercises/otel-in-action/todobackend-springboot/src/test/java/io/novatec/todobackend/TodobackendApplicationIntegrationTests.java
index 97a63c0..b18589d 100755
--- a/exercises/otel-in-action/todobackend-springboot/src/test/java/io/novatec/todobackend/TodobackendApplicationIntegrationTests.java
+++ b/exercises/otel-in-action/todobackend-springboot/src/test/java/io/novatec/todobackend/TodobackendApplicationIntegrationTests.java
@@ -1,4 +1,4 @@
-package com.example.todobackend;
+package io.novatec.todobackend;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/exercises/otel-in-action/todoui-thymeleaf/Dockerfile b/exercises/otel-in-action/todoui-thymeleaf/Dockerfile
index 709f225..be98665 100644
--- a/exercises/otel-in-action/todoui-thymeleaf/Dockerfile
+++ b/exercises/otel-in-action/todoui-thymeleaf/Dockerfile
@@ -21,6 +21,6 @@ COPY --from=build ${DEPENDENCY}/BOOT-INF/classes /opt/todoui/app
 
 ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v2.8.0/opentelemetry-javaagent.jar /opt/todoui
 
-ENTRYPOINT ["java","-cp","/opt/todoui/app:/opt/todoui/app/lib/*", "-javaagent:/opt/todoui/opentelemetry-javaagent.jar", "com.example.todoui.TodouiApplication"]
-#ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*",  "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","com.example.todobackend.TodobackendApplication"]
+ENTRYPOINT ["java","-cp","/opt/todoui/app:/opt/todoui/app/lib/*", "-javaagent:/opt/todoui/opentelemetry-javaagent.jar", "io.novatec.todoui.TodouiApplication"]
+#ENTRYPOINT ["java", "-cp", "/opt/todobackend/app:/opt/todobackend/app/lib/*",  "-javaagent:/opt/todobackend/opentelemetry-javaagent.jar","io.novatec.todobackend.TodobackendApplication"]
 
diff --git a/exercises/otel-in-action/todoui-thymeleaf/pom.xml b/exercises/otel-in-action/todoui-thymeleaf/pom.xml
index c06ec47..34f6abb 100644
--- a/exercises/otel-in-action/todoui-thymeleaf/pom.xml
+++ b/exercises/otel-in-action/todoui-thymeleaf/pom.xml
@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>com.example</groupId>
+	<groupId>io.novatec</groupId>
 	<artifactId>todoui</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
diff --git a/exercises/otel-in-action/todoui-thymeleaf/src/main/java/com/example/todoui/TodouiApplication.java b/exercises/otel-in-action/todoui-thymeleaf/src/main/java/io/novatec/todoui/TodouiApplication.java
similarity index 99%
rename from exercises/otel-in-action/todoui-thymeleaf/src/main/java/com/example/todoui/TodouiApplication.java
rename to exercises/otel-in-action/todoui-thymeleaf/src/main/java/io/novatec/todoui/TodouiApplication.java
index 16f0082..f98c072 100644
--- a/exercises/otel-in-action/todoui-thymeleaf/src/main/java/com/example/todoui/TodouiApplication.java
+++ b/exercises/otel-in-action/todoui-thymeleaf/src/main/java/io/novatec/todoui/TodouiApplication.java
@@ -1,4 +1,4 @@
-package com.example.todoui;
+package io.novatec.todoui;
 
 import javax.annotation.PostConstruct;