diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk
index 22a381b263..aee8a55c17 100644
--- a/.bingo/Variables.mk
+++ b/.bingo/Variables.mk
@@ -71,11 +71,11 @@ $(GOX): $(BINGO_DIR)/gox.mod
 	@echo "(re)installing $(GOBIN)/gox-v1.0.1"
 	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=gox.mod -o=$(GOBIN)/gox-v1.0.1 "github.com/mitchellh/gox"
 
-HUGO := $(GOBIN)/hugo-v0.80.0
+HUGO := $(GOBIN)/hugo-v0.87.0
 $(HUGO): $(BINGO_DIR)/hugo.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/hugo-v0.80.0"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=hugo.mod -o=$(GOBIN)/hugo-v0.80.0 "github.com/gohugoio/hugo"
+	@echo "(re)installing $(GOBIN)/hugo-v0.87.0"
+	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=hugo.mod -o=$(GOBIN)/hugo-v0.87.0 "github.com/gohugoio/hugo"
 
 MUTAGEN := $(GOBIN)/mutagen-v0.11.8
 $(MUTAGEN): $(BINGO_DIR)/mutagen.mod
@@ -83,6 +83,12 @@ $(MUTAGEN): $(BINGO_DIR)/mutagen.mod
 	@echo "(re)installing $(GOBIN)/mutagen-v0.11.8"
 	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=mutagen.mod -o=$(GOBIN)/mutagen-v0.11.8 "github.com/mutagen-io/mutagen/cmd/mutagen"
 
+OAPI_CODEGEN := $(GOBIN)/oapi-codegen-v1.6.1
+$(OAPI_CODEGEN): $(BINGO_DIR)/oapi-codegen.mod
+	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
+	@echo "(re)installing $(GOBIN)/oapi-codegen-v1.6.1"
+	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=oapi-codegen.mod -o=$(GOBIN)/oapi-codegen-v1.6.1 "github.com/deepmap/oapi-codegen/cmd/oapi-codegen"
+
 PROTOC_GEN_DOC := $(GOBIN)/protoc-gen-doc-v1.4.1
 $(PROTOC_GEN_DOC): $(BINGO_DIR)/protoc-gen-doc.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
diff --git a/.bingo/goverage.mod b/.bingo/goverage.mod
index ab529e4ed3..d3f4a0e39d 100644
--- a/.bingo/goverage.mod
+++ b/.bingo/goverage.mod
@@ -2,7 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
 go 1.16
 
-require (
-	github.com/haya14busa/goverage v0.0.0-20180129164344-eec3514a20b5
-	golang.org/x/tools v0.1.5 // indirect
-)
+require github.com/haya14busa/goverage v0.0.0-20180129164344-eec3514a20b5
diff --git a/.bingo/hugo.mod b/.bingo/hugo.mod
index 685f11d984..2a7f90df5b 100644
--- a/.bingo/hugo.mod
+++ b/.bingo/hugo.mod
@@ -4,4 +4,4 @@ go 1.16
 
 replace github.com/markbates/inflect => github.com/markbates/inflect v0.0.0-20171215194931-a12c3aec81a6
 
-require github.com/gohugoio/hugo v0.80.0
+require github.com/gohugoio/hugo v0.87.0
diff --git a/.bingo/variables.env b/.bingo/variables.env
index d2574f53c1..acba65d052 100644
--- a/.bingo/variables.env
+++ b/.bingo/variables.env
@@ -26,10 +26,12 @@ GOVERAGE="${GOBIN}/goverage-v0.0.0-20180129164344-eec3514a20b5"
 
 GOX="${GOBIN}/gox-v1.0.1"
 
-HUGO="${GOBIN}/hugo-v0.80.0"
+HUGO="${GOBIN}/hugo-v0.87.0"
 
 MUTAGEN="${GOBIN}/mutagen-v0.11.8"
 
+OAPI_CODEGEN="${GOBIN}/oapi-codegen-v1.6.1"
+
 PROTOC_GEN_DOC="${GOBIN}/protoc-gen-doc-v1.4.1"
 
 PROTOC_GEN_GO="${GOBIN}/protoc-gen-go-v1.26.0"
diff --git a/docs/Makefile b/docs/Makefile
index b9d5f5e4ff..dfdd2285ca 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -19,6 +19,7 @@ docs-init:
 	@cd hugo && git remote add origin https://github.com/owncloud/owncloud.github.io
 	@cd hugo && git fetch --depth=1
 	@cd hugo && git checkout origin/source -f
+	@make -C hugo theme
 
 .PHONY: docs-serve
 docs-serve: docs-init docs-generate docs-copy ## serve docs with hugo