diff --git a/baseapp/testutil/buf.lock b/baseapp/testutil/buf.lock
index 1bc0a2429e..89f0d19044 100644
--- a/baseapp/testutil/buf.lock
+++ b/baseapp/testutil/buf.lock
@@ -6,8 +6,18 @@ deps:
     repository: cosmos-proto
     commit: 1935555c206d4afb9e94615dfd0fad31
     digest: shake256:c74d91a3ac7ae07d579e90eee33abf9b29664047ac8816500cf22c081fec0d72d62c89ce0bebafc1f6fec7aa5315be72606717740ca95007248425102c365377
+  - remote: buf.build
+    owner: cosmos
+    repository: cosmos-sdk
+    commit: 9d547dbea90f47afbe1898388fcebffb
+    digest: shake256:63237398fb2043153c81bbe91ce52a832bca02d4307334b62fcc9914ce6f12fea59388eb5102949255054973f7022f581e02f97ed1f69a6585d2d00fb1da5833
   - remote: buf.build
     owner: cosmos
     repository: gogo-proto
     commit: 5e5b9fdd01804356895f8f79a6f1ddc1
     digest: shake256:0b85da49e2e5f9ebc4806eae058e2f56096ff3b1c59d1fb7c190413dd15f45dd456f0b69ced9059341c80795d2b6c943de15b120a9e0308b499e43e4b5fc2952
+  - remote: buf.build
+    owner: googleapis
+    repository: googleapis
+    commit: cc916c31859748a68fd229a3c8d7a2e8
+    digest: shake256:469b049d0eb04203d5272062636c078decefc96fec69739159c25d85349c50c34c7706918a8b216c5c27f76939df48452148cff8c5c3ae77fa6ba5c25c1b8bf8
diff --git a/baseapp/testutil/buf.yaml b/baseapp/testutil/buf.yaml
index e6f82c0cdc..b0edfb59a9 100644
--- a/baseapp/testutil/buf.yaml
+++ b/baseapp/testutil/buf.yaml
@@ -1,4 +1,5 @@
 version: v1
 deps:
+  - buf.build/cosmos/cosmos-sdk
   - buf.build/cosmos/gogo-proto
   - buf.build/cosmos/cosmos-proto
diff --git a/scripts/protocgen-pulsar.sh b/scripts/protocgen-pulsar.sh
index 43b0c386ba..5fe48f859a 100755
--- a/scripts/protocgen-pulsar.sh
+++ b/scripts/protocgen-pulsar.sh
@@ -8,7 +8,7 @@ echo "Generating API module"
 (cd proto; buf generate --template buf.gen.pulsar.yaml)
 
 echo "Generate Pulsar Test Data"
-(cd testutil/testdata; buf mod update; buf generate --template buf.gen.pulsar.yaml)
+(cd testutil/testdata; buf generate --template buf.gen.pulsar.yaml)
 
 echo "Generate x/tx"
 (cd x/tx; make codegen)
\ No newline at end of file
diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh
index 01c4349bd2..b1a4428e85 100755
--- a/scripts/protocgen.sh
+++ b/scripts/protocgen.sh
@@ -23,10 +23,10 @@ done
 cd ..
 
 # generate codec/testdata proto code
-(cd testutil/testdata; buf mod update; buf generate)
+(cd testutil/testdata; buf generate)
 
 # generate baseapp test messages
-(cd baseapp/testutil; buf mod update; buf generate)
+(cd baseapp/testutil; buf generate)
 
 # move proto files to the right places
 cp -r github.com/cosmos/cosmos-sdk/* ./
diff --git a/testutil/testdata/buf.lock b/testutil/testdata/buf.lock
index a2cdec427a..89f0d19044 100644
--- a/testutil/testdata/buf.lock
+++ b/testutil/testdata/buf.lock
@@ -9,8 +9,8 @@ deps:
   - remote: buf.build
     owner: cosmos
     repository: cosmos-sdk
-    commit: e0dcb5ad221c4c3b8166c04751084b9d
-    digest: shake256:31ac8086ce294d2e388d266f9a867789710109b7e7ce647fad404569f5b57af407607d5ff85e609e9bc32f5abf7acdc9ec94c053865bd1f6d9f1ac0d58a99ebb
+    commit: 9d547dbea90f47afbe1898388fcebffb
+    digest: shake256:63237398fb2043153c81bbe91ce52a832bca02d4307334b62fcc9914ce6f12fea59388eb5102949255054973f7022f581e02f97ed1f69a6585d2d00fb1da5833
   - remote: buf.build
     owner: cosmos
     repository: gogo-proto
@@ -19,5 +19,5 @@ deps:
   - remote: buf.build
     owner: googleapis
     repository: googleapis
-    commit: 5ae7f88519b04fe1965da0f8a375a088
-    digest: shake256:27d9fcdc0e3eb957449dc3d17e2d24c7ce59c3c483ecf128818183c336dfd28595ecd13771fb3172247775caf7707c4076dd8e70c5ac2cbcac170df35e4d0028
+    commit: cc916c31859748a68fd229a3c8d7a2e8
+    digest: shake256:469b049d0eb04203d5272062636c078decefc96fec69739159c25d85349c50c34c7706918a8b216c5c27f76939df48452148cff8c5c3ae77fa6ba5c25c1b8bf8
diff --git a/x/tx/Makefile b/x/tx/Makefile
index 1d33ef29c0..7fd7077787 100644
--- a/x/tx/Makefile
+++ b/x/tx/Makefile
@@ -1,3 +1,3 @@
 codegen:
-	@(cd internal/testpb; buf mod update; buf generate)
+	@(cd internal/testpb; buf generate)
 	@(cd signing/aminojson/internal; make codegen)
\ No newline at end of file
diff --git a/x/tx/internal/testpb/buf.lock b/x/tx/internal/testpb/buf.lock
index a2cdec427a..89f0d19044 100644
--- a/x/tx/internal/testpb/buf.lock
+++ b/x/tx/internal/testpb/buf.lock
@@ -9,8 +9,8 @@ deps:
   - remote: buf.build
     owner: cosmos
     repository: cosmos-sdk
-    commit: e0dcb5ad221c4c3b8166c04751084b9d
-    digest: shake256:31ac8086ce294d2e388d266f9a867789710109b7e7ce647fad404569f5b57af407607d5ff85e609e9bc32f5abf7acdc9ec94c053865bd1f6d9f1ac0d58a99ebb
+    commit: 9d547dbea90f47afbe1898388fcebffb
+    digest: shake256:63237398fb2043153c81bbe91ce52a832bca02d4307334b62fcc9914ce6f12fea59388eb5102949255054973f7022f581e02f97ed1f69a6585d2d00fb1da5833
   - remote: buf.build
     owner: cosmos
     repository: gogo-proto
@@ -19,5 +19,5 @@ deps:
   - remote: buf.build
     owner: googleapis
     repository: googleapis
-    commit: 5ae7f88519b04fe1965da0f8a375a088
-    digest: shake256:27d9fcdc0e3eb957449dc3d17e2d24c7ce59c3c483ecf128818183c336dfd28595ecd13771fb3172247775caf7707c4076dd8e70c5ac2cbcac170df35e4d0028
+    commit: cc916c31859748a68fd229a3c8d7a2e8
+    digest: shake256:469b049d0eb04203d5272062636c078decefc96fec69739159c25d85349c50c34c7706918a8b216c5c27f76939df48452148cff8c5c3ae77fa6ba5c25c1b8bf8
diff --git a/x/tx/signing/aminojson/internal/buf.lock b/x/tx/signing/aminojson/internal/buf.lock
index a2cdec427a..89f0d19044 100644
--- a/x/tx/signing/aminojson/internal/buf.lock
+++ b/x/tx/signing/aminojson/internal/buf.lock
@@ -9,8 +9,8 @@ deps:
   - remote: buf.build
     owner: cosmos
     repository: cosmos-sdk
-    commit: e0dcb5ad221c4c3b8166c04751084b9d
-    digest: shake256:31ac8086ce294d2e388d266f9a867789710109b7e7ce647fad404569f5b57af407607d5ff85e609e9bc32f5abf7acdc9ec94c053865bd1f6d9f1ac0d58a99ebb
+    commit: 9d547dbea90f47afbe1898388fcebffb
+    digest: shake256:63237398fb2043153c81bbe91ce52a832bca02d4307334b62fcc9914ce6f12fea59388eb5102949255054973f7022f581e02f97ed1f69a6585d2d00fb1da5833
   - remote: buf.build
     owner: cosmos
     repository: gogo-proto
@@ -19,5 +19,5 @@ deps:
   - remote: buf.build
     owner: googleapis
     repository: googleapis
-    commit: 5ae7f88519b04fe1965da0f8a375a088
-    digest: shake256:27d9fcdc0e3eb957449dc3d17e2d24c7ce59c3c483ecf128818183c336dfd28595ecd13771fb3172247775caf7707c4076dd8e70c5ac2cbcac170df35e4d0028
+    commit: cc916c31859748a68fd229a3c8d7a2e8
+    digest: shake256:469b049d0eb04203d5272062636c078decefc96fec69739159c25d85349c50c34c7706918a8b216c5c27f76939df48452148cff8c5c3ae77fa6ba5c25c1b8bf8