diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index 2dc24e47e..1120963d1 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -84,6 +84,8 @@
         <!-- io.fabric8:docker-maven-plugin -->
         <version.fabric8.docker.maven.plugin>0.45-tb-0.1.0</version.fabric8.docker.maven.plugin>
         <docker.platforms>linux/amd64,linux/arm64</docker.platforms>
+        <!-- Used for switching between forked and original helm repo-->
+        <group.fabric8.plugin>org.technologybrewery.fabric8</group.fabric8.plugin>
 
         <!-- ***************** -->
         <!-- Repository Deployment URLs - mostly in aissemble-root -->
@@ -558,7 +560,7 @@
                         This can be removed once https://github.com/fabric8io/docker-maven-plugin/issues/1804
                         is incorporated into the io.fabric8 plugin directly.
                       -->
-                    <groupId>org.technologybrewery.fabric8</groupId>
+                    <groupId>${group.fabric8.plugin}</groupId>
                     <artifactId>docker-maven-plugin</artifactId>
                     <version>${version.fabric8.docker.maven.plugin}</version>
                     <extensions>true</extensions>
@@ -1025,7 +1027,7 @@ To suppress enforce-helm-version rule, you must add following plugin to the root
                             </configuration>
                         </plugin>
                         <plugin>
-                            <groupId>org.technologybrewery.fabric8</groupId>
+                            <groupId>${group.fabric8.plugin}</groupId>
                             <artifactId>docker-maven-plugin</artifactId>
                             <version>${version.fabric8.docker.maven.plugin}</version>
                             <executions>
diff --git a/extensions/extensions-docker/aissemble-configuration-store/pom.xml b/extensions/extensions-docker/aissemble-configuration-store/pom.xml
index 6b3a42330..61ce51573 100644
--- a/extensions/extensions-docker/aissemble-configuration-store/pom.xml
+++ b/extensions/extensions-docker/aissemble-configuration-store/pom.xml
@@ -40,7 +40,7 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.technologybrewery.fabric8</groupId>
+                <groupId>${group.fabric8.plugin}</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
             </plugin>
         </plugins>
diff --git a/extensions/extensions-docker/aissemble-data-lineage-http-consumer/pom.xml b/extensions/extensions-docker/aissemble-data-lineage-http-consumer/pom.xml
index 9962e5071..580be060e 100644
--- a/extensions/extensions-docker/aissemble-data-lineage-http-consumer/pom.xml
+++ b/extensions/extensions-docker/aissemble-data-lineage-http-consumer/pom.xml
@@ -51,7 +51,7 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.technologybrewery.fabric8</groupId>
+                <groupId>${group.fabric8.plugin}</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
             </plugin>
         </plugins>
diff --git a/extensions/extensions-docker/aissemble-fastapi/pom.xml b/extensions/extensions-docker/aissemble-fastapi/pom.xml
index 988f8bc25..ac21e25d4 100644
--- a/extensions/extensions-docker/aissemble-fastapi/pom.xml
+++ b/extensions/extensions-docker/aissemble-fastapi/pom.xml
@@ -17,7 +17,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.technologybrewery.fabric8</groupId>
+                <groupId>${group.fabric8.plugin}</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
             </plugin>
         </plugins>
diff --git a/extensions/extensions-docker/aissemble-hive/aissemble-hive-mysql/pom.xml b/extensions/extensions-docker/aissemble-hive/aissemble-hive-mysql/pom.xml
index 14ec466ac..32f6d9a47 100644
--- a/extensions/extensions-docker/aissemble-hive/aissemble-hive-mysql/pom.xml
+++ b/extensions/extensions-docker/aissemble-hive/aissemble-hive-mysql/pom.xml
@@ -17,7 +17,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.technologybrewery.fabric8</groupId>
+                <groupId>${group.fabric8.plugin}</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
             </plugin>
         </plugins>
diff --git a/extensions/extensions-docker/aissemble-hive/aissemble-hive-service/pom.xml b/extensions/extensions-docker/aissemble-hive/aissemble-hive-service/pom.xml
index 0e8bfee36..b20f646af 100644
--- a/extensions/extensions-docker/aissemble-hive/aissemble-hive-service/pom.xml
+++ b/extensions/extensions-docker/aissemble-hive/aissemble-hive-service/pom.xml
@@ -35,7 +35,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.technologybrewery.fabric8</groupId>
+                <groupId>${group.fabric8.plugin}</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
                     <images>
diff --git a/extensions/extensions-docker/aissemble-jenkins/aissemble-jenkins-agent/pom.xml b/extensions/extensions-docker/aissemble-jenkins/aissemble-jenkins-agent/pom.xml
index fa05caa63..cef50e18d 100644
--- a/extensions/extensions-docker/aissemble-jenkins/aissemble-jenkins-agent/pom.xml
+++ b/extensions/extensions-docker/aissemble-jenkins/aissemble-jenkins-agent/pom.xml
@@ -17,7 +17,7 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.technologybrewery.fabric8</groupId>
+				<groupId>${group.fabric8.plugin}</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
 			</plugin>
 		</plugins>
diff --git a/extensions/extensions-docker/aissemble-jenkins/aissemble-jenkins-controller/pom.xml b/extensions/extensions-docker/aissemble-jenkins/aissemble-jenkins-controller/pom.xml
index a65cc8a40..ff9557573 100644
--- a/extensions/extensions-docker/aissemble-jenkins/aissemble-jenkins-controller/pom.xml
+++ b/extensions/extensions-docker/aissemble-jenkins/aissemble-jenkins-controller/pom.xml
@@ -17,7 +17,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.technologybrewery.fabric8</groupId>
+                <groupId>${group.fabric8.plugin}</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
             </plugin>
         </plugins>
diff --git a/extensions/extensions-docker/aissemble-metadata/pom.xml b/extensions/extensions-docker/aissemble-metadata/pom.xml
index 00c2be8e0..3b2fcc3b7 100644
--- a/extensions/extensions-docker/aissemble-metadata/pom.xml
+++ b/extensions/extensions-docker/aissemble-metadata/pom.xml
@@ -41,7 +41,7 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.technologybrewery.fabric8</groupId>
+                <groupId>${group.fabric8.plugin}</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
             </plugin>
         </plugins>
diff --git a/extensions/extensions-docker/aissemble-model-training-api-containers/aissemble-model-training-api-sagemaker/pom.xml b/extensions/extensions-docker/aissemble-model-training-api-containers/aissemble-model-training-api-sagemaker/pom.xml
index 17e4f9f2a..3ce029135 100644
--- a/extensions/extensions-docker/aissemble-model-training-api-containers/aissemble-model-training-api-sagemaker/pom.xml
+++ b/extensions/extensions-docker/aissemble-model-training-api-containers/aissemble-model-training-api-sagemaker/pom.xml
@@ -21,7 +21,7 @@
                 <artifactId>habushu-maven-plugin</artifactId>
             </plugin>
             <plugin>
-                <groupId>org.technologybrewery.fabric8</groupId>
+                <groupId>${group.fabric8.plugin}</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
             </plugin>
         </plugins>
diff --git a/extensions/extensions-docker/aissemble-model-training-api-containers/aissemble-model-training-api/pom.xml b/extensions/extensions-docker/aissemble-model-training-api-containers/aissemble-model-training-api/pom.xml
index a54d848b2..f12aea35e 100644
--- a/extensions/extensions-docker/aissemble-model-training-api-containers/aissemble-model-training-api/pom.xml
+++ b/extensions/extensions-docker/aissemble-model-training-api-containers/aissemble-model-training-api/pom.xml
@@ -21,7 +21,7 @@
                 <artifactId>habushu-maven-plugin</artifactId>
             </plugin>
             <plugin>
-                <groupId>org.technologybrewery.fabric8</groupId>
+                <groupId>${group.fabric8.plugin}</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
             </plugin>
         </plugins>
diff --git a/extensions/extensions-docker/aissemble-nvidia/pom.xml b/extensions/extensions-docker/aissemble-nvidia/pom.xml
index d6cd5e4d5..f1fb96972 100644
--- a/extensions/extensions-docker/aissemble-nvidia/pom.xml
+++ b/extensions/extensions-docker/aissemble-nvidia/pom.xml
@@ -17,7 +17,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.technologybrewery.fabric8</groupId>
+                <groupId>${group.fabric8.plugin}</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
             </plugin>
         </plugins>
diff --git a/extensions/extensions-docker/aissemble-pipeline-invocation/pom.xml b/extensions/extensions-docker/aissemble-pipeline-invocation/pom.xml
index 2b11de78c..7edf7aa7f 100644
--- a/extensions/extensions-docker/aissemble-pipeline-invocation/pom.xml
+++ b/extensions/extensions-docker/aissemble-pipeline-invocation/pom.xml
@@ -48,7 +48,7 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.technologybrewery.fabric8</groupId>
+                <groupId>${group.fabric8.plugin}</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
             </plugin>
         </plugins>
diff --git a/extensions/extensions-docker/aissemble-policy-decision-point/pom.xml b/extensions/extensions-docker/aissemble-policy-decision-point/pom.xml
index fbda6c958..c96245c4a 100644
--- a/extensions/extensions-docker/aissemble-policy-decision-point/pom.xml
+++ b/extensions/extensions-docker/aissemble-policy-decision-point/pom.xml
@@ -40,7 +40,7 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.technologybrewery.fabric8</groupId>
+                <groupId>${group.fabric8.plugin}</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
             </plugin>
         </plugins>
diff --git a/extensions/extensions-docker/aissemble-quarkus/pom.xml b/extensions/extensions-docker/aissemble-quarkus/pom.xml
index 570cb699c..f1e7201a6 100644
--- a/extensions/extensions-docker/aissemble-quarkus/pom.xml
+++ b/extensions/extensions-docker/aissemble-quarkus/pom.xml
@@ -17,7 +17,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.technologybrewery.fabric8</groupId>
+                <groupId>${group.fabric8.plugin}</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
             </plugin>
         </plugins>
diff --git a/extensions/extensions-docker/aissemble-spark-infrastructure/pom.xml b/extensions/extensions-docker/aissemble-spark-infrastructure/pom.xml
index d65ceecba..d12ae5371 100644
--- a/extensions/extensions-docker/aissemble-spark-infrastructure/pom.xml
+++ b/extensions/extensions-docker/aissemble-spark-infrastructure/pom.xml
@@ -56,7 +56,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.technologybrewery.fabric8</groupId>
+                <groupId>${group.fabric8.plugin}</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
                     <images>
@@ -89,7 +89,7 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.technologybrewery.fabric8</groupId>
+                <groupId>${group.fabric8.plugin}</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
                     <images>
diff --git a/extensions/extensions-docker/aissemble-spark-operator/pom.xml b/extensions/extensions-docker/aissemble-spark-operator/pom.xml
index 72544d44e..4e7086887 100644
--- a/extensions/extensions-docker/aissemble-spark-operator/pom.xml
+++ b/extensions/extensions-docker/aissemble-spark-operator/pom.xml
@@ -56,7 +56,7 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.technologybrewery.fabric8</groupId>
+                <groupId>${group.fabric8.plugin}</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
             </plugin>
         </plugins>
diff --git a/extensions/extensions-docker/aissemble-spark/pom.xml b/extensions/extensions-docker/aissemble-spark/pom.xml
index fe8882bf2..99fdecee8 100644
--- a/extensions/extensions-docker/aissemble-spark/pom.xml
+++ b/extensions/extensions-docker/aissemble-spark/pom.xml
@@ -62,7 +62,7 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.technologybrewery.fabric8</groupId>
+                <groupId>${group.fabric8.plugin}</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
             </plugin>
         </plugins>
diff --git a/extensions/extensions-docker/aissemble-vault/pom.xml b/extensions/extensions-docker/aissemble-vault/pom.xml
index 93a011013..a9cc5820d 100644
--- a/extensions/extensions-docker/aissemble-vault/pom.xml
+++ b/extensions/extensions-docker/aissemble-vault/pom.xml
@@ -17,7 +17,7 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.technologybrewery.fabric8</groupId>
+                <groupId>${group.fabric8.plugin}</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
             </plugin>
         </plugins>
diff --git a/extensions/extensions-docker/aissemble-versioning/pom.xml b/extensions/extensions-docker/aissemble-versioning/pom.xml
index 15d1648cb..af2e8e17e 100644
--- a/extensions/extensions-docker/aissemble-versioning/pom.xml
+++ b/extensions/extensions-docker/aissemble-versioning/pom.xml
@@ -21,7 +21,7 @@
                 <artifactId>habushu-maven-plugin</artifactId>
             </plugin>
             <plugin>
-                <groupId>org.technologybrewery.fabric8</groupId>
+                <groupId>${group.fabric8.plugin}</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
             </plugin>
         </plugins>
diff --git a/extensions/extensions-docker/pom.xml b/extensions/extensions-docker/pom.xml
index b0a31bfa5..10f16d491 100644
--- a/extensions/extensions-docker/pom.xml
+++ b/extensions/extensions-docker/pom.xml
@@ -24,7 +24,7 @@
                 <pluginManagement>
                     <plugins>
                         <plugin>
-                            <groupId>org.technologybrewery.fabric8</groupId>
+                            <groupId>${group.fabric8.plugin}</groupId>
                             <artifactId>docker-maven-plugin</artifactId>
                             <configuration><images>
                                     <image>
diff --git a/foundation/foundation-archetype/src/main/resources/archetype-resources/__rootArtifactId__-docker/pom.xml b/foundation/foundation-archetype/src/main/resources/archetype-resources/__rootArtifactId__-docker/pom.xml
index 16282440f..62112b896 100644
--- a/foundation/foundation-archetype/src/main/resources/archetype-resources/__rootArtifactId__-docker/pom.xml
+++ b/foundation/foundation-archetype/src/main/resources/archetype-resources/__rootArtifactId__-docker/pom.xml
@@ -61,7 +61,7 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.technologybrewery.fabric8</groupId>
+                <groupId>${group.fabric8.plugin}</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
                     <skip>true</skip>
@@ -81,14 +81,13 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.technologybrewery.fabric8</groupId>
+                        <groupId>${group.fabric8.plugin}</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
                         <configuration>
                             <skip>false</skip>
                             <images>
                                 <image>
-                                    <name>${docker.project.repository.url}/${project.artifactId}:${project.version}
-                                    </name>
+                                    <name>${docker.project.repository.url}${project.artifactId}:${project.version}</name>
                                 </image>
                             </images>
                         </configuration>
diff --git a/foundation/foundation-archetype/src/main/resources/archetype-resources/__rootArtifactId__-tests/__rootArtifactId__-tests-docker/pom.xml b/foundation/foundation-archetype/src/main/resources/archetype-resources/__rootArtifactId__-tests/__rootArtifactId__-tests-docker/pom.xml
index e2fb84df5..2a404d8e5 100644
--- a/foundation/foundation-archetype/src/main/resources/archetype-resources/__rootArtifactId__-tests/__rootArtifactId__-tests-docker/pom.xml
+++ b/foundation/foundation-archetype/src/main/resources/archetype-resources/__rootArtifactId__-tests/__rootArtifactId__-tests-docker/pom.xml
@@ -28,7 +28,7 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.technologybrewery.fabric8</groupId>
+                <groupId>${group.fabric8.plugin}</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
                     <skip>true</skip>
@@ -56,7 +56,7 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.technologybrewery.fabric8</groupId>
+                        <groupId>${group.fabric8.plugin}</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
                         <configuration>
                             <skip>false</skip>
diff --git a/foundation/foundation-mda/src/main/resources/templates/general-docker/sagemaker-training.docker.pom.xml.vm b/foundation/foundation-mda/src/main/resources/templates/general-docker/sagemaker-training.docker.pom.xml.vm
index 9630b93d9..896544e2d 100755
--- a/foundation/foundation-mda/src/main/resources/templates/general-docker/sagemaker-training.docker.pom.xml.vm
+++ b/foundation/foundation-mda/src/main/resources/templates/general-docker/sagemaker-training.docker.pom.xml.vm
@@ -64,7 +64,7 @@
                 </dependencies>
             </plugin>
             <plugin>
-                <groupId>org.technologybrewery.fabric8</groupId>
+                <groupId>${group.fabric8.plugin}</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
                 <executions>
                     <execution>
diff --git a/pom.xml b/pom.xml
index 4cce9bde6..b9e49d5e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -245,7 +245,7 @@
                 <pluginManagement>
                     <plugins>
                         <plugin>
-                            <groupId>org.technologybrewery.fabric8</groupId>
+                            <groupId>${group.fabric8.plugin}</groupId>
                             <artifactId>docker-maven-plugin</artifactId>
                             <configuration>
                                 <skip>true</skip>