diff --git a/ublue/motd/src/ublue-motd b/ublue/motd/src/ublue-motd
index 3071099..4e43dcf 100755
--- a/ublue/motd/src/ublue-motd
+++ b/ublue/motd/src/ublue-motd
@@ -33,11 +33,8 @@ THEMES_DIRECTORY="$(get_config '."themes-directory"' "/usr/share/ublue-os/motd/t
 # HOOKS_DIRECTORY="$(get_config '."hooks-directory"' "/usr/share/ublue-os/motd/hooks.d")"
 [ ! -f "$TEMPLATE_FILE" ] && die "Failed reading template file"
 
-TIP_FILE="$(find "$TIP_DIRECTORY" -iname "*.md" 2>/dev/null | shuf -n 1)"
-
 if [ "$CHECK_OUTDATED" == "true" ] ; then
-	IMAGE_DATE=$(rpm-ostree status --booted | sed -n 's/.*Timestamp: \(.*\)/\1/p')
-	IMAGE_DATE_SECONDS=$(date -d "$IMAGE_DATE" +%s)
+	IMAGE_DATE_SECONDS=$(rpm-ostree status --booted --json | jq -r '.deployments[].timestamp')
 	CURRENT_SECONDS=$(date +%s)
 	DIFFERENCE=$((CURRENT_SECONDS - IMAGE_DATE_SECONDS))
 	ONE_MONTH=$((30 * 24 * 60 * 60))
@@ -47,7 +44,7 @@ if [ "$CHECK_OUTDATED" == "true" ] ; then
 	fi
 fi
 
-TIP="${TIP:-$(shuf -n 1 "$TIP_FILE")}"
+TIP="${TIP:-"$(/usr/bin/cat "$TIP_DIRECTORY"/*.md 2>/dev/null | shuf -n 1)"}"
 TIP_ESCAPED="󰋼 $(escape "$TIP")"
 
 KEY_WARN_FILE="/run/user-motd-sbkey-warn.md"
diff --git a/ublue/motd/ublue-motd.spec b/ublue/motd/ublue-motd.spec
index 43dd27d..42eb65a 100644
--- a/ublue/motd/ublue-motd.spec
+++ b/ublue/motd/ublue-motd.spec
@@ -1,7 +1,7 @@
 %global debug_package %{nil}
 
 Name:           ublue-motd
-Version:        0.2.2
+Version:        0.2.3
 Release:        1%{?dist}
 Summary:        MOTD scripts for Universal Blue images