diff --git a/.gitlab/ci/pipelines/schedule_container_scanning_evm_node_releases.yml b/.gitlab/ci/pipelines/schedule_container_scanning_evm_node_releases.yml
index 1e148de6ea658932fd8a63ba5547903da9dd6b68..8e7c081e2ff5385d4b1f329b8be994973bbbea30 100644
--- a/.gitlab/ci/pipelines/schedule_container_scanning_evm_node_releases.yml
+++ b/.gitlab/ci/pipelines/schedule_container_scanning_evm_node_releases.yml
@@ -33,6 +33,6 @@ container_scanning:
   - gtcs scan
   variables:
     GIT_STRATEGY: fetch
-    CS_IMAGE: tezos/tezos:octez-evm-node-v0.20
+    CS_IMAGE: tezos/tezos:octez-evm-node-v0.21
     SECURE_LOG_LEVEL: debug
     CS_DOCKERFILE_PATH: build.Dockerfile
diff --git a/ci/bin/main.ml b/ci/bin/main.ml
index 64fc03267b6b96441b5d6a352fdf3c98e4e007a8..f8da23760968018be6def2035d5078755db59379 100644
--- a/ci/bin/main.ml
+++ b/ci/bin/main.ml
@@ -349,7 +349,7 @@ let () =
       [
         Common.job_datadog_pipeline_trace;
         Common.job_container_scanning
-          ~docker_image:"tezos/tezos:octez-evm-node-v0.20"
+          ~docker_image:"tezos/tezos:octez-evm-node-v0.21"
           ~dockerfile_path:"build.Dockerfile";
       ]
     ~description:
diff --git a/etherlink/CHANGES_NODE.md b/etherlink/CHANGES_NODE.md
index 8ef427682ca13fd558ce617d40ce116ae49f2fa5..e96c7b67e8ea8ef444608d76057e8888fe926c97 100644
--- a/etherlink/CHANGES_NODE.md
+++ b/etherlink/CHANGES_NODE.md
@@ -8,6 +8,46 @@
 
 ### RPCs changes
 
+### Metrics changes
+
+### Execution changes
+
+### Storage changes
+
+### Documentation changes
+
+### Experimental features changes
+
+*No guarantees are provided regarding backward compatibility of experimental
+features. They can be modified or removed without any deprecation notices. If
+you start using them, you probably want to use `octez-evm-node check config
+--config-file PATH` to assert your configuration file is still valid.*
+
+## Version 0.21 (2025-04-09)
+
+This release finalizes the new experimental `tx_queue` which allows to send
+multiple transactions to be included in a single block. It also improves the
+bootstrapping process with snapshots and considerably speeds up the catch-up
+phases.
+
+This release will not apply any migration to the node’s store (version 20),
+meaning it is possible to downgrade to the previous version.
+
+Configuration files created with versions v0.17 and v0.18 might cause encoding
+errors related to `l2_chain` or lead to `Mismatched_chain_family`
+issues. Operators of EVM nodes should verify their configurations by running:
+
+```
+octez-evm-node check config
+```
+
+If issues persist after verification, remove the `l2_chains` entry from the `experimental_features` section of your configuration file.
+
+By default, the configuration file (`config.json`) is located in your `data_dir`
+directory.
+
+### RPCs changes
+
 - Fixes `mixHash` being renamed into `prevRandao` in the output of our JSON RPC
   API server. (!17394)
 - Adds `GET /evm/blueprints/range?from_level=l&max_count=c` which returns a
@@ -16,8 +56,6 @@
   its store, the RPC returns a 404 error instead of an empty list. `c` default
   to `1` if not specified and reduced to `500` if superior. (!17592)
 
-### Metrics changes
-
 ### Execution changes
 
 - `replay blueprint` can export tick and gas consumption with `--profile`. (!17441)
@@ -41,8 +79,6 @@
 - Allow to import snapshots from standard input with `-`. (!17463)
 - Use `curl` (faster) to download snapshots when available. (!17477)
 
-### Documentation changes
-
 ### Experimental features changes
 
 *No guarantees are provided regarding backward compatibility of experimental
@@ -50,19 +86,10 @@ features. They can be modified or removed without any deprecation notices. If
 you start using them, you probably want to use `octez-evm-node check config
 --config-file PATH` to assert your configuration file is still valid.*
 
-Configuration files created with versions v0.17 and v0.18 might cause encoding errors related to `l2_chain` or lead to `Mismatched_chain_family` issues. Operators of EVM nodes should verify their configurations by running:
-
-```
-octez-evm-node check config
-```
-
-If issues persist after verification, remove the `l2_chains` entry from the `experimental_features` section of your configuration file.
-
-By default, the configuration file (`config.json`) is located in your `data_dir`
-directory.
-
 - Websocket server (with Resto backend) can be configured to rate limit messages
   with the field `experimental_features.websocket_rate_limit`. (!17510 !17523)
+- Add support for the `tx_queue` in RPC mode. (!17254)
+- Add support for the `tx_queue` in proxy mode. (!17246)
 
 ## Version 0.20 (2025-03-21)
 
diff --git a/etherlink/scripts/docker-compose/mainnet-docker-compose/.env b/etherlink/scripts/docker-compose/mainnet-docker-compose/.env
index d5cdba9456ac07c5fd2fb67a3ca2881914a79ca4..cebcb14b08c4086f7f7229f082f1e21edbdc6b56 100644
--- a/etherlink/scripts/docker-compose/mainnet-docker-compose/.env
+++ b/etherlink/scripts/docker-compose/mainnet-docker-compose/.env
@@ -49,7 +49,7 @@ ARCHIVE_OCTEZ_NODE_ENDPOINT=${ARCHIVE_OCTEZ_NODE_ENDPOINT:-"https://rpc.tzkt.io/
 
 # EVM node is not published yet in release and so it must uses a more
 # recent commit (on master branch).
-EVM_OCTEZ_TAG=octez-evm-node-v0.20
+EVM_OCTEZ_TAG=octez-evm-node-v0.21
 # exposed port of the evm-node container
 EVM_OCTEZ_PORT=8545
 # Add argument you would like to uses when running the EVM node.