diff --git a/infra/libkookie/overlays/default.nix b/infra/libkookie/overlays/default.nix
index b4399a2e76c..5492537ea40 100644
--- a/infra/libkookie/overlays/default.nix
+++ b/infra/libkookie/overlays/default.nix
@@ -17,7 +17,7 @@ self: super: {
   ## Packages to-be-upstreamed
   foo2zjs = self.callPackage ./staging/foo2zjs { };
   nodemcu-uploader = self.callPackage ./staging/nodemcu-uploader { };
-  pleroma = self.callPackage ./staging/pleroma { };
+  rmfakecloud = self.callPackage ./staging/rmfakecloud { };
   
   ## Override packages from nixpkgs
   cgit = self.callPackage ./patches/cgit { inherit (super) cgit; };
diff --git a/infra/libkookie/overlays/staging/rmfakecloud/default.nix b/infra/libkookie/overlays/staging/rmfakecloud/default.nix
new file mode 100644
index 00000000000..04310617dd3
--- /dev/null
+++ b/infra/libkookie/overlays/staging/rmfakecloud/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "rmfakecloud";
+  version = "0.0.3";
+
+  subPackages = [ "." ];
+
+  src = fetchFromGitHub {
+    owner = "ddvk";
+    repo = "rmfakecloud";
+    rev = "v${version}";
+    sha256 = "0cjh0g3mjjx118xfa9ivixz2s4g97k96ssd7a1p70yhwbja2mqan";
+  };
+
+  vendorSha256 = "039898vs09y39vqpqzz32lv09v85gxlzn4vnrnv3k2r3rmicb3vv";
+
+  meta = with lib; {
+    description = "Host your own cloud for the remarkable ";
+    license = licenses.agpl3;
+    platforms = platforms.linux;
+    hompage = "https://github.com/ddvk/rmfakecloud";
+    maintainers = [ maintainers.spacekookie ];
+  };
+}