diff --git a/Makefile b/Makefile
index f6cf50a..8fbbfb9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,3 @@
-#
 # Copyright 2018 the original author or authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,152 +11,46 @@
 # 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.
-#
 
-ifeq ($(TAG),)
-TAG := latest
-endif
+# Configure shell
+SHELL = bash -eu -o pipefail
 
-ifeq ($(TARGET_TAG),)
-TARGET_TAG := latest
-endif
-
-ifneq ($(http_proxy)$(https_proxy),)
-# Include proxies from the environment
-DOCKER_PROXY_ARGS = \
-       --build-arg http_proxy=$(http_proxy) \
-       --build-arg https_proxy=$(https_proxy) \
-       --build-arg ftp_proxy=$(ftp_proxy) \
-       --build-arg no_proxy=$(no_proxy) \
-       --build-arg HTTP_PROXY=$(HTTP_PROXY) \
-       --build-arg HTTPS_PROXY=$(HTTPS_PROXY) \
-       --build-arg FTP_PROXY=$(FTP_PROXY) \
-       --build-arg NO_PROXY=$(NO_PROXY)
-endif
-
-DOCKER_BUILD_ARGS = \
-        --build-arg TAG=$(TAG) \
-        --build-arg REGISTRY=$(REGISTRY) \
-        --build-arg REPOSITORY=$(REPOSITORY) \
-        $(DOCKER_PROXY_ARGS) $(DOCKER_CACHE_ARG) \
-         --rm --force-rm \
-        $(DOCKER_BUILD_EXTRA_ARGS)
-
-DOCKER_IMAGE_LIST = \
-	pyvoltha-base \
-        pyvoltha
-
-VENVDIR := venv-$(shell uname -s | tr '[:upper:]' '[:lower:]')
-
-VENV_BIN ?= virtualenv
-VENV_OPTS ?=
-
-.PHONY: $(DIRS) $(DIRS_CLEAN) $(DIRS_FLAKE8) flake8 venv rebuild-venv clean distclean build test docker_base_img docker_image
+default: help
 
 # This should to be the first and default target in this Makefile
 help:
 	@echo "Usage: make [<target>]"
 	@echo "where available targets are:"
 	@echo
-	@echo "dist                 : Create the python package"
-	@echo "docker_base_img      : Build a base docker image with a modern version of pip and requirements.txt installed"
-	@echo "docker_image         : Build a docker image with pyvoltha installed"
-	@echo "utest                : Run all unit test"
-	@echo "utest-with-coverage  : Run all unit test with coverage reporting"
 	@echo "clean                : Remove files created by the build and tests"
-	@echo "distclean            : Remove venv directory"
+	@echo "dist                 : Create source distribution of the python package"
 	@echo "help                 : Print this help"
-	@echo "rebuild-venv         : Rebuild local Python virtualenv from scratch"
-	@echo "venv                 : Build local Python virtualenv if did not exist yet"
+	@echo "test                 : Run all unit test"
+	@echo "upload               : Upload test version of python package to test.pypi.org"
 	@echo
 
-## New directories can be added here
-#DIRS:=
+# ignore these directories
+.PHONY: test dist
 
-## If one directory depends on another directory that
-## dependency can be expressed here
-##
-## For example, if the Tibit directory depended on the eoam
-## directory being built first, then that can be expressed here.
-##  driver/tibit: eoam
-
-# Parallel Build
-$(DIRS):
-	@echo "    MK $@"
-	$(Q)$(MAKE) -C $@
-
-# Parallel Clean
-DIRS_CLEAN = $(addsuffix .clean,$(DIRS))
-$(DIRS_CLEAN):
-	@echo "    CLEAN $(basename $@)"
-	$(Q)$(MAKE) -C $(basename $@) clean
-
-# Parallel Flake8
-DIRS_FLAKE8 = $(addsuffix .flake8,$(DIRS))
-$(DIRS_FLAKE8):
-	@echo "    FLAKE8 $(basename $@)"
-	-$(Q)$(MAKE) -C $(basename $@) flake8
-
-dist: venv 
-	@ echo "Creating PyPi artifacts"
+dist:
+	@ echo "Creating python source distribution"
 	python setup.py sdist
 
 upload: dist
-	@ echo "Uploading PyPi artifacts"
+	@ echo "Uploading sdist to test.pypi.org"
 	twine upload --repository-url https://test.pypi.org/legacy/ dist/*
-	twine upload dist/*
 
-docker_base_img:
-	docker build $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}pyvoltha-base:${TAG} -f docker/Dockerfile.base .
-
-docker_image: docker_base_img dist
-	docker build $(DOCKER_BUILD_ARGS) -t ${REGISTRY}${REPOSITORY}pyvoltha:${TAG} -f docker/Dockerfile.pyvoltha .
-
-test: venv
-	@ echo "Executing all unit tests"
-	@ tox -- --with-xunit
-
-COVERAGE_OPTS=--with-coverage --with-xunit --cover-branches --cover-html --cover-html-dir=tmp/cover \
-              --cover-package=pyvoltha.adapters,pyvoltha.common
-
-utest-with-coverage: venv
-	@ echo "Executing all unit tests and producing coverage results"
-	@ tox -- $(COVERAGE_OPTS)
+test:
+	@ echo "Executing unit tests w/tox"
+	tox
 
 clean:
 	find . -name '*.pyc' | xargs rm -f
-	find . -name 'coverage.xml' | xargs rm -f
-	find . -name 'nosetests.xml' | xargs rm -f
-	rm -rf pyvoltha.egg-info
-	rm -rf dist
-	rm -rf .tox
-	rm -rf test/unit/tmp
-
-distclean: clean
-	rm -rf ${VENVDIR}
-
-purge-venv:
-	rm -fr ${VENVDIR}
-
-rebuild-venv: purge-venv venv
-
-venv: ${VENVDIR}/.built
-
-${VENVDIR}/.built:
-	@ $(VENV_BIN) ${VENV_OPTS} ${VENVDIR}
-	@ $(VENV_BIN) ${VENV_OPTS} --relocatable ${VENVDIR}
-	@ . ${VENVDIR}/bin/activate && \
-	    pip install --upgrade pip; \
-	    if ! pip install -r requirements.txt; \
-	    then \
-	        echo "On MAC OS X, if the installation failed with an error \n'<openssl/opensslv.h>': file not found,"; \
-	        echo "see the BUILD.md file for a workaround"; \
-	    else \
-	        uname -s > ${VENVDIR}/.built; \
-	    fi
-	@ $(VENV_BIN) ${VENV_OPTS} --relocatable ${VENVDIR}
-
-
-flake8: $(DIRS_FLAKE8)
-
-# end file
+	rm -rf \
+    .tox \
+		.coverage \
+    coverage.xml \
+    dist \
+    nose-results.xml \
+    pyvoltha.egg-info \
+    test/unit/tmp