diff --git a/build/compose-devnet.yaml b/build/compose-devnet.yaml
index da518ef69..b7339fa62 100644
--- a/build/compose-devnet.yaml
+++ b/build/compose-devnet.yaml
@@ -19,7 +19,7 @@ services:
       CARTESI_BLOCKCHAIN_WS_ENDPOINT: "ws://devnet:8545"
       CARTESI_BLOCKCHAIN_IS_LEGACY: "false"
       CARTESI_BLOCKCHAIN_FINALITY_OFFSET: "1"
-      CARTESI_CONTRACTS_APPLICATION_ADDRESS: "0xb72c832dDeA10326143831F1E5F1646920C9c990"
+      CARTESI_CONTRACTS_APPLICATION_ADDRESS: "0x2E663fe9aE92275242406A185AA4fC8174339D3E"
       CARTESI_CONTRACTS_ICONSENSUS_ADDRESS: "0x77e5a5fb18F72b5106621f66C704c006c6dB4578"
       CARTESI_CONTRACTS_INPUT_BOX_ADDRESS: "0xA1b8EB1F13d8D5Db976a653BbDF8972cfD14691C"
       CARTESI_CONTRACTS_INPUT_BOX_DEPLOYMENT_BLOCK_NUMBER: "16"
diff --git a/build/docker-bake.hcl b/build/docker-bake.hcl
index 97d82d813..2c2025ca7 100644
--- a/build/docker-bake.hcl
+++ b/build/docker-bake.hcl
@@ -17,22 +17,23 @@ target "common" {
   dockerfile = "./build/Dockerfile"
   context    = ".."
   args       = {
-    BASE_IMAGE                = "debian:bookworm-20240311-slim"
-    RUST_VERSION              = "1.78.0"
-    GO_VERSION                = "1.22.1"
-    FOUNDRY_NIGHTLY_VERSION   = "293fad73670b7b59ca901c7f2105bf7a29165a90"
-    MACHINE_EMULATOR_VERSION  = "0.16.1"
-    TOOLS_VERSION             = "0.14.1"
-    LINUX_VERSION             = "0.19.1"
-    LINUX_KERNEL_VERSION      = "6.5.9-ctsi-1-v0.19.1"
+    BASE_IMAGE                   = "debian:bookworm-20240311-slim"
+    RUST_VERSION                 = "1.78.0"
+    GO_VERSION                   = "1.22.1"
+    FOUNDRY_NIGHTLY_VERSION      = "293fad73670b7b59ca901c7f2105bf7a29165a90"
+    MACHINE_EMULATOR_VERSION     = "0.17.0"
+    MACHINE_TOOLS_VERSION        = "0.15.0"
+    MACHINE_IMAGE_KERNEL_VERSION = "0.20.0" 
+    MACHINE_KERNEL_VERSION       = "6.5.13" 
+    MACHINE_XGENEXT2FS_VERSION   = "1.5.6" 
   }
 }
 
 target "rollups-node" {
   inherits = ["common"]
   target   = "rollups-node"
-  args       = {
-    ROLLUPS_NODE_VERSION      = "devel"
+  args     = {
+    ROLLUPS_NODE_VERSION = "devel"
   }
 }
 
@@ -46,9 +47,9 @@ target "rollups-node-devnet" {
   target   = "rollups-node-devnet"
 }
 
-target "rollups-node-ci-base" {
-  inherits = ["common"]
-  target   = "rollups-node-ci-base"
+target "rollups-node-ci" {
+  inherits   = ["common"]
+  target     = "rollups-node-ci"
   dockerfile = "./Dockerfile"
-  context  = "."
+  context    = "."
 }
diff --git a/pkg/addresses/addresses.go b/pkg/addresses/addresses.go
index 8a4b710a2..466b63254 100644
--- a/pkg/addresses/addresses.go
+++ b/pkg/addresses/addresses.go
@@ -35,7 +35,7 @@ type Book struct {
 // Get the addresses for the test environment.
 func GetTestBook() *Book {
 	return &Book{
-		Application:         common.HexToAddress("0xb72c832dDeA10326143831F1E5F1646920C9c990"),
+		Application:         common.HexToAddress("0x2E663fe9aE92275242406A185AA4fC8174339D3E"),
 		ApplicationFactory:  common.HexToAddress("0x39cc8d1faB70F713784032f166aB7Fe3B4801144"),
 		Authority:           common.HexToAddress("0x77e5a5fb18F72b5106621f66C704c006c6dB4578"),
 		AuthorityFactory:    common.HexToAddress("0x5EF4260c72a7A8df752AFF49aC46Ba741754E04a"),
diff --git a/setup_env.sh b/setup_env.sh
index b6f7fcf45..761cab0e4 100644
--- a/setup_env.sh
+++ b/setup_env.sh
@@ -9,7 +9,7 @@ export CARTESI_BLOCKCHAIN_WS_ENDPOINT="ws://localhost:8545"
 export CARTESI_BLOCKCHAIN_IS_LEGACY="false"
 export CARTESI_BLOCKCHAIN_FINALITY_OFFSET="1"
 export CARTESI_BLOCKCHAIN_BLOCK_TIMEOUT="60"
-export CARTESI_CONTRACTS_APPLICATION_ADDRESS="0xb72c832dDeA10326143831F1E5F1646920C9c990"
+export CARTESI_CONTRACTS_APPLICATION_ADDRESS="0x2E663fe9aE92275242406A185AA4fC8174339D3E"
 export CARTESI_CONTRACTS_ICONSENSUS_ADDRESS="0x77e5a5fb18F72b5106621f66C704c006c6dB4578"
 export CARTESI_CONTRACTS_INPUT_BOX_ADDRESS="0xA1b8EB1F13d8D5Db976a653BbDF8972cfD14691C"
 export CARTESI_CONTRACTS_INPUT_BOX_DEPLOYMENT_BLOCK_NUMBER="16"