diff --git a/src/bin/bitfield.rs b/src/bin/bitfield.rs
index f82c2a2..d9889b1 100644
--- a/src/bin/bitfield.rs
+++ b/src/bin/bitfield.rs
@@ -7,7 +7,7 @@ use {{crate_name}} as _; // global logger + panicking-behavior + memory layout
 fn main() -> ! {
     // value of the FREQUENCY register (nRF52840 device; RADIO peripheral)
     let frequency: u32 = 276;
-    defmt::debug!("FREQUENCY: {0:0..7}, MAP: {0:8..9}", frequency);
+    defmt::debug!("FREQUENCY: {0=0..7}, MAP: {0=8..9}", frequency);
 
     {{crate_name}}::exit()
 }
diff --git a/src/bin/format.rs b/src/bin/format.rs
index aa8c35f..30476f6 100644
--- a/src/bin/format.rs
+++ b/src/bin/format.rs
@@ -20,7 +20,7 @@ fn main() -> ! {
     let s = S1 { x: 42, y: S2 { z: 43 } };
     defmt::info!("s={:?}", s);
     let x = 42;
-    defmt::info!("x={:u8}", x);
+    defmt::info!("x={=u8}", x);
 
     {{crate_name}}::exit()
 }
diff --git a/src/bin/overflow.rs b/src/bin/overflow.rs
index 03c2a47..4e85b95 100644
--- a/src/bin/overflow.rs
+++ b/src/bin/overflow.rs
@@ -10,7 +10,7 @@ fn main() -> ! {
 }
 
 fn ack(m: u32, n: u32) -> u32 {
-    defmt::info!("ack(m={:u32}, n={:u32})", m, n);
+    defmt::info!("ack(m={=u32}, n={=u32})", m, n);
     let mut big = [2; 512];
     if m == 0 {
         n + 1
diff --git a/src/lib.rs b/src/lib.rs
index 2905d1c..9b79116 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -15,14 +15,8 @@ fn panic() -> ! {
     cortex_m::asm::udf()
 }
 
-#[defmt::timestamp]
-fn timestamp() -> u64 {
-    static COUNT: AtomicUsize = AtomicUsize::new(0);
-    // NOTE(no-CAS) `timestamps` runs with interrupts disabled
-    let n = COUNT.load(Ordering::Relaxed);
-    COUNT.store(n + 1, Ordering::Relaxed);
-    n as u64
-}
+static COUNT: AtomicUsize = AtomicUsize::new(0);
+defmt::timestamp!("{=usize}", COUNT.fetch_add(1, Ordering::Relaxed));
 
 /// Terminates the application and makes `probe-run` exit with exit-code = 0
 pub fn exit() -> ! {