diff --git a/Cargo.lock b/Cargo.lock
index 6e365d49bc..664aeea097 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3977,7 +3977,7 @@ checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03"
 [[package]]
 name = "namada_account"
 version = "0.39.0"
-source = "git+https://github.com/anoma/namada?rev=c74c583c7f11e0483088b034e721c7bee001f13c#c74c583c7f11e0483088b034e721c7bee001f13c"
+source = "git+https://github.com/anoma/namada?rev=d6fc2f2e1472898b33b7072ef98312ce8b5e9d31#d6fc2f2e1472898b33b7072ef98312ce8b5e9d31"
 dependencies = [
  "borsh 1.5.0",
  "linkme",
@@ -3991,7 +3991,7 @@ dependencies = [
 [[package]]
 name = "namada_controller"
 version = "0.39.0"
-source = "git+https://github.com/anoma/namada?rev=c74c583c7f11e0483088b034e721c7bee001f13c#c74c583c7f11e0483088b034e721c7bee001f13c"
+source = "git+https://github.com/anoma/namada?rev=d6fc2f2e1472898b33b7072ef98312ce8b5e9d31#d6fc2f2e1472898b33b7072ef98312ce8b5e9d31"
 dependencies = [
  "namada_core",
  "smooth-operator",
@@ -4001,7 +4001,7 @@ dependencies = [
 [[package]]
 name = "namada_core"
 version = "0.39.0"
-source = "git+https://github.com/anoma/namada?rev=c74c583c7f11e0483088b034e721c7bee001f13c#c74c583c7f11e0483088b034e721c7bee001f13c"
+source = "git+https://github.com/anoma/namada?rev=d6fc2f2e1472898b33b7072ef98312ce8b5e9d31#d6fc2f2e1472898b33b7072ef98312ce8b5e9d31"
 dependencies = [
  "bech32 0.8.1",
  "borsh 1.5.0",
@@ -4049,7 +4049,7 @@ dependencies = [
 [[package]]
 name = "namada_ethereum_bridge"
 version = "0.39.0"
-source = "git+https://github.com/anoma/namada?rev=c74c583c7f11e0483088b034e721c7bee001f13c#c74c583c7f11e0483088b034e721c7bee001f13c"
+source = "git+https://github.com/anoma/namada?rev=d6fc2f2e1472898b33b7072ef98312ce8b5e9d31#d6fc2f2e1472898b33b7072ef98312ce8b5e9d31"
 dependencies = [
  "borsh 1.5.0",
  "ethers",
@@ -4076,7 +4076,7 @@ dependencies = [
 [[package]]
 name = "namada_events"
 version = "0.39.0"
-source = "git+https://github.com/anoma/namada?rev=c74c583c7f11e0483088b034e721c7bee001f13c#c74c583c7f11e0483088b034e721c7bee001f13c"
+source = "git+https://github.com/anoma/namada?rev=d6fc2f2e1472898b33b7072ef98312ce8b5e9d31#d6fc2f2e1472898b33b7072ef98312ce8b5e9d31"
 dependencies = [
  "borsh 1.5.0",
  "linkme",
@@ -4092,7 +4092,7 @@ dependencies = [
 [[package]]
 name = "namada_gas"
 version = "0.39.0"
-source = "git+https://github.com/anoma/namada?rev=c74c583c7f11e0483088b034e721c7bee001f13c#c74c583c7f11e0483088b034e721c7bee001f13c"
+source = "git+https://github.com/anoma/namada?rev=d6fc2f2e1472898b33b7072ef98312ce8b5e9d31#d6fc2f2e1472898b33b7072ef98312ce8b5e9d31"
 dependencies = [
  "borsh 1.5.0",
  "linkme",
@@ -4107,7 +4107,7 @@ dependencies = [
 [[package]]
 name = "namada_governance"
 version = "0.39.0"
-source = "git+https://github.com/anoma/namada?rev=c74c583c7f11e0483088b034e721c7bee001f13c#c74c583c7f11e0483088b034e721c7bee001f13c"
+source = "git+https://github.com/anoma/namada?rev=d6fc2f2e1472898b33b7072ef98312ce8b5e9d31#d6fc2f2e1472898b33b7072ef98312ce8b5e9d31"
 dependencies = [
  "borsh 1.5.0",
  "itertools 0.12.1",
@@ -4130,9 +4130,10 @@ dependencies = [
 [[package]]
 name = "namada_ibc"
 version = "0.39.0"
-source = "git+https://github.com/anoma/namada?rev=c74c583c7f11e0483088b034e721c7bee001f13c#c74c583c7f11e0483088b034e721c7bee001f13c"
+source = "git+https://github.com/anoma/namada?rev=d6fc2f2e1472898b33b7072ef98312ce8b5e9d31#d6fc2f2e1472898b33b7072ef98312ce8b5e9d31"
 dependencies = [
  "borsh 1.5.0",
+ "data-encoding",
  "ibc",
  "ibc-derive",
  "ics23",
@@ -4159,7 +4160,7 @@ dependencies = [
 [[package]]
 name = "namada_macros"
 version = "0.39.0"
-source = "git+https://github.com/anoma/namada?rev=c74c583c7f11e0483088b034e721c7bee001f13c#c74c583c7f11e0483088b034e721c7bee001f13c"
+source = "git+https://github.com/anoma/namada?rev=d6fc2f2e1472898b33b7072ef98312ce8b5e9d31#d6fc2f2e1472898b33b7072ef98312ce8b5e9d31"
 dependencies = [
  "data-encoding",
  "proc-macro2",
@@ -4171,7 +4172,7 @@ dependencies = [
 [[package]]
 name = "namada_merkle_tree"
 version = "0.39.0"
-source = "git+https://github.com/anoma/namada?rev=c74c583c7f11e0483088b034e721c7bee001f13c#c74c583c7f11e0483088b034e721c7bee001f13c"
+source = "git+https://github.com/anoma/namada?rev=d6fc2f2e1472898b33b7072ef98312ce8b5e9d31#d6fc2f2e1472898b33b7072ef98312ce8b5e9d31"
 dependencies = [
  "borsh 1.5.0",
  "eyre",
@@ -4186,7 +4187,7 @@ dependencies = [
 [[package]]
 name = "namada_migrations"
 version = "0.39.0"
-source = "git+https://github.com/anoma/namada?rev=c74c583c7f11e0483088b034e721c7bee001f13c#c74c583c7f11e0483088b034e721c7bee001f13c"
+source = "git+https://github.com/anoma/namada?rev=d6fc2f2e1472898b33b7072ef98312ce8b5e9d31#d6fc2f2e1472898b33b7072ef98312ce8b5e9d31"
 dependencies = [
  "lazy_static",
  "linkme",
@@ -4196,7 +4197,7 @@ dependencies = [
 [[package]]
 name = "namada_parameters"
 version = "0.39.0"
-source = "git+https://github.com/anoma/namada?rev=c74c583c7f11e0483088b034e721c7bee001f13c#c74c583c7f11e0483088b034e721c7bee001f13c"
+source = "git+https://github.com/anoma/namada?rev=d6fc2f2e1472898b33b7072ef98312ce8b5e9d31#d6fc2f2e1472898b33b7072ef98312ce8b5e9d31"
 dependencies = [
  "namada_core",
  "namada_macros",
@@ -4207,7 +4208,7 @@ dependencies = [
 [[package]]
 name = "namada_proof_of_stake"
 version = "0.39.0"
-source = "git+https://github.com/anoma/namada?rev=c74c583c7f11e0483088b034e721c7bee001f13c#c74c583c7f11e0483088b034e721c7bee001f13c"
+source = "git+https://github.com/anoma/namada?rev=d6fc2f2e1472898b33b7072ef98312ce8b5e9d31#d6fc2f2e1472898b33b7072ef98312ce8b5e9d31"
 dependencies = [
  "borsh 1.5.0",
  "konst",
@@ -4232,7 +4233,7 @@ dependencies = [
 [[package]]
 name = "namada_replay_protection"
 version = "0.39.0"
-source = "git+https://github.com/anoma/namada?rev=c74c583c7f11e0483088b034e721c7bee001f13c#c74c583c7f11e0483088b034e721c7bee001f13c"
+source = "git+https://github.com/anoma/namada?rev=d6fc2f2e1472898b33b7072ef98312ce8b5e9d31#d6fc2f2e1472898b33b7072ef98312ce8b5e9d31"
 dependencies = [
  "namada_core",
 ]
@@ -4240,7 +4241,7 @@ dependencies = [
 [[package]]
 name = "namada_sdk"
 version = "0.39.0"
-source = "git+https://github.com/anoma/namada?rev=c74c583c7f11e0483088b034e721c7bee001f13c#c74c583c7f11e0483088b034e721c7bee001f13c"
+source = "git+https://github.com/anoma/namada?rev=d6fc2f2e1472898b33b7072ef98312ce8b5e9d31#d6fc2f2e1472898b33b7072ef98312ce8b5e9d31"
 dependencies = [
  "async-trait",
  "bimap",
@@ -4305,7 +4306,7 @@ dependencies = [
 [[package]]
 name = "namada_shielded_token"
 version = "0.39.0"
-source = "git+https://github.com/anoma/namada?rev=c74c583c7f11e0483088b034e721c7bee001f13c#c74c583c7f11e0483088b034e721c7bee001f13c"
+source = "git+https://github.com/anoma/namada?rev=d6fc2f2e1472898b33b7072ef98312ce8b5e9d31#d6fc2f2e1472898b33b7072ef98312ce8b5e9d31"
 dependencies = [
  "borsh 1.5.0",
  "masp_primitives",
@@ -4322,7 +4323,7 @@ dependencies = [
 [[package]]
 name = "namada_state"
 version = "0.39.0"
-source = "git+https://github.com/anoma/namada?rev=c74c583c7f11e0483088b034e721c7bee001f13c#c74c583c7f11e0483088b034e721c7bee001f13c"
+source = "git+https://github.com/anoma/namada?rev=d6fc2f2e1472898b33b7072ef98312ce8b5e9d31#d6fc2f2e1472898b33b7072ef98312ce8b5e9d31"
 dependencies = [
  "borsh 1.5.0",
  "itertools 0.12.1",
@@ -4346,7 +4347,7 @@ dependencies = [
 [[package]]
 name = "namada_storage"
 version = "0.39.0"
-source = "git+https://github.com/anoma/namada?rev=c74c583c7f11e0483088b034e721c7bee001f13c#c74c583c7f11e0483088b034e721c7bee001f13c"
+source = "git+https://github.com/anoma/namada?rev=d6fc2f2e1472898b33b7072ef98312ce8b5e9d31#d6fc2f2e1472898b33b7072ef98312ce8b5e9d31"
 dependencies = [
  "borsh 1.5.0",
  "itertools 0.12.1",
@@ -4366,7 +4367,7 @@ dependencies = [
 [[package]]
 name = "namada_token"
 version = "0.39.0"
-source = "git+https://github.com/anoma/namada?rev=c74c583c7f11e0483088b034e721c7bee001f13c#c74c583c7f11e0483088b034e721c7bee001f13c"
+source = "git+https://github.com/anoma/namada?rev=d6fc2f2e1472898b33b7072ef98312ce8b5e9d31#d6fc2f2e1472898b33b7072ef98312ce8b5e9d31"
 dependencies = [
  "borsh 1.5.0",
  "namada_core",
@@ -4381,7 +4382,7 @@ dependencies = [
 [[package]]
 name = "namada_trans_token"
 version = "0.39.0"
-source = "git+https://github.com/anoma/namada?rev=c74c583c7f11e0483088b034e721c7bee001f13c#c74c583c7f11e0483088b034e721c7bee001f13c"
+source = "git+https://github.com/anoma/namada?rev=d6fc2f2e1472898b33b7072ef98312ce8b5e9d31#d6fc2f2e1472898b33b7072ef98312ce8b5e9d31"
 dependencies = [
  "konst",
  "namada_core",
@@ -4392,7 +4393,7 @@ dependencies = [
 [[package]]
 name = "namada_tx"
 version = "0.39.0"
-source = "git+https://github.com/anoma/namada?rev=c74c583c7f11e0483088b034e721c7bee001f13c#c74c583c7f11e0483088b034e721c7bee001f13c"
+source = "git+https://github.com/anoma/namada?rev=d6fc2f2e1472898b33b7072ef98312ce8b5e9d31#d6fc2f2e1472898b33b7072ef98312ce8b5e9d31"
 dependencies = [
  "ark-bls12-381",
  "bitflags 2.5.0",
@@ -4420,7 +4421,7 @@ dependencies = [
 [[package]]
 name = "namada_vote_ext"
 version = "0.39.0"
-source = "git+https://github.com/anoma/namada?rev=c74c583c7f11e0483088b034e721c7bee001f13c#c74c583c7f11e0483088b034e721c7bee001f13c"
+source = "git+https://github.com/anoma/namada?rev=d6fc2f2e1472898b33b7072ef98312ce8b5e9d31#d6fc2f2e1472898b33b7072ef98312ce8b5e9d31"
 dependencies = [
  "borsh 1.5.0",
  "linkme",
diff --git a/Cargo.toml b/Cargo.toml
index e7c5b8c3c3..c888650b01 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,10 +39,10 @@ tendermint-rpc                   = { version = "=0.36.0" }
 tendermint-testgen               = { version = "=0.36.0" }
 
 # Namada dependencies
-namada_ibc        = { git = "https://github.com/anoma/namada", rev = "c74c583c7f11e0483088b034e721c7bee001f13c" }
-namada_parameters = { git = "https://github.com/anoma/namada", rev = "c74c583c7f11e0483088b034e721c7bee001f13c" }
-namada_sdk        = { git = "https://github.com/anoma/namada", rev = "c74c583c7f11e0483088b034e721c7bee001f13c" }
-namada_token      = { git = "https://github.com/anoma/namada", rev = "c74c583c7f11e0483088b034e721c7bee001f13c" }
+namada_ibc        = { git = "https://github.com/anoma/namada", rev = "d6fc2f2e1472898b33b7072ef98312ce8b5e9d31" }
+namada_parameters = { git = "https://github.com/anoma/namada", rev = "d6fc2f2e1472898b33b7072ef98312ce8b5e9d31" }
+namada_sdk        = { git = "https://github.com/anoma/namada", rev = "d6fc2f2e1472898b33b7072ef98312ce8b5e9d31" }
+namada_token      = { git = "https://github.com/anoma/namada", rev = "d6fc2f2e1472898b33b7072ef98312ce8b5e9d31" }
 
 # Other dependencies
 abscissa_core            = "=0.6.0"
diff --git a/e2e/namada-gaia-simple-transfers b/e2e/namada-gaia-simple-transfers
index 65ec968279..95b2b447ed 100755
--- a/e2e/namada-gaia-simple-transfers
+++ b/e2e/namada-gaia-simple-transfers
@@ -227,11 +227,22 @@ echo "==== Balances on Gaia ===="
 balance=$(gaiad query bank balances ${gaia_user})
 echo "${balance}"
 balance=$(echo "${balance}" | grep ibc -B 1 | tr -d '\n')
-if [[ "${balance}" != *"- amount: \"200\"  denom: ibc/"* ]]; then
+if [[ "${balance}" != *"- amount: \"200000000\"  denom: ibc/"* ]]; then
   echo "The balance on Gaia is wrong"
   exit 1
 fi
 
+echo "~~ Generate the proof from Namada for the following transfer ~~"
+resp=$(${NAMADAC} --base-dir ${base_dir} ibc-gen-shielding \
+  --output-folder-path ${base_dir} \
+  --target ${payment_addr_a} \
+  --token samoleans \
+  --amount 10 \
+  --port-id transfer \
+  --channel-id channel-0 \
+  --node ${NAMADA_LEDGER_ADDR})
+memo_path=$(echo $resp | awk '{print $8}')
+
 echo "~~ Shielding transfer 10 samoleans from Gaia to Namada ~~"
 cargo run --bin hermes -- --config config_for_namada.toml \
   tx ft-transfer \
@@ -243,6 +254,7 @@ cargo run --bin hermes -- --config config_for_namada.toml \
   --receiver ${payment_addr_a} \
   --denom samoleans \
   --timeout-height-offset 1000 \
+  --memo $(cat ${memo_path})
 
 # wait for relaying
 sleep 40
diff --git a/e2e/namada-simple-transfers b/e2e/namada-simple-transfers
index 941cf2b10b..84e8964367 100755
--- a/e2e/namada-simple-transfers
+++ b/e2e/namada-simple-transfers
@@ -309,10 +309,11 @@ fi
 echo "==== Shielded transfer tests ===="
 
 echo "~~ Generate the proof from chain_b for the following transfer ~~"
+apfel_addr=$(${NAMADAW} --base-dir ${base_dir_a} find --alias apfel | awk '/"apfel":/{print $3}')
 resp=$(${NAMADAC} --base-dir ${base_dir_b} ibc-gen-shielding \
   --output-folder-path ${base_dir_b} \
   --target ${payment_addr_b} \
-  --token apfel \
+  --token ${apfel_addr} \
   --amount 100000000 \
   --port-id transfer \
   --channel-id channel-0 \
@@ -398,11 +399,12 @@ if [[ "${balance}" != *"${IBC_TOKEN}: 50000000" ]]; then
 fi
 
 echo "~~ Generate the proof from chain A for the following transfer ~~"
+ibc_token="transfer/channel-0/${apfel_addr}"
 resp=$(${NAMADAC} --base-dir ${base_dir_a} ibc-gen-shielding \
   --output-folder-path ${base_dir_a} \
   --target ${payment_addr_a} \
-  --token ${IBC_TOKEN} \
-  --amount 50000000 \
+  --token ${ibc_token} \
+  --amount 50 \
   --port-id transfer \
   --channel-id channel-0 \
   --node ${LEDGER_ADDR_A})