diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4acc2b8fb..a0c3a0eb5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,15 @@ Group changes to describe their impact on the project, as follows:
     Fixed for any bug fixes.
     Security to invite users to upgrade in case of vulnerabilities.
 
+## [6.0.4] - 2025-04-11
+
+### Changed
+- Third party SIP accounts push notifications will be disabled and setting will be hidden unless if list of supported domains (to prevent issues, specifically when used with UDP transport protocol causing bigger packets getting lost)
+
+### Fixed
+- Prevent refresh of views due to contacts changes to happen to frequently at startup
+- Prevent crash in Help view if app is built without Firebase
+
 ## [6.0.3] - 2025-04-04
 
 ### Added
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 970897087..01d0b20a4 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -32,7 +32,7 @@ if (firebaseCloudMessagingAvailable) {
 }
 
 var gitBranch = ByteArrayOutputStream()
-var gitVersion = "6.0.3"
+var gitVersion = "6.0.4"
 
 task("getGitVersion") {
     val gitVersionStream = ByteArrayOutputStream()
@@ -100,8 +100,8 @@ android {
         applicationId = packageName
         minSdk = 28
         targetSdk = 36
-        versionCode = 600003 // 6.00.003
-        versionName = "6.0.3"
+        versionCode = 600004 // 6.00.004
+        versionName = "6.0.4"
 
         manifestPlaceholders["appAuthRedirectScheme"] = packageName