diff --git a/.drone.yml b/.drone.yml
index 4215aeb..3aeca19 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,28 +1,38 @@
 build:
   image: golang:1.5
   environment:
-    - GO15VENDOREXPERIMENT=1
-    - GOOS=linux
-    - GOARCH=amd64
     - CGO_ENABLED=0
   commands:
-    - go get
-    - go build
-    - go test
+    - make deps
+    - make vet
+    - make build
+    - make test
 
 publish:
-  docker:
-    username: drone
-    password: $$DOCKER_PASS
-    email: $$DOCKER_EMAIL
-    repo: objectpartners/drone-terraform
+  coverage:
     when:
       branch: master
+  docker:
+    username: $$DOCKER_USER
+    password: $$DOCKER_PASS
+    email: $$DOCKER_EMAIL
+    repo: plugins/drone-terraform
+    tag: latest
+    when:
+      branch: master
+  docker:
+    username: $$DOCKER_USER
+    password: $$DOCKER_PASS
+    email: $$DOCKER_EMAIL
+    repo: plugins/drone-terraform
+    tag: develop
+    when:
+      branch: develop
 
 plugin:
   name: Terraform
-  desc: Execute Terraform commands
+  desc: Execute Terraform plan and apply
   type: deploy
-  image: objectpartners/drone-terraform
+  image: plugins/drone-terraform
   labels:
     - terraform
diff --git a/Makefile b/Makefile
index 13d6975..2487852 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,32 @@
-deps:
-	GO15VENDOREXPERIMENT=1 go get -u ./...
+.PHONY: clean deps fmt vet test docker
 
-build:
-	GO15VENDOREXPERIMENT=1 GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build
+EXECUTABLE ?= drone-terraform
+IMAGE ?= plugins/$(EXECUTABLE)
+CI_BUILD_NUMBER ?= 0
+
+LDFLAGS = -X "main.buildDate=$(shell date -u '+%Y-%m-%d %H:%M:%S %Z')"
+	PACKAGES = $(shell go list ./... | grep -v /vendor/)
 
 clean:
-	rm drone-terraform
+		go clean -i ./...
+
+deps:
+		go get -t ./...
+
+fmt:
+		go fmt $(PACKAGES)
+
+vet:
+		go vet $(PACKAGES)
+
+test:
+		@for PKG in $(PACKAGES); do go test -cover -coverprofile $$GOPATH/src/$$PKG/coverage.out $$PKG || exit 1; done;
+
+docker:
+		GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '-s -w $(LDFLAGS)'
+			docker build --rm -t $(IMAGE) .
+
+$(EXECUTABLE): $(wildcard *.go)
+		go build -ldflags '-s -w $(LDFLAGS)'
+
+build: $(EXECUTABLE)