diff --git a/.make/recursion.mk b/.make/recursion.mk
deleted file mode 100644
index fcef863ebe..0000000000
--- a/.make/recursion.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-
-ifeq ($(MAKE_DEPTH),)
-MAKE_DEPTH := 0
-else
-$(eval MAKE_DEPTH := $(shell echo "$$(( $(MAKE_DEPTH) + 1 ))" ) )
-endif
-
-export
diff --git a/Makefile b/Makefile
index 7d88f8a707..ca10398421 100644
--- a/Makefile
+++ b/Makefile
@@ -78,8 +78,6 @@ ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warn
 include .bingo/Variables.mk
 endif
 
-include .make/recursion.mk
-
 .PHONY: help
 help:
 	@echo "Please use 'make <target>' where <target> is one of the following:"
diff --git a/opencloud/Makefile b/opencloud/Makefile
index 059e39a378..4e147953b4 100644
--- a/opencloud/Makefile
+++ b/opencloud/Makefile
@@ -11,7 +11,6 @@ ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warn
 include ../.bingo/Variables.mk
 endif
 include ../.make/default.mk
-include ../.make/recursion.mk
 include ../.make/go.mk
 include ../.make/release.mk
 include ../.make/docs.mk
diff --git a/pkg/Makefile b/pkg/Makefile
index f0363a3d06..698fd1bf7a 100644
--- a/pkg/Makefile
+++ b/pkg/Makefile
@@ -5,7 +5,6 @@ ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warn
 include ../.bingo/Variables.mk
 endif
 include ../.make/default.mk
-include ../.make/recursion.mk
 include ../.make/go.mk
 include ../.make/release.mk
 include ../.make/docs.mk
diff --git a/protogen/Makefile b/protogen/Makefile
index 93930cc247..7a1f6677ca 100644
--- a/protogen/Makefile
+++ b/protogen/Makefile
@@ -5,7 +5,6 @@ ifneq (, $(shell command -v go 2> /dev/null)) # suppress `command not found warn
 include ../.bingo/Variables.mk
 endif
 include ../.make/default.mk
-include ../.make/recursion.mk
 include ../.make/generate.mk
 
 .PHONY: go-generate
diff --git a/services/activitylog/Makefile b/services/activitylog/Makefile
index 0d6a6af77c..c7180453aa 100644
--- a/services/activitylog/Makefile
+++ b/services/activitylog/Makefile
@@ -8,7 +8,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/antivirus/Makefile b/services/antivirus/Makefile
index 47a588dd8b..addc8a0023 100644
--- a/services/antivirus/Makefile
+++ b/services/antivirus/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/app-provider/Makefile b/services/app-provider/Makefile
index f200baa5fb..ba34ce2c79 100644
--- a/services/app-provider/Makefile
+++ b/services/app-provider/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/app-registry/Makefile b/services/app-registry/Makefile
index c35e1fa1b7..6f959ec782 100644
--- a/services/app-registry/Makefile
+++ b/services/app-registry/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/audit/Makefile b/services/audit/Makefile
index d7abe37491..ecd683a3cb 100644
--- a/services/audit/Makefile
+++ b/services/audit/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/auth-app/Makefile b/services/auth-app/Makefile
index 4d2f8f1d7c..f2a24dbd0e 100644
--- a/services/auth-app/Makefile
+++ b/services/auth-app/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/auth-basic/Makefile b/services/auth-basic/Makefile
index 8d7cab3a81..68dbf6ba3f 100644
--- a/services/auth-basic/Makefile
+++ b/services/auth-basic/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/auth-bearer/Makefile b/services/auth-bearer/Makefile
index 30bd5d69f1..8d89b6eee6 100644
--- a/services/auth-bearer/Makefile
+++ b/services/auth-bearer/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/auth-machine/Makefile b/services/auth-machine/Makefile
index ef21e4be45..b880dea624 100644
--- a/services/auth-machine/Makefile
+++ b/services/auth-machine/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/auth-service/Makefile b/services/auth-service/Makefile
index e0bebf5230..3e4226894e 100644
--- a/services/auth-service/Makefile
+++ b/services/auth-service/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/clientlog/Makefile b/services/clientlog/Makefile
index fa6927bab1..fafc6d26c4 100644
--- a/services/clientlog/Makefile
+++ b/services/clientlog/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/collaboration/Makefile b/services/collaboration/Makefile
index c8273d6d0d..1c62bcf7de 100644
--- a/services/collaboration/Makefile
+++ b/services/collaboration/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/eventhistory/Makefile b/services/eventhistory/Makefile
index 62ed0bf393..393882eca1 100644
--- a/services/eventhistory/Makefile
+++ b/services/eventhistory/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/frontend/Makefile b/services/frontend/Makefile
index 1bdbc68348..eda820ce45 100644
--- a/services/frontend/Makefile
+++ b/services/frontend/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/gateway/Makefile b/services/gateway/Makefile
index 8f7ba6f9d9..7b193fb051 100644
--- a/services/gateway/Makefile
+++ b/services/gateway/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/graph/Makefile b/services/graph/Makefile
index aa80ead13c..ee9d95e9cf 100644
--- a/services/graph/Makefile
+++ b/services/graph/Makefile
@@ -8,7 +8,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/groups/Makefile b/services/groups/Makefile
index 99f974c783..fb80fa5fc3 100644
--- a/services/groups/Makefile
+++ b/services/groups/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/idm/Makefile b/services/idm/Makefile
index d8ba474d75..2c53ad5aef 100644
--- a/services/idm/Makefile
+++ b/services/idm/Makefile
@@ -7,7 +7,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/idp/Makefile b/services/idp/Makefile
index 499de81485..3f13072b92 100644
--- a/services/idp/Makefile
+++ b/services/idp/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/invitations/Makefile b/services/invitations/Makefile
index 5660dcb590..beaeb351fd 100644
--- a/services/invitations/Makefile
+++ b/services/invitations/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/nats/Makefile b/services/nats/Makefile
index a6ba55d982..0e06713d5e 100644
--- a/services/nats/Makefile
+++ b/services/nats/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/notifications/Makefile b/services/notifications/Makefile
index 28944cbd5a..90e67dd785 100644
--- a/services/notifications/Makefile
+++ b/services/notifications/Makefile
@@ -8,7 +8,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/ocdav/Makefile b/services/ocdav/Makefile
index 89c152a20b..392e8f6cff 100644
--- a/services/ocdav/Makefile
+++ b/services/ocdav/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/ocm/Makefile b/services/ocm/Makefile
index 4dc5cb82f9..4774695f2e 100644
--- a/services/ocm/Makefile
+++ b/services/ocm/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/ocs/Makefile b/services/ocs/Makefile
index e03181e31b..17d92f4f1a 100644
--- a/services/ocs/Makefile
+++ b/services/ocs/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/policies/Makefile b/services/policies/Makefile
index 81c60e0cc6..e7eb762748 100644
--- a/services/policies/Makefile
+++ b/services/policies/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/postprocessing/Makefile b/services/postprocessing/Makefile
index 255e6d323c..7b306856cb 100644
--- a/services/postprocessing/Makefile
+++ b/services/postprocessing/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/proxy/Makefile b/services/proxy/Makefile
index 39a3bf50af..13ad7a8296 100644
--- a/services/proxy/Makefile
+++ b/services/proxy/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/search/Makefile b/services/search/Makefile
index cd1195517a..fa38d02769 100644
--- a/services/search/Makefile
+++ b/services/search/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/settings/Makefile b/services/settings/Makefile
index b8167cc523..d3c44051da 100644
--- a/services/settings/Makefile
+++ b/services/settings/Makefile
@@ -8,7 +8,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/sharing/Makefile b/services/sharing/Makefile
index c9477dd790..d0c0d7b59f 100644
--- a/services/sharing/Makefile
+++ b/services/sharing/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/sse/Makefile b/services/sse/Makefile
index 6c2f9b0526..5fcc294aca 100644
--- a/services/sse/Makefile
+++ b/services/sse/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/storage-publiclink/Makefile b/services/storage-publiclink/Makefile
index abe0f41948..32feca80c9 100644
--- a/services/storage-publiclink/Makefile
+++ b/services/storage-publiclink/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/storage-shares/Makefile b/services/storage-shares/Makefile
index 9589cfc11e..c29ebbe510 100644
--- a/services/storage-shares/Makefile
+++ b/services/storage-shares/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/storage-system/Makefile b/services/storage-system/Makefile
index 4b93f7bf20..82d8a6129f 100644
--- a/services/storage-system/Makefile
+++ b/services/storage-system/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/storage-users/Makefile b/services/storage-users/Makefile
index 03ddb20485..dd2e18cef9 100644
--- a/services/storage-users/Makefile
+++ b/services/storage-users/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/thumbnails/Makefile b/services/thumbnails/Makefile
index 14f5561804..ed66a59360 100644
--- a/services/thumbnails/Makefile
+++ b/services/thumbnails/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/userlog/Makefile b/services/userlog/Makefile
index 002711c056..11de808d42 100644
--- a/services/userlog/Makefile
+++ b/services/userlog/Makefile
@@ -8,7 +8,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/users/Makefile b/services/users/Makefile
index 8c2e22d928..ab98b072eb 100644
--- a/services/users/Makefile
+++ b/services/users/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/web/Makefile b/services/web/Makefile
index a505570c02..b0454f2dff 100644
--- a/services/web/Makefile
+++ b/services/web/Makefile
@@ -8,7 +8,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/webdav/Makefile b/services/webdav/Makefile
index 536a3cd72c..418c8e2ea9 100644
--- a/services/webdav/Makefile
+++ b/services/webdav/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk
diff --git a/services/webfinger/Makefile b/services/webfinger/Makefile
index 070f11d6ba..aa5e220c26 100644
--- a/services/webfinger/Makefile
+++ b/services/webfinger/Makefile
@@ -6,7 +6,6 @@ include ../../.bingo/Variables.mk
 endif
 
 include ../../.make/default.mk
-include ../../.make/recursion.mk
 include ../../.make/go.mk
 include ../../.make/release.mk
 include ../../.make/docs.mk