diff --git a/conf/local-sample.config.php b/conf/local-sample.config.php
index 882204e..2e7d58a 100644
--- a/conf/local-sample.config.php
+++ b/conf/local-sample.config.php
@@ -19,7 +19,7 @@
 return [
 	'database' => [
 		'hostname' => 'localhost',
-		'username' => '__DB_NAME__',
+		'username' => '__DB_USER__',
 		'password' => '__DB_PWD__',
 		'database' => '__DB_NAME__',
 		'charset' => 'utf8mb4',
@@ -38,7 +38,7 @@ return [
 		'register_text' => '',
 	],
 	'system' => [
-		'default_timezone' => 'UTC',
+		'default_timezone' => '__TIMEZONE__',
 		'language' => '__LANGUAGE__',
 	],
 ];
diff --git a/manifest.json b/manifest.json
index 4ca9313..34ea90c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
     "en": "Social Communication Server",
     "fr": "Serveur de Communication Social"
   },
-  "version": "2022.03~ynh1",
+  "version": "2022.06~ynh1",
   "url": "http://friendi.ca",
   "upstream": {
         "license": "AGPL-3.0-only",
@@ -21,17 +21,17 @@
     "name": "Anmol Sharma",
     "email": ""
   },
-  "requirements": {
-    "yunohost": ">= 4.3.0"
-  },
   "previous_maintainers": {
     "name": "aymhce",
     "email": "aymhce@gmail.com"
   },
+  "requirements": {
+    "yunohost": ">= 4.3.0"
+  },
   "multi_instance": true,
   "services": [
     "nginx",
-    "php7.3-fpm",
+    "php8.0-fpm",
     "mysql"
     ],
     "arguments": {
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 8c5cefb..2d82671 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -5,14 +5,14 @@
 #=================================================
 
 # commit hashes
-# 2022.03
-version_commit="f660c3894411d5a55ad201b0da8d46715b5b5002"
-addons_version_commit="c35a6d58345ef7f99534f465d8453bccdca80450"
+# 2022.06
+version_commit="7fe7d0c90437283bd0e83a7e571e1c032e5168ea"
+addons_version_commit="7bb3595d467868170f95fe231edaecf0dd4e84a1"
 
 # dependencies used by the app
-YNH_PHP_VERSION="7.3"
+YNH_PHP_VERSION="8.0"
 
-extra_php_dependencies="php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-gd"
+extra_php_dependencies="php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-imagick php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-gd"
 
 #=================================================
 # EXPERIMENTAL HELPERS