diff --git a/hosts/nachtigall/apps/mastodon.nix b/hosts/nachtigall/apps/mastodon.nix
index 3cd0685..a71a521 100644
--- a/hosts/nachtigall/apps/mastodon.nix
+++ b/hosts/nachtigall/apps/mastodon.nix
@@ -32,23 +32,17 @@
     owner = config.services.mastodon.user;
   };
 
-  services.opensearch.enable = true;
-
   services.mastodon = {
     enable = true;
     # Different from WEB_DOMAIN in our case
     localDomain = "pub.solar";
-    # We use caddy, see caddy.nix
     configureNginx = true;
     enableUnixSocket = true;
-    #streamingSocket = "/run/mastodon-streaming/streaming.socket";
-    #webSocket = "/run/mastodon-web/web.socket";
-    #sidekiqPort = 55002;
     # Processes used by the mastodon-streaming service. Defaults to the number
     # of CPU cores minus one
     # This is without affect until this comment is addressed
     # https://github.com/NixOS/nixpkgs/pull/251950#issuecomment-1732568492
-    #streamingProcesses = 5;
+    streamingProcesses = 5;
     # Processes used by the mastodon-web service
     webProcesses = 2;
     # Threads per process used by the mastodon-web service
@@ -71,6 +65,7 @@
     ];
     extraConfig = {
       WEB_DOMAIN = "mastodon.pub.solar";
+      # Defined in ./opensearch.nix
       ES_HOST = "127.0.0.1";
       # S3 File storage (optional)
       # -----------------------
diff --git a/hosts/nachtigall/apps/opensearch.nix b/hosts/nachtigall/apps/opensearch.nix
new file mode 100644
index 0000000..1b9c0f2
--- /dev/null
+++ b/hosts/nachtigall/apps/opensearch.nix
@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+  services.opensearch.enable = true;
+}
diff --git a/hosts/nachtigall/default.nix b/hosts/nachtigall/default.nix
index bf579d3..57535d4 100644
--- a/hosts/nachtigall/default.nix
+++ b/hosts/nachtigall/default.nix
@@ -8,10 +8,11 @@
 
       ./networking.nix
       ./nix.nix
-
       ./apps/nginx.nix
+
       ./apps/nginx-website.nix
       ./apps/mastodon.nix
+      ./apps/opensearch.nix
       ./apps/postgresql.nix
     ];
 }
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 4690a3d..6b7ba1d 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -1,7 +1,7 @@
 let
   # set ssh public keys here for your system and user
   axeman-1 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMNeQYLFauAbzDyIbKC86NUh9yZfiyBm/BtIdkcpZnSU axeman@tuxnix";
-  bbcom = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCmXpOU6vzQiVSSYCoxHYv7wDxC63Qg3dxlAMR6AOzwIABCU5PFFNcO0NWYms/YR7MOViorl+19LCLRABar9JgHU1n+uqxKV6eGph3OPeMp5sN8LAh7C9N+TZj8iJzBxQ3ch+Z/LdmLRwYNJ7KSUI+gwGK6xRS3+z1022Y4P0G0sx7IeCBl4lealQEIIF10ZOfjUdBcLQar7XTc5AxyGKnHCerXHRtccCoadLQujk0AvPXbv3Ma4JwX9X++AnCWRWakqS5UInu2tGuZ/6Hrjd2a9AKWjTaBVDcbYqCvY4XVuMj2/A2bCceFBaoi41apybSk26FSFTU4qiEUNQ6lxeOwG4+1NCXyHe2bGI4VyoxinDYa8vLLzXIRfTRA0qoGfCweXNeWPf0jMqASkUKaSOH5Ot7O5ps34r0j9pWzavDid8QeKJPyhxKuF1a5G4iBEZ0O9vuti60dPSjJPci9oTxbune2/jb7Sa0yO06DtLFJ2ncr5f70s/BDxKk4XIwQLy+KsvzlQEGdY8yA6xv28bOGxL3sQ0HE2pDTsvIbAisVOKzdJeolStL9MM5W8Hg0r/KkGj2bg0TfoRp1xHV9hjKkvJrsQ6okaPvNFeZq0HXzPhWMOVQ+/46z80uaQ1ByRLr3FTwuWJ7F/73ndfxiq6bDE4z2Ji0vOjeWJm6HCxTdGw== hello@benjaminbaedorf.com";
+  b12f-bbcom = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCmXpOU6vzQiVSSYCoxHYv7wDxC63Qg3dxlAMR6AOzwIABCU5PFFNcO0NWYms/YR7MOViorl+19LCLRABar9JgHU1n+uqxKV6eGph3OPeMp5sN8LAh7C9N+TZj8iJzBxQ3ch+Z/LdmLRwYNJ7KSUI+gwGK6xRS3+z1022Y4P0G0sx7IeCBl4lealQEIIF10ZOfjUdBcLQar7XTc5AxyGKnHCerXHRtccCoadLQujk0AvPXbv3Ma4JwX9X++AnCWRWakqS5UInu2tGuZ/6Hrjd2a9AKWjTaBVDcbYqCvY4XVuMj2/A2bCceFBaoi41apybSk26FSFTU4qiEUNQ6lxeOwG4+1NCXyHe2bGI4VyoxinDYa8vLLzXIRfTRA0qoGfCweXNeWPf0jMqASkUKaSOH5Ot7O5ps34r0j9pWzavDid8QeKJPyhxKuF1a5G4iBEZ0O9vuti60dPSjJPci9oTxbune2/jb7Sa0yO06DtLFJ2ncr5f70s/BDxKk4XIwQLy+KsvzlQEGdY8yA6xv28bOGxL3sQ0HE2pDTsvIbAisVOKzdJeolStL9MM5W8Hg0r/KkGj2bg0TfoRp1xHV9hjKkvJrsQ6okaPvNFeZq0HXzPhWMOVQ+/46z80uaQ1ByRLr3FTwuWJ7F/73ndfxiq6bDE4z2Ji0vOjeWJm6HCxTdGw== hello@benjaminbaedorf.com";
   hensoko-1 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEbaQdxp7Flz6ttELe63rn+Nt9g43qJOLih6VCMP4gPb";
   hensoko-2 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAqkqMYgncrnczcW/0PY+Z+FmNXXpgw6D9JWTTwiainy";
   teutat3s-1 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHcU6KPy4b1MQXd6EJhcYwbJu7E+0IrBZF/IP6T7gbMf teutat3s@dumpyourvms";
@@ -10,7 +10,7 @@ let
 
   baseKeys = [
     axeman-1
-    bbcom
+    b12f-bbcom
     hensoko-1
     hensoko-2
     teutat3s-1