--- a/Makefile
+++ b/Makefile
@@ -48,6 +48,7 @@ GOFLAGS ?= $(GOFLAGS:)
 GO=go
 DELVE=dlv
 GO_LINKER_FLAGS ?= -ldflags \
-				   "-X github.com/mattermost/mattermost-server/model.BuildNumber=$(BUILD_NUMBER)\
+				   "-linkmode external -extldflags '$(LDFLAGS)' -s -w \
+				    -X github.com/mattermost/mattermost-server/model.BuildNumber=$(BUILD_NUMBER)\
 				    -X 'github.com/mattermost/mattermost-server/model.BuildDate=$(BUILD_DATE)'\
 				    -X github.com/mattermost/mattermost-server/model.BuildHash=$(BUILD_HASH)\