diff --git a/versioningHelper.gradle b/versioningHelper.gradle
index 3e5ee33f0..b2e5e0199 100644
--- a/versioningHelper.gradle
+++ b/versioningHelper.gradle
@@ -8,7 +8,7 @@ gradle.allprojects {
         def stdout = new ByteArrayOutputStream()
         String tagIsh
         try {
-            Project.getProviders().exec {
+            project.exec {
                 commandLine 'git', 'describe', '--tags', "--match=v*"
                 standardOutput = stdout
             }
@@ -19,7 +19,7 @@ gradle.allprojects {
 
         // Dev tags: v2021.1.6-3-gf922466d
         // We're specifically looking to capture the middle -3-
-        boolean isDev = tagIsh.matches(".*-[0-9]*-g[0-9a-f]*")
+        boolean isDev = tagIsh.matches(".*-[0-9a-z]*-g[0-9a-f]*")
         if (isDev && !tagIsh.startsWith("dev-")) tagIsh = "dev-" + tagIsh
         println("Picked up version: " + tagIsh)
         return tagIsh