diff --git a/docker/Dockerfile.cli b/docker/Dockerfile.cli
index 0c04759..70757e4 100755
--- a/docker/Dockerfile.cli
+++ b/docker/Dockerfile.cli
@@ -12,8 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ARG TAG=latest
+ARG REGISTRY=
+ARG REPOSITORY=
 
-FROM voltha/voltha-base:${TAG}
+FROM ${REGISTRY}${REPOSITORY}voltha-base:${TAG}
 
 MAINTAINER Sergio Slobodrian <sslobodr@ciena.com>
 
diff --git a/docker/Dockerfile.dashd b/docker/Dockerfile.dashd
index 05cf57e..c33446f 100755
--- a/docker/Dockerfile.dashd
+++ b/docker/Dockerfile.dashd
@@ -12,8 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ARG TAG=latest
+ARG REGISTRY=
+ARG REPOSITORY=
 
-FROM voltha/voltha-base:${TAG}
+FROM ${REGISTRY}${REPOSITORY}voltha-base:${TAG}
 
 MAINTAINER Sergio Slobodrian <sslobodr@ciena.com>
 
diff --git a/docker/Dockerfile.fluentd b/docker/Dockerfile.fluentd
index ed5417c..c25c5ba 100644
--- a/docker/Dockerfile.fluentd
+++ b/docker/Dockerfile.fluentd
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 #DockerFile to Create Fluentd Forwards inside cord-voltha
-FROM fluent/fluentd:v0.14.23.rc1
+FROM fluent/fluentd:v0.12.42
 MAINTAINER Voltha Community <info@opennetworking.org>
 
 RUN apk add --update bash
diff --git a/docker/Dockerfile.netconf b/docker/Dockerfile.netconf
index b740aae..666750c 100644
--- a/docker/Dockerfile.netconf
+++ b/docker/Dockerfile.netconf
@@ -12,8 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ARG TAG=latest
+ARG REGISTRY=
+ARG REPOSITORY=
 
-FROM voltha/voltha-base:${TAG}
+FROM ${REGISTRY}${REPOSITORY}voltha-base:${TAG}
 
 MAINTAINER Zsolt Haraszti <zharaszt@ciena.com>
 MAINTAINER Ali Al-Shabibi <ali.al-shabibi@onlab.us>
diff --git a/docker/Dockerfile.nginx b/docker/Dockerfile.nginx
index 33b8068..5910449 100755
--- a/docker/Dockerfile.nginx
+++ b/docker/Dockerfile.nginx
@@ -12,8 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ARG TAG=latest
+ARG REGISTRY=
+ARG REPOSITORY=
 
-FROM voltha/voltha-base:${TAG}
+FROM ${REGISTRY}${REPOSITORY}voltha-base:${TAG}
 
 MAINTAINER Sergio Slobodrian <sslobodr@ciena.com>
 
diff --git a/docker/Dockerfile.ofagent b/docker/Dockerfile.ofagent
index 733b9df..9ac0c05 100644
--- a/docker/Dockerfile.ofagent
+++ b/docker/Dockerfile.ofagent
@@ -12,8 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ARG TAG=latest
+ARG REGISTRY=
+ARG REPOSITORY=
 
-FROM voltha/voltha-base:${TAG}
+FROM ${REGISTRY}${REPOSITORY}voltha-base:${TAG}
 
 MAINTAINER Zsolt Haraszti <zharaszt@ciena.com>
 MAINTAINER Ali Al-Shabibi <ali.al-shabibi@onlab.us>
diff --git a/docker/Dockerfile.shovel b/docker/Dockerfile.shovel
index 3a411fb..163a2ca 100644
--- a/docker/Dockerfile.shovel
+++ b/docker/Dockerfile.shovel
@@ -12,8 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ARG TAG=latest
+ARG REGISTRY=
+ARG REPOSITORY=
 
-FROM voltha/voltha-base:${TAG}
+FROM ${REGISTRY}${REPOSITORY}voltha-base:${TAG}
 
 MAINTAINER Zsolt Haraszti <zharaszt@ciena.com>
 MAINTAINER Ali Al-Shabibi <ali.al-shabibi@onlab.us>
diff --git a/docker/Dockerfile.tester b/docker/Dockerfile.tester
index a9b1a10..ba7deb9 100644
--- a/docker/Dockerfile.tester
+++ b/docker/Dockerfile.tester
@@ -11,10 +11,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 ARG TAG=latest
+ARG REGISTRY=
+ARG REPOSITORY=
 
-FROM voltha/voltha-base:${TAG}
+FROM ${REGISTRY}${REPOSITORY}voltha-base:${TAG}
 
 MAINTAINER Zsolt Haraszti <zharaszt@ciena.com>
 MAINTAINER Ali Al-Shabibi <ali.al-shabibi@onlab.us>
diff --git a/docker/Dockerfile.tools b/docker/Dockerfile.tools
index 168ffee..dfc3e9d 100755
--- a/docker/Dockerfile.tools
+++ b/docker/Dockerfile.tools
@@ -12,8 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ARG TAG=latest
+ARG REGISTRY=
+ARG REPOSITORY=
 
-FROM voltha/voltha-base:${TAG}
+FROM ${REGISTRY}${REPOSITORY}voltha-base:${TAG}
 
 MAINTAINER Sergio Slobodrian <sslobodr@ciena.com>
 
diff --git a/docker/Dockerfile.voltha b/docker/Dockerfile.voltha
index ece248b..0b3853a 100644
--- a/docker/Dockerfile.voltha
+++ b/docker/Dockerfile.voltha
@@ -12,8 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ARG TAG=latest
+ARG REGISTRY=
+ARG REPOSITORY=
 
-FROM voltha/voltha-base:${TAG}
+FROM ${REGISTRY}${REPOSITORY}voltha-base:${TAG}
 
 MAINTAINER Zsolt Haraszti <zharaszt@ciena.com>
 MAINTAINER Ali Al-Shabibi <ali.al-shabibi@onlab.us>