diff --git a/buildkite/src/Constants/Network.dhall b/buildkite/src/Constants/Network.dhall
index 9053ee626163..a4b04dcf7bfe 100644
--- a/buildkite/src/Constants/Network.dhall
+++ b/buildkite/src/Constants/Network.dhall
@@ -4,7 +4,14 @@ let List/any = Prelude.List.any
 
 let Network
     : Type
-    = < Devnet | Mainnet | Berkeley | DevnetLegacy | MainnetLegacy | PreMesa1 >
+    = < Devnet
+      | Mainnet
+      | Berkeley
+      | DevnetLegacy
+      | MainnetLegacy
+      | PreMesa1
+      | Mesa
+      >
 
 let capitalName =
           \(network : Network)
@@ -15,6 +22,7 @@ let capitalName =
             , DevnetLegacy = "DevnetLegacy"
             , MainnetLegacy = "MainnetLegacy"
             , PreMesa1 = "PreMesa1"
+            , Mesa = "Mesa"
             }
             network
 
@@ -27,6 +35,7 @@ let lowerName =
             , DevnetLegacy = "devnet_legacy"
             , MainnetLegacy = "mainnet_legacy"
             , PreMesa1 = "hetzner-pre-mesa-1"
+            , Mesa = "mesa"
             }
             network
 
@@ -39,6 +48,7 @@ let requiresMainnetBuild =
             , DevnetLegacy = True
             , MainnetLegacy = True
             , PreMesa1 = False
+            , Mesa = False
             }
             network
 
diff --git a/buildkite/src/Constants/Profiles.dhall b/buildkite/src/Constants/Profiles.dhall
index 1b3a7cb572c5..0d2274b2c420 100644
--- a/buildkite/src/Constants/Profiles.dhall
+++ b/buildkite/src/Constants/Profiles.dhall
@@ -43,6 +43,7 @@ let fromNetwork =
             , DevnetLegacy = Profile.Devnet
             , MainnetLegacy = Profile.Mainnet
             , PreMesa1 = Profile.Devnet
+            , Mesa = Profile.Devnet
             }
             network
 
diff --git a/scripts/hardfork/build-packages.sh b/scripts/hardfork/build-packages.sh
index aa520ec0481e..d00335f5f7db 100755
--- a/scripts/hardfork/build-packages.sh
+++ b/scripts/hardfork/build-packages.sh
@@ -57,7 +57,7 @@ gunzip config.json.gz
 
 echo "--- Generate hardfork ledger tarballs"
 mkdir hardfork_ledgers
-_build/default/src/app/runtime_genesis_ledger/runtime_genesis_ledger.exe --config-file config.json --genesis-dir hardfork_ledgers/ --hash-output-file hardfork_ledger_hashes.json | tee runtime_genesis_ledger.log | _build/default/src/app/logproc/logproc.exe
+_build/default/src/app/runtime_genesis_ledger/runtime_genesis_ledger.exe --pad-app-state --config-file config.json --genesis-dir hardfork_ledgers/ --hash-output-file hardfork_ledger_hashes.json | tee runtime_genesis_ledger.log | _build/default/src/app/logproc/logproc.exe
 
 echo "--- Create hardfork config"
 FORK_CONFIG_JSON=config.json LEDGER_HASHES_JSON=hardfork_ledger_hashes.json scripts/hardfork/create_runtime_config.sh > new_config.json
diff --git a/scripts/hardfork/mina-verify-packaged-fork-config b/scripts/hardfork/mina-verify-packaged-fork-config
index 0f455a021d00..0cc988d416c3 100755
--- a/scripts/hardfork/mina-verify-packaged-fork-config
+++ b/scripts/hardfork/mina-verify-packaged-fork-config
@@ -185,7 +185,7 @@ if [ "$result" != "true" ]; then
     exit 1
 fi
 
-"$MINA_GENESIS_EXE" --config-file "$FORK_CONFIG" --genesis-dir "$WORKDIR/ledgers" --hash-output-file "$WORKDIR/hashes.json"
+"$MINA_GENESIS_EXE" --pad-app-state --config-file "$FORK_CONFIG" --genesis-dir "$WORKDIR/ledgers" --hash-output-file "$WORKDIR/hashes.json"
 
 FORK_CONFIG_JSON="$FORK_CONFIG" \
 LEDGER_HASHES_JSON="$WORKDIR/hashes.json" \