diff --git a/.github/workflows/async-icq.yml b/.github/workflows/async-icq.yml
index b9673d32..e29139f8 100644
--- a/.github/workflows/async-icq.yml
+++ b/.github/workflows/async-icq.yml
@@ -127,7 +127,7 @@ jobs:
         run: |
           docker image load -i ${{ env.HOST_TAR_PATH }}
           docker image load -i ${{ env.CONTROLLER_TAR_PATH }}
-          docker image load -i testing/previous_images/icq-host_8_0_0.tar
+          docker image load -i testing/previous_images/icq-host_7_1_1.tar
           docker image ls -a
 
       - name: Run Test
diff --git a/modules/async-icq/e2e/icq_test.go b/modules/async-icq/e2e/icq_test.go
index 8834ad6d..81946931 100644
--- a/modules/async-icq/e2e/icq_test.go
+++ b/modules/async-icq/e2e/icq_test.go
@@ -65,13 +65,11 @@ func TestInterchainQueries(t *testing.T) {
 		UidGid:     "1025:1025",
 	}
 
-	/*
-		relayerImage := ibc.DockerImage{
-			Repository: "icq-relayer",
-			Version:    "local",
-			UidGid:     "1025:1025",
-		}
-	*/
+	relayerImage := ibc.DockerImage{
+		Repository: "ghcr.io/cosmos/relayer",
+		Version:    "main",
+		UidGid:     "1025:1025",
+	}
 
 	cf := interchaintest.NewBuiltinChainFactory(zaptest.NewLogger(t), []*interchaintest.ChainSpec{
 		{
@@ -123,8 +121,7 @@ func TestInterchainQueries(t *testing.T) {
 	r := interchaintest.NewBuiltinRelayerFactory(
 		ibc.CosmosRly,
 		zaptest.NewLogger(t),
-		// relayer.DockerImage(&relayerImage),
-		// relayer.ImagePull(false),
+		relayer.DockerImage(&relayerImage),
 		relayer.StartupFlags("--processor", "events", "--block-history", "100"),
 	).Build(t, client, network)
 
diff --git a/modules/async-icq/e2e/upgrade_test.go b/modules/async-icq/e2e/upgrade_test.go
index 98f04493..09d2585b 100644
--- a/modules/async-icq/e2e/upgrade_test.go
+++ b/modules/async-icq/e2e/upgrade_test.go
@@ -2,14 +2,12 @@ package e2e
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"testing"
 	"time"
 
 	upgradetypes "cosmossdk.io/x/upgrade/types"
 	cosmosproto "github.com/cosmos/gogoproto/proto"
-	icqtypes "github.com/cosmos/ibc-apps/modules/async-icq/v8/types"
 	"github.com/docker/docker/client"
 	"github.com/strangelove-ventures/interchaintest/v8"
 	"github.com/strangelove-ventures/interchaintest/v8/chain/cosmos"
@@ -20,7 +18,7 @@ import (
 
 const (
 	chainName   = "simapp"
-	upgradeName = "v2" // x/params migration
+	upgradeName = "v3" // default handler, SDK v47 -> SDK v50.
 
 	haltHeightDelta    = uint64(9) // will propose upgrade this many blocks in the future
 	blocksAfterUpgrade = uint64(7)
@@ -31,14 +29,14 @@ const (
 
 var (
 	// baseChain is the current version of the chain that will be upgraded from
-	// docker image load -i ../prev_builds/icq-host_8_0_0.tar
+	// docker image load -i ../prev_builds/icq-host_7_1_1.tar
 	baseChain = ibc.DockerImage{
 		Repository: "icq-host",
-		Version:    "v8.0.0",
+		Version:    "v7.1.1",
 		UidGid:     "1025:1025",
 	}
 
-	// make local-image
+	// make local-image-icq
 	upgradeTo = ibc.DockerImage{
 		Repository: "icq-host",
 		Version:    "local",
@@ -106,23 +104,6 @@ func CosmosChainUpgradeTest(t *testing.T, chainName, upgradeRepo, upgradeDockerT
 
 	ValidatorVoting(t, ctx, chain, proposalID, height, haltHeight)
 	UpgradeNodes(t, ctx, chain, client, haltHeight, upgradeRepo, upgradeDockerTag)
-
-	// Validate the ICQ subspace -> keeper migration was successful.
-	cmd := []string{
-		chain.Config().Bin, "q", "interchainquery", "params", "--output=json", "--node", chain.GetRPCAddress(),
-	}
-	stdout, _, err := chain.Exec(ctx, cmd, nil)
-	fmt.Println("stdout", string(stdout))
-	require.NoError(t, err, "error fetching icq params")
-
-	var params icqtypes.Params
-	err = json.Unmarshal(stdout, &params)
-	require.NoError(t, err, "error unmarshalling icq params")
-
-	t.Logf("params: %+v", params)
-	require.Equal(t, false, params.HostEnabled, "HostEnabled not equal to expected value")
-	require.Equal(t, []string{"/cosmos.bank.v1beta1.Query/AllBalances"}, params.AllowQueries, "AllowQueries not equal to expected value")
-
 }
 
 func SubmitUpgradeProposal(t *testing.T, ctx context.Context, chain *cosmos.CosmosChain, user ibc.Wallet, upgradeName string, haltHeight uint64) string {
diff --git a/modules/async-icq/ibc_module.go b/modules/async-icq/ibc_module.go
index 4e9402de..93dd73fa 100644
--- a/modules/async-icq/ibc_module.go
+++ b/modules/async-icq/ibc_module.go
@@ -8,11 +8,10 @@ import (
 
 	"cosmossdk.io/errors"
 
-	capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types"
-
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
+	capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types"
 	channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types"
 	host "github.com/cosmos/ibc-go/v8/modules/core/24-host"
 	ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported"
diff --git a/modules/async-icq/ibc_module_test.go b/modules/async-icq/ibc_module_test.go
index 9ab4fa03..9f5fe851 100644
--- a/modules/async-icq/ibc_module_test.go
+++ b/modules/async-icq/ibc_module_test.go
@@ -9,14 +9,13 @@ import (
 	"github.com/cosmos/ibc-apps/modules/async-icq/v8/types"
 	"github.com/stretchr/testify/suite"
 
-	capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types"
-
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	abcitypes "github.com/cometbft/cometbft/abci/types"
 	tmprotostate "github.com/cometbft/cometbft/proto/tendermint/state"
 	tmstate "github.com/cometbft/cometbft/state"
 
+	capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types"
 	clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types"
 	channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types"
 	host "github.com/cosmos/ibc-go/v8/modules/core/24-host"
diff --git a/modules/async-icq/keeper/keeper.go b/modules/async-icq/keeper/keeper.go
index bbe41302..501f7d57 100644
--- a/modules/async-icq/keeper/keeper.go
+++ b/modules/async-icq/keeper/keeper.go
@@ -5,16 +5,15 @@ import (
 
 	"github.com/cosmos/ibc-apps/modules/async-icq/v8/types"
 
+	"cosmossdk.io/log"
 	storetypes "cosmossdk.io/store/types"
-	capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper"
-	capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types"
 
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"cosmossdk.io/log"
-
+	capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper"
+	capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types"
 	host "github.com/cosmos/ibc-go/v8/modules/core/24-host"
 	ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported"
 )
diff --git a/modules/async-icq/keeper/relay_test.go b/modules/async-icq/keeper/relay_test.go
index 3c3eeeef..e23b5702 100644
--- a/modules/async-icq/keeper/relay_test.go
+++ b/modules/async-icq/keeper/relay_test.go
@@ -3,10 +3,11 @@ package keeper_test
 import (
 	"fmt"
 
-	storetypes "cosmossdk.io/store/types"
 	"github.com/cosmos/ibc-apps/modules/async-icq/v8/testing/simapp"
 	"github.com/cosmos/ibc-apps/modules/async-icq/v8/types"
 
+	storetypes "cosmossdk.io/store/types"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/query"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
diff --git a/modules/async-icq/testing/demo-simapp/scripts/protocgen.sh b/modules/async-icq/testing/demo-simapp/scripts/protocgen.sh
index 2084d442..61331ac6 100644
--- a/modules/async-icq/testing/demo-simapp/scripts/protocgen.sh
+++ b/modules/async-icq/testing/demo-simapp/scripts/protocgen.sh
@@ -6,12 +6,12 @@ echo "Generating gogo proto code"
 cd proto
 
 # generate gogo proto code
-buf generate --template buf.gen.gogo.yaml 
+buf generate --template buf.gen.gogo.yaml
 
 cd ..
 
 # move proto files to the right places
-cp -r github.com/cosmos/ibc-apps/modules/async-icq/v8/interchain-query-demo/x/interquery/types/* x/interquery/types/
+cp -r github.com/cosmos/ibc-apps/modules/async-icq/v*/interchain-query-demo/x/interquery/types/* x/interquery/types/
 rm -rf github.com
 
 go mod tidy
diff --git a/modules/async-icq/testing/previous_images/README.md b/modules/async-icq/testing/previous_images/README.md
index 101f7774..26b9b602 100644
--- a/modules/async-icq/testing/previous_images/README.md
+++ b/modules/async-icq/testing/previous_images/README.md
@@ -2,8 +2,6 @@
 
 This section is used for upgrades e2e test.
 
-v8.0.0
-
-- <https://github.com/cosmos/ibc-apps/commit/e5a274cf6fc2eb965a9f8da4bdeb7c718d06661d>
-- docker build . -t icq-host:v8.0.0 -f Dockerfile.icq
-- docker save icq-host:v8.0.0 > icq-host_8_0_0.tar
+- <https://github.com/cosmos/ibc-apps/commit/2e44c421ad4a330263c58a29009b19e87562e720>
+- docker build . -t icq-host:v7.1.1 -f Dockerfile.icq
+- docker save icq-host:v7.1.1 > icq-host_7_1_1.tar
diff --git a/modules/async-icq/testing/previous_images/icq-host_8_0_0.tar b/modules/async-icq/testing/previous_images/icq-host_8_0_0.tar
deleted file mode 100644
index 38e45bc4..00000000
Binary files a/modules/async-icq/testing/previous_images/icq-host_8_0_0.tar and /dev/null differ
diff --git a/modules/async-icq/testing/simapp/app.go b/modules/async-icq/testing/simapp/app.go
index 6410772b..b02e5aaf 100644
--- a/modules/async-icq/testing/simapp/app.go
+++ b/modules/async-icq/testing/simapp/app.go
@@ -6,6 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
+	dbm "github.com/cosmos/cosmos-db"
 	icq "github.com/cosmos/ibc-apps/modules/async-icq/v8"
 	icqkeeper "github.com/cosmos/ibc-apps/modules/async-icq/v8/keeper"
 	upgrades "github.com/cosmos/ibc-apps/modules/async-icq/v8/testing/simapp/upgrades"
@@ -17,6 +18,7 @@ import (
 	reflectionv1 "cosmossdk.io/api/cosmos/reflection/v1"
 	"cosmossdk.io/client/v2/autocli"
 	"cosmossdk.io/core/appmodule"
+	"cosmossdk.io/log"
 	storetypes "cosmossdk.io/store/types"
 	"cosmossdk.io/x/evidence"
 	evidencekeeper "cosmossdk.io/x/evidence/keeper"
@@ -27,9 +29,6 @@ import (
 	"cosmossdk.io/x/upgrade"
 	upgradekeeper "cosmossdk.io/x/upgrade/keeper"
 	upgradetypes "cosmossdk.io/x/upgrade/types"
-	"github.com/cosmos/ibc-go/modules/capability"
-	capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper"
-	capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types"
 
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client"
@@ -95,11 +94,12 @@ import (
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	"cosmossdk.io/log"
 	abci "github.com/cometbft/cometbft/abci/types"
 	tmos "github.com/cometbft/cometbft/libs/os"
-	dbm "github.com/cosmos/cosmos-db"
 
+	"github.com/cosmos/ibc-go/modules/capability"
+	capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper"
+	capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types"
 	ibc "github.com/cosmos/ibc-go/v8/modules/core"
 	porttypes "github.com/cosmos/ibc-go/v8/modules/core/05-port/types"
 	ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported"
@@ -639,7 +639,9 @@ func (app *SimApp) InitChainer(ctx sdk.Context, req *abci.RequestInitChain) (*ab
 	if err := json.Unmarshal(req.AppStateBytes, &genesisState); err != nil {
 		panic(err)
 	}
-	app.UpgradeKeeper.SetModuleVersionMap(ctx, app.mm.GetVersionMap())
+	if err := app.UpgradeKeeper.SetModuleVersionMap(ctx, app.mm.GetVersionMap()); err != nil {
+		panic(err)
+	}
 	return app.mm.InitGenesis(ctx, app.appCodec, genesisState)
 }
 
@@ -795,6 +797,10 @@ func (app *SimApp) setupUpgradeHandlers() {
 		upgrades.V2,
 		upgrades.CreateV2UpgradeHandler(app.mm, app.configurator, app.ParamsKeeper, app.ConsensusParamsKeeper, app.ICQKeeper),
 	)
+	app.UpgradeKeeper.SetUpgradeHandler(
+		upgrades.V3,
+		upgrades.CreateDefaultUpgradeHandler(app.mm, app.configurator),
+	)
 }
 
 // setupUpgradeStoreLoaders sets all necessary store loaders required by upgrades.
diff --git a/modules/async-icq/testing/simapp/cmd/icqd/root.go b/modules/async-icq/testing/simapp/cmd/icqd/root.go
index aea34725..faffa68c 100644
--- a/modules/async-icq/testing/simapp/cmd/icqd/root.go
+++ b/modules/async-icq/testing/simapp/cmd/icqd/root.go
@@ -5,11 +5,13 @@ import (
 	"io"
 	"os"
 
-	"github.com/cosmos/ibc-apps/modules/async-icq/v8/testing/simapp"
+	dbm "github.com/cosmos/cosmos-db"
 	app "github.com/cosmos/ibc-apps/modules/async-icq/v8/testing/simapp"
 	"github.com/spf13/cast"
 	"github.com/spf13/cobra"
 
+	"cosmossdk.io/log"
+
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/config"
 	"github.com/cosmos/cosmos-sdk/client/flags"
@@ -28,10 +30,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/crisis"
 	genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli"
 
-	"cosmossdk.io/log"
 	tmcfg "github.com/cometbft/cometbft/config"
 	tmcli "github.com/cometbft/cometbft/libs/cli"
-	dbm "github.com/cosmos/cosmos-db"
 )
 
 // NewRootCmd creates a new root command for simd. It is called once in the
@@ -191,7 +191,6 @@ func txCommand(tempApp *app.SimApp) *cobra.Command {
 		authcmd.GetBroadcastCommand(),
 		authcmd.GetEncodeCommand(),
 		authcmd.GetDecodeCommand(),
-		//authcmd.GetAuxToFeeCommand(),
 	)
 
 	tempApp.BasicModuleManager.AddTxCommands(cmd)
@@ -277,7 +276,7 @@ func (ac appCreator) appExport(
 var tempDir = func() string {
 	dir, err := os.MkdirTemp("", "simapp")
 	if err != nil {
-		dir = simapp.DefaultNodeHome
+		dir = app.DefaultNodeHome
 	}
 	defer os.RemoveAll(dir)
 
diff --git a/modules/async-icq/testing/simapp/encoding.go b/modules/async-icq/testing/simapp/encoding.go
index edddaee8..52a4d6c5 100644
--- a/modules/async-icq/testing/simapp/encoding.go
+++ b/modules/async-icq/testing/simapp/encoding.go
@@ -1,9 +1,10 @@
 package simapp
 
 import (
-	"cosmossdk.io/x/tx/signing"
 	"github.com/cosmos/gogoproto/proto"
 
+	"cosmossdk.io/x/tx/signing"
+
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/codec/address"
diff --git a/modules/async-icq/testing/simapp/export.go b/modules/async-icq/testing/simapp/export.go
index cc2a431a..6460e7a8 100644
--- a/modules/async-icq/testing/simapp/export.go
+++ b/modules/async-icq/testing/simapp/export.go
@@ -31,7 +31,9 @@ func (app *SimApp) ExportAppStateAndValidators(
 		app.prepForZeroHeightGenesis(ctx, jailAllowedAddrs)
 	}
 
-	app.mm.ExportGenesisForModules(ctx, app.appCodec, modulesToExport)
+	if _, err := app.mm.ExportGenesisForModules(ctx, app.appCodec, modulesToExport); err != nil {
+		return servertypes.ExportedApp{}, err
+	}
 
 	genState, err := app.mm.ExportGenesis(ctx, app.appCodec)
 	if err != nil {
@@ -78,9 +80,12 @@ func (app *SimApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []
 	/* Handle fee distribution state. */
 
 	// withdraw all validator commission
-	app.StakingKeeper.IterateValidators(ctx, func(_ int64, val stakingtypes.ValidatorI) (stop bool) {
-		valAddr, _ := sdk.ValAddressFromBech32(val.GetOperator())
-		_, _ = app.DistrKeeper.WithdrawValidatorCommission(ctx, valAddr)
+	_ = app.StakingKeeper.IterateValidators(ctx, func(_ int64, val stakingtypes.ValidatorI) (stop bool) {
+		valBz, err := app.StakingKeeper.ValidatorAddressCodec().StringToBytes(val.GetOperator())
+		if err != nil {
+			panic(err)
+		}
+		_, _ = app.DistrKeeper.WithdrawValidatorCommission(ctx, valBz)
 		return false
 	})
 
@@ -90,7 +95,7 @@ func (app *SimApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []
 		panic(err)
 	}
 	for _, delegation := range dels {
-		valAddr, err := sdk.ValAddressFromBech32(delegation.ValidatorAddress)
+		valBz, err := app.StakingKeeper.ValidatorAddressCodec().StringToBytes(delegation.GetValidatorAddr())
 		if err != nil {
 			panic(err)
 		}
@@ -99,7 +104,7 @@ func (app *SimApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []
 		if err != nil {
 			panic(err)
 		}
-		_, _ = app.DistrKeeper.WithdrawDelegationRewards(ctx, delAddr, valAddr)
+		_, _ = app.DistrKeeper.WithdrawDelegationRewards(ctx, delAddr, valBz)
 	}
 
 	// clear validator slash events
@@ -113,10 +118,14 @@ func (app *SimApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []
 	ctx = ctx.WithBlockHeight(0)
 
 	// reinitialize all validators
-	app.StakingKeeper.IterateValidators(ctx, func(_ int64, val stakingtypes.ValidatorI) (stop bool) {
+	_ = app.StakingKeeper.IterateValidators(ctx, func(_ int64, val stakingtypes.ValidatorI) (stop bool) {
 		// donate any unwithdrawn outstanding reward fraction tokens to the community pool
-		valAddr, _ := sdk.ValAddressFromBech32(val.GetOperator())
-		scraps, err := app.DistrKeeper.GetValidatorOutstandingRewardsCoins(ctx, valAddr)
+		valBz, err := app.StakingKeeper.ValidatorAddressCodec().StringToBytes(val.GetOperator())
+		if err != nil {
+			panic(err)
+		}
+
+		scraps, err := app.DistrKeeper.GetValidatorOutstandingRewardsCoins(ctx, valBz)
 		if err != nil {
 			panic(err)
 		}
@@ -130,13 +139,13 @@ func (app *SimApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []
 			panic(err)
 		}
 
-		err = app.DistrKeeper.Hooks().AfterValidatorCreated(ctx, valAddr)
+		err = app.DistrKeeper.Hooks().AfterValidatorCreated(ctx, valBz)
 		return err != nil
 	})
 
 	// reinitialize all delegations
 	for _, del := range dels {
-		valAddr, err := sdk.ValAddressFromBech32(del.ValidatorAddress)
+		valBz, err := app.StakingKeeper.ValidatorAddressCodec().StringToBytes(del.GetValidatorAddr())
 		if err != nil {
 			panic(err)
 		}
@@ -144,11 +153,11 @@ func (app *SimApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []
 		if err != nil {
 			panic(err)
 		}
-		err = app.DistrKeeper.Hooks().BeforeDelegationCreated(ctx, delAddr, valAddr)
+		err = app.DistrKeeper.Hooks().BeforeDelegationCreated(ctx, delAddr, valBz)
 		if err != nil {
 			panic(err)
 		}
-		err = app.DistrKeeper.Hooks().AfterDelegationModified(ctx, delAddr, valAddr)
+		err = app.DistrKeeper.Hooks().AfterDelegationModified(ctx, delAddr, valBz)
 		if err != nil {
 			panic(err)
 		}
@@ -160,20 +169,20 @@ func (app *SimApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []
 	/* Handle staking state. */
 
 	// iterate through redelegations, reset creation height
-	app.StakingKeeper.IterateRedelegations(ctx, func(_ int64, red stakingtypes.Redelegation) (stop bool) {
+	_ = app.StakingKeeper.IterateRedelegations(ctx, func(_ int64, red stakingtypes.Redelegation) (stop bool) {
 		for i := range red.Entries {
 			red.Entries[i].CreationHeight = 0
 		}
-		app.StakingKeeper.SetRedelegation(ctx, red)
+		_ = app.StakingKeeper.SetRedelegation(ctx, red)
 		return false
 	})
 
 	// iterate through unbonding delegations, reset creation height
-	app.StakingKeeper.IterateUnbondingDelegations(ctx, func(_ int64, ubd stakingtypes.UnbondingDelegation) (stop bool) {
+	_ = app.StakingKeeper.IterateUnbondingDelegations(ctx, func(_ int64, ubd stakingtypes.UnbondingDelegation) (stop bool) {
 		for i := range ubd.Entries {
 			ubd.Entries[i].CreationHeight = 0
 		}
-		app.StakingKeeper.SetUnbondingDelegation(ctx, ubd)
+		_ = app.StakingKeeper.SetUnbondingDelegation(ctx, ubd)
 		return false
 	})
 
@@ -195,7 +204,7 @@ func (app *SimApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []
 			validator.Jailed = true
 		}
 
-		app.StakingKeeper.SetValidator(ctx, validator)
+		_ = app.StakingKeeper.SetValidator(ctx, validator)
 		counter++
 	}
 
@@ -209,12 +218,16 @@ func (app *SimApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []
 	/* Handle slashing state. */
 
 	// reset start height on signing infos
-	app.SlashingKeeper.IterateValidatorSigningInfos(
+	if err := app.SlashingKeeper.IterateValidatorSigningInfos(
 		ctx,
 		func(addr sdk.ConsAddress, info slashingtypes.ValidatorSigningInfo) (stop bool) {
 			info.StartHeight = 0
-			app.SlashingKeeper.SetValidatorSigningInfo(ctx, addr, info)
+			if err := app.SlashingKeeper.SetValidatorSigningInfo(ctx, addr, info); err != nil {
+				panic(err)
+			}
 			return false
 		},
-	)
+	); err != nil {
+		panic(err)
+	}
 }
diff --git a/modules/async-icq/testing/simapp/upgrades/upgrades.go b/modules/async-icq/testing/simapp/upgrades/upgrades.go
index b687908e..48789939 100644
--- a/modules/async-icq/testing/simapp/upgrades/upgrades.go
+++ b/modules/async-icq/testing/simapp/upgrades/upgrades.go
@@ -18,6 +18,7 @@ import (
 
 const (
 	V2 = "v2"
+	V3 = "v3" // SDK v50 migration
 )
 
 // CreateDefaultUpgradeHandler creates a base upgrade handler for the async-icq module.
@@ -58,7 +59,9 @@ func CreateV2UpgradeHandler(
 		// Migrate Tendermint consensus parameters from x/params module to a deprecated x/consensus module.
 		// The old params module is required to still be imported in your app.go in order to handle this migration.
 		baseAppLegacySS := paramskeeper.Subspace(baseapp.Paramspace).WithKeyTable(paramstypes.ConsensusParamsKeyTable())
-		baseapp.MigrateParams(sdk.UnwrapSDKContext(ctx), baseAppLegacySS, &consensusparamskeeper.ParamsStore)
+		if err := baseapp.MigrateParams(sdk.UnwrapSDKContext(ctx), baseAppLegacySS, &consensusparamskeeper.ParamsStore); err != nil {
+			return nil, err
+		}
 
 		versionMap, err := mm.RunMigrations(ctx, cfg, vm)
 		if err != nil {
diff --git a/modules/async-icq/types/expected_keepers.go b/modules/async-icq/types/expected_keepers.go
index e96b29c8..55653956 100644
--- a/modules/async-icq/types/expected_keepers.go
+++ b/modules/async-icq/types/expected_keepers.go
@@ -1,10 +1,9 @@
 package types
 
 import (
-	capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types"
-
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
+	capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types"
 	clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types"
 	channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types"
 	ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported"