diff --git a/changelog.md b/changelog.md
index 5c8699527f..b9918c0196 100644
--- a/changelog.md
+++ b/changelog.md
@@ -22,6 +22,7 @@
 - [#4178](https://github.com/ignite/cli/pull/4178) Bump cosmos-sdk to `v0.50.7`
 - [#4194](https://github.com/ignite/cli/pull/4194) Bump client/v2 to `v2.0.0-beta.2`
   If you are uprading manually, check out the recommended changes in `root.go` from the above PR.
+- [#4210](https://github.com/ignite/cli/pull/4210) Improve default home wiring
 
 ### Fixes
 
diff --git a/ignite/templates/app/files-consumer/app/app.go.plush b/ignite/templates/app/files-consumer/app/app.go.plush
index 41b642eb75..2a13442c4f 100644
--- a/ignite/templates/app/files-consumer/app/app.go.plush
+++ b/ignite/templates/app/files-consumer/app/app.go.plush
@@ -2,10 +2,9 @@ package app
 
 import (
 	"io"
-	"os"
-	"path/filepath"
 	"fmt"
 
+	clienthelpers "cosmossdk.io/client/v2/helpers"
 	"cosmossdk.io/depinject"
 	"cosmossdk.io/log"
 	storetypes "cosmossdk.io/store/types"
@@ -135,12 +134,11 @@ type App struct {
 }
 
 func init() {
-	userHomeDir, err := os.UserHomeDir()
+	var err error
+	DefaultNodeHome, err = clienthelpers.GetNodeHomeDirectory("."+Name)
 	if err != nil {
 		panic(err)
 	}
-
-	DefaultNodeHome = filepath.Join(userHomeDir, "."+Name)
 }
 
 // AppConfig returns the default app config.
diff --git a/ignite/templates/app/files-minimal/app/app.go.plush b/ignite/templates/app/files-minimal/app/app.go.plush
index d44022ba32..78d29e130a 100644
--- a/ignite/templates/app/files-minimal/app/app.go.plush
+++ b/ignite/templates/app/files-minimal/app/app.go.plush
@@ -2,9 +2,8 @@ package app
 
 import (
 	"io"
-	"os"
-	"path/filepath"
 
+	clienthelpers "cosmossdk.io/client/v2/helpers"
 	"cosmossdk.io/depinject"
 	"cosmossdk.io/log"
 	storetypes "cosmossdk.io/store/types"
@@ -81,12 +80,11 @@ type App struct {
 }
 
 func init() {
-	userHomeDir, err := os.UserHomeDir()
+	var err error
+	DefaultNodeHome, err = clienthelpers.GetNodeHomeDirectory("."+Name)
 	if err != nil {
 		panic(err)
 	}
-
-	DefaultNodeHome = filepath.Join(userHomeDir, "."+Name)
 }
 
 // AppConfig returns the default app config.
diff --git a/ignite/templates/app/files/app/app.go.plush b/ignite/templates/app/files/app/app.go.plush
index 7c52129826..4e787989dc 100644
--- a/ignite/templates/app/files/app/app.go.plush
+++ b/ignite/templates/app/files/app/app.go.plush
@@ -2,9 +2,8 @@ package app
 
 import (
 	"io"
-	"os"
-	"path/filepath"
 
+	clienthelpers "cosmossdk.io/client/v2/helpers"
 	"cosmossdk.io/depinject"
 	"cosmossdk.io/log"
 	storetypes "cosmossdk.io/store/types"
@@ -147,12 +146,11 @@ type App struct {
 }
 
 func init() {
-	userHomeDir, err := os.UserHomeDir()
+	var err error
+	DefaultNodeHome, err = clienthelpers.GetNodeHomeDirectory("."+Name)
 	if err != nil {
 		panic(err)
 	}
-
-	DefaultNodeHome = filepath.Join(userHomeDir, "."+Name)
 }
 
 // getGovProposalHandlers return the chain proposal handlers.
diff --git a/ignite/templates/app/files/go.mod.plush b/ignite/templates/app/files/go.mod.plush
index e6a6706617..ceb2690ace 100644
--- a/ignite/templates/app/files/go.mod.plush
+++ b/ignite/templates/app/files/go.mod.plush
@@ -11,7 +11,7 @@ replace (
 
 require (
 	cosmossdk.io/api v0.7.5
-	cosmossdk.io/client/v2 v2.0.0-beta.2
+	cosmossdk.io/client/v2 v2.0.0-beta.2.0.20240625200423-e4c342eb99f5
 	cosmossdk.io/collections v0.4.0
 	cosmossdk.io/core v0.11.0
 	cosmossdk.io/depinject v1.0.0-alpha.4
@@ -23,7 +23,7 @@ require (
 	cosmossdk.io/x/evidence v0.1.0
 	cosmossdk.io/x/feegrant v0.1.0
 	cosmossdk.io/x/nft v0.1.0
-	cosmossdk.io/x/upgrade v0.1.3
+	cosmossdk.io/x/upgrade v0.1.4-0.20240625200423-e4c342eb99f5
 	<%= if (IsConsumerChain) { %>
 	github.com/cosmos/interchain-security/v5 v5.0.0
 	<% } %>