diff --git a/cdt/pom.xml b/cdt/pom.xml
index 3d592a0..48cd40a 100644
--- a/cdt/pom.xml
+++ b/cdt/pom.xml
@@ -172,7 +172,7 @@ limitations under the License.
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
-                        <version>0.16.5</version>
+                        <version>0.28.0</version>
                         <inherited>false</inherited>
                         <configuration>
                             <images>
@@ -181,7 +181,7 @@ limitations under the License.
                                     <build>
                                         <cleanup>try</cleanup>
                                         <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-                                        <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+                                        <dockerFile>Dockerfile</dockerFile>
                                         <tags>
                                             <tag>${dockertag1}</tag>
                                             <tag>${dockertag2}</tag>
diff --git a/cdt/src/main/docker/Dockerfile b/cdt/src/main/docker/Dockerfile
index 4fe3d4f..4194c12 100644
--- a/cdt/src/main/docker/Dockerfile
+++ b/cdt/src/main/docker/Dockerfile
@@ -20,7 +20,7 @@
 # ============LICENSE_END============================================
 
 # Base Alpine with added packages needed for ONAP
-FROM httpd:2.4-alpine
+FROM docker.io/httpd:2.4-alpine
 MAINTAINER APP-C Team (appc@lists.openecomp.org)
 
 RUN sed -i -e "s/80/18080/" /usr/local/apache2/conf/httpd.conf; \
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 706465b..52637dc 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -27,7 +27,7 @@ networks:
 
 services:
   db:
-    image: mariadb:10.4.3
+    image: mariadb
     container_name: sdnc_db_container
     ports:
       - "3306"
diff --git a/installation/appc/pom.xml b/installation/appc/pom.xml
index 1628f5f..919fdba 100644
--- a/installation/appc/pom.xml
+++ b/installation/appc/pom.xml
@@ -48,6 +48,7 @@ limitations under the License.
 		<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
 		<!--Determines the version of the cdt-proxy-service to download and install-->
 		<appc.cdt.version>1.4.0</appc.cdt.version>
+		<docker.plugin.version>0.28.0</docker.plugin.version>
 	</properties>
 
 
@@ -261,7 +262,7 @@ limitations under the License.
 					<plugin>
 						<groupId>io.fabric8</groupId>
 						<artifactId>docker-maven-plugin</artifactId>
-						<version>0.16.5</version>
+						<version>${docker.plugin.version}</version>
 						<inherited>false</inherited>
 						<configuration>
 							<images>
@@ -270,7 +271,7 @@ limitations under the License.
 									<build>
 										<cleanup>try</cleanup>
 										<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
-										<dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+										<dockerFile>Dockerfile</dockerFile>
 										<tags>
 											<tag>${dockertag1}</tag>
 											<tag>${dockertag2}</tag>
diff --git a/installation/appc/src/main/docker/Dockerfile b/installation/appc/src/main/docker/Dockerfile
index ab3e2f2..e746281 100644
--- a/installation/appc/src/main/docker/Dockerfile
+++ b/installation/appc/src/main/docker/Dockerfile
@@ -21,7 +21,7 @@
 # ============LICENSE_END============================================
 
 # Base ubuntu with added packages needed for ONAP
-FROM onap/ccsdk-odlsli-alpine-image:0.4-STAGING-latest
+FROM onap/ccsdk-odlsli-alpine-image:0.4-SNAPSHOT-latest
 MAINTAINER APP-C Team (appc@lists.openecomp.org)
 
 # Set the Env. Variable in the container to add the APPC CONFIG DIR (the SDNC_CONFIG_DIR is inherited from SDNC Image)