diff --git a/esp-hal-common/Cargo.toml b/esp-hal-common/Cargo.toml
index 8e40163a9..b760f08a7 100644
--- a/esp-hal-common/Cargo.toml
+++ b/esp-hal-common/Cargo.toml
@@ -16,22 +16,22 @@ nb           = "1.0"
 paste        = "1.0"
 riscv        = { version = "0.7", optional = true }
 void         = { version = "1.0", default-features = false }
-xtensa-lx    = { version = "0.4", optional = true }
-xtensa-lx-rt = { version = "0.7", features = ["lx6"], optional = true }
+xtensa-lx    = { version = "0.6.0", optional = true }
+xtensa-lx-rt = { version = "0.8.0", features = ["esp32"], optional = true }
 procmacros   = { path = "../esp-hal-procmacros", package = "esp-hal-procmacros" }
 # IMPORTANT:
 # Each supported device MUST have its PAC included below along with a
 # corresponding feature.
-esp32_pac   = { package = "esp32",   git = "https://github.com/jessebraham/esp32.git",   branch = "develop", optional = true }
-esp32c3_pac = { package = "esp32c3", git = "https://github.com/jessebraham/esp32c3.git", branch = "develop", optional = true }
-esp32s2_pac = { package = "esp32s2", git = "https://github.com/jessebraham/esp32s2.git", branch = "develop", optional = true }
-esp32s3_pac = { package = "esp32s3", git = "https://github.com/jessebraham/esp32s3.git", branch = "develop", optional = true }
+esp32_pac   = { package = "esp32", git = "https://github.com/esp-rs/esp-pacs.git", branch = "with_source", optional = true }
+esp32c3_pac = { package = "esp32c3", git = "https://github.com/esp-rs/esp-pacs.git", branch = "with_source", optional = true }
+esp32s2_pac = { package = "esp32s2", git = "https://github.com/esp-rs/esp-pacs.git", branch = "with_source", optional = true }
+esp32s3_pac = { package = "esp32s3", git = "https://github.com/esp-rs/esp-pacs.git", branch = "with_source", optional = true }
 
 [features]
-esp32   = ["esp32_pac",   "esp32_pac/rt",   "xtensa-lx/lx6", "xtensa-lx-rt/lx6", "procmacros/rtc_slow", "dual_core"]
+esp32   = ["esp32_pac",   "esp32_pac/rt",   "xtensa-lx/esp32", "xtensa-lx-rt/esp32", "procmacros/rtc_slow", "dual_core"]
 esp32c3 = ["esp32c3_pac", "esp32c3_pac/rt", "riscv", "single_core"]
-esp32s2 = ["esp32s2_pac", "esp32s2_pac/rt", "xtensa-lx/lx6", "xtensa-lx-rt/lx6", "procmacros/rtc_slow", "single_core"] # FIXME
-esp32s3 = ["esp32s3_pac", "esp32s3_pac/rt", "xtensa-lx/lx6", "xtensa-lx-rt/lx6", "procmacros/rtc_slow", "dual_core"] # FIXME
+esp32s2 = ["esp32s2_pac", "esp32s2_pac/rt", "xtensa-lx/esp32", "xtensa-lx-rt/esp32", "procmacros/rtc_slow", "single_core"] # FIXME
+esp32s3 = ["esp32s3_pac", "esp32s3_pac/rt", "xtensa-lx/esp32", "xtensa-lx-rt/esp32", "procmacros/rtc_slow", "dual_core"] # FIXME
 
 single_core = []
 dual_core = []
diff --git a/esp32-hal/Cargo.toml b/esp32-hal/Cargo.toml
index a6dec0d03..e74701d5a 100644
--- a/esp32-hal/Cargo.toml
+++ b/esp32-hal/Cargo.toml
@@ -28,8 +28,8 @@ bare-metal   = "1.0"
 embedded-hal = { version = "0.2", features = ["unproven"] }
 nb           = "1.0"
 void         = { version = "1.0", default-features = false }
-xtensa-lx    = { version = "0.4", features = ["lx6"] }
-xtensa-lx-rt = { version = "0.7", features = ["lx6"], optional = true }
+xtensa-lx    = { version = "0.6.0", features = ["esp32"] }
+xtensa-lx-rt = { version = "0.8.0", features = ["esp32"], optional = true }
 
 [dependencies.esp-hal-common]
 path     = "../esp-hal-common"
diff --git a/esp32s2-hal/Cargo.toml b/esp32s2-hal/Cargo.toml
index fba3c5ce4..0223f40e7 100644
--- a/esp32s2-hal/Cargo.toml
+++ b/esp32s2-hal/Cargo.toml
@@ -28,18 +28,13 @@ bare-metal   = "1.0"
 embedded-hal = { version = "0.2", features = ["unproven"] }
 nb           = "1.0"
 void         = { version = "1.0", default-features = false }
-xtensa-lx    = { version = "0.4", features = ["lx6"] } # FIXME
+xtensa-lx    = { version = "0.6.0", features = ["esp32"] } # FIXME
+xtensa-lx-rt = { version = "0.8.0", features = ["esp32"], optional = true }
 
 [dependencies.esp-hal-common]
 path     = "../esp-hal-common"
 features = ["esp32s2"]
 
-[dependencies.xtensa-lx-rt] # FIXME
-git      = "https://github.com/esp-rs/xtensa-lx-rt/"
-branch   = "unify-xtensa-asm"
-features = ["lx6"]
-optional = true
-
 [dev-dependencies]
 panic-halt = "0.2"
 
diff --git a/esp32s3-hal/Cargo.toml b/esp32s3-hal/Cargo.toml
index 356082113..eb7e51bd6 100644
--- a/esp32s3-hal/Cargo.toml
+++ b/esp32s3-hal/Cargo.toml
@@ -28,18 +28,13 @@ bare-metal   = "1.0"
 embedded-hal = { version = "0.2", features = ["unproven"] }
 nb           = "1.0"
 void         = { version = "1.0", default-features = false }
-xtensa-lx    = { version = "0.4", features = ["lx6"] } # FIXME
+xtensa-lx    = { version = "0.6.0", features = ["esp32"] } # FIXME
+xtensa-lx-rt = { version = "0.8.0", features = ["esp32"], optional = true }
 
 [dependencies.esp-hal-common]
 path     = "../esp-hal-common"
 features = ["esp32s3"]
 
-[dependencies.xtensa-lx-rt] # FIXME
-git      = "https://github.com/esp-rs/xtensa-lx-rt/"
-branch   = "unify-xtensa-asm"
-features = ["lx6"]
-optional = true
-
 [dev-dependencies]
 panic-halt = "0.2"