diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74b0376fe..58c73a7af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,11 @@ Group changes to describe their impact on the project, as follows:
 
 ## [5.1.0] - Unreleased
 
+### Added
+- Showing short term presence for contacts whom publish it + added setting to disable it (enabled by default for sip.linphone.org accounts)
+
 ### Changed
+- Account EXPIRES is now set to 1 month instead of 1 year for sip.linphone.org accounts
 - Replaced voice recordings file name by localized placeholder text, like for video conferences invitations
 - Removed jetifier as it is not needed
 
@@ -25,7 +29,7 @@ Group changes to describe their impact on the project, as follows:
 ### Changed
 - Updated translations
 
-## [5.0.6] - Unreleased
+## [5.0.6] - 2023-02-17
 
 ### Fixed
 - Wrong country displayed in assistant after picking it in the list if another country has the same international prefix (such as +1)
diff --git a/app/src/main/assets/assistant_default_values b/app/src/main/assets/assistant_default_values
index a2c4512ab..5800203a4 100644
--- a/app/src/main/assets/assistant_default_values
+++ b/app/src/main/assets/assistant_default_values
@@ -4,6 +4,7 @@
     <entry name="avpf" overwrite="true">0</entry>
     <entry name="dial_escape_plus" overwrite="true">0</entry>
     <entry name="publish" overwrite="true">0</entry>
+    <entry name="publish_expires" overwrite="true">-1</entry>
     <entry name="quality_reporting_collector" overwrite="true"></entry>
     <entry name="quality_reporting_enabled" overwrite="true">0</entry>
     <entry name="quality_reporting_interval" overwrite="true">0</entry>
diff --git a/app/src/main/assets/assistant_linphone_default_values b/app/src/main/assets/assistant_linphone_default_values
index e9724cd0c..f42e3ef28 100644
--- a/app/src/main/assets/assistant_linphone_default_values
+++ b/app/src/main/assets/assistant_linphone_default_values
@@ -4,6 +4,7 @@
     <entry name="avpf" overwrite="true">1</entry>
     <entry name="dial_escape_plus" overwrite="true">0</entry>
     <entry name="publish" overwrite="true">1</entry>
+    <entry name="publish_expires" overwrite="true">120</entry>
     <entry name="quality_reporting_collector" overwrite="true">sip:voip-metrics@sip.linphone.org;transport=tls</entry>
     <entry name="quality_reporting_enabled" overwrite="true">1</entry>
     <entry name="quality_reporting_interval" overwrite="true">180</entry>
diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt
index eadb05351..6530d1197 100644
--- a/app/src/main/java/org/linphone/core/CoreContext.kt
+++ b/app/src/main/java/org/linphone/core/CoreContext.kt
@@ -454,6 +454,7 @@ class CoreContext(
                     if (!account.params.isPublishEnabled) {
                         Log.i("[Context] Enabling presence publish on proxy config ${params.identityAddress?.asString()}")
                         params.isPublishEnabled = true
+                        params.publishExpires = 120
                         paramsChanged = true
                     }
                 }