diff --git a/hosts/paidh-tri.nix b/hosts/ceitidh.nix
similarity index 50%
rename from hosts/paidh-tri.nix
rename to hosts/ceitidh.nix
index c114694..2562d76 100644
--- a/hosts/paidh-tri.nix
+++ b/hosts/ceitidh.nix
@@ -1,19 +1,22 @@
-# NixOps configuration for pàidh-tri
+# NixOps configuration for ceitidh
 {
   config,
   pkgs,
   lib,
   ...
 }: {
-  imports = [../networks/pi3B_rack.nix ../profiles/cyclone-ibis.nix];
+  imports = [
+    ../networks/pi3B_rack.nix
+    ../profiles/cyclone-ibis.nix
+  ];
 
   # Comment out deployment when building the SD Image.
   deployment.targetHost = "10.42.0.203";
-  networking.hostName = "paidh-tri"; # Define your hostname.
+  networking.hostName = "ceitidh"; # Define your hostname.
 
   environment.systemPackages = with pkgs; [
     gnupg # GPL OpenPGP implementation
   ];
 
-  system.stateVersion = "20.09"; # The version of NixOS originally installed
+  system.stateVersion = "22.05"; # The version of NixOS originally installed
 }
diff --git a/images/sd-image_ceitidh.nix b/images/sd-image_ceitidh.nix
new file mode 100644
index 0000000..1959012
--- /dev/null
+++ b/images/sd-image_ceitidh.nix
@@ -0,0 +1,13 @@
+# SD image for ceitidh
+#
+# To build this image, run:
+#
+# nix-build '<nixpkgs/nixos>' -A config.system.build.sdImage -I \
+# nixos-config=./images/sd-image_ceitidh.nix
+#
+# An example of how to write the image to SD card:
+#
+# zstdcat ./result/sd-image/nixos-sd-image-22.05pre-git-aarch64-linux.img.zst | sudo dd of=/dev/sdb
+{...}: {
+  imports = [./sd-image_paidh-aarch64.nix ../hosts/ceitidh.nix];
+}
diff --git a/images/sd-image_paidh-tri.nix b/images/sd-image_paidh-tri.nix
deleted file mode 100644
index 2e9b6b0..0000000
--- a/images/sd-image_paidh-tri.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-# SD image for paidh-tri
-#
-# To build this image, run:
-#
-# nix-build '<nixpkgs/nixos>' -A config.system.build.sdImage -I \
-# nixos-config=./images/sd-image_paidh-tri.nix
-#
-# An example of how to write the image to SD card:
-#
-# bzcat ./result/sd-image/nixos-sd-image-20.03.1577.74a80c5a9ab-aarch64-linux.img.bz2 | sudo dd of=/dev/sdb
-{...}: {
-  imports = [./sd-image_paidh-aarch64.nix ../hosts/paidh-tri.nix];
-}
diff --git a/nixops.nix b/nixops.nix
index 29eacbf..650d3c2 100644
--- a/nixops.nix
+++ b/nixops.nix
@@ -25,7 +25,7 @@
   paidh-ceithir = import hosts/paidh-ceithir.nix;
   paidh-coig = import hosts/paidh-coig.nix;
   buaidheach = import hosts/buaidheach.nix;
-  paidh-tri = import hosts/paidh-tri.nix;
+  ceitidh = import hosts/ceitidh.nix;
   paidh-uachdar = import hosts/paidh-uachdar.nix;
   sithlainnir = import hosts/sithlainnir.nix;
   teintidh = import hosts/teintidh.nix;