diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index a049b1a..1aec0cd 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -7,7 +7,7 @@ ENV LANG=C.UTF-8
 # Arguments
 ARG CONTAINER_USER=esp
 ARG CONTAINER_GROUP=esp
-ARG TOOLCHAIN_VERSION=1.62.1.0
+ARG TOOLCHAIN_VERSION=1.63.0.2
 ARG ESP_BOARD=esp32
 ARG INSTALL_RUST_TOOLCHAIN=install-rust-toolchain.sh
 
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index ada0ad9..287f7c7 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,7 +1,7 @@
 {
   "name": "{{ crate_name }}",
   // Select between image and build propieties to pull or build the image.
-  // "image": "docker.io/espressif/idf-rust:{{ mcu }}_1.62.1.0",
+  // "image": "docker.io/espressif/idf-rust:{{ mcu }}_1.63.0.2",
   "build": {
     "dockerfile": "Dockerfile",
     "args": {
@@ -13,7 +13,7 @@
   "settings": {
     "editor.formatOnPaste": true,
     "editor.formatOnSave": true,
-    "editor.formatOnSaveMode": "modifications",
+    "editor.formatOnSaveMode": "file",
     "editor.formatOnType": true,
     "lldb.executable": "/usr/bin/lldb",
     "files.watcherExclude": {
diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
index 536f48c..b7db05a 100644
--- a/.gitpod.Dockerfile
+++ b/.gitpod.Dockerfile
@@ -6,7 +6,7 @@ ENV LANG=C.UTF-8
 # ARGS
 ARG CONTAINER_USER=gitpod
 ARG CONTAINER_GROUP=gitpod
-ARG TOOLCHAIN_VERSION=1.62.1.0
+ARG TOOLCHAIN_VERSION=1.63.0.2
 ARG ESP_BOARD={{ mcu }}
 ARG INSTALL_RUST_TOOLCHAIN=install-rust-toolchain.sh
 
diff --git a/Cargo.toml b/Cargo.toml
index 45b89f5..61cacb9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-{{ mcu }}-hal = { package = "{{ mcu }}-hal", git = "https://github.com/esp-rs/esp-hal.git", rev = "6e037b0" }
+{{ mcu }}-hal = { package = "{{ mcu }}-hal", git = "https://github.com/esp-rs/esp-hal.git", rev = "e9f22ac" }
 esp-backtrace = { version = "0.1.0", features = ["{{ mcu }}", "panic-handler", "print-uart"] }
 {% if mcu == "esp32c3" -%}
 riscv-rt = { version = "0.9", optional = true }