diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b104e305b..2f5c8190f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -31,7 +31,7 @@ jobs:
           # helper functions
           extract_txhash() { awk -F 'txhash: ' '/txhash:/{print $2; exit}'; }
           extract_proposal_id() { awk -F 'key: proposal_id|value: ' '/key: proposal_id/ { getline; gsub(/"/, "", $2); print $2; exit }'; }
-          extract_and_calc_upgrade_height() { awk -F'"latest_block_height":"' '{ split($2,a,"\""); print a[1]+2000; exit }'; }
+          extract_and_calc_upgrade_height() { awk -F'"latest_block_height":"' '{ split($2,a,"\""); print a[1]+8000; exit }'; }
           extract_checksum() { awk "/elysd-${{ github.ref_name }}-linux-amd64.tar.gz/ {print \$1; exit}"; }
 
           # environment variables
diff --git a/cmd/elysd/cmd/root.go b/cmd/elysd/cmd/root.go
index 8a2991cb9..5761319c0 100644
--- a/cmd/elysd/cmd/root.go
+++ b/cmd/elysd/cmd/root.go
@@ -79,7 +79,7 @@ func NewRootCmd() (*cobra.Command, appparams.EncodingConfig) {
 			customTMConfig := initTendermintConfig()
 
 			// override the default timeout commit value
-			customTMConfig.Consensus.TimeoutCommit = 3000 * time.Millisecond
+			customTMConfig.Consensus.TimeoutCommit = 5000 * time.Millisecond
 
 			return server.InterceptConfigsPreRunHandler(
 				cmd, customAppTemplate, customAppConfig, customTMConfig,