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 8efaa72dc4..d413261253 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 d9150e3676..03e690cace 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 for {{ .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 for {{ .Version }}.
 [{{ .Version }}]: https://github.com/owncloud/ocis/compare/94f19e653e30cdf16dcf23dbaf36c6d753d37ae9...v{{ .Version }}
 
 {{ end -}}
-{{- end -}}
+{{ else -}}
+# Changes in {{ .Version }}
+
+{{ end -}}
 
 ## Summary
 {{ range $entry := .Entries }}{{ with $entry }}
diff --git a/docs/bridge.md b/docs/bridge.md
index bba45075d8..e407873e91 100644
--- a/docs/bridge.md
+++ b/docs/bridge.md
@@ -7,6 +7,8 @@ geekdocEditPath: edit/master/docs
 geekdocFilePath: bridge.md
 ---
 
+{{< toc >}}
+
 We are planning to build a bridge from ownCloud 10 to ocis. The idea is to have a reverse proxy infront of ownCloud 10 that will forward requests to ownCloud 10 or ocis-reva, depending on the migration status of the logged in user.
 
 This document is a work in progress of the current setup.
diff --git a/docs/building.md b/docs/building.md
index 4120816940..319516066a 100644
--- a/docs/building.md
+++ b/docs/building.md
@@ -16,7 +16,7 @@ cd ocis
 
 All required tool besides Go itself and make are bundled or getting automatically installed within the `GOPATH`. All commands to build this project are part of our `Makefile`.
 
-### Simple Ocis
+## Simple Ocis
 
 Building the simple ocis binary:
 
@@ -37,7 +37,7 @@ devldap
 micro's own services
 ```
 
-### Backend
+## Backend
 
 {{< highlight txt >}}
 make generate
diff --git a/docs/extensions.md b/docs/extensions.md
index d5b837f655..ddcbecb819 100644
--- a/docs/extensions.md
+++ b/docs/extensions.md
@@ -7,6 +7,8 @@ geekdocEditPath: edit/master/docs
 geekdocFilePath: extensions.md
 ---
 
+{{< toc >}}
+
 ## How to build and run ocis-simple
 
 ocis uses build tags to build different flavors of the binary. In order to work on a new extension we are going to reduce the scope a little and use the `simple` tag. Let us begin by creating a dedicated folder:
diff --git a/docs/getting-started.md b/docs/getting-started.md
index abcc9eddf1..7564354247 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -7,6 +7,8 @@ geekdocEditPath: edit/master/docs
 geekdocFilePath: getting-started.md
 ---
 
+{{< toc >}}
+
 ## Installation
 
 So far we are offering two different variants for the installation. You can choose between [Docker](https://www.docker.com/) or pre-built binaries which are stored on our download mirrors and GitHub releases. Maybe we will also provide system packages for the major distributions later if we see the need for it.