diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 12c68b284b..b095de2586 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -71,13 +71,13 @@ jobs:
   node:
     uses: ./.github/workflows/test-node.yml
     with:
-      nim_wakunode_image: ${{ inputs.nim_wakunode_image || 'wakuorg/nwaku:v0.20.0' }}
+      nim_wakunode_image: ${{ inputs.nim_wakunode_image || 'wakuorg/nwaku:v0.21.0' }}
       test_type: node
 
   node_optional:
     uses: ./.github/workflows/test-node.yml
     with:
-      nim_wakunode_image: ${{ inputs.nim_wakunode_image || 'wakuorg/nwaku:v0.20.0' }}
+      nim_wakunode_image: ${{ inputs.nim_wakunode_image || 'wakuorg/nwaku:v0.21.0' }}
       test_type: node-optional
 
   node_with_go_waku_master:
diff --git a/packages/tests/src/node/node.ts b/packages/tests/src/node/node.ts
index 14dd6fdc0d..9a5d5d9390 100644
--- a/packages/tests/src/node/node.ts
+++ b/packages/tests/src/node/node.ts
@@ -27,7 +27,7 @@ const WAKU_SERVICE_NODE_PARAMS =
   process.env.WAKU_SERVICE_NODE_PARAMS ?? undefined;
 const NODE_READY_LOG_LINE = "Node setup complete";
 
-const DOCKER_IMAGE_NAME = process.env.WAKUNODE_IMAGE || "wakuorg/nwaku:v0.20.0";
+const DOCKER_IMAGE_NAME = process.env.WAKUNODE_IMAGE || "wakuorg/nwaku:v0.21.0";
 
 const isGoWaku = DOCKER_IMAGE_NAME.includes("go-waku");
 
diff --git a/packages/tests/src/run-tests.js b/packages/tests/src/run-tests.js
index 6b7c9cc78f..3738c6cd1a 100644
--- a/packages/tests/src/run-tests.js
+++ b/packages/tests/src/run-tests.js
@@ -3,7 +3,7 @@ import { promisify } from "util";
 
 const execAsync = promisify(exec);
 
-const WAKUNODE_IMAGE = process.env.WAKUNODE_IMAGE || "wakuorg/nwaku:v0.20.0";
+const WAKUNODE_IMAGE = process.env.WAKUNODE_IMAGE || "wakuorg/nwaku:v0.21.0";
 
 async function main() {
   try {
diff --git a/packages/tests/tests/light-push/index.node.spec.ts b/packages/tests/tests/light-push/index.node.spec.ts
index 2a08701c71..c7f04d5987 100644
--- a/packages/tests/tests/light-push/index.node.spec.ts
+++ b/packages/tests/tests/light-push/index.node.spec.ts
@@ -79,6 +79,7 @@ describe("Waku Light Push", function () {
       payload: new Uint8Array()
     });
 
+    expect(pushResponse.recipients.length).to.eq(0);
     expect(pushResponse.errors).to.include(SendError.EMPTY_PAYLOAD);
     expect(await messageCollector.waitForMessages(1)).to.eq(false);
   });
@@ -152,8 +153,7 @@ describe("Waku Light Push", function () {
       });
     } else {
       expect(pushResponse.recipients.length).to.eq(0);
-      // Should be `REMOTE_PEER_REJECTED`, tracked with https://github.com/waku-org/nwaku/issues/2059
-      expect(pushResponse.errors).to.include(SendError.REMOTE_PEER_FAULT);
+      expect(pushResponse.errors).to.include(SendError.REMOTE_PEER_REJECTED);
       expect(await messageCollector.waitForMessages(1)).to.eq(false);
     }
   });