diff --git a/hosts/sombrero/modules/ssh/default.nix b/hosts/sombrero/modules/ssh/default.nix
index 0d0ac95..e1dacc7 100644
--- a/hosts/sombrero/modules/ssh/default.nix
+++ b/hosts/sombrero/modules/ssh/default.nix
@@ -17,6 +17,11 @@ in
         enable = true;
 
         matchBlocks = {
+          "codeberg.org" = {
+            hostname = "codeberg.org";
+            identityFile = "/home/alex/.ssh/alex.sombrero-codeberg.org";
+          };
+
           "github.com" = {
             hostname = "github.com";
             identityFile = "/home/alex/.ssh/alex.sombrero-github.com";
@@ -68,6 +73,19 @@ in
         path = "${authorizedKeysPath}/alex.pinwheel-sombrero.pub";
       };
 
+      "alex.sombrereo-codeberg.org" = {
+        file = ../../../../secrets/pinwheel/alex.sombrero-codeberg.org.age;
+        path = "/home/alex/.ssh/alex.sombrero-codeberg.org";
+        owner = "alex";
+        group = "users";
+      };
+      "alex.pinwheel-codeberg.org.pub" = {
+        file = ../../../../secrets/pinwheel/alex.sombrero-codeberg.org.pub.age;
+        path = "/home/alex/.ssh/alex.sombrero-codeberg.org.pub";
+        owner = "alex";
+        group = "users";
+      };
+
       "alex.sombrero-github.com" = {
         file = ../../../../secrets/sombrero/alex.sombrero-github.com.age;
         path = "/home/alex/.ssh/alex.sombrero-github.com";
diff --git a/secrets/pinwheel/alex.sombrero-codeberg.org.age b/secrets/pinwheel/alex.sombrero-codeberg.org.age
new file mode 100644
index 0000000..47428e5
Binary files /dev/null and b/secrets/pinwheel/alex.sombrero-codeberg.org.age differ
diff --git a/secrets/pinwheel/alex.sombrero-codeberg.org.pub.age b/secrets/pinwheel/alex.sombrero-codeberg.org.pub.age
new file mode 100644
index 0000000..c5c8c8b
Binary files /dev/null and b/secrets/pinwheel/alex.sombrero-codeberg.org.pub.age differ
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 5895b67..eed9508 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -24,4 +24,6 @@ in {
   "sombrero/syncthing-key.age".publicKeys = [ sombrero alex ];
   "sombrero/alex.sombrero-github.com.age".publicKeys = [ sombrero alex ];
   "sombrero/alex.sombrero-github.com.pub.age".publicKeys = [ sombrero alex ];
+  "pinwheel/alex.sombrero-codeberg.org.age".publicKeys = [ sombrero alex ];
+  "pinwheel/alex.sombrero-codeberg.org.pub.age".publicKeys = [ sombrero alex ];
 }