diff --git a/config/hosts/mail-1/simple-nixos-mailserver.nix b/config/hosts/mail-1/simple-nixos-mailserver.nix
index 81fa130..126b0dc 100644
--- a/config/hosts/mail-1/simple-nixos-mailserver.nix
+++ b/config/hosts/mail-1/simple-nixos-mailserver.nix
@@ -10,7 +10,10 @@
         enableImapSsl = true;
         enableSubmission = false;
         enableSubmissionSsl = true;
+<<<<<<< HEAD
         lmtpSaveToDetailMailbox = "no";
+=======
+>>>>>>> 634557c (Change mail config of services to use new mail server)
         domains = [ "grzb.de" "vs.grzb.de" "wg.grzb.de" "nekover.se" ];
         loginAccounts = {
           "fiona@grzb.de" = {
diff --git a/config/hosts/matrix/matrix-synapse.nix b/config/hosts/matrix/matrix-synapse.nix
index e4f508e..19f8824 100644
--- a/config/hosts/matrix/matrix-synapse.nix
+++ b/config/hosts/matrix/matrix-synapse.nix
@@ -10,9 +10,9 @@
         args.password = "synapse";
       };
       email = {
-        smtp_host = "mail.grzb.de";
+        smtp_host = "mail-1.grzb.de";
         smtp_port = 465;
-        smtp_user = "matrix";
+        smtp_user = "matrix@nekover.se";
         force_tls = true;
         notif_from = "Nekoverse Matrix Server <nyareply@nekover.se>";
       };
diff --git a/config/hosts/nextcloud/nextcloud.nix b/config/hosts/nextcloud/nextcloud.nix
index dd3a328..22f456e 100644
--- a/config/hosts/nextcloud/nextcloud.nix
+++ b/config/hosts/nextcloud/nextcloud.nix
@@ -25,9 +25,9 @@
       mail_domain = "nekover.se";
       mail_smtpauthtype = "LOGIN";
       mail_smtpauth = 1;
-      mail_smtphost = "mail.grzb.de";
+      mail_smtphost = "mail-1.grzb.de";
       mail_smtpport = 465;
-      mail_smtpname = "nextcloud";
+      mail_smtpname = "cloud@nekover.se";
     };
     # Only contains mail_smtppassword
     secretFile = "/secrets/nextcloud-secretfile.secret";
diff --git a/config/hosts/web-public-2/virtualHosts/element-web-config/config.json b/config/hosts/web-public-2/virtualHosts/element-web-config/config.json
index 96b6288..7344ce4 100644
--- a/config/hosts/web-public-2/virtualHosts/element-web-config/config.json
+++ b/config/hosts/web-public-2/virtualHosts/element-web-config/config.json
@@ -24,12 +24,12 @@
     ],
     "bug_report_endpoint_url": "https://element.io/bugreports/submit",
     "uisi_autorageshake_app": "element-auto-uisi",
-    "defaultCountryCode": "DE",
-    "showLabsSettings": true,
-    "features": { },
+    "default_country_code": "DE",
+    "show_labs_settings": true,
+    "features": {},
     "default_federate": true,
     "default_theme": "dark",
-    "roomDirectory": {
+    "room_directory": {
         "servers": [
             "matrix.org"
         ]
@@ -39,7 +39,7 @@
         "https://matrix.org": false,
         "https://matrix-client.matrix.org": false
     },
-    "settingDefaults": {
+    "setting_defaults": {
         "breadcrumbs": true
     },
     "jitsi": {
diff --git a/config/hosts/web-public-2/virtualHosts/element.nekover.se.nix b/config/hosts/web-public-2/virtualHosts/element.nekover.se.nix
index ba220c7..9e6bbf9 100644
--- a/config/hosts/web-public-2/virtualHosts/element.nekover.se.nix
+++ b/config/hosts/web-public-2/virtualHosts/element.nekover.se.nix
@@ -1,8 +1,8 @@
 { pkgs, ... }:
 let
   element-web = pkgs.fetchzip {
-    url = "https://github.com/vector-im/element-web/releases/download/v1.11.40/element-v1.11.40.tar.gz";
-    sha256 = "sha256-IZ1FjT9fAv6wDfgLcCLBHwg6iXGXC4E0/2/67hArD4w=";
+    url = "https://github.com/vector-im/element-web/releases/download/v1.11.43/element-v1.11.43.tar.gz";
+    sha256 = "sha256-MxUu5dFf4RL0crQol4hG6gNE+9Qu5/vBWdpf0ENaFV0=";
   };
 in
 {
diff --git a/flake.lock b/flake.lock
index 1f29fe8..ca1b1d6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -70,11 +70,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1695011647,
-        "narHash": "sha256-A0iKkey2LBlKCvwMR0HDXSs7ubdFP3ly8YE3m2zS/L4=",
+        "lastModified": 1695106126,
+        "narHash": "sha256-5BDOEo5miK+46ByqhooW32viYzDUmHrw++UK8zkMbPg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4d2bff6897a5434eef9bd958c7e89c96dec569e0",
+        "rev": "53d337b63c8f9d7e0f8709cae0008a9655bee33e",
         "type": "github"
       },
       "original": {
@@ -116,11 +116,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1694928810,
-        "narHash": "sha256-M/3+pRQmM+FeBeSKRp0b01pncbNiiC2ggJE4Wpi7c1Q=",
+        "lastModified": 1695043561,
+        "narHash": "sha256-ajrDIUJA5RB6Y2I1G4suDhiDMJuwg1WarNuasshRobE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "948e8754755a9f27587d5bd109af2cfad313add8",
+        "rev": "089313d7c7c864b21648d78fb8700062dafab1f2",
         "type": "github"
       },
       "original": {