diff --git a/.github/lock.yml b/.github/lock.yml
new file mode 100644
index 0000000..141ad2f
--- /dev/null
+++ b/.github/lock.yml
@@ -0,0 +1,7 @@
+# Configuration for Lock Threads - https://github.com/dessant/lock-threads
+
+# Number of days of inactivity before a closed issue or pull request is locked
+daysUntilLock: 3
+
+# Comment to post before locking. Set to `false` to disable
+lockComment: false
diff --git a/build-release.patch b/build-release.patch
index e057044..2086664 100644
--- a/build-release.patch
+++ b/build-release.patch
@@ -11,7 +11,7 @@ diff --git a/build/release.mk b/build/release.mk
 index 238343e..1b7859f 100644
 --- a/build/release.mk
 +++ b/build/release.mk
-@@ -66,7 +66,7 @@ endif
+@@ -70,7 +70,7 @@ endif
  	done
  
  	@# ----- PLATFORM SPECIFIC -----
@@ -20,10 +20,10 @@ index 238343e..1b7859f 100644
  	@# Make osx package
  	@# Copy binary
  ifeq ($(BUILDER_GOOS_GOARCH),"darwin_amd64")
-@@ -96,7 +96,7 @@ endif
- 	@# Cleanup
+@@ -110,7 +110,7 @@ endif
  	rm -f $(DIST_PATH)/bin/mattermost.exe
  	rm -f $(DIST_PATH)/bin/platform.exe
+ 	rm -f $(DIST_PATH)/prepackaged_plugins/*
 -
 +package-linux: package
  	@# Make linux package
diff --git a/build.sh b/build.sh
index e541ea3..28313fb 100644
--- a/build.sh
+++ b/build.sh
@@ -31,9 +31,9 @@ if [ "$(id -u)" -eq 0 ]; then # as root user
 	apt-get update
 	# dependencies to setup repositories
 	apt-get install --quiet \
-		gnupg2 dirmngr apt-transport-https ca-certificates
-	# receive missing key
-	apt-key adv --keyserver 'ipv4.pool.sks-keyservers.net' --recv-keys "${NODE_KEY}"
+		gnupg2 dirmngr apt-transport-https ca-certificates parallel
+	# receive missing key (retry on failure)
+	parallel --verbose --delay=30 --retries=5 "apt-key adv --keyserver 'ipv4.pool.sks-keyservers.net' --recv-keys '{}'" ::: "${NODE_KEY}"
 	# add required additional repositories
 	printf 'deb-src http://deb.debian.org/debian %s main' "${DEBIAN_RELEASE}" \
 		> "/etc/apt/sources.list.d/${DEBIAN_RELEASE}-source.list"
@@ -88,6 +88,8 @@ if [ "$(go env GOOS)_$(go env GOARCH)" != 'linux_amd64' ]; then
 fi
 patch --directory="${HOME}/go/src/github.com/mattermost/mattermost-server" \
 	--strip=1 < "${HOME}/build-release.patch"
+patch --directory="${HOME}/go/src/github.com/mattermost/mattermost-server" \
+	--strip=1 < "${HOME}/go-backport.patch"
 make --directory="${HOME}/go/src/github.com/mattermost/mattermost-server" \
 	config-reset build-linux package-linux \
 	BUILD_NUMBER="dev-$(go env GOOS)-$(go env GOARCH)-${MATTERMOST_RELEASE}" \
diff --git a/dependabot/Gopkg.lock b/dependabot/Gopkg.lock
index 4a64da1..584a21a 100644
--- a/dependabot/Gopkg.lock
+++ b/dependabot/Gopkg.lock
@@ -42,7 +42,15 @@
   revision = "483fb8d7c32fcb4b5636cd293a92e3935932e2f4"
 
 [[projects]]
-  digest = "1:fa1e727613a8f6f45e9ef1c9abaef028bce3b345d02a68814d59e21a27eda6ee"
+  digest = "1:9fa4a4a684dfb36f3ba1b0a163225140e19e3219e5576d0761d02dbd4c31b743"
+  name = "github.com/mattermost/go-i18n"
+  packages = ["i18n"]
+  pruneopts = ""
+  revision = "0dc1626d56435e9d605a29875701721c54bc9bbd"
+  version = "v1.10.0"
+
+[[projects]]
+  digest = "1:6820b3c6ae3e9fde8123d3f793c5aa422f2d7b61d15434a0bb7285183f84f5e5"
   name = "github.com/mattermost/mattermost-server"
   packages = [
     "mlog",
@@ -52,14 +60,13 @@
     "utils/markdown",
   ]
   pruneopts = ""
-  revision = "692d1be91eafb64328ce21bcd18671288eb5139b"
-  version = "v5.11.0"
+  revision = "bfd66aa445a2df8c6ed6ba9f2567021ecf6c9f3b"
+  version = "v5.12.0"
 
 [[projects]]
   digest = "1:9fa4a4a684dfb36f3ba1b0a163225140e19e3219e5576d0761d02dbd4c31b743"
   name = "github.com/nicksnyder/go-i18n"
   packages = [
-    "i18n",
     "i18n/bundle",
     "i18n/language",
     "i18n/translation",
diff --git a/dependabot/Gopkg.toml b/dependabot/Gopkg.toml
index 377f8d7..9f4c2d3 100644
--- a/dependabot/Gopkg.toml
+++ b/dependabot/Gopkg.toml
@@ -1,3 +1,3 @@
 [[constraint]]
   name = "github.com/mattermost/mattermost-server"
-  version = "v5.11.0"
+  version = "v5.12.0"
diff --git a/go-backport.patch b/go-backport.patch
new file mode 100644
index 0000000..5b9ab51
--- /dev/null
+++ b/go-backport.patch
@@ -0,0 +1,27 @@
+From 556e16211ed1b4c146ca2a094688618458182ae7 Mon Sep 17 00:00:00 2001
+From: Your Name <you@example.com>
+Date: Wed, 6 Jun 2018 12:34:56 +0100
+Subject: [PATCH] go 1.11 backport
+
+---
+ store/sqlstore/channel_store.go | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/store/sqlstore/channel_store.go b/store/sqlstore/channel_store.go
+index cf63c706d..dae7c8c9c 100644
+--- a/store/sqlstore/channel_store.go
++++ b/store/sqlstore/channel_store.go
+@@ -2156,9 +2156,9 @@ func (s SqlChannelStore) SearchAllChannels(term string, opts store.ChannelSearch
+ 
+ 		likeClause, likeTerm := s.buildLIKEClause(term, "c.Name, c.DisplayName, c.Purpose")
+ 		if len(likeTerm) > 0 {
+-			likeClause = strings.ReplaceAll(likeClause, ":LikeTerm", "'"+likeTerm+"'")
++			likeClause = strings.Replace(likeClause, ":LikeTerm", "'"+likeTerm+"'", -1)
+ 			fulltextClause, fulltextTerm := s.buildFulltextClause(term, "c.Name, c.DisplayName, c.Purpose")
+-			fulltextClause = strings.ReplaceAll(fulltextClause, ":FulltextTerm", "'"+fulltextTerm+"'")
++			fulltextClause = strings.Replace(fulltextClause, ":FulltextTerm", "'"+fulltextTerm+"'", -1)
+ 			query = query.Where("(" + likeClause + " OR " + fulltextClause + ")")
+ 		}
+ 
+-- 
+2.11.0