diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 426aae95..e0c2b58e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -166,7 +166,6 @@ build_linux:
     when: on_success
     paths:
       - build/linux/release/bundle/
-  allow_failure: true
 
 snap:edge:
   stage: release
@@ -186,6 +185,7 @@ snap:edge:
     paths:
       - "./*.snap"
     when: on_success
+  allow_failure: true
 
 #snap:publish:
 #  stage: release
diff --git a/pubspec.lock b/pubspec.lock
index 65b762a8..08d5f2bf 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -215,8 +215,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "0bad62971bee06c7c4a90e1564246c6325ae7d8f"
-      resolved-ref: "0bad62971bee06c7c4a90e1564246c6325ae7d8f"
+      ref: "ll/null-safety"
+      resolved-ref: "097a9e0ebb892c2c833b5df231ddedb2865955dd"
       url: "https://gitlab.com/famedly/famedlysdk.git"
     source: git
     version: "0.0.1"
@@ -389,12 +389,10 @@ packages:
   flutter_matrix_html:
     dependency: "direct main"
     description:
-      path: "."
-      ref: HEAD
-      resolved-ref: "71735d848c9720d986c84078a013253321399058"
-      url: "https://github.com/ChristianPauly/flutter_matrix_html.git"
-    source: git
-    version: "0.2.0"
+      name: flutter_matrix_html
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.3.0"
   flutter_olm:
     dependency: "direct main"
     description:
@@ -639,12 +637,10 @@ packages:
   matrix_link_text:
     dependency: "direct main"
     description:
-      path: "."
-      ref: HEAD
-      resolved-ref: "6f60e56cf9234e0b720c281cf021e7e8377ab59b"
-      url: "https://github.com/ChristianPauly/matrix_link_text.git"
-    source: git
-    version: "0.3.2"
+      name: matrix_link_text
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.4.0"
   meta:
     dependency: transitive
     description:
@@ -921,7 +917,7 @@ packages:
     source: hosted
     version: "2.0.1"
   shared_preferences:
-    dependency: "direct overridden"
+    dependency: transitive
     description:
       name: shared_preferences
       url: "https://pub.dartlang.org"
@@ -1125,11 +1121,11 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "8edc09a87d726d912926ac612e209573452c1273"
-      resolved-ref: "8edc09a87d726d912926ac612e209573452c1273"
-      url: "https://github.com/UnifiedPush/flutter-connector.git"
+      ref: HEAD
+      resolved-ref: e75ed43d46dc20bc8d3ac79c2546ddf2c3cc89e9
+      url: "https://github.com/ChristianPauly/flutter-connector.git"
     source: git
-    version: "0.0.1"
+    version: "1.0.1"
   universal_html:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 271bebb0..871a4b6b 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -13,12 +13,11 @@ dependencies:
   famedlysdk:
     git:
       url: https://gitlab.com/famedly/famedlysdk.git
-      ref: 0bad62971bee06c7c4a90e1564246c6325ae7d8f
+      ref: ll/null-safety
 
   unifiedpush:
     git:
-      url: https://github.com/UnifiedPush/flutter-connector.git
-      ref: 8edc09a87d726d912926ac612e209573452c1273
+      url: https://github.com/ChristianPauly/flutter-connector.git
 
   # Firebase Notifications
   fcm_shared_isolate:
@@ -37,7 +36,6 @@ dependencies:
   provider: ^5.0.0
   adaptive_theme: ^2.1.1
   # desktop_notifications: ^0.0.0-dev.4  // Currently blocked by: https://github.com/canonical/desktop_notifications.dart/issues/5
-  matrix_link_text: ^0.3.2
   path_provider: ^2.0.1
   android_path_provider: ^0.2.1
   permission_handler: ^6.1.1
@@ -50,9 +48,8 @@ dependencies:
   open_file: ^3.1.0
   mime_type: ^1.0.0
   adaptive_dialog: ^0.10.0+5
-  flutter_matrix_html:
-    git:
-      url: https://github.com/ChristianPauly/flutter_matrix_html.git
+  flutter_matrix_html: ^0.3.0
+  matrix_link_text: ^0.4.0
   moor: ^4.2.1
   sqlite3: ^1.0.0
   sqflite: ^2.0.0+3 # Still used to obtain the database location
@@ -87,15 +84,6 @@ dev_dependencies:
   pedantic: ^1.11.0
   dapackages: ^1.6.0
 
-# The flutter_maths version of flutter_matrix_html is weird and conflicts with a few of our packages.
-# So, we have to force-override the dependencies to work out.
-dependency_overrides:
-  flutter_svg: ^0.21.0+1
-  shared_preferences: ^2.0.1
-  matrix_link_text:
-    git:
-      url: https://github.com/ChristianPauly/matrix_link_text.git
-
 flutter:
   generate: true
   uses-material-design: true