diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1f04da56..a150bca4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,6 +12,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - name: Install latest nightly
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: 1.58.0
+          override: true
+          components: rustfmt, clippy, doc
       - uses: Swatinem/rust-cache@v2
       - uses: taiki-e/install-action@cargo-make
       - run: cargo make fmt-check
@@ -25,6 +31,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - name: Install latest nightly
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: 1.58.0
+          override: true
       - uses: Swatinem/rust-cache@v2
       - uses: taiki-e/install-action@cargo-make
       - name: Add hosts entries
diff --git a/src/store/postgres/event_store.rs b/src/store/postgres/event_store.rs
index 3860a943..fa727b32 100644
--- a/src/store/postgres/event_store.rs
+++ b/src/store/postgres/event_store.rs
@@ -189,8 +189,8 @@ where
             .collect::<Result<Vec<StoreEvent<A::Event>>, Self::Error>>()?)
     }
 
-    // Note: https://github.com/rust-lang/rust-clippy/issues/12281
-    #[allow(clippy::blocks_in_conditions)]
+    // Clippy introduced `blocks_in_conditions` lint. With certain version of rust and tracing this
+    // line throws an error see: https://github.com/rust-lang/rust-clippy/issues/12281
     #[tracing::instrument(skip_all, fields(aggregate_id = % aggregate_state.id()), err)]
     async fn persist(
         &self,