diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh
index 48a4e22..91bc692 100644
--- a/.github/workflows/updater.sh
+++ b/.github/workflows/updater.sh
@@ -79,13 +79,13 @@ echo "Handling asset at $asset_url"
 # Leave $src empty to ignore the asset
 case $asset_url in
   *"mattermost-"*"-linux-arm.tar.gz")
-    src="arm"
+    src="armhf"
     ;;
   *"mattermost-"*"-linux-arm64.tar.gz")
     src="arm64"
     ;;
   *"mattermost-team-"*"-linux-amd64.tar.gz")
-    src="x86-64"
+    src="amd64"
     ;;
   *"mattermost-enterprise-"*"-linux-amd64.tar.gz")
     src="enterprise"
diff --git a/README.md b/README.md
index eba6776..ebe2d4b 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ To explore the benefits of Mattermost’s enterprise features, you can replace t
 - Multiple languages including U.S. English, Australian English, Bulgarian, Chinese (Simplified and Traditional), Dutch, French, German, Hungarian, Italian, Japanese, Korean, Polish, Brazilian Portuguese, Romanian, Russian, Turkish, Spanish, Swedish, and Ukrainian
 
 
-**Shipped version:** 6.2.1~ynh1
+**Shipped version:** 6.3.1~ynh1
 
 
 
diff --git a/README_fr.md b/README_fr.md
index b8a46ea..bf20e72 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -33,7 +33,7 @@ Pour explorer les avantages des fonctionnalités d'entreprise de Mattermost, vou
 - Plusieurs langues dont l'anglais américain, l'anglais australien, le bulgare, le chinois (simplifié et traditionnel), le néerlandais, le français, l'allemand, le hongrois, l'italien, le japonais, le coréen, le polonais, le portugais brésilien, le roumain, le russe, le turc, l'espagnol, le suédois et l'ukrainien 
 
 
-**Version incluse :** 6.2.1~ynh1
+**Version incluse :** 6.3.1~ynh1
 
 
 
diff --git a/bump-mattermost.rb b/bump-mattermost.rb
index 442cabb..34f8f13 100755
--- a/bump-mattermost.rb
+++ b/bump-mattermost.rb
@@ -36,9 +36,9 @@ module Mattermost
 
     def retrieve_release_data
       case @variant
-      when :'x86-64', :enterprise
+      when :amd64, :enterprise
         retrieve_first_party_release_data
-      when :arm, :arm64
+      when :armhf, :arm64
         retrieve_smart_honeybee_release_data
       else
         raise "Unsupported variant '{#release_desc.variant}'"
@@ -47,7 +47,7 @@ module Mattermost
 
     def retrieve_first_party_release_data
       edition = {
-        'x86-64': 'team',
+        amd64: 'team',
         enterprise: 'enterprise'
       }.fetch(variant)
 
@@ -59,7 +59,12 @@ module Mattermost
     end
 
     def retrieve_smart_honeybee_release_data
-      @url = "https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v#{version}/mattermost-v#{version}-linux-#{variant}.tar.gz"
+      arch = {
+        armhf: 'arm',
+        arm64: 'arm64'
+      }.fetch(variant)
+
+      @url = "https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v#{version}/mattermost-v#{version}-linux-#{arch}.tar.gz"
 
       puts "Downloading release #{version}-#{variant} for computing checksum…"
       release_file = URI.parse(@url).read
@@ -122,7 +127,7 @@ if version.nil?
   abort("ERROR: The Mattermost release version must be provided.\nExample: ./bump-mattermost.sh 5.33.1")
 end
 
-VARIANTS = %i[x86-64 enterprise arm arm64]
+VARIANTS = %i[amd64 enterprise armhf arm64]
 
 # Compute releases URLs and sums
 releases = VARIANTS
diff --git a/conf/amd64.src b/conf/amd64.src
index e6d6579..53a7b88 100644
--- a/conf/amd64.src
+++ b/conf/amd64.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://releases.mattermost.com/6.2.1/mattermost-team-6.2.1-linux-amd64.tar.gz
-SOURCE_SUM=4fcc4185ff3a5f6f6e96c327bfeef48e11621cf8b850a66821b469dcf9c6bb10
+SOURCE_URL=https://releases.mattermost.com/6.3.1/mattermost-team-6.3.1-linux-amd64.tar.gz
+SOURCE_SUM=3a612b3d8045a58bf845747a6ba7bd2a9ed5e8a7d2ee076a92e463dafadf7f72
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/conf/arm64.src b/conf/arm64.src
index 6c4e9f4..a94d00c 100644
--- a/conf/arm64.src
+++ b/conf/arm64.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v6.2.1/mattermost-v6.2.1-linux-arm64.tar.gz
-SOURCE_SUM=d63df70e27ee71fbb802b322b74a93168b0f19d3283865dd5dbf69d8daa9b4b0
+SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v6.3.1/mattermost-v6.3.1-linux-arm64.tar.gz
+SOURCE_SUM=6014da3b34e75f7cdffc9054c6bad849677c2b7e10993865fd172e8ba4a552c7
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/conf/armhf.src b/conf/armhf.src
index 7377aea..b60c298 100644
--- a/conf/armhf.src
+++ b/conf/armhf.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v6.2.1/mattermost-v6.2.1-linux-arm.tar.gz
-SOURCE_SUM=44b1fdd99f91448d6d6d0becff52804e30b0da8bb6dd6b4ad884da2605342532
+SOURCE_URL=https://github.com/SmartHoneybee/ubiquitous-memory/releases/download/v6.3.1/mattermost-v6.3.1-linux-arm.tar.gz
+SOURCE_SUM=1ed236b7de9657b2aeb26507842fd4b8b9be962c5afc6f4f8d8b89b9e84a4417
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/conf/config.json b/conf/config.json
index b72664a..3638b3a 100644
--- a/conf/config.json
+++ b/conf/config.json
@@ -32,10 +32,11 @@
     "RestrictLinkPreviews": "",
     "EnableTesting": false,
     "EnableDeveloper": false,
+    "DeveloperFlags": "",
     "EnableOpenTracing": false,
     "EnableSecurityFixAlert": true,
     "EnableInsecureOutgoingConnections": false,
-    "AllowedUntrustedInternalConnections": "",
+    "AllowedUntrustedInternalConnections": "api.integrations.mattermost.com",
     "EnableMultifactorAuthentication": false,
     "EnforceMultifactorAuthentication": false,
     "EnableUserAccessTokens": false,
@@ -92,8 +93,7 @@
     "DebugSplit": false,
     "ThreadAutoFollow": true,
     "CollapsedThreads": "disabled",
-    "ManagedResourcePaths": "",
-    "EnableReliableWebSockets": false
+    "ManagedResourcePaths": ""
   },
   "TeamSettings": {
     "SiteName": "Mattermost",
@@ -121,8 +121,6 @@
   "ClientRequirements": {
     "AndroidLatestVersion": "",
     "AndroidMinVersion": "",
-    "DesktopLatestVersion": "",
-    "DesktopMinVersion": "",
     "IosLatestVersion": "",
     "IosMinVersion": ""
   },
@@ -570,18 +568,22 @@
     "CollapsedThreads": true,
     "EnableRemoteClusterService": false,
     "AppsEnabled": false,
+    "AppBarEnabled": false,
     "PluginPlaybooks": "",
     "PluginApps": "",
     "PluginFocalboard": "",
     "PermalinkPreviews": true,
     "GlobalHeader": true,
     "AddChannelButton": "by_team_name",
-    "PrewrittenMessages": "tour_point",
-    "DownloadAppsCTA": "tips_and_next_steps",
     "NewAccountNoisy": false,
     "BoardsUnfurl": true,
     "CallsMobile": false,
-    "AutoTour": "none"
+    "AutoTour": "none",
+    "BoardsFeatureFlags": "",
+    "AddMembersToChannel": "top",
+    "GuidedChannelCreation": false,
+    "ResendInviteEmailInterval": "",
+    "InviteToTeam": "none"
   },
   "ImportSettings": {
     "Directory": "./import",
diff --git a/conf/enterprise.src b/conf/enterprise.src
index b5c5415..69157ee 100644
--- a/conf/enterprise.src
+++ b/conf/enterprise.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://releases.mattermost.com/6.2.1/mattermost-enterprise-6.2.1-linux-amd64.tar.gz
-SOURCE_SUM=a55fccc0c08af2f3330125ee335f9e3dc6ab220adc3409052c47663f26bdd751
+SOURCE_URL=https://releases.mattermost.com/6.3.1/mattermost-enterprise-6.3.1-linux-amd64.tar.gz
+SOURCE_SUM=945c1266c01c42eb964cdfb8c027bb1832e4869d404a7e4613bfcae55a69af5e
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index 6dee1b6..b1d9061 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Open source collaboration platform built for developers",
         "fr": "Plateforme de collaboration open source conçue pour les développeurs"
     },
-    "version": "6.2.1~ynh1",
+    "version": "6.3.1~ynh1",
     "url": "http://www.mattermost.org/",
     "upstream": {
         "license": "GPL-3.0-only",
diff --git a/scripts/upgrade b/scripts/upgrade
index 03e870e..86ba36d 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -126,8 +126,9 @@ then
   # Create a temporary directory
   tmpdir="$(mktemp -d)"
 
-  # Backup the config file in the temp dir
+  # Backup the config file and local plugins in the temp dir
   cp -a "$final_path/config/config.json" "$tmpdir/config.json"
+  cp -ar "$final_path/plugins" "$tmpdir/plugins"
 
   # Remove the app directory securely
   ynh_secure_remove --file="$final_path"
@@ -138,8 +139,9 @@ then
     ynh_setup_source --dest_dir="$final_path" --source_id="$architecture"
   fi
 
-  # Copy the admin saved settings from tmp directory to final path  
+  # Copy the admin saved settings and plugins from tmp directory to final path
   cp -a "$tmpdir/config.json" "$final_path/config/config.json" 
+  cp -ar --no-clobber "$tmpdir/plugins" "$final_path/"
 
   # Remove the tmp directory securely
   ynh_secure_remove --file="$tmpdir"