diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7506899..615dcb3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -56,7 +56,7 @@ jobs:
 
       - name: Set environment from runtime properties
         run: |
-          echo "MATTERMOST_RELEASE=$(grep 'mattermost-server' dependabot/go.mod | cut -d' ' -f3)" >> $GITHUB_ENV
+          echo "MATTERMOST_RELEASE=$(grep 'mattermost-server' dependabot/go.mod | cut -d' ' -f2)" >> $GITHUB_ENV
           echo "MMCTL_RELEASE=$MATTERMOST_RELEASE" >> $GITHUB_ENV
 
       - name: Pull docker image
diff --git a/build-release.patch b/build-release.patch
index 34f5d6a..71adc9a 100644
--- a/build-release.patch
+++ b/build-release.patch
@@ -1,5 +1,5 @@
 diff --git a/build/release.mk b/build/release.mk
-index 017746342..3c3e76bea 100644
+index faa027239..df40f0c68 100644
 --- a/build/release.mk
 +++ b/build/release.mk
 @@ -99,7 +99,7 @@ package-prep:
@@ -11,22 +11,14 @@ index 017746342..3c3e76bea 100644
  	cp -RL fonts $(DIST_PATH)
  	cp -RL templates $(DIST_PATH)
  	rm -rf $(DIST_PATH)/templates/*.mjml $(DIST_PATH)/templates/partials/
-@@ -159,13 +159,14 @@ else
+@@ -159,8 +159,8 @@ else
  	cp $(GOBIN)/$(CURRENT_PACKAGE_ARCH)/$(MM_BIN_NAME) $(DIST_PATH_GENERIC)/bin # from cross-compiled bin dir
  endif
  
-+	@#Copy cross-compiled MMCTL
-+	cp "${HOME}/go/src/github.com/mattermost/mmctl/mmctl" $(DIST_PATH_GENERIC)/bin
-+
- ifeq ("darwin_arm64","$(CURRENT_PACKAGE_ARCH)")
--	echo "No plugins or mmctl yet for $(CURRENT_PACKAGE_ARCH) platform, skipping..."
-+	echo "No plugins yet for $(CURRENT_PACKAGE_ARCH) platform, skipping..."
- else ifeq ("linux_arm64","$(CURRENT_PACKAGE_ARCH)")
--	echo "No plugins or mmctl yet for $(CURRENT_PACKAGE_ARCH) platform, skipping..."
-+	echo "No plugins yet for $(CURRENT_PACKAGE_ARCH) platform, skipping..."
- else
 -	#Download MMCTL for $(MMCTL_PLATFORM)
 -	scripts/download_mmctl_release.sh $(MMCTL_PLATFORM) $(DIST_PATH_GENERIC)/bin
- 	@# Prepackage plugins
- 	@for plugin_package in $(PLUGIN_PACKAGES) ; do \
- 		ARCH=$(PLUGIN_ARCH); \
++	@#Copy cross-compiled MMCTL
++	cp "${HOME}/go/src/github.com/mattermost/mmctl/mmctl" $(DIST_PATH_GENERIC)/bin
+ 
+ ifeq ("darwin_arm64","$(CURRENT_PACKAGE_ARCH)")
+ 	echo "No plugins yet for $(CURRENT_PACKAGE_ARCH) platform, skipping..."
diff --git a/build.sh b/build.sh
index d8d3396..c989ac1 100755
--- a/build.sh
+++ b/build.sh
@@ -10,7 +10,7 @@ MATTERMOST_RELEASE="${MATTERMOST_RELEASE:-v5.26.0}"
 MMCTL_RELEASE="${MMCTL_RELEASE:-v5.26.0}"
 # node key id and release
 NODE_KEY="${NODE_KEY:-9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280}"
-NODE_RELEASE="${NODE_RELEASE:-16}"
+NODE_RELEASE="${NODE_RELEASE:-15}"
 # golang version
 GO_VERSION="${GO_VERSION:-1.16.7}"
 
@@ -48,7 +48,7 @@ if [ "$(id -u)" -eq 0 ]; then # as root user
 	apt-get update
 	# install dependencies
 	apt-get install --quiet \
-		wget build-essential patch git nodejs
+		wget build-essential patch git nodejs python2
 	# install 'pngquant' build dependencies (required by node module)
 	apt-get build-dep --quiet \
 		pngquant
diff --git a/dependabot/go.mod b/dependabot/go.mod
index 80871d5..8072e2a 100644
--- a/dependabot/go.mod
+++ b/dependabot/go.mod
@@ -2,5 +2,7 @@ module github.com/SmartHoneybee/ubiquitous-memory/dependabot
 
 go 1.16
 
-require github.com/mattermost/mattermost-server/v6 v6.2.1
-
+require (
+	github.com/mattermost/mattermost-server/v6 v6.3.0
+	github.com/mattermost/mmctl v0.0.0-20211221153052-1bb2fec4c15e
+)