diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0ce7677..bda6721 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -64,5 +64,5 @@ jobs:
         env:
           GRADLE_PUBLISH_KEY: ${{ secrets.GRADLE_PORTAL_PUBLISH_KEY }}
           GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PORTAL_PUBLISH_SECRET }}
-        run: cd structs4java-gradle-plugin && ./gradlew publishPlugins -Dgradle.publish.key=${{ secrets.GRADLE_PORTAL_PUBLISH_KEY }} -Dgradle.publish.secret=${{ secrets.GRADLE_PORTAL_PUBLISH_SECRET }} -Pversion=${{ github.event.release.tag_name }} -Porg.gradle.configuration-cache=false
+        run: cd structs4java-gradle-plugin && ./gradlew publishPlugins -Dgradle.publish.key=${{ secrets.GRADLE_PORTAL_PUBLISH_KEY }} -Dgradle.publish.secret=${{ secrets.GRADLE_PORTAL_PUBLISH_SECRET }} -Pversion=${{ github.event.release.tag_name }} --no-configuration-cache
 
diff --git a/README.md b/README.md
index 65950dd..fff50dd 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ Add the plugin to your gradle build:
 ```Gradle
 plugins {
   id('java')
-  id('com.github.marc-christian-schulze.structs4java')
+  id('io.github.marc-christian-schulze.structs4java.structs4java-gradle-plugin')
 }
 ```
 
diff --git a/structs4java-gradle-plugin/plugin/build.gradle.kts b/structs4java-gradle-plugin/plugin/build.gradle.kts
index 42b4a0f..cbabda7 100644
--- a/structs4java-gradle-plugin/plugin/build.gradle.kts
+++ b/structs4java-gradle-plugin/plugin/build.gradle.kts
@@ -37,13 +37,14 @@ dependencies {
 gradlePlugin {
     // Define the plugin
     val structs4java by plugins.creating {
-        id = "com.github.marc-christian-schulze.structs4java"
+        group = "io.github.marc-christian-schulze.structs4java"
+        id    = "io.github.marc-christian-schulze.structs4java.structs4java-gradle-plugin"
         implementationClass = "org.structs4java.Structs4javaGradlePlugin"
         website.set("https://github.com/marc-christian-schulze/structs4java")
         vcsUrl.set("https://github.com/marc-christian-schulze/structs4java.git")
         displayName = "Structs4Java Gradle Plugin"
         description = "Structs4Java is a code generator based on C/C++ structures."
-        tags = listOf("Java", "Gradle", "plugin", "structs")
+        tags = listOf("generator", "structs")
     }
 }
 
diff --git a/structs4java-gradle-plugin/plugin/src/functionalTest/java/org/structs4java/Structs4javaGradlePluginFunctionalTest.java b/structs4java-gradle-plugin/plugin/src/functionalTest/java/org/structs4java/Structs4javaGradlePluginFunctionalTest.java
index e85fcf7..97186d4 100644
--- a/structs4java-gradle-plugin/plugin/src/functionalTest/java/org/structs4java/Structs4javaGradlePluginFunctionalTest.java
+++ b/structs4java-gradle-plugin/plugin/src/functionalTest/java/org/structs4java/Structs4javaGradlePluginFunctionalTest.java
@@ -55,7 +55,7 @@ private File getInterfaceFile() {
         writeString(getBuildFile(), """
             plugins {
                 id('java')
-                id('com.github.marc-christian-schulze.structs4java')
+                id('io.github.marc-christian-schulze.structs4java.structs4java-gradle-plugin')
             }
             """);
         writeString(getInterfaceFile(), """
diff --git a/structs4java-gradle-plugin/plugin/src/test/java/org/structs4java/Structs4javaGradlePluginTest.java b/structs4java-gradle-plugin/plugin/src/test/java/org/structs4java/Structs4javaGradlePluginTest.java
index 4a5a161..1d26515 100644
--- a/structs4java-gradle-plugin/plugin/src/test/java/org/structs4java/Structs4javaGradlePluginTest.java
+++ b/structs4java-gradle-plugin/plugin/src/test/java/org/structs4java/Structs4javaGradlePluginTest.java
@@ -15,7 +15,7 @@ class Structs4javaGradlePluginTest {
     @Test void pluginRegistersATask() {
         // Create a test project and apply the plugin
         Project project = ProjectBuilder.builder().build();
-        project.getPlugins().apply("com.github.marc-christian-schulze.structs4java");
+        project.getPlugins().apply("io.github.marc-christian-schulze.structs4java.structs4java-gradle-plugin");
 
         // Verify the result
         assertNotNull(project.getTasks().findByName("compileStructs"));