diff --git a/.project b/.project
deleted file mode 100644
index e96d2da..0000000
--- a/.project
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>VM-Operator</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>ch.acanda.eclipse.pmd.builder.PMDBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
-		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
-		<nature>ch.acanda.eclipse.pmd.builder.PMDNature</nature>
-	</natures>
-	<filteredResources>
-		<filter>
-			<id>1</id>
-			<name></name>
-			<type>30</type>
-			<matcher>
-				<id>org.eclipse.core.resources.regexFilterMatcher</id>
-				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
-</projectDescription>
diff --git a/build.gradle b/build.gradle
index c9e91ba..4fd0f66 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,8 +5,8 @@ buildscript {
 }
 
 plugins {
-    id 'org.ajoberstar.grgit' version '5.2.0'
-    id 'org.ajoberstar.git-publish' version '4.2.0'
+    id 'org.ajoberstar.grgit' version '5.2.0' apply false
+    id 'org.ajoberstar.git-publish' version '4.2.0' apply false
     id 'pl.allegro.tech.build.axion-release' version '1.15.0' apply false
     id 'org.jdrupes.vmoperator.java-doc-conventions'
     id 'eclipse'
diff --git a/buildSrc/src/org.jdrupes.vmoperator.java-common-conventions.gradle b/buildSrc/src/org.jdrupes.vmoperator.java-common-conventions.gradle
index 852423b..fa85d06 100644
--- a/buildSrc/src/org.jdrupes.vmoperator.java-common-conventions.gradle
+++ b/buildSrc/src/org.jdrupes.vmoperator.java-common-conventions.gradle
@@ -8,14 +8,14 @@ plugins {
     // Apply the java Plugin to add support for Java.
     id 'java'
     
-    // Git based versioning
-    id 'pl.allegro.tech.build.axion-release'
-    
     // Apply eclipse plugin
     id 'eclipse'
     
     // Access to git information
     id 'org.ajoberstar.grgit'
+    
+    // Apply the common versioning conventions.
+    id 'org.jdrupes.vmoperator.versioning-conventions'
 }
 
 repositories {
diff --git a/buildSrc/src/org.jdrupes.vmoperator.java-doc-conventions.gradle b/buildSrc/src/org.jdrupes.vmoperator.java-doc-conventions.gradle
index be163a9..95d7eff 100644
--- a/buildSrc/src/org.jdrupes.vmoperator.java-doc-conventions.gradle
+++ b/buildSrc/src/org.jdrupes.vmoperator.java-doc-conventions.gradle
@@ -1,10 +1,15 @@
 plugins {
-    // Apply the common convention plugin for shared build configuration between library and application projects.
-    id 'org.jdrupes.vmoperator.java-common-conventions'
-
+    // Apply the common versioning conventions.
+    id 'org.jdrupes.vmoperator.versioning-conventions'
+    
     id 'org.ajoberstar.git-publish'
 }
 
+repositories {
+    // Use Maven Central for resolving dependencies.
+    mavenCentral()
+}
+
 var docDestinationDir = file("${rootProject.buildDir}/javadoc")
 
 configurations {
diff --git a/buildSrc/src/org.jdrupes.vmoperator.versioning-conventions.gradle b/buildSrc/src/org.jdrupes.vmoperator.versioning-conventions.gradle
new file mode 100644
index 0000000..21006a3
--- /dev/null
+++ b/buildSrc/src/org.jdrupes.vmoperator.versioning-conventions.gradle
@@ -0,0 +1,28 @@
+/*
+ * This file was generated by the Gradle 'init' task.
+ *
+ * This project uses @Incubating APIs which are subject to change.
+ */
+
+plugins {
+    // Required by axion-release
+    id 'org.ajoberstar.grgit'
+    // Git based versioning
+    id 'pl.allegro.tech.build.axion-release'
+}
+
+scmVersion {
+    versionIncrementer 'incrementMinor'
+    tag {
+        def shortened = project.name.startsWith(project.group + ".") ?
+            project.name.substring(project.group.length() + 1) : project.name
+        var p = shortened.replace('.', '-') + "-"
+        if (grgit.branch.current.name != "main"
+            && !grgit.branch.current.name.startsWith("release")) {
+            p = p + grgit.branch.current.name.replace('/', '-') + "-"
+        }
+        prefix = p
+    }
+}
+version = scmVersion.version
+ext.isSnapshot = version.endsWith('-SNAPSHOT')
diff --git a/org.jdrupes.vmoperator.util/.settings/org.eclipse.jdt.core.prefs b/org.jdrupes.vmoperator.util/.settings/org.eclipse.jdt.core.prefs
index 672f85e..e65abaa 100644
--- a/org.jdrupes.vmoperator.util/.settings/org.eclipse.jdt.core.prefs
+++ b/org.jdrupes.vmoperator.util/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
 #
-#Thu Sep 14 22:05:28 CEST 2023
+#Fri Sep 22 15:21:52 CEST 2023
 org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert