diff --git a/Dockerfile b/Dockerfile
index 97b715a..3d95450 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
-# Copyright 2018-present Open Networking Foundation
+# Copyright 2018 the original author or authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-# http://www.apache.org/licenses/LICENSE-2.0
+#      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,36 +14,49 @@
 
 # bbsim dockerfile
 
-# builder parent
-FROM golang:1.10-stretch as builder
+ARG TAG=latest
+ARG REGISTRY=
+ARG REPOSITORY=
 
-# install prereqs
-ENV PROTOC_VERSION 3.6.1
-ENV PROTOC_SHA256SUM 6003de742ea3fcf703cfec1cd4a3380fd143081a2eb0e559065563496af27807
+#builder parent
+FROM ubuntu:16.04
 
-RUN apt-get update \
- && apt-get install unzip \
- && curl -L -o /tmp/protoc-${PROTOC_VERSION}-linux-x86_64.zip https://github.com/google/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-linux-x86_64.zip \
- && echo "$PROTOC_SHA256SUM  /tmp/protoc-${PROTOC_VERSION}-linux-x86_64.zip" | sha256sum -c - \
- && unzip /tmp/protoc-${PROTOC_VERSION}-linux-x86_64.zip -d /tmp/protoc3 \
- && mv /tmp/protoc3/bin/* /usr/local/bin/ \
- && mv /tmp/protoc3/include/* /usr/local/include/ \
- && go get -v github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway \
- && go get -v github.com/golang/protobuf/protoc-gen-go
+MAINTAINER Voltha Community <info@opennetworking.org>
 
-# copy and build
-WORKDIR /go/src/gerrit.opencord.org/voltha-bbsim
-COPY . /go/src/gerrit.opencord.org/voltha-bbsim
+# Install required packages
+RUN apt-get update && apt-get install -y wget git make libpcap-dev gcc unzip
+ARG version="1.9.3."
+RUN wget https://storage.googleapis.com/golang/go${version}linux-amd64.tar.gz -P /tmp \
+    && tar -C /usr/local -xzf /tmp/go${version}linux-amd64.tar.gz \
+    && rm /tmp/go${version}linux-amd64.tar.gz
 
+# Set PATH
+ENV GOPATH $HOME/go
+ENV PATH /usr/local/go/bin:/go/bin:$PATH
+
+# Copy source code
+RUN mkdir -p $GOPATH/src/gerrit.opencord.org/voltha-bbsim
+COPY . $GOPATH/src/gerrit.opencord.org/voltha-bbsim
+
+# Install golang protobuf and pcap support
+RUN wget https://github.com/google/protobuf/releases/download/v3.6.0/protoc-3.6.0-linux-x86_64.zip -P /tmp/ \
+&& unzip /tmp/protoc-3.6.0-linux-x86_64.zip -d /tmp/ \
+&& mv /tmp/bin/* /usr/local/bin/ \
+&& mv /tmp/include/* /usr/local/include/ \
+&& go get -u github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway \
+&& go get -u github.com/golang/protobuf/protoc-gen-go \
+&& go get -u github.com/google/gopacket/pcap \
+&& go get -u golang.org/x/net/context \
+&& go get -u google.golang.org/grpc
+
+# ... Install utilities & config
+RUN apt-get update && apt-get install -y wpasupplicant isc-dhcp-server
+COPY ./config/wpa_supplicant.conf /etc/wpa_supplicant/
+COPY ./config/isc-dhcp-server /etc/default/
+COPY ./config/dhcpd.conf /etc/dhcp/
+RUN mv /usr/sbin/dhcpd /usr/local/bin/ \
+&& mv /sbin/dhclient /usr/local/bin/
+
+WORKDIR $GOPATH/src/gerrit.opencord.org/voltha-bbsim
 RUN make bbsim
 
-# runtime parent
-FROM alpine:3.8
-
-# required for binaries to run
-RUN apk add --update libc6-compat
-
-WORKDIR /app
-COPY --from=builder /go/src/gerrit.opencord.org/voltha-bbsim/bbsim /app/bbsim
-
-CMD [ '/app/bbsim' ]