diff --git a/CHANGELOG.md b/CHANGELOG.md
index e244f25..b87639d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.2.0
+  - etcdctl v3.2.1
+  - Upgrade baseimage: tinc:0.2.0 (debian stretch)
+
 ## 0.1.3
   - Upgrade baseimage: tinc:0.1.4
 
diff --git a/Makefile b/Makefile
index 2db2de5..05a9265 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,7 @@
 NAME = osixia/tinc-etcd
-VERSION = 0.1.3
+VERSION = 0.2.0
 
-.PHONY: all build build-nocache test tag_latest release
-
-all: build
+.PHONY: build build-nocache test tag-latest push push-latest release git-tag-version
 
 build:
 	docker build -t $(NAME):$(VERSION) --rm image
@@ -14,10 +12,17 @@ build-nocache:
 test:
 	env NAME=$(NAME) VERSION=$(VERSION) bats test/test.bats
 
-tag_latest:
+tag-latest:
 	docker tag $(NAME):$(VERSION) $(NAME):latest
 
-release: build test tag_latest
-	@if ! docker images $(NAME) | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME) version $(VERSION) is not yet built. Please run 'make build'"; false; fi
-	docker push $(NAME)
-	@echo "*** Don't forget to run 'twgit release/hotfix finish' :)"
+push:
+	docker push $(NAME):$(VERSION)
+
+push-latest:
+	docker push $(NAME):latest
+
+release: build test tag-latest push push-latest
+
+git-tag-version: release
+	git tag -a v$(VERSION) -m "v$(VERSION)"
+	git push origin v$(VERSION)
diff --git a/image/Dockerfile b/image/Dockerfile
index 4efb257..7f1c720 100644
--- a/image/Dockerfile
+++ b/image/Dockerfile
@@ -1,7 +1,7 @@
-FROM osixia/tinc:0.1.4
+FROM osixia/tinc:0.2.0
 MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
 
-ENV ETCD_VERSION=3.0.4
+ARG ETCD_VERSION=3.2.1
 
 # Install multiple process stack from baseimage
 # https://github.com/osixia/docker-light-baseimage/blob/stable/image/tool/install-multiple-process-stack