diff --git a/build.gradle b/build.gradle
index daeba3ce2..2502839be 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,6 +26,6 @@ allprojects {
         mavenCentral()
         jcenter()
     }
-    group = 'netflix'
+    group = 'com.netflix.graphql.dgs.codegen'
 }
 description = 'Netflix GraphQL DGS Code Generation'
diff --git a/graphql-dgs-codegen-gradle/build.gradle b/graphql-dgs-codegen-gradle/build.gradle
index 2caeef26c..49dc29c36 100644
--- a/graphql-dgs-codegen-gradle/build.gradle
+++ b/graphql-dgs-codegen-gradle/build.gradle
@@ -59,18 +59,9 @@ pluginBundle {
     vcsUrl = 'https://github.com/Netflix/dgs-codegen.git'
     description = 'Gradle plugin for generating Java and Kotlin types from GraphlQL Schema'
     website = 'https://github.com/Netflix/dgs-codegen'
-
-    plugins {
-        codegen_public {
-            id = 'netflix.codegen-gradle-plugin'
-            displayName = 'DGS Code Generation Plugin '
-            description = 'Gradle plugin for generating Java and Kotlin types from GraphlQL Schema'
-            tags = ['Codegen']
-        }
-    }
 }
 
-group = 'netflix'
+group = 'com.netflix.graphql.dgs.codegen'
 gradlePlugin {
     // Define the plugin
     plugins {
@@ -78,10 +69,6 @@ gradlePlugin {
             id = 'codegen-gradle-plugin'
             implementationClass = 'com.netflix.graphql.dgs.codegen.gradle.CodegenPlugin'
         }
-        codegen_public {
-            id = 'netflix.codegen-gradle-plugin'
-            implementationClass = 'com.netflix.graphql.dgs.codegen.gradle.CodegenPlugin'
-        }
     }
 }