diff --git a/clients/java-client-lib/client-command-builders/pom.xml b/clients/java-client-lib/client-command-builders/pom.xml
index 7b39e7ff2..bc20aaeb2 100644
--- a/clients/java-client-lib/client-command-builders/pom.xml
+++ b/clients/java-client-lib/client-command-builders/pom.xml
@@ -24,9 +24,9 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>net.zscript.maven</groupId>
+                <groupId>net.zscript.maven-templates</groupId>
                 <artifactId>mustache-templating-maven-plugin</artifactId>
-                <version>${project.version}</version>
+                <version>0.0.1-SNAPSHOT</version>
 
                 <dependencies>
                     <dependency>
diff --git a/model/model-templating-adapter/pom.xml b/model/model-templating-adapter/pom.xml
index 717c4a048..652c421b4 100644
--- a/model/model-templating-adapter/pom.xml
+++ b/model/model-templating-adapter/pom.xml
@@ -18,9 +18,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>net.zscript.maven</groupId>
+            <groupId>net.zscript.maven-templates</groupId>
             <artifactId>mustache-templating-maven-plugin-adapter</artifactId>
-            <version>${project.version}</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>net.zscript</groupId>
diff --git a/receivers/jvm/java-model-components/pom.xml b/receivers/jvm/java-model-components/pom.xml
index 98c8ff204..084538876 100644
--- a/receivers/jvm/java-model-components/pom.xml
+++ b/receivers/jvm/java-model-components/pom.xml
@@ -18,9 +18,9 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>net.zscript.maven</groupId>
+                <groupId>net.zscript.maven-templates</groupId>
                 <artifactId>mustache-templating-maven-plugin</artifactId>
-                <version>${project.version}</version>
+                <version>0.0.1-SNAPSHOT</version>
 
                 <dependencies>
                     <dependency>
diff --git a/receivers/native/cpp-model-components/pom.xml b/receivers/native/cpp-model-components/pom.xml
index 2b22a6b02..979d89568 100644
--- a/receivers/native/cpp-model-components/pom.xml
+++ b/receivers/native/cpp-model-components/pom.xml
@@ -21,7 +21,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>net.zscript.maven</groupId>
+                <groupId>net.zscript.maven-templates</groupId>
                 <artifactId>mustache-templating-maven-plugin</artifactId>
                 <version>0.0.1-SNAPSHOT</version>
 
diff --git a/util/mustache-templating/mustache-templating-maven-plugin-adapter/pom.xml b/util/mustache-templating/mustache-templating-maven-plugin-adapter/pom.xml
index 3fac805f1..d8fad6e42 100644
--- a/util/mustache-templating/mustache-templating-maven-plugin-adapter/pom.xml
+++ b/util/mustache-templating/mustache-templating-maven-plugin-adapter/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>net.zscript.maven</groupId>
+        <groupId>net.zscript.maven-templates</groupId>
         <artifactId>mustache-templating</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
diff --git a/util/mustache-templating/mustache-templating-maven-plugin/pom.xml b/util/mustache-templating/mustache-templating-maven-plugin/pom.xml
index 11774e734..bfabdcc2a 100644
--- a/util/mustache-templating/mustache-templating-maven-plugin/pom.xml
+++ b/util/mustache-templating/mustache-templating-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>net.zscript.maven</groupId>
+        <groupId>net.zscript.maven-templates</groupId>
         <artifactId>mustache-templating</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
@@ -15,7 +15,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>net.zscript.maven</groupId>
+            <groupId>net.zscript.maven-templates</groupId>
             <artifactId>mustache-templating-maven-plugin-adapter</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -60,7 +60,7 @@
         </dependency>
     </dependencies>
 
-    <!-- Useful: run mvn help:describe -Dplugin=net.zscript.maven:mustache-templating-maven-plugin  -Ddetail -->
+    <!-- Useful: run mvn help:describe -Dplugin=net.zscript.maven-templates:mustache-templating-maven-plugin  -Ddetail -->
     <build>
         <plugins>
             <plugin>
diff --git a/util/mustache-templating/mustache-templating-test-resources/pom.xml b/util/mustache-templating/mustache-templating-test-resources/pom.xml
index 624b2b341..84895059f 100644
--- a/util/mustache-templating/mustache-templating-test-resources/pom.xml
+++ b/util/mustache-templating/mustache-templating-test-resources/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>net.zscript.maven</groupId>
+        <groupId>net.zscript.maven-templates</groupId>
         <artifactId>mustache-templating</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
diff --git a/util/mustache-templating/mustache-templating-tests/pom.xml b/util/mustache-templating/mustache-templating-tests/pom.xml
index 60b6e82d9..b14af15e5 100644
--- a/util/mustache-templating/mustache-templating-tests/pom.xml
+++ b/util/mustache-templating/mustache-templating-tests/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>net.zscript.maven</groupId>
+        <groupId>net.zscript.maven-templates</groupId>
         <artifactId>mustache-templating</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
@@ -35,7 +35,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>net.zscript.maven</groupId>
+            <groupId>net.zscript.maven-templates</groupId>
             <artifactId>mustache-templating-maven-plugin-test-resources</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
@@ -45,12 +45,12 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>net.zscript.maven</groupId>
+                <groupId>net.zscript.maven-templates</groupId>
                 <artifactId>mustache-templating-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <dependencies>
                     <dependency>
-                        <groupId>net.zscript.maven</groupId>
+                        <groupId>net.zscript.maven-templates</groupId>
                         <artifactId>mustache-templating-maven-plugin-test-resources</artifactId>
                         <version>${project.version}</version>
                     </dependency>
diff --git a/util/mustache-templating/pom.xml b/util/mustache-templating/pom.xml
index be0028e89..fe59a290b 100644
--- a/util/mustache-templating/pom.xml
+++ b/util/mustache-templating/pom.xml
@@ -9,7 +9,7 @@
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
-    <groupId>net.zscript.maven</groupId>
+    <groupId>net.zscript.maven-templates</groupId>
     <artifactId>mustache-templating</artifactId>
     <packaging>pom</packaging>
     <name>Mustache Templating Plugin Package</name>