diff --git a/common/fragments/homepage.nix b/common/fragments/homepage.nix
index 70da6b8..8b8b33c 100644
--- a/common/fragments/homepage.nix
+++ b/common/fragments/homepage.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }: {
   virtualisation.oci-containers.containers = {
     "homepage" = {
-      image = "ghcr.io/benphelps/homepage:v0.6.12";
+      image = "ghcr.io/benphelps/homepage:v0.6.18";
       autoStart = true;
       ports = [ "127.0.0.1:3000:3000" ];
       volumes = [
diff --git a/common/pkgs/mastodon/source.nix b/common/pkgs/mastodon/source.nix
index 2da733e..0b4d743 100644
--- a/common/pkgs/mastodon/source.nix
+++ b/common/pkgs/mastodon/source.nix
@@ -2,8 +2,8 @@
 { fetchgit, applyPatches }: let
   src = fetchgit {
     url = "https://github.com/AgathaSorceress/mastodon.git";
-    rev = "a756be76b5b3455c17ccc2cb68dd3f32e3140c03";
-    sha256 = "1y0acq6rbmiw6j7zx3kma7nk60djdvczphms81vln7mdmbsdrd32";
+    rev = "03aaee3a6dce9fdc1ca08aeaa7ad0180f3d9db47";
+    sha256 = "10lw2l91viicq47lwsj3nlhc4g3mvcpvfc8rd0jzvvbjyfq7npim";
   };
 in applyPatches {
   inherit src;
diff --git a/common/pkgs/mastodon/version.nix b/common/pkgs/mastodon/version.nix
index a37a8ef..1704e9d 100644
--- a/common/pkgs/mastodon/version.nix
+++ b/common/pkgs/mastodon/version.nix
@@ -1 +1 @@
-"a756be76b5b3455c17ccc2cb68dd3f32e3140c03"
+"03aaee3a6dce9fdc1ca08aeaa7ad0180f3d9db47"