diff --git a/ci/gitlab-ci/lib.yml b/ci/gitlab-ci/lib.yml
index 2619203f0f..a602ebb646 100644
--- a/ci/gitlab-ci/lib.yml
+++ b/ci/gitlab-ci/lib.yml
@@ -772,8 +772,14 @@
       
           matrix_send_message $MATRIX_ROOM "🟢 Packages for ${version} have been released to github."
       
-          if [ "${RELEASE_TYPE}" == "be" ]; then
-              matrix_send_message "!gGPNgDOyMWwSPjFFXa:matrix.org" "We just released the new version \"${CODENAME}\" ${version} 🎉\\nCheck https://www.tine-groupware.de/ and https://github.com/tine-groupware/tine/releases for more information and the downloads.\\nYou can also pull the image from dockerhub: https://hub.docker.com/r/tinegroupware/tine"
+          if [ "${RELEASE_TYPE}" == "be" ] || [ "${RELEASE_TYPE}" == "nightly" ]; then
+              matrix_room="!gGPNgDOyMWwSPjFFXa:matrix.org"
+      
+              if [ "${RELEASE_TYPE}" == "nightly" ]; then
+                  matrix_room="${MATRIX_ROOM}"
+              fi
+      
+              matrix_send_message "${matrix_room}" "We just released the new version ${CODENAME} ${version} 🎉\\nCheck https://www.tine-groupware.de/ and https://github.com/tine-groupware/tine/releases for more information and the downloads.\\nYou can also pull the image from dockerhub: https://hub.docker.com/r/tinegroupware/tine"
           fi
       }
       
@@ -1884,8 +1890,14 @@
         
             matrix_send_message $MATRIX_ROOM "🟢 Packages for ${version} have been released to github."
         
-            if [ "${RELEASE_TYPE}" == "be" ]; then
-                matrix_send_message "!gGPNgDOyMWwSPjFFXa:matrix.org" "We just released the new version \"${CODENAME}\" ${version} 🎉\\nCheck https://www.tine-groupware.de/ and https://github.com/tine-groupware/tine/releases for more information and the downloads.\\nYou can also pull the image from dockerhub: https://hub.docker.com/r/tinegroupware/tine"
+            if [ "${RELEASE_TYPE}" == "be" ] || [ "${RELEASE_TYPE}" == "nightly" ]; then
+                matrix_room="!gGPNgDOyMWwSPjFFXa:matrix.org"
+        
+                if [ "${RELEASE_TYPE}" == "nightly" ]; then
+                    matrix_room="${MATRIX_ROOM}"
+                fi
+        
+                matrix_send_message "${matrix_room}" "We just released the new version ${CODENAME} ${version} 🎉\\nCheck https://www.tine-groupware.de/ and https://github.com/tine-groupware/tine/releases for more information and the downloads.\\nYou can also pull the image from dockerhub: https://hub.docker.com/r/tinegroupware/tine"
             fi
         }
         
@@ -3042,8 +3054,14 @@
         
             matrix_send_message $MATRIX_ROOM "🟢 Packages for ${version} have been released to github."
         
-            if [ "${RELEASE_TYPE}" == "be" ]; then
-                matrix_send_message "!gGPNgDOyMWwSPjFFXa:matrix.org" "We just released the new version \"${CODENAME}\" ${version} 🎉\\nCheck https://www.tine-groupware.de/ and https://github.com/tine-groupware/tine/releases for more information and the downloads.\\nYou can also pull the image from dockerhub: https://hub.docker.com/r/tinegroupware/tine"
+            if [ "${RELEASE_TYPE}" == "be" ] || [ "${RELEASE_TYPE}" == "nightly" ]; then
+                matrix_room="!gGPNgDOyMWwSPjFFXa:matrix.org"
+        
+                if [ "${RELEASE_TYPE}" == "nightly" ]; then
+                    matrix_room="${MATRIX_ROOM}"
+                fi
+        
+                matrix_send_message "${matrix_room}" "We just released the new version ${CODENAME} ${version} 🎉\\nCheck https://www.tine-groupware.de/ and https://github.com/tine-groupware/tine/releases for more information and the downloads.\\nYou can also pull the image from dockerhub: https://hub.docker.com/r/tinegroupware/tine"
             fi
         }
         
diff --git a/ci/gitlab-ci/lib/scripts/release_packages.sh b/ci/gitlab-ci/lib/scripts/release_packages.sh
index b8815f0d38..deda8e0b56 100644
--- a/ci/gitlab-ci/lib/scripts/release_packages.sh
+++ b/ci/gitlab-ci/lib/scripts/release_packages.sh
@@ -23,8 +23,14 @@ release_packages_notify_matrix() {
 
     matrix_send_message $MATRIX_ROOM "🟢 Packages for ${version} have been released to github."
 
-    if [ "${RELEASE_TYPE}" == "be" ]; then
-        matrix_send_message "!gGPNgDOyMWwSPjFFXa:matrix.org" "We just released the new version \"${CODENAME}\" ${version} 🎉\\nCheck https://www.tine-groupware.de/ and https://github.com/tine-groupware/tine/releases for more information and the downloads.\\nYou can also pull the image from dockerhub: https://hub.docker.com/r/tinegroupware/tine"
+    if [ "${RELEASE_TYPE}" == "be" ] || [ "${RELEASE_TYPE}" == "nightly" ]; then
+        matrix_room="!gGPNgDOyMWwSPjFFXa:matrix.org"
+
+        if [ "${RELEASE_TYPE}" == "nightly" ]; then
+            matrix_room="${MATRIX_ROOM}"
+        fi
+
+        matrix_send_message "${matrix_room}" "We just released the new version ${CODENAME} ${version} 🎉\\nCheck https://www.tine-groupware.de/ and https://github.com/tine-groupware/tine/releases for more information and the downloads.\\nYou can also pull the image from dockerhub: https://hub.docker.com/r/tinegroupware/tine"
     fi
 }