diff --git a/pkg/util/docker/docker.go b/pkg/util/docker/docker.go
index 6590d19..867c446 100644
--- a/pkg/util/docker/docker.go
+++ b/pkg/util/docker/docker.go
@@ -52,7 +52,7 @@
 	dockerFile := []string{}
 
 	// Start from the base image that contains the maven install: <RegistryName>/<BaseImageName>
-	dockerFile = append(dockerFile, FROM(GetFullDockerImage(BaseImageName, latestTag)))
+	dockerFile = append(dockerFile, FROM(GetFullDockerImage(GetBaseImagePath(), latestTag)))
 
 	// Create container workspace directory.
 	dockerFile = append(dockerFile, RUNMakeDir(GetContainerWorkspaceDir()))
@@ -90,16 +90,17 @@
 	//
 	// docker build -f <BaseWorkingDirectory>/Dockerfile -t <dockerRegistry>/<BaseImageName> <BaseWorkingDirectory>
 	//
-	return BuildImageArgs(BaseWorkingDirectory, BaseImageName, BaseWorkingDirectory)
+	// Add register
+	return BuildImageArgs(BaseWorkingDirectory, GetBaseImagePath(), BaseWorkingDirectory)
 }
 
 // BuildIntegrationImageArgs --
-func BuildIntegrationImageArgs(imageName string) []string {
+func BuildIntegrationImageArgs(imagePath string) []string {
 	// Construct the docker command:
 	//
-	// docker build -f <BaseWorkingDirectory>/Dockerfile -t <dockerRegistry>/<ImageName> <MavenWorkingDirectory>
+	// docker build -f <BaseWorkingDirectory>/Dockerfile -t <imagePath> <MavenWorkingDirectory>
 	//
-	return BuildImageArgs(IntegrationWorkingDirectory, imageName, util.MavenWorkingDirectory)
+	return BuildImageArgs(IntegrationWorkingDirectory, imagePath, util.MavenWorkingDirectory)
 }
 
 // RunIntegrationImageArgs --
diff --git a/pkg/util/docker/docker_base.go b/pkg/util/docker/docker_base.go
index 4424499..366ad77 100644
--- a/pkg/util/docker/docker_base.go
+++ b/pkg/util/docker/docker_base.go
@@ -144,11 +144,6 @@
 func GetFullDockerImage(dockerImageName string, tag string) string {
 	fullImagePath := make([]string, 0)
 
-	// If register is specified, add it.
-	if RegistryName != "" {
-		fullImagePath = append(fullImagePath, RegistryName)
-	}
-
 	// Add image and tag.
 	if tag == "" {
 		fullImagePath = append(fullImagePath, dockerImageName)
@@ -159,6 +154,11 @@
 	return strings.Join(fullImagePath, dockerEndpointSeparator)
 }
 
+// GetBaseImagePath --
+func GetBaseImagePath() string {
+	return RegistryName + dockerEndpointSeparator + BaseImageName
+}
+
 //
 // Container file management.
 //