diff --git a/admin/Dockerfile b/admin/Dockerfile
index 79221aeff..619dc24b0 100644
--- a/admin/Dockerfile
+++ b/admin/Dockerfile
@@ -17,9 +17,7 @@
 # Run image using:
 # $> docker run --rm -it absaoss/spline-admin:latest
 
-ARG DOCKER_BASE_IMAGE_PREFIX
-
-FROM "$DOCKER_BASE_IMAGE_PREFIX"adoptopenjdk:11-jre
+FROM adoptopenjdk:11-jre
 
 ARG PROJECT_BUILD_FINAL_NAME
 ARG IMAGE_NAME
diff --git a/admin/pom.xml b/admin/pom.xml
index bd4dd6953..28c7131f7 100644
--- a/admin/pom.xml
+++ b/admin/pom.xml
@@ -139,13 +139,10 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
                     <skip>false</skip>
-                    <buildArgs>
-                        <IMAGE_NAME>${dockerfile.imageName}</IMAGE_NAME>
-                    </buildArgs>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/build/parent-pom/pom.xml b/build/parent-pom/pom.xml
index 542d97362..fa5a7390c 100644
--- a/build/parent-pom/pom.xml
+++ b/build/parent-pom/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>za.co.absa</groupId>
         <artifactId>root-pom</artifactId>
-        <version>1.0.4</version>
+        <version>1.0.5</version>
     </parent>
 
     <groupId>za.co.absa.spline</groupId>
diff --git a/kafka-gateway/Dockerfile b/kafka-gateway/Dockerfile
index d1421c8b8..075c90308 100644
--- a/kafka-gateway/Dockerfile
+++ b/kafka-gateway/Dockerfile
@@ -14,9 +14,7 @@
 # limitations under the License.
 #
 
-ARG DOCKER_BASE_IMAGE_PREFIX=
-
-FROM "$DOCKER_BASE_IMAGE_PREFIX"tomcat:9-jre11-openjdk-slim-buster
+FROM tomcat:9-jre11-openjdk-slim-buster
 
 LABEL \
     vendor="ABSA" \
diff --git a/kafka-gateway/pom.xml b/kafka-gateway/pom.xml
index 5f04c175a..3768df3ea 100644
--- a/kafka-gateway/pom.xml
+++ b/kafka-gateway/pom.xml
@@ -111,8 +111,8 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
                     <skip>false</skip>
                 </configuration>
diff --git a/rest-gateway/Dockerfile b/rest-gateway/Dockerfile
index 4f68ef599..a45bea599 100644
--- a/rest-gateway/Dockerfile
+++ b/rest-gateway/Dockerfile
@@ -14,9 +14,7 @@
 # limitations under the License.
 #
 
-ARG DOCKER_BASE_IMAGE_PREFIX=
-
-FROM "$DOCKER_BASE_IMAGE_PREFIX"tomcat:9-jre11-openjdk-slim-buster
+FROM tomcat:9-jre11-openjdk-slim-buster
 
 LABEL \
     vendor="ABSA" \
diff --git a/rest-gateway/pom.xml b/rest-gateway/pom.xml
index 654cad879..17cc19b24 100644
--- a/rest-gateway/pom.xml
+++ b/rest-gateway/pom.xml
@@ -202,8 +202,8 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>dockerfile-maven-plugin</artifactId>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
                     <skip>false</skip>
                 </configuration>