diff --git a/CHANGELOG.md b/CHANGELOG.md
index d10f59d..2fa03c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project uses [Calendar Versioning](https://calver.org/) with a `YYYY.minor.patch` scheme.
 All dates in this file are given in the [UTC time zone](https://en.wikipedia.org/wiki/Coordinated_Universal_Time).
 
+## Unreleased
+
+### Changed
+
+- `core/apps/planktoscope/device-portal`: the `ghcr.io/planktoscope/device-portal` container is upgraded from v0.2.3 to v0.2.4.
+- `core/apps/planktoscope/docs`: the `ghcr.io/planktoscope/project-docs` container is upgraded.
+
+### Fixed
+- `core/host/machine-name`: the `update-hostname` systemd service provided by this package now explicitly starts before the `avahi-daemon` systemd service, so that Avahi correctly registers the device as `pkscope-{machine-name}.local` instead of registering it as `raspberrypi.local` (based on the default hostname).
+
 ## v2024.0.0-beta.2 - 2024-09-19
 
 ### Added
diff --git a/core/apps/planktoscope/device-portal/compose.yml b/core/apps/planktoscope/device-portal/compose.yml
index 9ecb4f1..f9e8865 100644
--- a/core/apps/planktoscope/device-portal/compose.yml
+++ b/core/apps/planktoscope/device-portal/compose.yml
@@ -1,6 +1,6 @@
 services:
   server:
-    image: ghcr.io/planktoscope/device-portal:0.2.3
+    image: ghcr.io/planktoscope/device-portal:0.2.4
 
 networks:
   default:
diff --git a/core/apps/planktoscope/docs/compose-full-site.yml b/core/apps/planktoscope/docs/compose-full-site.yml
index 410515b..f5ea529 100644
--- a/core/apps/planktoscope/docs/compose-full-site.yml
+++ b/core/apps/planktoscope/docs/compose-full-site.yml
@@ -1,3 +1,3 @@
 services:
   server:
-    image: ghcr.io/planktoscope/project-docs:2024.0.0-beta.2
+    image: ghcr.io/planktoscope/project-docs:sha-087e173
diff --git a/core/apps/planktoscope/docs/compose.yml b/core/apps/planktoscope/docs/compose.yml
index 989bc17..c20f441 100644
--- a/core/apps/planktoscope/docs/compose.yml
+++ b/core/apps/planktoscope/docs/compose.yml
@@ -1,6 +1,6 @@
 services:
   server:
-    image: ghcr.io/planktoscope/project-docs:2024.0.0-beta.2-minimal
+    image: ghcr.io/planktoscope/project-docs:sha-087e173-minimal
     volumes:
       - server-data:/data
       - server-config:/config
diff --git a/core/host/machine-name/overlays/usr/lib/systemd/system/update-hostname.service b/core/host/machine-name/overlays/usr/lib/systemd/system/update-hostname.service
index 913be54..47e9fe9 100644
--- a/core/host/machine-name/overlays/usr/lib/systemd/system/update-hostname.service
+++ b/core/host/machine-name/overlays/usr/lib/systemd/system/update-hostname.service
@@ -7,6 +7,7 @@ Requires=systemd-hostnamed.service
 After=systemd-hostnamed.service
 Wants=network-pre.target
 Before=network-pre.target
+Before=avahi-daemon.service
 
 [Service]
 Type=oneshot
diff --git a/core/host/networking/avahi-daemon/overlays/usr/lib/systemd/system/planktoscope-mdns-alias@.service b/core/host/networking/avahi-daemon/overlays/usr/lib/systemd/system/planktoscope-mdns-alias@.service
index ffc8449..cfb6d0a 100644
--- a/core/host/networking/avahi-daemon/overlays/usr/lib/systemd/system/planktoscope-mdns-alias@.service
+++ b/core/host/networking/avahi-daemon/overlays/usr/lib/systemd/system/planktoscope-mdns-alias@.service
@@ -7,6 +7,8 @@ Wants=avahi-daemon.socket
 [Service]
 Type=simple
 ExecStart=/usr/bin/bash -c "/usr/bin/avahi-publish -a -R %i.local 192.168.4.1"
+# FIXME: replace this with a package to generate a /etc/avahi/hosts file from
+# a /etc/avahi/hosts.d directory, just like how we generate /etc/hosts!
 
 [Install]
 WantedBy=multi-user.target