diff --git a/Cargo.lock b/Cargo.lock
index f4d73e1cf4..77eebec8ac 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1845,7 +1845,7 @@ dependencies = [
 [[package]]
 name = "cnidarium"
 version = "0.80.7"
-source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.80.7#35f9f2f64a652b6055a39ff227e504636436cb7e"
+source = "git+https://github.com/astriaorg/penumbra.git?rev=291567004f40d0760dfaf5a042135a1801805b73#291567004f40d0760dfaf5a042135a1801805b73"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -1874,7 +1874,7 @@ dependencies = [
 [[package]]
 name = "cnidarium-component"
 version = "0.80.7"
-source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.80.7#35f9f2f64a652b6055a39ff227e504636436cb7e"
+source = "git+https://github.com/astriaorg/penumbra.git?rev=291567004f40d0760dfaf5a042135a1801805b73#291567004f40d0760dfaf5a042135a1801805b73"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2419,7 +2419,7 @@ dependencies = [
 [[package]]
 name = "decaf377-fmd"
 version = "0.80.7"
-source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.80.7#35f9f2f64a652b6055a39ff227e504636436cb7e"
+source = "git+https://github.com/astriaorg/penumbra.git?rev=291567004f40d0760dfaf5a042135a1801805b73#291567004f40d0760dfaf5a042135a1801805b73"
 dependencies = [
  "ark-ff 0.4.2",
  "ark-serialize 0.4.2",
@@ -2433,7 +2433,7 @@ dependencies = [
 [[package]]
 name = "decaf377-ka"
 version = "0.80.7"
-source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.80.7#35f9f2f64a652b6055a39ff227e504636436cb7e"
+source = "git+https://github.com/astriaorg/penumbra.git?rev=291567004f40d0760dfaf5a042135a1801805b73#291567004f40d0760dfaf5a042135a1801805b73"
 dependencies = [
  "ark-ff 0.4.2",
  "decaf377",
@@ -5722,7 +5722,7 @@ dependencies = [
 [[package]]
 name = "penumbra-asset"
 version = "0.80.7"
-source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.80.7#35f9f2f64a652b6055a39ff227e504636436cb7e"
+source = "git+https://github.com/astriaorg/penumbra.git?rev=291567004f40d0760dfaf5a042135a1801805b73#291567004f40d0760dfaf5a042135a1801805b73"
 dependencies = [
  "anyhow",
  "ark-ff 0.4.2",
@@ -5761,7 +5761,7 @@ dependencies = [
 [[package]]
 name = "penumbra-ibc"
 version = "0.80.7"
-source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.80.7#35f9f2f64a652b6055a39ff227e504636436cb7e"
+source = "git+https://github.com/astriaorg/penumbra.git?rev=291567004f40d0760dfaf5a042135a1801805b73#291567004f40d0760dfaf5a042135a1801805b73"
 dependencies = [
  "anyhow",
  "ark-ff 0.4.2",
@@ -5798,7 +5798,7 @@ dependencies = [
 [[package]]
 name = "penumbra-keys"
 version = "0.80.7"
-source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.80.7#35f9f2f64a652b6055a39ff227e504636436cb7e"
+source = "git+https://github.com/astriaorg/penumbra.git?rev=291567004f40d0760dfaf5a042135a1801805b73#291567004f40d0760dfaf5a042135a1801805b73"
 dependencies = [
  "aes",
  "anyhow",
@@ -5842,7 +5842,7 @@ dependencies = [
 [[package]]
 name = "penumbra-num"
 version = "0.80.7"
-source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.80.7#35f9f2f64a652b6055a39ff227e504636436cb7e"
+source = "git+https://github.com/astriaorg/penumbra.git?rev=291567004f40d0760dfaf5a042135a1801805b73#291567004f40d0760dfaf5a042135a1801805b73"
 dependencies = [
  "anyhow",
  "ark-ff 0.4.2",
@@ -5878,7 +5878,7 @@ dependencies = [
 [[package]]
 name = "penumbra-proto"
 version = "0.80.7"
-source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.80.7#35f9f2f64a652b6055a39ff227e504636436cb7e"
+source = "git+https://github.com/astriaorg/penumbra.git?rev=291567004f40d0760dfaf5a042135a1801805b73#291567004f40d0760dfaf5a042135a1801805b73"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -5907,7 +5907,7 @@ dependencies = [
 [[package]]
 name = "penumbra-sct"
 version = "0.80.7"
-source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.80.7#35f9f2f64a652b6055a39ff227e504636436cb7e"
+source = "git+https://github.com/astriaorg/penumbra.git?rev=291567004f40d0760dfaf5a042135a1801805b73#291567004f40d0760dfaf5a042135a1801805b73"
 dependencies = [
  "anyhow",
  "ark-ff 0.4.2",
@@ -5943,7 +5943,7 @@ dependencies = [
 [[package]]
 name = "penumbra-tct"
 version = "0.80.7"
-source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.80.7#35f9f2f64a652b6055a39ff227e504636436cb7e"
+source = "git+https://github.com/astriaorg/penumbra.git?rev=291567004f40d0760dfaf5a042135a1801805b73#291567004f40d0760dfaf5a042135a1801805b73"
 dependencies = [
  "ark-ed-on-bls12-377",
  "ark-ff 0.4.2",
@@ -5972,7 +5972,7 @@ dependencies = [
 [[package]]
 name = "penumbra-tower-trace"
 version = "0.80.7"
-source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.80.7#35f9f2f64a652b6055a39ff227e504636436cb7e"
+source = "git+https://github.com/astriaorg/penumbra.git?rev=291567004f40d0760dfaf5a042135a1801805b73#291567004f40d0760dfaf5a042135a1801805b73"
 dependencies = [
  "futures",
  "hex",
@@ -5994,7 +5994,7 @@ dependencies = [
 [[package]]
 name = "penumbra-txhash"
 version = "0.80.7"
-source = "git+https://github.com/penumbra-zone/penumbra.git?tag=v0.80.7#35f9f2f64a652b6055a39ff227e504636436cb7e"
+source = "git+https://github.com/astriaorg/penumbra.git?rev=291567004f40d0760dfaf5a042135a1801805b73#291567004f40d0760dfaf5a042135a1801805b73"
 dependencies = [
  "anyhow",
  "blake2b_simd 1.0.2",
diff --git a/Cargo.toml b/Cargo.toml
index d1cc181333..8d5c512c55 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -105,3 +105,12 @@ tracing = "0.1"
 tryhard = "0.5.1"
 which = "4.4.0"
 wiremock = "0.5"
+
+# patch for handling height field in gRPC headers for IBC queries
+# see https://github.com/astriaorg/penumbra/pull/2
+[patch.'https://github.com/penumbra-zone/penumbra.git']
+penumbra-ibc = { git = "https://github.com/astriaorg/penumbra.git", rev = "291567004f40d0760dfaf5a042135a1801805b73" }
+penumbra-proto = { git = "https://github.com/astriaorg/penumbra.git", rev = "291567004f40d0760dfaf5a042135a1801805b73" }
+penumbra-tower-trace = { git = "https://github.com/astriaorg/penumbra.git", rev = "291567004f40d0760dfaf5a042135a1801805b73" }
+cnidarium = { git = "https://github.com/astriaorg/penumbra.git", rev = "291567004f40d0760dfaf5a042135a1801805b73" }
+cnidarium-component = { git = "https://github.com/astriaorg/penumbra.git", rev = "291567004f40d0760dfaf5a042135a1801805b73" }