diff --git a/checks/addresses-nonroot.sh b/checks/addresses-nonroot.sh
index c7ec16d..b137fa4 100755
--- a/checks/addresses-nonroot.sh
+++ b/checks/addresses-nonroot.sh
@@ -3,7 +3,7 @@
 # Set path to a save default
 PATH="$(dirname "$0")/..:/usr/lib/gatemon:/usr/lib/nagios/plugins:/usr/lib/monitoring-plugins:/bin:/usr/bin:/sbin:/usr/sbin"
 
-export TIMEFORMAT="%0R"
+export TIMEFORMAT="%2R"
 export LC_ALL=C
 
 NETWORK_DEVICE="$1"
@@ -32,10 +32,14 @@ fi
 exec 3>&- 4>&-
 
 cat <<EOF
-        ipv4: ${STATUS_CODE}
+        ipv4:
+          status: ${STATUS_CODE}
+          time: ${ELAPSED_TIME}
 EOF
 
 # IPv6
 cat <<EOF
-        ipv6: 0
+        ipv6:
+          status: 0
+          time: false
 EOF
diff --git a/checks/dns-nonroot.sh b/checks/dns-nonroot.sh
index ed7bb71..b577630 100755
--- a/checks/dns-nonroot.sh
+++ b/checks/dns-nonroot.sh
@@ -12,7 +12,7 @@ else
   exit 1
 fi
 
-export TIMEFORMAT="%0R"
+export TIMEFORMAT="%2R"
 
 NETWORK_DEVICE="$1"
 SERVER_IP4="$2"
@@ -40,7 +40,9 @@ fi
 exec 3>&- 4>&-
 
 cat <<EOF
-        ipv4: ${STATUS_CODE}
+        ipv4:
+          status: ${STATUS_CODE}
+          time: ${ELAPSED_TIME}
 EOF
 
 # IPv6
@@ -55,5 +57,7 @@ fi
 exec 3>&- 4>&-
 
 cat <<EOF
-        ipv6: ${STATUS_CODE}
+        ipv6:
+          status: ${STATUS_CODE}
+          time: ${ELAPSED_TIME}
 EOF
diff --git a/checks/ntp-nonroot.sh b/checks/ntp-nonroot.sh
index 94bf4ca..acc0a2a 100755
--- a/checks/ntp-nonroot.sh
+++ b/checks/ntp-nonroot.sh
@@ -12,7 +12,7 @@ else
   exit 1
 fi
 
-export TIMEFORMAT="%0R"
+export TIMEFORMAT="%2R"
 
 NETWORK_DEVICE="$1"
 SERVER_IP4="$2"
@@ -40,7 +40,9 @@ fi
 exec 3>&- 4>&-
 
 cat <<EOF
-        ipv4: ${STATUS_CODE}
+        ipv4:
+          status: ${STATUS_CODE}
+          time: ${ELAPSED_TIME}
 EOF
 
 # IPv6
@@ -55,5 +57,7 @@ fi
 exec 3>&- 4>&-
 
 cat <<EOF
-        ipv6: ${STATUS_CODE}
+        ipv6:
+          status: ${STATUS_CODE}
+          time: ${ELAPSED_TIME}
 EOF
diff --git a/checks/uplink-nonroot.sh b/checks/uplink-nonroot.sh
index d6f5b09..e6844cd 100755
--- a/checks/uplink-nonroot.sh
+++ b/checks/uplink-nonroot.sh
@@ -13,7 +13,7 @@ else
   exit 1
 fi
 
-export TIMEFORMAT="%0R"
+export TIMEFORMAT="%2R"
 
 NETWORK_DEVICE="$1"
 SERVER_IP4="$2"
@@ -44,7 +44,9 @@ fi
 exec 3>&- 4>&-
 
 cat <<EOF
-        ipv4: ${STATUS_CODE}
+        ipv4:
+          status: ${STATUS_CODE}
+          time: ${ELAPSED_TIME}
 EOF
 
 # IPv6
@@ -59,5 +61,7 @@ fi
 exec 3>&- 4>&-
 
 cat <<EOF
-        ipv6: ${STATUS_CODE}
+        ipv6:
+          status: ${STATUS_CODE}
+          time: ${ELAPSED_TIME}
 EOF