diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh
index 63a40189df..506c503c55 100644
--- a/docker/horizon/extend_start.sh
+++ b/docker/horizon/extend_start.sh
@@ -209,7 +209,8 @@ function settings_bundle {
     tar -cf- --mtime=1970-01-01 \
         /etc/openstack-dashboard/local_settings \
         /etc/openstack-dashboard/custom_local_settings \
-        /etc/openstack-dashboard/local_settings.d 2> /dev/null || true
+        /etc/openstack-dashboard/local_settings.d \
+        /etc/openstack-dashboard/themes 2> /dev/null || true
 }
 
 function settings_changed {
diff --git a/docker/rabbitmq/rabbitmq/healthcheck_rabbitmq b/docker/rabbitmq/rabbitmq/healthcheck_rabbitmq
index 529362bace..277ab098c3 100644
--- a/docker/rabbitmq/rabbitmq/healthcheck_rabbitmq
+++ b/docker/rabbitmq/rabbitmq/healthcheck_rabbitmq
@@ -2,9 +2,7 @@
 
 set -e
 
-rabbitmq-diagnostics -t 5 -q ping || exit 1
-rabbitmq-diagnostics -t 5 -q status || exit 1
-rabbitmq-diagnostics -t 5 -q check_running || exit 1
-rabbitmq-diagnostics -t 5 -q check_local_alarms || exit 1
-rabbitmq-diagnostics -t 5 -q check_port_connectivity || exit 1
-rabbitmq-diagnostics -t 5 -q check_virtual_hosts || exit 1
+for check in ping status check_running check_local_alarms check_port_connectivity check_virtual_hosts; do
+    echo "Running rabbitmq-diagnostics $check"
+    rabbitmq-diagnostics -t 5 -q $check || (echo "ERROR: $check failed" && exit 1)
+done
diff --git a/releasenotes/notes/horizon-theme-rebuilds-65e5f50c1d0cc8dd.yaml b/releasenotes/notes/horizon-theme-rebuilds-65e5f50c1d0cc8dd.yaml
new file mode 100644
index 0000000000..a85f1e5f4f
--- /dev/null
+++ b/releasenotes/notes/horizon-theme-rebuilds-65e5f50c1d0cc8dd.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Fixed Horizon static asset regeneration for custom theme updates.
+    Changes under ``/etc/openstack-dashboard/themes`` now invalidate the
+    startup settings hash, so Horizon reruns ``collectstatic`` and
+    ``compress`` after a restart or recreate.