diff --git a/docker/caddy/Caddyfile b/docker/caddy/Caddyfile
index 3149a812..dd9680b6 100644
--- a/docker/caddy/Caddyfile
+++ b/docker/caddy/Caddyfile
@@ -10,8 +10,8 @@ korhonen.cc, *.korhonen.cc {
 		Strict-Transport-Security "max-age=63072000; includeSubDomains; preload"
 	}
 
-	@homepage-redir host www.korhonen.cc
-	handle @homepage-redir {
+	@homepage-www-redir host www.korhonen.cc
+	handle @homepage-www-redir {
 		redir https://korhonen.cc
 	}
 
@@ -25,7 +25,7 @@ korhonen.cc, *.korhonen.cc {
 	handle @wkd {
 		root * /var/www/wkd
 		file_server browse
-    header Access-Control-Allow-Origin "*"
+		header Access-Control-Allow-Origin "*"
 	}
 
 	@index host index.korhonen.cc
@@ -69,11 +69,6 @@ korhonen.cc, *.korhonen.cc {
 		reverse_proxy jellyfin:8096
 	}
 
-	@misskey host social.korhonen.cc
-	handle @misskey {
-		reverse_proxy misskey:3000
-	}
-
 	@pihole host pihole.korhonen.cc
 	handle @pihole {
 		reverse_proxy pihole
@@ -82,7 +77,7 @@ korhonen.cc, *.korhonen.cc {
 	@umami host umami.korhonen.cc
 	handle @umami {
 		reverse_proxy umami:3000
-    rewrite /ua9quuaW.js /script.js
+		rewrite /ua9quuaW.js /script.js
 	}
 
 	@nextcloud host cloud.korhonen.cc
@@ -134,7 +129,13 @@ korhonen.cc, *.korhonen.cc {
 
 	@drop host drop.korhonen.cc
 	handle @drop {
-    reverse_proxy drop:3000
+		reverse_proxy drop:3000
+	}
+
+	# Redirect to new fediverse host
+	@misskey host social.korhonen.cc
+	handle @misskey {
+		redir https://korhonen.social
 	}
 
 	# Fallback for unhandled domains
@@ -143,6 +144,25 @@ korhonen.cc, *.korhonen.cc {
 	}
 }
 
-korhonen.social {
-  respond "Kbin instance coming soon"
+korhonen.social, *.korhonen.social {
+	tls {$CLOUDFLARE_EMAIL} {
+		dns cloudflare {$CLOUDFLARE_API_TOKEN}
+		resolvers 1.1.1.1
+	}
+
+	encode zstd gzip
+
+	header {
+		Strict-Transport-Security "max-age=63072000; includeSubDomains; preload"
+	}
+
+	@firefish-www-redir host www.korhonen.social
+	handle @firefish-www-redir {
+		redir https://korhonen.social
+	}
+
+	@firefish host korhonen.social
+	handle @firefish {
+		reverse_proxy firefish:3000
+	}
 }
diff --git a/docker/firefish/docker-compose.toml b/docker/firefish/docker-compose.toml
new file mode 100644
index 00000000..25f28504
--- /dev/null
+++ b/docker/firefish/docker-compose.toml
@@ -0,0 +1,41 @@
+#:schema https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json
+
+[services.firefish]
+image = "registry.joinfirefish.org/firefish/firefish:beta-amd64"
+container_name = "firefish"
+restart = "unless-stopped"
+depends_on = ["redis"]
+ports = ["3083:3000"]
+networks = ["firefish", "proxy", "postgres"]
+environment = { NODE_ENV = "production" }
+volumes = [
+  "/docker/firefish/files:/firefish/files",
+  "/docker/firefish/config:/firefish/.config:ro",
+]
+
+[services.redis]
+image = "redis"
+container_name = "redis-firefish"
+restart = "unless-stopped"
+networks = ["firefish"]
+volumes = ["/docker/firefish/redis:/data"]
+
+[services.sonic]
+image = "valeriansaliou/sonic:v1.4.0"
+container_name = "sonic-firefish"
+logging = { driver = "none" }
+networks = ["firefish"]
+volumes = [
+  "/docker/firefish/sonic:/var/lib/sonic/store",
+  "/docker/firefish/sonic/config.cfg:/etc/sonic.cfg",
+]
+env_file = ".env"
+
+[networks.firefish]
+internal = true
+
+[networks.proxy]
+external = true
+
+[networks.postgres]
+external = true
diff --git a/docker/misskey/docker-compose.toml b/docker/misskey/docker-compose.toml
deleted file mode 100644
index 27430f84..00000000
--- a/docker/misskey/docker-compose.toml
+++ /dev/null
@@ -1,44 +0,0 @@
-[services.misskey]
-image = "misskey/misskey"
-container_name = "misskey"
-restart = "unless-stopped"
-depends_on = ["redis"]
-ports = ["3082:3000"]
-networks = ["misskey", "proxy", "postgres"]
-volumes = [
-  "/docker/misskey/files:/misskey/files",
-  "/docker/misskey/config:/misskey/.config:ro",
-]
-
-#[services.elasticsearch]
-#image = "docker.elastic.co/elasticsearch/elasticsearch:7.17.8"
-#container_name = "misskey-elasticsearch"
-#restart = "unless-stopped"
-#volumes = ["/docker/misskey/elasticsearch/:/usr/share/elasticsearch/data"]
-#networks = ["misskey"]
-#environment = [
-#  "cluster.name=misskey-es-cluster",
-#  "node.name=misskey-node",
-#  "discovery.type=single-node",
-#  "bootstrap.memory_lock=true",
-#  "ES_JAVA_OPTS=-Xms200m -Xmx200m",
-#]
-#[services.elasticsearch.ulimits.memlock]
-#soft = -1
-#hard = -1
-
-[services.redis]
-image = "redis"
-container_name = "redis-misskey"
-restart = "unless-stopped"
-networks = ["misskey"]
-volumes = ["/docker/misskey/redis:/data"]
-
-[networks.misskey]
-internal = true
-
-[networks.proxy]
-external = true
-
-[networks.postgres]
-external = true
diff --git a/docker/postgres/docker-compose.toml b/docker/postgres/docker-compose.toml
index e8a9ec85..6e9f04f1 100644
--- a/docker/postgres/docker-compose.toml
+++ b/docker/postgres/docker-compose.toml
@@ -2,7 +2,7 @@
 
 [services.postgres]
 container_name = "postgres"
-image = "postgres:15"
+image = "postgres:16"
 environment = ["TZ=Europe/Helsinki", "POSTGRES_PASSWORD=12345"]
 ports = ["5432:5432"]
 networks = ["postgres"]