diff --git a/pom.xml b/pom.xml
index 853c7e3..6553531 100755
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,6 @@
     <packaging>war</packaging>
 
     <properties>
-        <docker.registry>nexus-riscv.allarddcs.nl/registry</docker.registry>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -100,10 +99,15 @@
                     </systemPropertyVariables>
                 </configuration>
             </plugin>
+
             <plugin>
               <groupId>org.codehaus.mojo</groupId>
               <artifactId>exec-maven-plugin</artifactId>
               <version>3.3.0</version>
+    <!-- 
+      Create new docker image using Dockerfile which must be present in current working directory.
+      Tag the image using maven project version information.
+    -->
               <executions>
                 <execution>
                   <id>docker-build</id>
@@ -117,11 +121,12 @@
                     <arguments>
                       <argument>build</argument>
                       <argument>-t</argument>
-                      <argument>${docker.registry}/${project.artifactId}:${project.version}</argument>
+                      <argument>${project.groupId}/${project.artifactId}:${project.version}</argument>
                       <argument>.</argument>
                     </arguments>
                   </configuration>
                 </execution>
+        <!-- Login and Push the image to a docker repo. -->
                 <execution>
                   <id>docker-login</id>
                   <phase>install</phase>
@@ -134,14 +139,13 @@
                     <arguments>
                       <argument>login</argument>
                       <argument>-u</argument>
-                      <argument>admin</argument>
+                      <argument>allardkrings</argument>
                       <argument>-p</argument>
-                      <argument>Nexus01@</argument>
-                      <argument>nexus-riscv.allarddcs.nl</argument>
+                      <argument>Kubernetes01@</argument>
+                      <argument>docker.io</argument>
                     </arguments>
                   </configuration>
                 </execution>
-
                 <execution>
                   <id>docker-push</id>
                   <phase>install</phase>
@@ -153,7 +157,7 @@
                     <workingDirectory>${project.basedir}</workingDirectory>
                     <arguments>
                       <argument>push</argument>
-                      <argument>nexus-riscv.allarddcs.nl/registry/${project.artifactId}:${project.version}</argument>
+                      <argument>${project.groupId}/${project.artifactId}:${project.version}</argument>
                     </arguments>
                   </configuration>
                 </execution>