diff --git a/.drone.star b/.drone.star
index 30a7cd204e..a204a15edb 100644
--- a/.drone.star
+++ b/.drone.star
@@ -485,7 +485,7 @@ def changelog(ctx):
       },
       {
         'name': 'diff',
-        'image': 'webhippie/golang:1.13',
+        'image': 'owncloud/alpine:latest',
         'pull': 'always',
         'commands': [
           'git diff',
@@ -493,7 +493,7 @@ def changelog(ctx):
       },
       {
         'name': 'output',
-        'image': 'webhippie/golang:1.13',
+        'image': 'owncloud/alpine:latest',
         'pull': 'always',
         'commands': [
           'cat CHANGELOG.md',
diff --git a/Makefile b/Makefile
index f7a353b76b..8e428f781b 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ sync:
 .PHONY: clean
 clean:
 	go clean -i ./...
-	rm -rf $(BIN) $(DIST)
+	rm -rf $(BIN) $(DIST) $(HUGO)
 
 .PHONY: fmt
 fmt:
diff --git a/changelog/CHANGELOG.tmpl b/changelog/CHANGELOG.tmpl
index e52348caae..28058bb7cd 100644
--- a/changelog/CHANGELOG.tmpl
+++ b/changelog/CHANGELOG.tmpl
@@ -1,10 +1,10 @@
 {{ $allVersions := . }}
 {{- range $index, $changes := . }}{{ with $changes -}}
+{{ if gt (len $allVersions) 1 -}}
 # Changelog for [{{ .Version }}] ({{ .Date }})
 
 The following sections list the changes in ocis-glauth {{ .Version }}.
 
-{{ if gt (len $allVersions) 1 -}}
 {{/* creating version compare links */ -}}
 {{ $next := add1 $index -}}
 {{ if ne (len $allVersions) $next -}}
@@ -23,7 +23,10 @@ The following sections list the changes in ocis-glauth {{ .Version }}.
 [{{ .Version }}]: https://github.com/owncloud/ocis-glauth/compare/178b6ccde34b64a88e8c14a9acb5857a4c6a3164...v{{ .Version }}
 
 {{ end -}}
-{{- end -}}
+{{ else -}}
+# Changes in {{ .Version }}
+
+{{ end -}}
 
 ## Summary
 {{ range $entry := .Entries }}{{ with $entry }}
diff --git a/go.sum b/go.sum
index 803c317a23..ca61b961c6 100644
--- a/go.sum
+++ b/go.sum
@@ -183,6 +183,7 @@ github.com/go-log/log v0.1.0 h1:wudGTNsiGzrD5ZjgIkVZ517ugi2XRe9Q/xRCzwEO4/U=
 github.com/go-log/log v0.1.0/go.mod h1:4mBwpdRMFLiuXZDCwU2lKQFsoSCo72j3HqBK9d81N2M=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-logr/logr v0.1.0 h1:M1Tv3VzNlEHg6uyACnRdtrploV2P7wZqH8BoQMtz0cg=
 github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
 github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM=
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=