diff --git a/.github/workflows/benchmark-prs.yml b/.github/workflows/benchmark-prs.yml
index ba3ba08da1..4d5955b418 100644
--- a/.github/workflows/benchmark-prs.yml
+++ b/.github/workflows/benchmark-prs.yml
@@ -74,7 +74,7 @@ jobs:
 
       - name: Start a client instance to compare memory usage
         shell: bash
-        run: target/release/safe --log-output-dest=data-dir files upload the-test-data.zip -r 0
+        run: target/release/safe --log-output-dest=data-dir files upload the-test-data.zip --retry-strategy quick
         env:
           SN_LOG: "all"
 
@@ -203,13 +203,13 @@ jobs:
 
       - name: Start a client to carry out download to output the logs
         shell: bash
-        run: target/release/safe --log-output-dest=data-dir files download
+        run: target/release/safe --log-output-dest=data-dir files download --retry-strategy quick
 
       - name: Start a client to simulate criterion upload
         shell: bash
         run: |
           ls -l target/release
-          target/release/safe --log-output-dest=data-dir files upload target/release/faucet -r 0
+          target/release/safe --log-output-dest=data-dir files upload target/release/faucet --retry-strategy quick
 
       #########################
       ### Stop Network      ###
diff --git a/.github/workflows/generate-benchmark-charts.yml b/.github/workflows/generate-benchmark-charts.yml
index 219daea88e..6b71f5d072 100644
--- a/.github/workflows/generate-benchmark-charts.yml
+++ b/.github/workflows/generate-benchmark-charts.yml
@@ -105,7 +105,7 @@ jobs:
 
       - name: Start a client instance to compare memory usage
         shell: bash
-        run: cargo run --bin safe --release -- --log-output-dest=data-dir files upload the-test-data.zip -r 0
+        run: cargo run --bin safe --release -- --log-output-dest=data-dir files upload the-test-data.zip --retry-strategy quick
         env:
           SN_LOG: "all"
       
diff --git a/.github/workflows/memcheck.yml b/.github/workflows/memcheck.yml
index d4be973d37..828fc6fb69 100644
--- a/.github/workflows/memcheck.yml
+++ b/.github/workflows/memcheck.yml
@@ -105,7 +105,7 @@ jobs:
       # -p makes files public
         run: |
           ls -l
-          cargo run --bin safe --release -- --log-output-dest=data-dir files upload "./the-test-data.zip" -r 0 -p
+          cargo run --bin safe --release -- --log-output-dest=data-dir files upload "./the-test-data.zip" --retry-strategy quick -p
         env:
           SN_LOG: "all"
         timeout-minutes: 25
@@ -128,7 +128,7 @@ jobs:
           cat initial_balance_from_faucet_1.txt | tail -n 1 > transfer_hex
           cat transfer_hex
           cargo run --bin safe --release -- --log-output-dest=data-dir wallet receive --file transfer_hex
-          cargo run --bin safe --release -- --log-output-dest=data-dir files upload "./the-test-data_1.zip" -r 0 -p > second_upload.txt
+          cargo run --bin safe --release -- --log-output-dest=data-dir files upload "./the-test-data_1.zip" --retry-strategy quick -p > second_upload.txt
           cat second_upload.txt
           rg "New wallet balance: 5000000.000000000" second_upload.txt -c --stats
         env:
@@ -211,7 +211,7 @@ jobs:
 
       - name: Start a client to download files
         run: |
-          cargo run --bin safe --release -- --log-output-dest=data-dir files download
+          cargo run --bin safe --release -- --log-output-dest=data-dir files download --retry-strategy quick
           ls -l $CLIENT_DATA_PATH/safe_files
           downloaded_files=$(ls $CLIENT_DATA_PATH/safe_files | wc -l)
           if [ $downloaded_files -lt 1 ]; then
@@ -225,7 +225,7 @@ jobs:
       # Download the same files again to ensure files won't get corrupted.
       - name: Start a client to download the same files again
         run: |
-          cargo run --bin safe --release -- --log-output-dest=data-dir files download --show-holders
+          cargo run --bin safe --release -- --log-output-dest=data-dir files download --show-holders --retry-strategy quick
           ls -l $CLIENT_DATA_PATH/safe_files
           downloaded_files=$(ls $CLIENT_DATA_PATH/safe_files | wc -l)
           if [ $downloaded_files -lt 1 ]; then
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 0d6ead7948..3d033afc0d 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -235,13 +235,13 @@ jobs:
         timeout-minutes: 5
 
       - name: Start a client to upload files
-        run: cargo run --bin safe --release -- --log-output-dest=data-dir files upload "./resources" -r 0
+        run: cargo run --bin safe --release -- --log-output-dest=data-dir files upload "./resources" --retry-strategy quick
         env:
           SN_LOG: "all"
         timeout-minutes: 15
 
       - name: Start a client to download files
-        run: cargo run --bin safe --release -- --log-output-dest=data-dir files download
+        run: cargo run --bin safe --release -- --log-output-dest=data-dir files download --retry-strategy quick
         env:
           SN_LOG: "all"
         timeout-minutes: 2
@@ -791,7 +791,7 @@ jobs:
         timeout-minutes: 5
 
       - name: Start a client to upload
-        run: ~/safe --log-output-dest=data-dir files upload "ubuntu-18.04.6-desktop-amd64.iso" -r 0
+        run: ~/safe --log-output-dest=data-dir files upload "ubuntu-18.04.6-desktop-amd64.iso" --retry-strategy quick
         env:
           SN_LOG: "all"
         timeout-minutes: 30
@@ -906,7 +906,7 @@ jobs:
         timeout-minutes: 5
 
       - name: Start a client to upload first file
-        run: cargo run --bin safe --release -- --log-output-dest=data-dir files upload "./test_data_1.tar.gz" -r 0
+        run: cargo run --bin safe --release -- --log-output-dest=data-dir files upload "./test_data_1.tar.gz" --retry-strategy quick
         env:
           SN_LOG: "all"
         timeout-minutes: 5
@@ -940,7 +940,7 @@ jobs:
         timeout-minutes: 6
 
       - name: Use same client to upload second file
-        run: cargo run --bin safe --release -- --log-output-dest=data-dir files upload "./test_data_2.tar.gz" -r 0
+        run: cargo run --bin safe --release -- --log-output-dest=data-dir files upload "./test_data_2.tar.gz" --retry-strategy quick
         env:
           SN_LOG: "all"
         timeout-minutes: 10
@@ -992,7 +992,7 @@ jobs:
         timeout-minutes: 25
 
       - name: Use second client to upload third file
-        run: cargo run --bin safe --release -- --log-output-dest=data-dir files upload "./test_data_3.tar.gz" -r 0
+        run: cargo run --bin safe --release -- --log-output-dest=data-dir files upload "./test_data_3.tar.gz" --retry-strategy quick
         env:
           SN_LOG: "all"
         timeout-minutes: 10
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 451036fa09..34759e2e93 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -52,7 +52,7 @@ jobs:
         timeout-minutes: 2
 
       - name: Start a client to carry out chunk actions
-        run: cargo run --bin safe --release -- --log-output-dest=data-dir files upload "./resources" -r 0
+        run: cargo run --bin safe --release -- --log-output-dest=data-dir files upload "./resources" --retry-strategy quick
         env:
           SN_LOG: "all"
         timeout-minutes: 2
diff --git a/.github/workflows/nightly_wan.yml b/.github/workflows/nightly_wan.yml
index a53f69536d..21d4914ebf 100644
--- a/.github/workflows/nightly_wan.yml
+++ b/.github/workflows/nightly_wan.yml
@@ -73,7 +73,7 @@ jobs:
         timeout-minutes: 2
 
       - name: Start a client to carry out chunk actions
-        run: cargo run --bin safe --release -- --log-output-dest=data-dir files upload "./resources" -r 0
+        run: cargo run --bin safe --release -- --log-output-dest=data-dir files upload "./resources" --retry-strategy quick
         env:
           SN_LOG: "all"
         timeout-minutes: 2
diff --git a/sn_client/src/api.rs b/sn_client/src/api.rs
index ba1267a03b..229e303904 100644
--- a/sn_client/src/api.rs
+++ b/sn_client/src/api.rs
@@ -677,7 +677,7 @@ impl Client {
     /// let xorname = XorName::random(&mut rng);
     /// let chunk_address = ChunkAddress::new(xorname);
     /// // get chunk
-    /// let chunk = client.get_chunk(chunk_address,true).await?;
+    /// let chunk = client.get_chunk(chunk_address,true, None).await?;
     /// # Ok(())
     /// # }
     /// ```