diff --git a/README.md b/README.md
index 2775d989..24d55bce 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # testcontainers-git
 [![codecov](https://codecov.io/gh/sparsick/testcontainers-git/branch/main/graph/badge.svg?token=F9R60M53IL)](https://codecov.io/gh/sparsick/testcontainers-git)
 [![Java CI with Maven](https://github.com/sparsick/testcontainers-git/actions/workflows/maven.yml/badge.svg?branch=main)](https://github.com/sparsick/testcontainers-git/actions/workflows/maven.yml)
-![Maven Central Version](https://img.shields.io/maven-central/v/io.github.sparsick.testcontainers.gitserver/testcontainers-git-parent)
+![Maven Central Version](https://img.shields.io/maven-central/v/dev.parsick.testcontainers.gitserver/testcontainers-git-parent)
 
 
 This project contains [Testcontainers](https://www.testcontainers.org/) implementations for several git (management) server:
@@ -22,7 +22,7 @@ The port is set by testcontainers' mechanism.
 <dependencyManagement>
     <dependencies>
         <dependency>
-            <groupId>io.github.sparsick.testcontainers.gitserver</groupId>
+            <groupId>dev.parsick.testcontainers.gitserver</groupId>
             <artifactId>testcontainers-git-bom</artifactId>
             <version>RELEASE</version>
             <type>pom</type>
@@ -33,17 +33,17 @@ The port is set by testcontainers' mechanism.
 
 <dependencies>
      <dependency>
-        <groupId>io.github.sparsick.testcontainers.gitserver</groupId>
+        <groupId>dev.parsick.testcontainers.gitserver</groupId>
         <artifactId>testcontainers-gitserver</artifactId>
         <scope>test</scope>
     </dependency>
      <dependency>
-         <groupId>io.github.sparsick.testcontainers.gitserver</groupId>
+         <groupId>dev.parsick.testcontainers.gitserver</groupId>
          <artifactId>testcontainers-forgejo</artifactId>
          <scope>test</scope>
      </dependency>
      <dependency>
-         <groupId>io.github.sparsick.testcontainers.gitserver</groupId>
+         <groupId>dev.parsick.testcontainers.gitserver</groupId>
          <artifactId>testcontainers-gitea</artifactId>
          <scope>test</scope>
      </dependency>
@@ -54,14 +54,14 @@ The port is set by testcontainers' mechanism.
 ```groovy
 dependencyManagement {
     imports {
-        mavenBom("io.github.sparsick.testcontainers.gitserver:testcontainers-git-bom:RELEASE")
+        mavenBom("dev.parsick.testcontainers.gitserver:testcontainers-git-bom:RELEASE")
 }
 
 
 dependencies {
-    testImplementation 'io.github.sparsick.testcontainers.gitserver:testcontainers-gitserver'
-    testImplementation 'io.github.sparsick.testcontainers.gitserver:testcontainers-forgejo'
-    testImplementation 'io.github.sparsick.testcontainers.gitserver:testcontainers-gitea'
+    testImplementation 'dev.parsick.testcontainers.gitserver:testcontainers-gitserver'
+    testImplementation 'dev.parsick.testcontainers.gitserver:testcontainers-forgejo'
+    testImplementation 'dev.parsick.testcontainers.gitserver:testcontainers-gitea'
 }
 ```
 
@@ -77,10 +77,10 @@ Currently, there exists two flavour:
 #### Git Server via SSH
 The following sample shows how to use the git server container via SSH in a JUnit 5 test:
 ````java
-import com.github.sparsick.testcontainers.gitserver.GitServerVersions;
-import com.github.sparsick.testcontainers.gitserver.plain.GitServerContainer;
-import com.github.sparsick.testcontainers.gitserver.plain.SshHostKey;
-import com.github.sparsick.testcontainers.gitserver.plain.SshIdentity;
+import dev.parsick.testcontainers.gitserver.GitServerVersions;
+import plain.dev.parsick.testcontainers.gitserver.GitServerContainer;
+import plain.dev.parsick.testcontainers.gitserver.SshHostKey;
+import plain.dev.parsick.testcontainers.gitserver.SshIdentity;
 
 @Testcontainers
 public class GitServerContainerUsedInJUnit5Test {
@@ -117,8 +117,8 @@ public class GitServerContainerUsedInJUnit5Test {
 The following sample shows how to use the git server container via HTTP without Basic Authentication in a JUnit 5 test:
 
 ````java
-import com.github.sparsick.testcontainers.gitserver.GitServerVersions;
-import com.github.sparsick.testcontainers.gitserver.http.GitHttpServerContainer;
+import dev.parsick.testcontainers.gitserver.GitServerVersions;
+import http.dev.parsick.testcontainers.gitserver.GitHttpServerContainer;
 
 @Testcontainers
 public class GitHttpServerContainerUsedInJUnit5Test {
@@ -139,9 +139,9 @@ public class GitHttpServerContainerUsedInJUnit5Test {
 The next sample shows how to use the git server container via HTTP with Basic Authentication in a JUnit 5 test:
 
 ````java
-import com.github.sparsick.testcontainers.gitserver.GitServerVersions;
-import com.github.sparsick.testcontainers.gitserver.http.BasicAuthenticationCredentials;
-import com.github.sparsick.testcontainers.gitserver.http.GitHttpServerContainer;
+import dev.parsick.testcontainers.gitserver.GitServerVersions;
+import http.dev.parsick.testcontainers.gitserver.BasicAuthenticationCredentials;
+import http.dev.parsick.testcontainers.gitserver.GitHttpServerContainer;
 
 @Testcontainers
 public class GitHttpServerContainerUsedInJUnit5Test {
@@ -166,8 +166,8 @@ public class GitHttpServerContainerUsedInJUnit5Test {
 Since 0.9.0 it is possible to configure HTTP proxy, programmatically. 
 
 ````java
-import com.github.sparsick.testcontainers.gitserver.GitServerVersions;
-import com.github.sparsick.testcontainers.gitserver.http.GitHttpServerContainer;
+import dev.parsick.testcontainers.gitserver.GitServerVersions;
+import http.dev.parsick.testcontainers.gitserver.GitHttpServerContainer;
 
 @Testcontainers
 public class GitHttpServerContainerUsedInJUnit5Test {
@@ -200,8 +200,8 @@ The container exposes two protocols:
 #### Cloning via HTTP
 
 ````java
-import io.github.sparsick.testcontainers.gitserver.forgejo.ForgejoContainer;
-import io.github.sparsick.testcontainers.gitserver.forgejo.ForgejoVersions;
+import forgejo.dev.parsick.testcontainers.gitserver.ForgejoContainer;
+import forgejo.dev.parsick.testcontainers.gitserver.ForgejoVersions;
 
 @Testcontainers
 public class ForgejoContainerUsedInJUnit5Test {
@@ -231,9 +231,9 @@ SSH public key authentication must be enabled explicitly with `.withSshKeyAuth()
 The container registers the built-in key pair with Forgejo automatically on startup.
 
 ````java
-import io.github.sparsick.testcontainers.gitserver.forgejo.ForgejoContainer;
-import io.github.sparsick.testcontainers.gitserver.forgejo.ForgejoVersions;
-import io.github.sparsick.testcontainers.gitserver.forgejo.SshIdentity;
+import forgejo.dev.parsick.testcontainers.gitserver.ForgejoContainer;
+import forgejo.dev.parsick.testcontainers.gitserver.ForgejoVersions;
+import forgejo.dev.parsick.testcontainers.gitserver.SshIdentity;
 
 @Testcontainers
 public class ForgejoContainerUsedInJUnit5Test {
@@ -333,12 +333,45 @@ new GiteaContainer(GiteaVersions.V1_13_0.getDockerImageName())
 
 In 0.5.x the package structure has changed.
 The package `com.github.sparsick.testcontainers.gitserver` is split in `com.github.sparsick.testcontainers.gitserver.plain` and `com.github.sparsick.testcontainers.gitserver.http`.
-Making this migration easier, an OpenRewrite recipe `io.github.sparsick.testcontainers.gitserver.rewrite.recipe.SplitPackage` is provided.
+Making this migration easier, an OpenRewrite recipe `dev.parsick.testcontainers.gitserver.rewrite.recipe.SplitPackage` is provided.
 
 ````shell
 mvn -U org.openrewrite.maven:rewrite-maven-plugin:run \
-  -Drewrite.recipeArtifactCoordinates=io.github.sparsick.testcontainers.gitserver:rewrite-testcontainers-gitserver:RELEASE \
-  -Drewrite.activeRecipes=io.github.sparsick.testcontainers.gitserver.rewrite.recipe.SplitPackage
+  -Drewrite.recipeArtifactCoordinates=dev.parsick.testcontainers.gitserver:rewrite-testcontainers-gitserver:RELEASE \
+  -Drewrite.activeRecipes=dev.parsick.testcontainers.gitserver.rewrite.recipe.SplitPackage
+````
+
+### Migration from 0.15.x to 0.16.x
+
+In 0.16.x the Maven group id and Java package names have been relocated to `dev.parsick`.
+
+Update the Maven coordinates from:
+
+````xml
+<groupId>io.github.sparsick.testcontainers.gitserver</groupId>
+````
+
+to:
+
+````xml
+<groupId>dev.parsick.testcontainers.gitserver</groupId>
+````
+
+Update imports from the old package names to the new `dev.parsick` package names, for example:
+
+````java
+import dev.parsick.testcontainers.gitserver.http.GitHttpServerContainer;
+import dev.parsick.testcontainers.gitserver.plain.GitServerContainer;
+import dev.parsick.testcontainers.gitserver.forgejo.ForgejoContainer;
+import dev.parsick.testcontainers.gitserver.gitea.GiteaContainer;
+````
+
+An OpenRewrite recipe is provided to automate the migration:
+
+````shell
+mvn -U org.openrewrite.maven:rewrite-maven-plugin:run \
+  -Drewrite.recipeArtifactCoordinates=dev.parsick.testcontainers.gitserver:rewrite-testcontainers-gitserver:RELEASE \
+  -Drewrite.activeRecipes=dev.parsick.testcontainers.gitserver.rewrite.recipe.Relocation
 ````
 
 ## License
diff --git a/pom.xml b/pom.xml
index 6b3b2840..003d0cc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,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>io.github.sparsick.testcontainers.gitserver</groupId>
+    <groupId>dev.parsick.testcontainers.gitserver</groupId>
     <artifactId>testcontainers-git-parent</artifactId>
     <version>0.16.0-SNAPSHOT</version>
 
@@ -208,7 +208,7 @@
                 <artifactId>spotbugs-maven-plugin</artifactId>
                 <version>4.9.8.4</version>
                 <configuration>
-                    <onlyAnalyze>io.github.sparsick.testcontainers.gitserver.*</onlyAnalyze>
+                    <onlyAnalyze>dev.parsick.testcontainers.gitserver.*</onlyAnalyze>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/rewrite-testcontainers-gitserver/pom.xml b/rewrite-testcontainers-gitserver/pom.xml
index 8983c671..bebe94eb 100644
--- a/rewrite-testcontainers-gitserver/pom.xml
+++ b/rewrite-testcontainers-gitserver/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>io.github.sparsick.testcontainers.gitserver</groupId>
+        <groupId>dev.parsick.testcontainers.gitserver</groupId>
         <artifactId>testcontainers-git-parent</artifactId>
         <version>0.16.0-SNAPSHOT</version>
     </parent>
@@ -13,6 +13,19 @@
     <artifactId>rewrite-testcontainers-gitserver</artifactId>
     <name>Rewrite for Git Server for Testcontainers</name>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>META-INF/rewrite/classpath/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
     <dependencies>
         <dependency>
@@ -47,6 +60,11 @@
             <artifactId>rewrite-java-21</artifactId>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>org.openrewrite</groupId>
+            <artifactId>rewrite-xml</artifactId>
+            <scope>runtime</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.junit.jupiter</groupId>
diff --git a/rewrite-testcontainers-gitserver/src/main/java/io/github/sparsick/testcontainers/gitserver/rewrite/recipe/RenamePackageOfGitHttpServerContainer.java b/rewrite-testcontainers-gitserver/src/main/java/dev/parsick/testcontainers/gitserver/rewrite/recipe/RenamePackageOfGitHttpServerContainer.java
similarity index 97%
rename from rewrite-testcontainers-gitserver/src/main/java/io/github/sparsick/testcontainers/gitserver/rewrite/recipe/RenamePackageOfGitHttpServerContainer.java
rename to rewrite-testcontainers-gitserver/src/main/java/dev/parsick/testcontainers/gitserver/rewrite/recipe/RenamePackageOfGitHttpServerContainer.java
index 3279e0fd..20b44654 100644
--- a/rewrite-testcontainers-gitserver/src/main/java/io/github/sparsick/testcontainers/gitserver/rewrite/recipe/RenamePackageOfGitHttpServerContainer.java
+++ b/rewrite-testcontainers-gitserver/src/main/java/dev/parsick/testcontainers/gitserver/rewrite/recipe/RenamePackageOfGitHttpServerContainer.java
@@ -1,4 +1,4 @@
-package io.github.sparsick.testcontainers.gitserver.rewrite.recipe;
+package dev.parsick.testcontainers.gitserver.rewrite.recipe;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import java.util.Set;
diff --git a/rewrite-testcontainers-gitserver/src/main/resources/META-INF/rewrite/classpath/testcontainers-forgejo-0.15.0.jar b/rewrite-testcontainers-gitserver/src/main/resources/META-INF/rewrite/classpath/testcontainers-forgejo-0.15.0.jar
new file mode 100644
index 00000000..18cb3d9b
Binary files /dev/null and b/rewrite-testcontainers-gitserver/src/main/resources/META-INF/rewrite/classpath/testcontainers-forgejo-0.15.0.jar differ
diff --git a/rewrite-testcontainers-gitserver/src/main/resources/META-INF/rewrite/classpath/testcontainers-gitea-0.15.0.jar b/rewrite-testcontainers-gitserver/src/main/resources/META-INF/rewrite/classpath/testcontainers-gitea-0.15.0.jar
new file mode 100644
index 00000000..a06980c8
Binary files /dev/null and b/rewrite-testcontainers-gitserver/src/main/resources/META-INF/rewrite/classpath/testcontainers-gitea-0.15.0.jar differ
diff --git a/rewrite-testcontainers-gitserver/src/main/resources/META-INF/rewrite/classpath/testcontainers-gitserver-0.15.0.jar b/rewrite-testcontainers-gitserver/src/main/resources/META-INF/rewrite/classpath/testcontainers-gitserver-0.15.0.jar
new file mode 100644
index 00000000..531b8157
Binary files /dev/null and b/rewrite-testcontainers-gitserver/src/main/resources/META-INF/rewrite/classpath/testcontainers-gitserver-0.15.0.jar differ
diff --git a/rewrite-testcontainers-gitserver/src/main/resources/META-INF/rewrite/rewrite.yml b/rewrite-testcontainers-gitserver/src/main/resources/META-INF/rewrite/rewrite.yml
index 6ba807f9..610ebeb7 100644
--- a/rewrite-testcontainers-gitserver/src/main/resources/META-INF/rewrite/rewrite.yml
+++ b/rewrite-testcontainers-gitserver/src/main/resources/META-INF/rewrite/rewrite.yml
@@ -1,6 +1,6 @@
 ---
 type: specs.openrewrite.org/v1beta/recipe
-name: io.github.sparsick.testcontainers.gitserver.rewrite.recipe.RenamePackageOfBasicAuthenticationCredentials
+name: dev.parsick.testcontainers.gitserver.rewrite.recipe.RenamePackageOfBasicAuthenticationCredentials
 displayName: Rename package of BasicAuthenticationCredentials
 recipeList:
   - org.openrewrite.java.ChangeType:
@@ -10,7 +10,7 @@ recipeList:
 
 ---
 type: specs.openrewrite.org/v1beta/recipe
-name: io.github.sparsick.testcontainers.gitserver.rewrite.recipe.RenamePackageOfGitServerContainer
+name: dev.parsick.testcontainers.gitserver.rewrite.recipe.RenamePackageOfGitServerContainer
 displayName: Rename package of GitServerContainer
 recipeList:
   - org.openrewrite.java.ChangeType:
@@ -20,7 +20,7 @@ recipeList:
 
 ---
 type: specs.openrewrite.org/v1beta/recipe
-name: io.github.sparsick.testcontainers.gitserver.rewrite.recipe.RenamePackageOfSshHostKey
+name: dev.parsick.testcontainers.gitserver.rewrite.recipe.RenamePackageOfSshHostKey
 displayName: Rename package of SshHostKey
 recipeList:
   - org.openrewrite.java.ChangeType:
@@ -30,7 +30,7 @@ recipeList:
 
 ---
 type: specs.openrewrite.org/v1beta/recipe
-name: io.github.sparsick.testcontainers.gitserver.rewrite.recipe.RenamePackageOfSshIdentity
+name: dev.parsick.testcontainers.gitserver.rewrite.recipe.RenamePackageOfSshIdentity
 displayName: Rename package of SshIdentity
 recipeList:
   - org.openrewrite.java.ChangeType:
@@ -40,12 +40,49 @@ recipeList:
 ---
 
 type: specs.openrewrite.org/v1beta/recipe
-name: io.github.sparsick.testcontainers.gitserver.rewrite.recipe.SplitPackage
+name: dev.parsick.testcontainers.gitserver.rewrite.recipe.SplitPackage
 description: Splitting origin package into plain and http specific ones.
 displayName: Split package
 recipeList:
-  - io.github.sparsick.testcontainers.gitserver.rewrite.recipe.RenamePackageOfSshIdentity
-  - io.github.sparsick.testcontainers.gitserver.rewrite.recipe.RenamePackageOfSshHostKey
-  - io.github.sparsick.testcontainers.gitserver.rewrite.recipe.RenamePackageOfGitServerContainer
-  - io.github.sparsick.testcontainers.gitserver.rewrite.recipe.RenamePackageOfBasicAuthenticationCredentials
-  - io.github.sparsick.testcontainers.gitserver.rewrite.recipe.RenamePackageOfGitHttpServerContainer
\ No newline at end of file
+  - dev.parsick.testcontainers.gitserver.rewrite.recipe.RenamePackageOfSshIdentity
+  - dev.parsick.testcontainers.gitserver.rewrite.recipe.RenamePackageOfSshHostKey
+  - dev.parsick.testcontainers.gitserver.rewrite.recipe.RenamePackageOfGitServerContainer
+  - dev.parsick.testcontainers.gitserver.rewrite.recipe.RenamePackageOfBasicAuthenticationCredentials
+  - dev.parsick.testcontainers.gitserver.rewrite.recipe.RenamePackageOfGitHttpServerContainer
+
+---
+
+type: specs.openrewrite.org/v1beta/recipe
+name: dev.parsick.testcontainers.gitserver.rewrite.recipe.Relocation
+description: Relocate package name and groupid to dev.parsick.
+displayName: Relocate packages and groupid
+recipeList:
+  - dev.parsick.testcontainers.gitserver.rewrite.recipe.RenameComPackage
+  - dev.parsick.testcontainers.gitserver.rewrite.recipe.RenameIoPackage
+  - org.openrewrite.xml.ChangeTagValue:
+      elementName: groupId
+      oldValue: io.github.sparsick.testcontainers.gitserver
+      newValue: dev.parsick.testcontainers.gitserver
+
+
+
+---
+type: specs.openrewrite.org/v1beta/recipe
+name: dev.parsick.testcontainers.gitserver.rewrite.recipe.RenameComPackage
+displayName: Rename package name example
+recipeList:
+  - org.openrewrite.java.ChangePackage:
+      oldPackageName: com.github.sparsick
+      newPackageName: dev.parsick
+      recursive: true
+
+---
+type: specs.openrewrite.org/v1beta/recipe
+name: dev.parsick.testcontainers.gitserver.rewrite.recipe.RenameIoPackage
+displayName: Rename package name example
+recipeList:
+  - org.openrewrite.java.ChangePackage:
+      oldPackageName: io.github.sparsick
+      newPackageName: dev.parsick
+      recursive: true
+
diff --git a/rewrite-testcontainers-gitserver/src/test/java/dev/parsick/testcontainers/gitserver/rewrite/recipe/RelocationGroupIdTest.java b/rewrite-testcontainers-gitserver/src/test/java/dev/parsick/testcontainers/gitserver/rewrite/recipe/RelocationGroupIdTest.java
new file mode 100644
index 00000000..3dac9a7a
--- /dev/null
+++ b/rewrite-testcontainers-gitserver/src/test/java/dev/parsick/testcontainers/gitserver/rewrite/recipe/RelocationGroupIdTest.java
@@ -0,0 +1,97 @@
+package dev.parsick.testcontainers.gitserver.rewrite.recipe;
+
+import static org.openrewrite.xml.Assertions.xml;
+
+import org.junit.jupiter.api.Test;
+import org.openrewrite.test.RecipeSpec;
+import org.openrewrite.test.RewriteTest;
+
+public class RelocationGroupIdTest implements RewriteTest {
+
+  @Override
+  public void defaults(RecipeSpec spec) {
+    spec.recipe(
+        RelocationGroupIdTest.class.getResourceAsStream("/META-INF/rewrite/rewrite.yml"),
+        "dev.parsick.testcontainers.gitserver.rewrite.recipe.Relocation");
+  }
+
+  @Test
+  void renameGroupId() {
+    rewriteRun(
+        xml(
+            """
+                                        <project>
+                                            <modelVersion>4.0.0</modelVersion>
+                                            <groupId>com.mycompany.app</groupId>
+                                            <artifactId>my-app</artifactId>
+                                            <version>1</version>
+                                            <dependencies>
+                                                <dependency>
+                                                    <groupId>io.github.sparsick.testcontainers.gitserver</groupId>
+                                                    <artifactId>rewrite-testcontainers-gitserver</artifactId>
+                                                </dependency>
+                                                <dependency>
+                                                    <groupId>io.github.sparsick.testcontainers.gitserver</groupId>
+                                                    <artifactId>testcontainers-gitserver</artifactId>
+                                                </dependency>
+                                                <dependency>
+                                                    <groupId>io.github.sparsick.testcontainers.gitserver</groupId>
+                                                    <artifactId>testcontainers-forgejo</artifactId>
+                                                </dependency>
+                                                <dependency>
+                                                    <groupId>io.github.sparsick.testcontainers.gitserver</groupId>
+                                                    <artifactId>testcontainers-gitea</artifactId>
+                                                </dependency>
+                                            </dependencies>
+                                            <dependencyManagement>
+                                                <dependencies>
+                                                    <dependency>
+                                                        <groupId>io.github.sparsick.testcontainers.gitserver</groupId>
+                                                        <artifactId>testcontainers-git-bom</artifactId>
+                                                        <version>0.15.0</version>
+                                                        <type>pom</type>
+                                                        <scope>import</scope>
+                                                    </dependency>
+                                                </dependencies>
+                                            </dependencyManagement>
+                                        </project>
+                                    """,
+            """
+                                        <project>
+                                            <modelVersion>4.0.0</modelVersion>
+                                            <groupId>com.mycompany.app</groupId>
+                                            <artifactId>my-app</artifactId>
+                                            <version>1</version>
+                                            <dependencies>
+                                                <dependency>
+                                                    <groupId>dev.parsick.testcontainers.gitserver</groupId>
+                                                    <artifactId>rewrite-testcontainers-gitserver</artifactId>
+                                                </dependency>
+                                                <dependency>
+                                                    <groupId>dev.parsick.testcontainers.gitserver</groupId>
+                                                    <artifactId>testcontainers-gitserver</artifactId>
+                                                </dependency>
+                                                <dependency>
+                                                    <groupId>dev.parsick.testcontainers.gitserver</groupId>
+                                                    <artifactId>testcontainers-forgejo</artifactId>
+                                                </dependency>
+                                                <dependency>
+                                                    <groupId>dev.parsick.testcontainers.gitserver</groupId>
+                                                    <artifactId>testcontainers-gitea</artifactId>
+                                                </dependency>
+                                            </dependencies>
+                                            <dependencyManagement>
+                                                <dependencies>
+                                                    <dependency>
+                                                        <groupId>dev.parsick.testcontainers.gitserver</groupId>
+                                                        <artifactId>testcontainers-git-bom</artifactId>
+                                                        <version>0.15.0</version>
+                                                        <type>pom</type>
+                                                        <scope>import</scope>
+                                                    </dependency>
+                                                </dependencies>
+                                            </dependencyManagement>
+                                        </project>
+                                    """));
+  }
+}
diff --git a/rewrite-testcontainers-gitserver/src/test/java/dev/parsick/testcontainers/gitserver/rewrite/recipe/RelocationPackageTest.java b/rewrite-testcontainers-gitserver/src/test/java/dev/parsick/testcontainers/gitserver/rewrite/recipe/RelocationPackageTest.java
new file mode 100644
index 00000000..cca41859
--- /dev/null
+++ b/rewrite-testcontainers-gitserver/src/test/java/dev/parsick/testcontainers/gitserver/rewrite/recipe/RelocationPackageTest.java
@@ -0,0 +1,155 @@
+package dev.parsick.testcontainers.gitserver.rewrite.recipe;
+
+import static org.openrewrite.java.Assertions.java;
+import static org.openrewrite.xml.Assertions.xml;
+
+import org.junit.jupiter.api.Test;
+import org.openrewrite.InMemoryExecutionContext;
+import org.openrewrite.java.JavaParser;
+import org.openrewrite.test.RecipeSpec;
+import org.openrewrite.test.RewriteTest;
+
+public class RelocationPackageTest implements RewriteTest {
+
+  @Override
+  public void defaults(RecipeSpec spec) {
+    spec.recipe(
+        RelocationPackageTest.class.getResourceAsStream("/META-INF/rewrite/rewrite.yml"),
+        "dev.parsick.testcontainers.gitserver.rewrite.recipe.Relocation");
+    spec.parser(
+        JavaParser.fromJavaVersion()
+            .classpathFromResources(
+                new InMemoryExecutionContext(),
+                "testcontainers-gitserver-0.15.0",
+                "testcontainers-gitea-0.15.0",
+                "testcontainers-forgejo-0.15.0"));
+  }
+
+  @Test
+  void renameImporst() {
+    rewriteRun(
+        java(
+            """
+                                        import com.github.sparsick.testcontainers.gitserver.http.BasicAuthenticationCredentials;
+                                        import com.github.sparsick.testcontainers.gitserver.http.GitHttpServerContainer;
+                                        import com.github.sparsick.testcontainers.gitserver.plain.GitServerContainer;
+                                        import com.github.sparsick.testcontainers.gitserver.plain.SshHostKey;
+                                        import com.github.sparsick.testcontainers.gitserver.plain.SshIdentity;
+                                        import io.github.sparsick.testcontainers.gitserver.forgejo.ForgejoContainer;
+                                        import io.github.sparsick.testcontainers.gitserver.gitea.GiteaContainer;
+
+                                        class FooBar {
+
+                                            private GitHttpServerContainer httpContainer = null;
+                                            private BasicAuthenticationCredentials credentials = null;
+                                            private GitServerContainer plainContainer = null;
+                                            private SshIdentity identity = null;
+                                            private SshHostKey hostkey = null;
+                                            private ForgejoContainer forgejo = null;
+                                            private GiteaContainer gitea = null;
+
+                                        }
+                                    """,
+            """
+                                        import dev.parsick.testcontainers.gitserver.http.BasicAuthenticationCredentials;
+                                        import dev.parsick.testcontainers.gitserver.http.GitHttpServerContainer;
+                                        import dev.parsick.testcontainers.gitserver.plain.GitServerContainer;
+                                        import dev.parsick.testcontainers.gitserver.plain.SshHostKey;
+                                        import dev.parsick.testcontainers.gitserver.plain.SshIdentity;
+                                        import dev.parsick.testcontainers.gitserver.forgejo.ForgejoContainer;
+                                        import dev.parsick.testcontainers.gitserver.gitea.GiteaContainer;
+
+                                        class FooBar {
+
+                                            private GitHttpServerContainer httpContainer = null;
+                                            private BasicAuthenticationCredentials credentials = null;
+                                            private GitServerContainer plainContainer = null;
+                                            private SshIdentity identity = null;
+                                            private SshHostKey hostkey = null;
+                                            private ForgejoContainer forgejo = null;
+                                            private GiteaContainer gitea = null;
+
+                                        }
+                                    """));
+  }
+
+  @Test
+  void renameGroupId() {
+    rewriteRun(
+        xml(
+            """
+                                        <project>
+                                            <modelVersion>4.0.0</modelVersion>
+                                            <groupId>com.mycompany.app</groupId>
+                                            <artifactId>my-app</artifactId>
+                                            <version>1</version>
+                                            <dependencies>
+                                                <dependency>
+                                                    <groupId>io.github.sparsick.testcontainers.gitserver</groupId>
+                                                    <artifactId>rewrite-testcontainers-gitserver</artifactId>
+                                                </dependency>
+                                                <dependency>
+                                                    <groupId>io.github.sparsick.testcontainers.gitserver</groupId>
+                                                    <artifactId>testcontainers-gitserver</artifactId>
+                                                </dependency>
+                                                <dependency>
+                                                    <groupId>io.github.sparsick.testcontainers.gitserver</groupId>
+                                                    <artifactId>testcontainers-forgejo</artifactId>
+                                                </dependency>
+                                                <dependency>
+                                                    <groupId>io.github.sparsick.testcontainers.gitserver</groupId>
+                                                    <artifactId>testcontainers-gitea</artifactId>
+                                                </dependency>
+                                            </dependencies>
+                                            <dependencyManagement>
+                                                <dependencies>
+                                                    <dependency>
+                                                        <groupId>io.github.sparsick.testcontainers.gitserver</groupId>
+                                                        <artifactId>testcontainers-git-bom</artifactId>
+                                                        <version>0,15.0</version>
+                                                        <type>pom</type>
+                                                        <scope>import</scope>
+                                                    </dependency>
+                                                </dependencies>
+                                            </dependencyManagement>
+                                        </project>
+                                    """,
+            """
+                                        <project>
+                                            <modelVersion>4.0.0</modelVersion>
+                                            <groupId>com.mycompany.app</groupId>
+                                            <artifactId>my-app</artifactId>
+                                            <version>1</version>
+                                            <dependencies>
+                                                <dependency>
+                                                    <groupId>dev.parsick.testcontainers.gitserver</groupId>
+                                                    <artifactId>rewrite-testcontainers-gitserver</artifactId>
+                                                </dependency>
+                                                <dependency>
+                                                    <groupId>dev.parsick.testcontainers.gitserver</groupId>
+                                                    <artifactId>testcontainers-gitserver</artifactId>
+                                                </dependency>
+                                                <dependency>
+                                                    <groupId>dev.parsick.testcontainers.gitserver</groupId>
+                                                    <artifactId>testcontainers-forgejo</artifactId>
+                                                </dependency>
+                                                <dependency>
+                                                    <groupId>dev.parsick.testcontainers.gitserver</groupId>
+                                                    <artifactId>testcontainers-gitea</artifactId>
+                                                </dependency>
+                                            </dependencies>
+                                            <dependencyManagement>
+                                                <dependencies>
+                                                    <dependency>
+                                                        <groupId>dev.parsick.testcontainers.gitserver</groupId>
+                                                        <artifactId>testcontainers-git-bom</artifactId>
+                                                        <version>0,15.0</version>
+                                                        <type>pom</type>
+                                                        <scope>import</scope>
+                                                    </dependency>
+                                                </dependencies>
+                                            </dependencyManagement>
+                                        </project>
+                                    """));
+  }
+}
diff --git a/rewrite-testcontainers-gitserver/src/test/java/io/github/sparsick/testcontainers/gitserver/rewrite/recipe/RenamePackageOfGitHttpServerContainerTest.java b/rewrite-testcontainers-gitserver/src/test/java/dev/parsick/testcontainers/gitserver/rewrite/recipe/RenamePackageOfGitHttpServerContainerTest.java
similarity index 95%
rename from rewrite-testcontainers-gitserver/src/test/java/io/github/sparsick/testcontainers/gitserver/rewrite/recipe/RenamePackageOfGitHttpServerContainerTest.java
rename to rewrite-testcontainers-gitserver/src/test/java/dev/parsick/testcontainers/gitserver/rewrite/recipe/RenamePackageOfGitHttpServerContainerTest.java
index 1d66466c..1ce59dad 100644
--- a/rewrite-testcontainers-gitserver/src/test/java/io/github/sparsick/testcontainers/gitserver/rewrite/recipe/RenamePackageOfGitHttpServerContainerTest.java
+++ b/rewrite-testcontainers-gitserver/src/test/java/dev/parsick/testcontainers/gitserver/rewrite/recipe/RenamePackageOfGitHttpServerContainerTest.java
@@ -1,4 +1,4 @@
-package io.github.sparsick.testcontainers.gitserver.rewrite.recipe;
+package dev.parsick.testcontainers.gitserver.rewrite.recipe;
 
 import static org.openrewrite.java.Assertions.java;
 
diff --git a/rewrite-testcontainers-gitserver/src/test/java/io/github/sparsick/testcontainers/gitserver/rewrite/recipe/SplitPackageTest.java b/rewrite-testcontainers-gitserver/src/test/java/dev/parsick/testcontainers/gitserver/rewrite/recipe/SplitPackageTest.java
similarity index 94%
rename from rewrite-testcontainers-gitserver/src/test/java/io/github/sparsick/testcontainers/gitserver/rewrite/recipe/SplitPackageTest.java
rename to rewrite-testcontainers-gitserver/src/test/java/dev/parsick/testcontainers/gitserver/rewrite/recipe/SplitPackageTest.java
index 9d5f3272..b818d717 100644
--- a/rewrite-testcontainers-gitserver/src/test/java/io/github/sparsick/testcontainers/gitserver/rewrite/recipe/SplitPackageTest.java
+++ b/rewrite-testcontainers-gitserver/src/test/java/dev/parsick/testcontainers/gitserver/rewrite/recipe/SplitPackageTest.java
@@ -1,4 +1,4 @@
-package io.github.sparsick.testcontainers.gitserver.rewrite.recipe;
+package dev.parsick.testcontainers.gitserver.rewrite.recipe;
 
 import static org.openrewrite.java.Assertions.java;
 
@@ -14,7 +14,7 @@ public class SplitPackageTest implements RewriteTest {
   public void defaults(RecipeSpec spec) {
     spec.recipe(
         SplitPackageTest.class.getResourceAsStream("/META-INF/rewrite/rewrite.yml"),
-        "io.github.sparsick.testcontainers.gitserver.rewrite.recipe.SplitPackage");
+        "dev.parsick.testcontainers.gitserver.rewrite.recipe.SplitPackage");
     spec.parser(
         JavaParser.fromJavaVersion()
             .classpathFromResources(
diff --git a/testcontainers-forgejo/pom.xml b/testcontainers-forgejo/pom.xml
index 1c214893..fcbc59c8 100644
--- a/testcontainers-forgejo/pom.xml
+++ b/testcontainers-forgejo/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>io.github.sparsick.testcontainers.gitserver</groupId>
+        <groupId>dev.parsick.testcontainers.gitserver</groupId>
         <artifactId>testcontainers-git-parent</artifactId>
         <version>0.16.0-SNAPSHOT</version>
     </parent>
diff --git a/testcontainers-forgejo/src/main/java/io/github/sparsick/testcontainers/gitserver/forgejo/ForgejoContainer.java b/testcontainers-forgejo/src/main/java/dev/parsick/testcontainers/gitserver/forgejo/ForgejoContainer.java
similarity index 99%
rename from testcontainers-forgejo/src/main/java/io/github/sparsick/testcontainers/gitserver/forgejo/ForgejoContainer.java
rename to testcontainers-forgejo/src/main/java/dev/parsick/testcontainers/gitserver/forgejo/ForgejoContainer.java
index b6609e35..6f082cbc 100644
--- a/testcontainers-forgejo/src/main/java/io/github/sparsick/testcontainers/gitserver/forgejo/ForgejoContainer.java
+++ b/testcontainers-forgejo/src/main/java/dev/parsick/testcontainers/gitserver/forgejo/ForgejoContainer.java
@@ -1,4 +1,4 @@
-package io.github.sparsick.testcontainers.gitserver.forgejo;
+package dev.parsick.testcontainers.gitserver.forgejo;
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import java.io.IOException;
diff --git a/testcontainers-forgejo/src/main/java/io/github/sparsick/testcontainers/gitserver/forgejo/ForgejoVersions.java b/testcontainers-forgejo/src/main/java/dev/parsick/testcontainers/gitserver/forgejo/ForgejoVersions.java
similarity index 97%
rename from testcontainers-forgejo/src/main/java/io/github/sparsick/testcontainers/gitserver/forgejo/ForgejoVersions.java
rename to testcontainers-forgejo/src/main/java/dev/parsick/testcontainers/gitserver/forgejo/ForgejoVersions.java
index 5c7bec02..506da3c7 100644
--- a/testcontainers-forgejo/src/main/java/io/github/sparsick/testcontainers/gitserver/forgejo/ForgejoVersions.java
+++ b/testcontainers-forgejo/src/main/java/dev/parsick/testcontainers/gitserver/forgejo/ForgejoVersions.java
@@ -1,4 +1,4 @@
-package io.github.sparsick.testcontainers.gitserver.forgejo;
+package dev.parsick.testcontainers.gitserver.forgejo;
 
 import org.testcontainers.utility.DockerImageName;
 
diff --git a/testcontainers-gitea/src/main/java/io/github/sparsick/testcontainers/gitserver/gitea/SshIdentity.java b/testcontainers-forgejo/src/main/java/dev/parsick/testcontainers/gitserver/forgejo/SshIdentity.java
similarity index 95%
rename from testcontainers-gitea/src/main/java/io/github/sparsick/testcontainers/gitserver/gitea/SshIdentity.java
rename to testcontainers-forgejo/src/main/java/dev/parsick/testcontainers/gitserver/forgejo/SshIdentity.java
index 6207900b..2e23e501 100644
--- a/testcontainers-gitea/src/main/java/io/github/sparsick/testcontainers/gitserver/gitea/SshIdentity.java
+++ b/testcontainers-forgejo/src/main/java/dev/parsick/testcontainers/gitserver/forgejo/SshIdentity.java
@@ -1,4 +1,4 @@
-package io.github.sparsick.testcontainers.gitserver.gitea;
+package dev.parsick.testcontainers.gitserver.forgejo;
 
 import java.nio.charset.StandardCharsets;
 
diff --git a/testcontainers-forgejo/src/test/java/io/github/sparsick/testcontainers/gitserver/forgejo/ForgejoContainerJUnit5IntegrationTest.java b/testcontainers-forgejo/src/test/java/dev/parsick/testcontainers/gitserver/forgejo/ForgejoContainerJUnit5IntegrationTest.java
similarity index 95%
rename from testcontainers-forgejo/src/test/java/io/github/sparsick/testcontainers/gitserver/forgejo/ForgejoContainerJUnit5IntegrationTest.java
rename to testcontainers-forgejo/src/test/java/dev/parsick/testcontainers/gitserver/forgejo/ForgejoContainerJUnit5IntegrationTest.java
index fc634a71..5d1ab791 100644
--- a/testcontainers-forgejo/src/test/java/io/github/sparsick/testcontainers/gitserver/forgejo/ForgejoContainerJUnit5IntegrationTest.java
+++ b/testcontainers-forgejo/src/test/java/dev/parsick/testcontainers/gitserver/forgejo/ForgejoContainerJUnit5IntegrationTest.java
@@ -1,4 +1,4 @@
-package io.github.sparsick.testcontainers.gitserver.forgejo;
+package dev.parsick.testcontainers.gitserver.forgejo;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatNoException;
diff --git a/testcontainers-forgejo/src/test/java/io/github/sparsick/testcontainers/gitserver/forgejo/ForgejoContainerTest.java b/testcontainers-forgejo/src/test/java/dev/parsick/testcontainers/gitserver/forgejo/ForgejoContainerTest.java
similarity index 99%
rename from testcontainers-forgejo/src/test/java/io/github/sparsick/testcontainers/gitserver/forgejo/ForgejoContainerTest.java
rename to testcontainers-forgejo/src/test/java/dev/parsick/testcontainers/gitserver/forgejo/ForgejoContainerTest.java
index f98f9f34..bb7bc5a7 100644
--- a/testcontainers-forgejo/src/test/java/io/github/sparsick/testcontainers/gitserver/forgejo/ForgejoContainerTest.java
+++ b/testcontainers-forgejo/src/test/java/dev/parsick/testcontainers/gitserver/forgejo/ForgejoContainerTest.java
@@ -1,4 +1,4 @@
-package io.github.sparsick.testcontainers.gitserver.forgejo;
+package dev.parsick.testcontainers.gitserver.forgejo;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatNoException;
diff --git a/testcontainers-git-bom/pom.xml b/testcontainers-git-bom/pom.xml
index ca29fffc..239134ed 100644
--- a/testcontainers-git-bom/pom.xml
+++ b/testcontainers-git-bom/pom.xml
@@ -4,7 +4,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>
     <parent>
-        <groupId>io.github.sparsick.testcontainers.gitserver</groupId>
+        <groupId>dev.parsick.testcontainers.gitserver</groupId>
         <artifactId>testcontainers-git-parent</artifactId>
         <version>0.16.0-SNAPSHOT</version>
     </parent>
@@ -17,22 +17,22 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>io.github.sparsick.testcontainers.gitserver</groupId>
+                <groupId>dev.parsick.testcontainers.gitserver</groupId>
                 <artifactId>rewrite-testcontainers-gitserver</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>io.github.sparsick.testcontainers.gitserver</groupId>
+                <groupId>dev.parsick.testcontainers.gitserver</groupId>
                 <artifactId>testcontainers-gitserver</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>io.github.sparsick.testcontainers.gitserver</groupId>
+                <groupId>dev.parsick.testcontainers.gitserver</groupId>
                 <artifactId>testcontainers-forgejo</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>io.github.sparsick.testcontainers.gitserver</groupId>
+                <groupId>dev.parsick.testcontainers.gitserver</groupId>
                 <artifactId>testcontainers-gitea</artifactId>
                 <version>${project.version}</version>
             </dependency>
diff --git a/testcontainers-gitea/pom.xml b/testcontainers-gitea/pom.xml
index 8659e710..12488024 100644
--- a/testcontainers-gitea/pom.xml
+++ b/testcontainers-gitea/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>io.github.sparsick.testcontainers.gitserver</groupId>
+        <groupId>dev.parsick.testcontainers.gitserver</groupId>
         <artifactId>testcontainers-git-parent</artifactId>
         <version>0.16.0-SNAPSHOT</version>
     </parent>
diff --git a/testcontainers-gitea/src/main/java/io/github/sparsick/testcontainers/gitserver/gitea/GiteaContainer.java b/testcontainers-gitea/src/main/java/dev/parsick/testcontainers/gitserver/gitea/GiteaContainer.java
similarity index 99%
rename from testcontainers-gitea/src/main/java/io/github/sparsick/testcontainers/gitserver/gitea/GiteaContainer.java
rename to testcontainers-gitea/src/main/java/dev/parsick/testcontainers/gitserver/gitea/GiteaContainer.java
index 02d23310..85a0d59f 100644
--- a/testcontainers-gitea/src/main/java/io/github/sparsick/testcontainers/gitserver/gitea/GiteaContainer.java
+++ b/testcontainers-gitea/src/main/java/dev/parsick/testcontainers/gitserver/gitea/GiteaContainer.java
@@ -1,4 +1,4 @@
-package io.github.sparsick.testcontainers.gitserver.gitea;
+package dev.parsick.testcontainers.gitserver.gitea;
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import java.io.IOException;
diff --git a/testcontainers-gitea/src/main/java/io/github/sparsick/testcontainers/gitserver/gitea/GiteaVersions.java b/testcontainers-gitea/src/main/java/dev/parsick/testcontainers/gitserver/gitea/GiteaVersions.java
similarity index 96%
rename from testcontainers-gitea/src/main/java/io/github/sparsick/testcontainers/gitserver/gitea/GiteaVersions.java
rename to testcontainers-gitea/src/main/java/dev/parsick/testcontainers/gitserver/gitea/GiteaVersions.java
index ddac0feb..6d193476 100644
--- a/testcontainers-gitea/src/main/java/io/github/sparsick/testcontainers/gitserver/gitea/GiteaVersions.java
+++ b/testcontainers-gitea/src/main/java/dev/parsick/testcontainers/gitserver/gitea/GiteaVersions.java
@@ -1,4 +1,4 @@
-package io.github.sparsick.testcontainers.gitserver.gitea;
+package dev.parsick.testcontainers.gitserver.gitea;
 
 import org.testcontainers.utility.DockerImageName;
 
diff --git a/testcontainers-forgejo/src/main/java/io/github/sparsick/testcontainers/gitserver/forgejo/SshIdentity.java b/testcontainers-gitea/src/main/java/dev/parsick/testcontainers/gitserver/gitea/SshIdentity.java
similarity index 95%
rename from testcontainers-forgejo/src/main/java/io/github/sparsick/testcontainers/gitserver/forgejo/SshIdentity.java
rename to testcontainers-gitea/src/main/java/dev/parsick/testcontainers/gitserver/gitea/SshIdentity.java
index ba0f2bd0..faec4249 100644
--- a/testcontainers-forgejo/src/main/java/io/github/sparsick/testcontainers/gitserver/forgejo/SshIdentity.java
+++ b/testcontainers-gitea/src/main/java/dev/parsick/testcontainers/gitserver/gitea/SshIdentity.java
@@ -1,4 +1,4 @@
-package io.github.sparsick.testcontainers.gitserver.forgejo;
+package dev.parsick.testcontainers.gitserver.gitea;
 
 import java.nio.charset.StandardCharsets;
 
diff --git a/testcontainers-gitea/src/test/java/io/github/sparsick/testcontainers/gitserver/gitea/GiteaContainerJUnit5IntegrationTest.java b/testcontainers-gitea/src/test/java/dev/parsick/testcontainers/gitserver/gitea/GiteaContainerJUnit5IntegrationTest.java
similarity index 94%
rename from testcontainers-gitea/src/test/java/io/github/sparsick/testcontainers/gitserver/gitea/GiteaContainerJUnit5IntegrationTest.java
rename to testcontainers-gitea/src/test/java/dev/parsick/testcontainers/gitserver/gitea/GiteaContainerJUnit5IntegrationTest.java
index 1483744d..f21a0c6d 100644
--- a/testcontainers-gitea/src/test/java/io/github/sparsick/testcontainers/gitserver/gitea/GiteaContainerJUnit5IntegrationTest.java
+++ b/testcontainers-gitea/src/test/java/dev/parsick/testcontainers/gitserver/gitea/GiteaContainerJUnit5IntegrationTest.java
@@ -1,4 +1,4 @@
-package io.github.sparsick.testcontainers.gitserver.gitea;
+package dev.parsick.testcontainers.gitserver.gitea;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatNoException;
diff --git a/testcontainers-gitea/src/test/java/io/github/sparsick/testcontainers/gitserver/gitea/GiteaContainerTest.java b/testcontainers-gitea/src/test/java/dev/parsick/testcontainers/gitserver/gitea/GiteaContainerTest.java
similarity index 99%
rename from testcontainers-gitea/src/test/java/io/github/sparsick/testcontainers/gitserver/gitea/GiteaContainerTest.java
rename to testcontainers-gitea/src/test/java/dev/parsick/testcontainers/gitserver/gitea/GiteaContainerTest.java
index 26529ac9..cea21e47 100644
--- a/testcontainers-gitea/src/test/java/io/github/sparsick/testcontainers/gitserver/gitea/GiteaContainerTest.java
+++ b/testcontainers-gitea/src/test/java/dev/parsick/testcontainers/gitserver/gitea/GiteaContainerTest.java
@@ -1,4 +1,4 @@
-package io.github.sparsick.testcontainers.gitserver.gitea;
+package dev.parsick.testcontainers.gitserver.gitea;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatNoException;
diff --git a/testcontainers-gitserver/pom.xml b/testcontainers-gitserver/pom.xml
index 68cbe66f..827d7271 100644
--- a/testcontainers-gitserver/pom.xml
+++ b/testcontainers-gitserver/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>io.github.sparsick.testcontainers.gitserver</groupId>
+        <groupId>dev.parsick.testcontainers.gitserver</groupId>
         <artifactId>testcontainers-git-parent</artifactId>
         <version>0.16.0-SNAPSHOT</version>
     </parent>
diff --git a/testcontainers-gitserver/src/main/java/com/github/sparsick/testcontainers/gitserver/GitServerVersions.java b/testcontainers-gitserver/src/main/java/dev/parsick/testcontainers/gitserver/GitServerVersions.java
similarity index 96%
rename from testcontainers-gitserver/src/main/java/com/github/sparsick/testcontainers/gitserver/GitServerVersions.java
rename to testcontainers-gitserver/src/main/java/dev/parsick/testcontainers/gitserver/GitServerVersions.java
index 3e608584..8618f6a9 100644
--- a/testcontainers-gitserver/src/main/java/com/github/sparsick/testcontainers/gitserver/GitServerVersions.java
+++ b/testcontainers-gitserver/src/main/java/dev/parsick/testcontainers/gitserver/GitServerVersions.java
@@ -1,4 +1,4 @@
-package com.github.sparsick.testcontainers.gitserver;
+package dev.parsick.testcontainers.gitserver;
 
 import org.testcontainers.utility.DockerImageName;
 
diff --git a/testcontainers-gitserver/src/main/java/com/github/sparsick/testcontainers/gitserver/http/BasicAuthenticationCredentials.java b/testcontainers-gitserver/src/main/java/dev/parsick/testcontainers/gitserver/http/BasicAuthenticationCredentials.java
similarity index 91%
rename from testcontainers-gitserver/src/main/java/com/github/sparsick/testcontainers/gitserver/http/BasicAuthenticationCredentials.java
rename to testcontainers-gitserver/src/main/java/dev/parsick/testcontainers/gitserver/http/BasicAuthenticationCredentials.java
index de9583d0..64be9582 100644
--- a/testcontainers-gitserver/src/main/java/com/github/sparsick/testcontainers/gitserver/http/BasicAuthenticationCredentials.java
+++ b/testcontainers-gitserver/src/main/java/dev/parsick/testcontainers/gitserver/http/BasicAuthenticationCredentials.java
@@ -1,4 +1,4 @@
-package com.github.sparsick.testcontainers.gitserver.http;
+package dev.parsick.testcontainers.gitserver.http;
 
 /** Credentials for basic authentication */
 public class BasicAuthenticationCredentials {
diff --git a/testcontainers-gitserver/src/main/java/com/github/sparsick/testcontainers/gitserver/http/GitHttpServerContainer.java b/testcontainers-gitserver/src/main/java/dev/parsick/testcontainers/gitserver/http/GitHttpServerContainer.java
similarity index 99%
rename from testcontainers-gitserver/src/main/java/com/github/sparsick/testcontainers/gitserver/http/GitHttpServerContainer.java
rename to testcontainers-gitserver/src/main/java/dev/parsick/testcontainers/gitserver/http/GitHttpServerContainer.java
index 994b6914..72797149 100644
--- a/testcontainers-gitserver/src/main/java/com/github/sparsick/testcontainers/gitserver/http/GitHttpServerContainer.java
+++ b/testcontainers-gitserver/src/main/java/dev/parsick/testcontainers/gitserver/http/GitHttpServerContainer.java
@@ -1,4 +1,4 @@
-package com.github.sparsick.testcontainers.gitserver.http;
+package dev.parsick.testcontainers.gitserver.http;
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import java.io.IOException;
diff --git a/testcontainers-gitserver/src/main/java/com/github/sparsick/testcontainers/gitserver/http/HttpProxySetting.java b/testcontainers-gitserver/src/main/java/dev/parsick/testcontainers/gitserver/http/HttpProxySetting.java
similarity index 88%
rename from testcontainers-gitserver/src/main/java/com/github/sparsick/testcontainers/gitserver/http/HttpProxySetting.java
rename to testcontainers-gitserver/src/main/java/dev/parsick/testcontainers/gitserver/http/HttpProxySetting.java
index 34c35d75..28356e2c 100644
--- a/testcontainers-gitserver/src/main/java/com/github/sparsick/testcontainers/gitserver/http/HttpProxySetting.java
+++ b/testcontainers-gitserver/src/main/java/dev/parsick/testcontainers/gitserver/http/HttpProxySetting.java
@@ -1,4 +1,4 @@
-package com.github.sparsick.testcontainers.gitserver.http;
+package dev.parsick.testcontainers.gitserver.http;
 
 public class HttpProxySetting {
 
diff --git a/testcontainers-gitserver/src/main/java/com/github/sparsick/testcontainers/gitserver/plain/GitServerContainer.java b/testcontainers-gitserver/src/main/java/dev/parsick/testcontainers/gitserver/plain/GitServerContainer.java
similarity index 99%
rename from testcontainers-gitserver/src/main/java/com/github/sparsick/testcontainers/gitserver/plain/GitServerContainer.java
rename to testcontainers-gitserver/src/main/java/dev/parsick/testcontainers/gitserver/plain/GitServerContainer.java
index b3ca0e60..0dfb9278 100644
--- a/testcontainers-gitserver/src/main/java/com/github/sparsick/testcontainers/gitserver/plain/GitServerContainer.java
+++ b/testcontainers-gitserver/src/main/java/dev/parsick/testcontainers/gitserver/plain/GitServerContainer.java
@@ -1,4 +1,4 @@
-package com.github.sparsick.testcontainers.gitserver.plain;
+package dev.parsick.testcontainers.gitserver.plain;
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import java.io.IOException;
diff --git a/testcontainers-gitserver/src/main/java/com/github/sparsick/testcontainers/gitserver/plain/SshHostKey.java b/testcontainers-gitserver/src/main/java/dev/parsick/testcontainers/gitserver/plain/SshHostKey.java
similarity index 90%
rename from testcontainers-gitserver/src/main/java/com/github/sparsick/testcontainers/gitserver/plain/SshHostKey.java
rename to testcontainers-gitserver/src/main/java/dev/parsick/testcontainers/gitserver/plain/SshHostKey.java
index 7a3fc1ad..cfd82437 100644
--- a/testcontainers-gitserver/src/main/java/com/github/sparsick/testcontainers/gitserver/plain/SshHostKey.java
+++ b/testcontainers-gitserver/src/main/java/dev/parsick/testcontainers/gitserver/plain/SshHostKey.java
@@ -1,4 +1,4 @@
-package com.github.sparsick.testcontainers.gitserver.plain;
+package dev.parsick.testcontainers.gitserver.plain;
 
 /** Value object for SSH Host key information. */
 public class SshHostKey {
diff --git a/testcontainers-gitserver/src/main/java/com/github/sparsick/testcontainers/gitserver/plain/SshIdentity.java b/testcontainers-gitserver/src/main/java/dev/parsick/testcontainers/gitserver/plain/SshIdentity.java
similarity index 94%
rename from testcontainers-gitserver/src/main/java/com/github/sparsick/testcontainers/gitserver/plain/SshIdentity.java
rename to testcontainers-gitserver/src/main/java/dev/parsick/testcontainers/gitserver/plain/SshIdentity.java
index 2daf729f..ce341879 100644
--- a/testcontainers-gitserver/src/main/java/com/github/sparsick/testcontainers/gitserver/plain/SshIdentity.java
+++ b/testcontainers-gitserver/src/main/java/dev/parsick/testcontainers/gitserver/plain/SshIdentity.java
@@ -1,4 +1,4 @@
-package com.github.sparsick.testcontainers.gitserver.plain;
+package dev.parsick.testcontainers.gitserver.plain;
 
 /** Value object for identity information for a public key authentication. */
 public class SshIdentity {
diff --git a/testcontainers-gitserver/src/test/java/com/github/sparsick/testcontainers/gitserver/http/GitHttpServerContainerTest.java b/testcontainers-gitserver/src/test/java/dev/parsick/testcontainers/gitserver/http/GitHttpServerContainerTest.java
similarity index 97%
rename from testcontainers-gitserver/src/test/java/com/github/sparsick/testcontainers/gitserver/http/GitHttpServerContainerTest.java
rename to testcontainers-gitserver/src/test/java/dev/parsick/testcontainers/gitserver/http/GitHttpServerContainerTest.java
index 3b30e5a5..a8072985 100644
--- a/testcontainers-gitserver/src/test/java/com/github/sparsick/testcontainers/gitserver/http/GitHttpServerContainerTest.java
+++ b/testcontainers-gitserver/src/test/java/dev/parsick/testcontainers/gitserver/http/GitHttpServerContainerTest.java
@@ -1,9 +1,9 @@
-package com.github.sparsick.testcontainers.gitserver.http;
+package dev.parsick.testcontainers.gitserver.http;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowableOfType;
 
-import com.github.sparsick.testcontainers.gitserver.GitServerVersions;
+import dev.parsick.testcontainers.gitserver.GitServerVersions;
 import java.io.File;
 import java.io.IOException;
 import org.assertj.core.api.ThrowableAssert;
diff --git a/testcontainers-gitserver/src/test/java/com/github/sparsick/testcontainers/gitserver/plain/GitServerContainerJUnit5IntegrationTest.java b/testcontainers-gitserver/src/test/java/dev/parsick/testcontainers/gitserver/plain/GitServerContainerJUnit5IntegrationTest.java
similarity index 97%
rename from testcontainers-gitserver/src/test/java/com/github/sparsick/testcontainers/gitserver/plain/GitServerContainerJUnit5IntegrationTest.java
rename to testcontainers-gitserver/src/test/java/dev/parsick/testcontainers/gitserver/plain/GitServerContainerJUnit5IntegrationTest.java
index 669fc182..20a10061 100644
--- a/testcontainers-gitserver/src/test/java/com/github/sparsick/testcontainers/gitserver/plain/GitServerContainerJUnit5IntegrationTest.java
+++ b/testcontainers-gitserver/src/test/java/dev/parsick/testcontainers/gitserver/plain/GitServerContainerJUnit5IntegrationTest.java
@@ -1,4 +1,4 @@
-package com.github.sparsick.testcontainers.gitserver.plain;
+package dev.parsick.testcontainers.gitserver.plain;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatNoException;
diff --git a/testcontainers-gitserver/src/test/java/com/github/sparsick/testcontainers/gitserver/plain/GitServerContainerTest.java b/testcontainers-gitserver/src/test/java/dev/parsick/testcontainers/gitserver/plain/GitServerContainerTest.java
similarity index 98%
rename from testcontainers-gitserver/src/test/java/com/github/sparsick/testcontainers/gitserver/plain/GitServerContainerTest.java
rename to testcontainers-gitserver/src/test/java/dev/parsick/testcontainers/gitserver/plain/GitServerContainerTest.java
index 728e33d5..008f8bf6 100644
--- a/testcontainers-gitserver/src/test/java/com/github/sparsick/testcontainers/gitserver/plain/GitServerContainerTest.java
+++ b/testcontainers-gitserver/src/test/java/dev/parsick/testcontainers/gitserver/plain/GitServerContainerTest.java
@@ -1,14 +1,14 @@
-package com.github.sparsick.testcontainers.gitserver.plain;
+package dev.parsick.testcontainers.gitserver.plain;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatNoException;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import com.github.sparsick.testcontainers.gitserver.GitServerVersions;
 import com.jcraft.jsch.HostKey;
 import com.jcraft.jsch.JSch;
 import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.Session;
+import dev.parsick.testcontainers.gitserver.GitServerVersions;
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;