diff --git a/gradle-plugin-asciidoctor/build.gradle b/gradle-plugin-asciidoctor/build.gradle
index 2bb28b3..f729333 100644
--- a/gradle-plugin-asciidoctor/build.gradle
+++ b/gradle-plugin-asciidoctor/build.gradle
@@ -16,32 +16,27 @@ dependencies {
     testImplementation libs.jsoup
 }
 
-gradlePlugin {
-    plugins {
-        asciidoctorPlugin {
-            id = 'org.xbib.gradle.plugin.asciidoctor'
-            implementationClass = 'org.xbib.gradle.plugin.asciidoctor.AsciidoctorPlugin'
+if (project.hasProperty('gradle.publish.key')) {
+    gradlePlugin {
+        plugins {
+            asciidoctorPlugin {
+                id = 'org.xbib.gradle.plugin.asciidoctor'
+                implementationClass = 'org.xbib.gradle.plugin.asciidoctor.AsciidoctorPlugin'
+                version = project.version
+                description = 'Asciidoctor plugin for building documentations'
+                displayName = 'Asciidoctor plugin for building documentations'
+            }
         }
     }
-}
-
-if (project.hasProperty('gradle.publish.key')) {
     pluginBundle {
-        mavenCoordinates {
+/*        mavenCoordinates {
             groupId = "org.xbib.gradle.plugin"
             artifactId = "gradle-plugin-asciidoctor"
             version = project.version
         }
+*/
         website = 'https://github.com/jprante/gradle-plugins'
         vcsUrl = 'https://github.com/jprante/gradle-plugins'
-        plugins {
-            asciidoctorPlugin {
-                id = 'org.xbib.gradle.plugin.asciidoctor'
-                version = project.version
-                description = 'Asciidoctor plugin for building documentations'
-                displayName = 'Asciidoctor plugin for building documentations'
-                tags = ['asciidoctor']
-            }
-        }
+        tags = ['asciidoctor']
     }
 }
diff --git a/gradle-plugin-asciidoctor/gradle.properties b/gradle-plugin-asciidoctor/gradle.properties
index 6449a81..7040edc 100644
--- a/gradle-plugin-asciidoctor/gradle.properties
+++ b/gradle-plugin-asciidoctor/gradle.properties
@@ -1 +1,2 @@
+name = gradle-plugin-asciidoctor
 version = 2.5.2.1
diff --git a/gradle-plugin-docker/build.gradle b/gradle-plugin-docker/build.gradle
index 04bcdc0..91186a1 100644
--- a/gradle-plugin-docker/build.gradle
+++ b/gradle-plugin-docker/build.gradle
@@ -13,32 +13,26 @@ dependencies {
     testImplementation gradleTestKit()
 }
 
-gradlePlugin {
-    plugins {
-        dockerPlugin {
-            id = 'org.xbib.gradle.plugin.docker'
-            implementationClass = 'org.xbib.gradle.plugin.docker.DockerPlugin'
-        }
-    }
-}
-
 if (project.hasProperty('gradle.publish.key')) {
-  pluginBundle {
-    mavenCoordinates {
-      groupId = "org.xbib.gradle.plugin"
-      artifactId = "gradle-plugin-docker"
-      version = project.version
-    }
-    website = 'https://github.com/jprante/gradle-plugins'
-    vcsUrl = 'https://github.com/jprante/gradle-plugins'
-    plugins {
-        dockerPlugin {
-            id = 'org.xbib.gradle.plugin.docker'
-            version = project.version
-            description = 'Docker plugin for build and push by Dockerfile'
-            displayName = 'Docker Plugin for build and push by Dockerfile'
-            tags = ['docker']
+    gradlePlugin {
+        plugins {
+            dockerPlugin {
+                id = 'org.xbib.gradle.plugin.docker'
+                implementationClass = 'org.xbib.gradle.plugin.docker.DockerPlugin'
+                version = project.version
+                description = 'Docker plugin for build and push by Dockerfile'
+                displayName = 'Docker Plugin for build and push by Dockerfile'
+            }
         }
     }
+    pluginBundle {
+      /*mavenCoordinates {
+        groupId = "org.xbib.gradle.plugin"
+        artifactId = "gradle-plugin-docker"
+        version = project.version
+      }*/
+      website = 'https://github.com/jprante/gradle-plugins'
+      vcsUrl = 'https://github.com/jprante/gradle-plugins'
+      tags = ['docker']
   }
 }
diff --git a/gradle-plugin-docker/gradle.properties b/gradle-plugin-docker/gradle.properties
index f8f5a58..e028cef 100644
--- a/gradle-plugin-docker/gradle.properties
+++ b/gradle-plugin-docker/gradle.properties
@@ -1 +1,2 @@
+name = gradle-plugin-docker
 version = 2.4.0
diff --git a/gradle-plugin-git/build.gradle b/gradle-plugin-git/build.gradle
index 5126cdf..af5f562 100644
--- a/gradle-plugin-git/build.gradle
+++ b/gradle-plugin-git/build.gradle
@@ -16,32 +16,26 @@ dependencies {
     testImplementation libs.junit4
 }
 
-gradlePlugin {
-    plugins {
-        gitPlugin {
-            id = 'org.xbib.gradle.plugin.git'
-            implementationClass = 'org.xbib.gradle.plugin.git.GitPlugin'
-        }
-    }
-}
-
 if (project.hasProperty('gradle.publish.key')) {
-    pluginBundle {
-        mavenCoordinates {
-            groupId = "org.xbib.gradle.plugin"
-            artifactId = "gradle-plugin-git"
-            version = project.version
-        }
-        website = 'https://github.com/jprante/gradle-plugins'
-        vcsUrl = 'https://github.com/jprante/gradle-plugins'
+    gradlePlugin {
         plugins {
             gitPlugin {
                 id = 'org.xbib.gradle.plugin.git'
+                implementationClass = 'org.xbib.gradle.plugin.git.GitPlugin'
                 version = project.version
                 description = 'Git client plugin based on JGit'
                 displayName = 'Git client plugin based on JGit'
-                tags = ['git']
             }
         }
     }
+    pluginBundle {
+        /*mavenCoordinates {
+            groupId = "org.xbib.gradle.plugin"
+            artifactId = "gradle-plugin-git"
+            version = project.version
+        }*/
+        website = 'https://github.com/jprante/gradle-plugins'
+        vcsUrl = 'https://github.com/jprante/gradle-plugins'
+        tags = ['git']
+    }
 }
diff --git a/gradle-plugin-git/gradle.properties b/gradle-plugin-git/gradle.properties
index d9455e2..da31f79 100644
--- a/gradle-plugin-git/gradle.properties
+++ b/gradle-plugin-git/gradle.properties
@@ -1 +1,2 @@
-version = 2.2.0
\ No newline at end of file
+name = gradle-plugin-docker
+version = 2.2.0
diff --git a/gradle-plugin-jacc/build.gradle b/gradle-plugin-jacc/build.gradle
index abfd039..5d04fcb 100755
--- a/gradle-plugin-jacc/build.gradle
+++ b/gradle-plugin-jacc/build.gradle
@@ -15,27 +15,21 @@ dependencies {
     testImplementation gradleTestKit()
 }
 
-gradlePlugin {
-    plugins {
-        jaccPlugin {
-            id = 'org.xbib.gradle.plugin.jacc'
-            implementationClass = 'org.xbib.gradle.plugin.jacc.JaccPlugin'
-        }
-    }
-}
-
 if (project.hasProperty('gradle.publish.key')) {
-    pluginBundle {
-        website = scmUrl
-        vcsUrl = scmUrl
+    gradlePlugin {
         plugins {
             jaccPlugin {
                 id = 'org.xbib.gradle.plugin.jacc'
+                implementationClass = 'org.xbib.gradle.plugin.jacc.JaccPlugin'
                 version = project.version
                 description = 'Gradle Jacc plugin'
                 displayName = 'Gradle Jacc plugin'
-                tags = ['jacc']
             }
         }
     }
+    pluginBundle {
+        website = scmUrl
+        vcsUrl = scmUrl
+        tags = ['jacc']
+    }
 }
diff --git a/gradle-plugin-jacc/gradle.properties b/gradle-plugin-jacc/gradle.properties
index 749ca75..7caf3ce 100644
--- a/gradle-plugin-jacc/gradle.properties
+++ b/gradle-plugin-jacc/gradle.properties
@@ -1 +1,2 @@
+name = gradle-plugin-jacc
 version = 1.4.0
diff --git a/gradle-plugin-jflex/build.gradle b/gradle-plugin-jflex/build.gradle
index 7863040..8c3b982 100755
--- a/gradle-plugin-jflex/build.gradle
+++ b/gradle-plugin-jflex/build.gradle
@@ -15,27 +15,21 @@ dependencies {
     testImplementation gradleTestKit()
 }
 
-gradlePlugin {
-    plugins {
-        jflexPlugin {
-            id = 'org.xbib.gradle.plugin.jflex'
-            implementationClass = 'org.xbib.gradle.plugin.jflex.JFlexPlugin'
-        }
-    }
-}
-
 if (project.hasProperty('gradle.publish.key')) {
-    pluginBundle {
-        website = scmUrl
-        vcsUrl = scmUrl
+    gradlePlugin {
         plugins {
             jflexPlugin {
                 id = 'org.xbib.gradle.plugin.jflex'
+                implementationClass = 'org.xbib.gradle.plugin.jflex.JFlexPlugin'
                 version = project.version
                 description = 'Gradle JFlex plugin'
                 displayName = 'Gradle JFlex plugin'
-                tags = ['jflex']
             }
         }
     }
+    pluginBundle {
+        website = scmUrl
+        vcsUrl = scmUrl
+        tags = ['jflex']
+    }
 }
diff --git a/gradle-plugin-jflex/gradle.properties b/gradle-plugin-jflex/gradle.properties
index f16669e..000fd3d 100644
--- a/gradle-plugin-jflex/gradle.properties
+++ b/gradle-plugin-jflex/gradle.properties
@@ -1 +1,2 @@
+name = gradle-plugin-jflex
 version = 1.6.0
diff --git a/gradle-plugin-rpm/build.gradle b/gradle-plugin-rpm/build.gradle
index 9460103..badb991 100644
--- a/gradle-plugin-rpm/build.gradle
+++ b/gradle-plugin-rpm/build.gradle
@@ -14,32 +14,36 @@ dependencies {
     testImplementation gradleTestKit()
 }
 
-gradlePlugin {
-    plugins {
-        rpmPlugin {
-            id = 'org.xbib.gradle.plugin.rpm'
-            implementationClass = 'org.xbib.gradle.plugin.RpmPlugin'
+publishing {
+    repositories {
+        maven {
+            name = 'localRepository'
+            url = 'build/local-repository'
         }
     }
 }
 
 if (project.hasProperty('gradle.publish.key')) {
-    pluginBundle {
-        mavenCoordinates {
-            groupId = "org.xbib.gradle.plugin"
-            artifactId = "gradle-plugin-rpm"
-            version = project.version
-        }
-        website = 'https://github.com/jprante/gradle-plugins'
-        vcsUrl = 'https://github.com/jprante/gradle-plugins'
+    gradlePlugin {
         plugins {
             rpmPlugin {
                 id = 'org.xbib.gradle.plugin.rpm'
+                group = project.group
                 version = project.version
                 description = 'Java implementation for RPM packaging'
                 displayName = 'Java implementation for RPM packaging'
-                tags = [ 'rpm' ]
+                implementationClass = 'org.xbib.gradle.plugin.RpmPlugin'
             }
         }
     }
+    pluginBundle {
+        /*mavenCoordinates {
+            groupId = "org.xbib.gradle.plugin"
+            artifactId = "gradle-plugin-rpm"
+            version = project.version
+        }*/
+        website = 'https://github.com/jprante/gradle-plugins'
+        vcsUrl = 'https://github.com/jprante/gradle-plugins'
+        tags = [ 'rpm' ]
+    }
 }
diff --git a/gradle-plugin-rpm/gradle.properties b/gradle-plugin-rpm/gradle.properties
index b4a7849..44717b8 100644
--- a/gradle-plugin-rpm/gradle.properties
+++ b/gradle-plugin-rpm/gradle.properties
@@ -1 +1,2 @@
-version = 2.3.0
+name = gradle-plugin-rpm
+version = 2.4.0
diff --git a/gradle-plugin-shadow/build.gradle b/gradle-plugin-shadow/build.gradle
index 247989e..e0f82b4 100644
--- a/gradle-plugin-shadow/build.gradle
+++ b/gradle-plugin-shadow/build.gradle
@@ -19,27 +19,22 @@ dependencies {
     testImplementation libs.spock.junit4
 }
 
-gradlePlugin {
-    plugins {
-        shadowPlugin {
-            id = 'org.xbib.gradle.plugin.shadow'
-            implementationClass = 'org.xbib.gradle.plugin.shadow.ShadowPlugin'
-        }
-    }
-}
-
 if (project.hasProperty('gradle.publish.key')) {
-    pluginBundle {
-        website = scmUrl
-        vcsUrl = scmUrl
+    gradlePlugin {
         plugins {
             shadowPlugin {
                 id = 'org.xbib.gradle.plugin.shadow'
+                implementationClass = 'org.xbib.gradle.plugin.shadow.ShadowPlugin'
+                group = project.group
                 version = project.version
                 description = 'Shadow plugin for Gradle'
                 displayName = 'Shadow plugin for Gradle'
-                tags = [ 'shadow' ]
             }
         }
     }
+    pluginBundle {
+        website = scmUrl
+        vcsUrl = scmUrl
+        tags = [ 'shadow' ]
+    }
 }
diff --git a/gradle-plugin-shadow/gradle.properties b/gradle-plugin-shadow/gradle.properties
index f185967..f9b031a 100644
--- a/gradle-plugin-shadow/gradle.properties
+++ b/gradle-plugin-shadow/gradle.properties
@@ -1 +1,2 @@
+name = gradle-plugin-shadow
 version = 2.0.0
diff --git a/gradle.properties b/gradle.properties
index 41694b0..c544582 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
-group = 'org.xbib.gradle.plugin'
-name = 'gradle-plugins'
+group = org.xbib.gradle.plugin
+name = gradle-plugins
 version = 0.0.2
 
 org.gradle.warning.mode = ALL
diff --git a/settings.gradle b/settings.gradle
index 096e3e4..5b5aef0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -25,7 +25,7 @@ dependencyResolutionManagement {
             library('jacc', 'org.xbib:jacc:2.2.0')
             library('groovy-git', 'org.xbib.groovy', 'groovy-git').version('2.1.0')
             library('rpm', 'org.xbib', 'rpm-core').version('2.2.0')
-            plugin('publish', 'com.gradle.plugin-publish').version('0.18.0')
+            plugin('publish', 'com.gradle.plugin-publish').version('1.0.0-rc-2')
         }
     }
 }