diff --git a/builder/files/genesis-mainnet-v1.json b/builder/files/genesis-mainnet-v1.json
index 988bd0b6..be6977ea 100644
--- a/builder/files/genesis-mainnet-v1.json
+++ b/builder/files/genesis-mainnet-v1.json
@@ -4,8 +4,8 @@
   "chain_id": "heimdall-137",
   "consensus_params": {
     "block": {
-      "max_bytes": "22020096",
-      "max_gas": "25000000",
+      "max_bytes": "2097152",
+      "max_gas": "10000000",
       "time_iota_ms": "1000"
     },
     "evidence": {
diff --git a/builder/files/genesis-testnet-v4.json b/builder/files/genesis-testnet-v4.json
index 47b1edb3..88590dd5 100644
--- a/builder/files/genesis-testnet-v4.json
+++ b/builder/files/genesis-testnet-v4.json
@@ -4,8 +4,8 @@
   "chain_id": "heimdall-80001",
   "consensus_params": {
     "block": {
-      "max_bytes": "22020096",
-      "max_gas": "25000000",
+      "max_bytes": "2097152",
+      "max_gas": "10000000",
       "time_iota_ms": "1000"
     },
     "evidence": {
diff --git a/cmd/heimdalld/cmd/migrate.go b/cmd/heimdalld/cmd/migrate.go
index 299fd3ac..b7d7bb6d 100644
--- a/cmd/heimdalld/cmd/migrate.go
+++ b/cmd/heimdalld/cmd/migrate.go
@@ -821,23 +821,15 @@ func addMissingCometBFTConsensusParams(genesisData map[string]interface{}, initi
 		return err
 	}
 
-	if err := utils.AddProperty(genesisData, "consensus_params.block", "max_gas", "25000000"); err != nil {
-		return err
-	}
-
-	if err := utils.AddProperty(genesisData, "consensus_params.block", "max_gas", "25000000"); err != nil {
-		return err
-	}
-
 	if err := utils.AddProperty(genesisData, "consensus_params", "block", make(map[string]interface{})); err != nil {
 		return err
 	}
 
-	if err := utils.AddProperty(genesisData, "consensus_params.block", "max_gas", "25000000"); err != nil {
+	if err := utils.AddProperty(genesisData, "consensus_params.block", "max_gas", "10000000"); err != nil {
 		return err
 	}
 
-	if err := utils.AddProperty(genesisData, "consensus_params.block", "max_bytes", "102400"); err != nil {
+	if err := utils.AddProperty(genesisData, "consensus_params.block", "max_bytes", "2097152"); err != nil {
 		return err
 	}
 
diff --git a/cmd/heimdalld/cmd/testdata/dump-genesis.json b/cmd/heimdalld/cmd/testdata/dump-genesis.json
index 91a734b4..e838541e 100644
--- a/cmd/heimdalld/cmd/testdata/dump-genesis.json
+++ b/cmd/heimdalld/cmd/testdata/dump-genesis.json
@@ -3,8 +3,8 @@
   "chain_id": "heimdall-sCCAH4",
   "consensus_params": {
     "block": {
-      "max_bytes": "22020096",
-      "max_gas": "-1",
+      "max_bytes": "2097152",
+      "max_gas": "10000000",
       "time_iota_ms": "1000"
     },
     "evidence": {
diff --git a/cmd/heimdalld/cmd/testdata/migrated_dump-genesis.json b/cmd/heimdalld/cmd/testdata/migrated_dump-genesis.json
index 20f66590..23fd2bed 100644
--- a/cmd/heimdalld/cmd/testdata/migrated_dump-genesis.json
+++ b/cmd/heimdalld/cmd/testdata/migrated_dump-genesis.json
@@ -1665,8 +1665,8 @@
       "vote_extensions_enable_height": "1"
     },
     "block": {
-      "max_bytes": "102400",
-      "max_gas": "25000000"
+      "max_bytes": "2097152",
+      "max_gas": "10000000"
     },
     "evidence": {
       "max_age_duration": "172800000000000",
diff --git a/packaging/templates/config/genesis.json b/packaging/templates/config/genesis.json
index df900b1c..0dfbdcf6 100644
--- a/packaging/templates/config/genesis.json
+++ b/packaging/templates/config/genesis.json
@@ -4,8 +4,8 @@
   "chain_id": "heimdall-80001",
   "consensus_params": {
     "block": {
-      "max_bytes": "22020096",
-      "max_gas": "25000000",
+      "max_bytes": "2097152",
+      "max_gas": "10000000",
       "time_iota_ms": "1000"
     },
     "evidence": {