diff --git a/assets/.golangci.yml b/assets/.golangci.yml
index 69f30a5..b2710f1 100644
--- a/assets/.golangci.yml
+++ b/assets/.golangci.yml
@@ -11,7 +11,6 @@ linters:
     - nakedret
     - revive
     - staticcheck # Now includes gosimple and stylecheck
-    - typecheck
     - unconvert
     - unused
     - whitespace
@@ -69,7 +68,7 @@ formatters:
 
     goimports:
       local-prefixes:
-        - {{.GoModule.Name}}
+        - { { .GoModule.Name } }
 
 output:
   formats:
diff --git a/assets/build/build.mk b/assets/build/build.mk
index 19b83ec..22cec48 100644
--- a/assets/build/build.mk
+++ b/assets/build/build.mk
@@ -11,9 +11,16 @@ all: check-style test dist
 manifest-check:
 	pluginctl manifest check
 
+## Cleans the server build artifacts.
+.PHONY: clean-server
+clean-server:
+ifneq ($(HAS_SERVER),)
+	rm -rf server/dist
+endif
 
 ## Builds the server, if it exists, for all supported architectures, unless MM_SERVICESETTINGS_ENABLEDEVELOPER is set.
 .PHONY: server
+server: clean-server
 server:
 ifneq ($(HAS_SERVER),)
 ifneq ($(MM_DEBUG),)