diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9e9fcf..b94ae7f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.1.7
+  - Upgrade baseimage: light-baseimage:0.2.5
+
 ## 0.1.6
   - Upgrade baseimage: light-baseimage:0.2.4
 
diff --git a/Makefile b/Makefile
index 6eb58fd..7f7e7c9 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ test:
 	env NAME=$(NAME) VERSION=$(VERSION) bats test/test.bats
 
 tag_latest:
-	docker tag -f $(NAME):$(VERSION) $(NAME):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
diff --git a/image/Dockerfile b/image/Dockerfile
index d7457a3..3b186da 100644
--- a/image/Dockerfile
+++ b/image/Dockerfile
@@ -1,6 +1,6 @@
 # Use osixia/light-baseimage
 # sources: https://github.com/osixia/docker-light-baseimage
-FROM osixia/light-baseimage:0.2.4
+FROM osixia/light-baseimage:0.2.5
 MAINTAINER Bertrand Gouny <bertrand.gouny@osixia.net>
 
 # Install Backup Manager, GNUPG for encryption and cron from baseimage