diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..f838eae
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,76 @@
+# Copyright 2020-present Open Networking Foundation
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+
+# Makefile for device-management-interface
+default: test
+
+# set default shell options
+SHELL = bash -e -o pipefail
+
+# tool containers
+VOLTHA_TOOLS_VERSION ?= 2.0.0
+
+PROTOC    = docker run --rm --user $$(id -u):$$(id -g) -v ${CURDIR}:/app $(shell test -t 0 && echo "-it") voltha/voltha-ci-tools:${VOLTHA_TOOLS_VERSION}-protoc protoc
+PROTOC_SH = docker run --rm --user $$(id -u):$$(id -g) -v ${CURDIR}:/go/src/github.com/opencord/device-management-interface/v3 $(shell test -t 0 && echo "-it") --workdir=/go/src/github.com/opencord/device-management-interface/v3 voltha/voltha-ci-tools:${VOLTHA_TOOLS_VERSION}-protoc sh -c
+GO        = docker run --rm --user $$(id -u):$$(id -g) -v ${CURDIR}:/app $(shell test -t 0 && echo "-it") -v gocache:/.cache -v gocache-${VOLTHA_TOOLS_VERSION}:/go/pkg voltha/voltha-ci-tools:${VOLTHA_TOOLS_VERSION}-golang go
+
+# Function to extract the last path component from go_package line in .proto files
+define go_package_path
+$(shell grep go_package $(1) | sed -n 's/.*\/\(.*\)";/\1/p')
+endef
+
+# Variables
+PROTO_FILES := $(sort $(wildcard protos/dmi/*.proto))
+
+PROTO_GO_DEST_DIR := go
+PROTO_GO_PB:= $(foreach f, $(PROTO_FILES), $(patsubst protos/dmi/%.proto,$(PROTO_GO_DEST_DIR)/$(call go_package_path,$(f))/%.pb.go,$(f)))
+# Force pb file to be regenrated every time.  Otherwise the make process assumes generated version is still valid
+.PHONY: dmi.pb
+
+print:
+	@echo "Proto files: $(PROTO_FILES)"
+	@echo "Go PB files: $(PROTO_GO_PB)"
+
+# Generic targets
+protos: go-protos
+
+build: protos
+
+test: go-test
+
+venv_protos:
+	virtualenv -p python3 $@;\
+	source ./$@/bin/activate ; set -u ;\
+	pip install grpcio-tools googleapis-common-protos
+
+# Go targets
+go-protos: dmi.pb
+	@echo "Creating *.go.pb files"
+	@${PROTOC_SH} " \
+	  set -e -o pipefail; \
+	  for x in ${PROTO_FILES}; do \
+	    echo \$$x; \
+	    protoc --go_out=plugins=grpc:/go/src -I protos \$$x; \
+	  done"
+
+dmi.pb:
+	@echo "Creating $@"
+	@${PROTOC} -I protos \
+	  --include_imports --include_source_info \
+	  --descriptor_set_out=$@ \
+	  ${PROTO_FILES}
+
+go-test:
+	test/test-go-proto-consistency.sh
+	${GO} mod verify