diff --git a/build.gradle b/build.gradle
index c42a779..86e312b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,6 @@
 
+group = 'org.xbib.gradle.plugin'
+
 wrapper {
     gradleVersion = "${project.property('gradle.wrapper.version')}"
     distributionType = Wrapper.DistributionType.ALL
diff --git a/gradle-plugin-docker/build.gradle b/gradle-plugin-docker/build.gradle
index ec5a529..114a04e 100644
--- a/gradle-plugin-docker/build.gradle
+++ b/gradle-plugin-docker/build.gradle
@@ -58,7 +58,7 @@ if (project.hasProperty('gradle.publish.key')) {
             version = project.version
             description = rootProject.ext.description
             displayName = 'Gradle Docker Plugin'
-            tags = ['gradle', 'docker']
+            tags = ['docker']
         }
     }
   }
diff --git a/gradle-plugin-git/build.gradle b/gradle-plugin-git/build.gradle
index a707716..3f6deec 100644
--- a/gradle-plugin-git/build.gradle
+++ b/gradle-plugin-git/build.gradle
@@ -49,7 +49,7 @@ if (project.hasProperty('gradle.publish.key')) {
                 version = project.version
                 description = rootProject.ext.description
                 displayName = rootProject.ext.description
-                tags = ['gradle', 'plugin', 'git']
+                tags = ['git']
             }
         }
     }
diff --git a/gradle-plugin-rpm/build.gradle b/gradle-plugin-rpm/build.gradle
index 364c705..517edda 100644
--- a/gradle-plugin-rpm/build.gradle
+++ b/gradle-plugin-rpm/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java-gradle-plugin'
     id 'groovy'
-    id 'com.gradle.plugin-publish' version '0.17.0'
+    id 'com.gradle.plugin-publish' version '1.0.0-rc-2'
 }
 
 apply plugin: 'groovy'
@@ -29,26 +29,20 @@ validatePlugins {
   failOnWarning = false
 }
 
-gradlePlugin {
-    plugins {
-        rpmPlugin {
-            id = 'org.xbib.gradle.plugin.rpm'
-            implementationClass = 'org.xbib.gradle.plugin.RpmPlugin'
-        }
-    }
-}
-
 if (project.hasProperty('gradle.publish.key')) {
     pluginBundle {
-        website = 'https://github.com/jprante/rpm'
-        vcsUrl = 'https://github.com/jprante/rpm'
+        website = 'https://github.com/jprante/gradle-plugins/gradle-plugin-rpm'
+        vcsUrl = 'https://github.com/jprante/gradle-plugins/'
+        tags = ['rpm']
+    }
+    gradlePlugin {
         plugins {
             rpmPlugin {
                 id = 'org.xbib.gradle.plugin.rpm'
                 version = project.version
                 description = rootProject.ext.description
                 displayName = rootProject.ext.description
-                tags = ['gradle', 'plugin', 'rpm']
+                implementationClass = 'org.xbib.gradle.plugin.RpmPlugin'
             }
         }
     }
diff --git a/gradle-plugin-rpm/gradle.properties b/gradle-plugin-rpm/gradle.properties
index 6e920ca..f8f5a58 100644
--- a/gradle-plugin-rpm/gradle.properties
+++ b/gradle-plugin-rpm/gradle.properties
@@ -1 +1 @@
-version = 3.1.0
+version = 2.4.0
diff --git a/gradle.properties b/gradle.properties
index 8b110d8..6c567bd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,9 +1,9 @@
-group = 'org.xbib.gradle.plugin'
 name = 'gradle-plugins'
 version = 0.0.2
 
-groovy.version = 3.0.9
+org.gradle.warning.mode = all
 gradle.wrapper.version = 7.3.2
+groovy.version = 3.0.9
 groovy-git.version = 2.0.1
 rpm.version = 2.2.0
 spock.version = 2.0-groovy-3.0