diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
new file mode 100644
index 000000000..3876fbf04
--- /dev/null
+++ b/.github/workflows/checks.yml
@@ -0,0 +1,34 @@
+name: Checks
+
+on:
+  push:
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-22.04
+            arch: x86_64
+            runs-on: movement-runner
+          - os: macos-13-latest
+            arch: arm64
+            runs-on: macos-13-xlarge
+
+    runs-on: ${{ matrix.runs-on }}
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Install Nix
+      uses: DeterminateSystems/nix-installer-action@main
+
+    - name: Run test in nix environment
+      run: nix develop --command bash  -c "cargo check"  
+
+    - name: Run test in nix environment
+      run: nix develop --command bash  -c "just m1-da-light-node test.local -t=false"  
+
+    - name: Run test in nix environment
+      run: nix develop --command bash  -c "just monza-full-node test.local -t=false"  
\ No newline at end of file
diff --git a/.github/workflows/handle-target-comment.yml b/.github/workflows/handle-target-comment.yml
index 26745ec82..5ccc033bd 100644
--- a/.github/workflows/handle-target-comment.yml
+++ b/.github/workflows/handle-target-comment.yml
@@ -14,65 +14,4 @@ jobs:
     steps:
       - name: Output the comment
         run: |
-         echo "Comment was: ${{ github.event.inputs.comment }}"
-    
-  manage-infra-pr:
-    if: startsWith(github.event.inputs.comment, 'infra')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Extract repository name
-        id: repo-name
-        run: echo "REPO_NAME=$(echo ${{ github.repository }} | cut -d '/' -f2)" >> $GITHUB_ENV
-
-      - name: Search for existing PRs
-        id: search-prs
-        uses: actions/github-script@v6
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            const title = `${process.env.REPO_NAME}/${{ github.event.issue.title }}`;
-            const prs = await github.rest.pulls.list({
-              owner: 'movementlabsxyz',
-              repo: 'infra',
-              state: 'open',
-              head: 'main'
-            });
-            const existingPr = prs.data.find(pr => pr.title === title);
-            if (existingPr) {
-              return existingPr.html_url;
-            }
-            return '';
-
-      - name: Create PR in Infra Repo if not exist
-        if: steps.search-prs.outputs.result == ''
-        run: |
-          gh_pr_up() { gh pr create $* || gh pr edit $* }
-          gh_pr_up --title "${{ steps.repo-name.outputs.REPO_NAME }}/${{ github.event.issue.title }}" --body "**Infrastructure requested:** ${{ github.event.issue.html_url }}\n\n${{ github.event.comment.body }} --repo movementlabsxyz/infra"
-
-      - name: Comment on the Original PR with new PR link
-        if: steps.search-prs.outputs.result == ''
-        uses: peter-evans/create-or-update-comment@v2
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          issue_number: ${{ github.event.issue.number }}
-          body: ${{ steps.create-pr.outputs.pr_url }}
-
-      - name: Comment on Original PR with PR link if PR already exists
-        if: steps.search-prs.outputs.result != ''
-        uses: peter-evans/create-or-update-comment@v2
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          issue_number: ${{ github.event.issue.number }}
-          body: "A related PR already exists and you can follow it here: ${{ steps.search-prs.outputs.result }}"
-
-      - name: Comment on the Infra PR if created
-        if: steps.search-prs.outputs.result == ''
-        uses: peter-evans/create-or-update-comment@v2
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          repository: "movementlabsxyz/infra"
-          issue_number: ${{ steps.create-pr.outputs.pr_number }}
-          body: "This PR relates to changes triggered by an issue in another repository. Original PR: ${{ github.event.issue.html_url }} \n\n Details: ${{ github.event.comment.body }}"
\ No newline at end of file
+         echo "Comment was: ${{ github.event.inputs.comment }}"
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 7d6dd5eda..a6588e997 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,5 @@ target/
 ledger_db/
 state_merkle_db/
 .etc
-idea
-.movement
\ No newline at end of file
+.movement
+.idea
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index 0b0aecbdb..40decb0ca 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7203,7 +7203,6 @@ name = "movement-types"
 version = "0.3.0"
 dependencies = [
  "anyhow",
- "derivative",
  "serde",
  "serde_with",
  "sha2 0.10.8",
diff --git a/flake.lock b/flake.lock
index dbf2a3001..e2401ab59 100644
--- a/flake.lock
+++ b/flake.lock
@@ -38,17 +38,17 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1713714899,
-        "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=",
+        "lastModified": 1715266358,
+        "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6143fc5eeb9c4f00163267708e26191d1e918932",
+        "rev": "f1010e0469db743d14519a1efd37e23f8513d714",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6143fc5eeb9c4f00163267708e26191d1e918932",
+        "rev": "f1010e0469db743d14519a1efd37e23f8513d714",
         "type": "github"
       }
     },
diff --git a/flake.nix b/flake.nix
index 1e496588e..168d67f82 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,6 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/6143fc5eeb9c4f00163267708e26191d1e918932";
+    nixpkgs.url = "github:NixOS/nixpkgs/f1010e0469db743d14519a1efd37e23f8513d714";
     rust-overlay.url = "github:oxalica/rust-overlay";
     flake-utils.url = "github:numtide/flake-utils";
   };
@@ -12,9 +12,14 @@
     flake-utils,
     ...
     }:
-    flake-utils.lib.eachSystem ["aarch64-darwin" "x86_64-linux" "aarch64-linux"] (
+    flake-utils.lib.eachSystem ["aarch64-darwin" "x86_64-darwin" "x86_64-linux" "aarch64-linux"] (
+
       system: let
+
+        overrides = (builtins.fromTOML (builtins.readFile ./rust-toolchain.toml));
+
         overlays = [(import rust-overlay)];
+
         pkgs = import nixpkgs {
           inherit system overlays;
         };
@@ -28,29 +33,8 @@
         celestia-app = import ./celestia-app.nix { inherit pkgs; };
 
         # monza-aptos
-        monza-aptos = pkgs.stdenv.mkDerivation {
-          pname = "monza-aptos";
-          version = "branch-monza";
-
-          src = pkgs.fetchFromGitHub {
-              owner = "movementlabsxyz";
-              repo = "aptos-core";
-              rev = "06443b81f6b8b8742c4aa47eba9e315b5e6502ff";
-              sha256 = "sha256-iIYGbIh9yPtC6c22+KDi/LgDbxLEMhk4JJMGvweMJ1Q=";
-          };
-
-          installPhase = ''
-              cp -r . $out
-          '';
-
-          meta = with pkgs.lib; {
-              description = "Aptos core repository on the monza branch";
-              homepage = "https://github.com/movementlabsxyz/aptos-core";
-              license = licenses.asl20;
-          };
+        monza-aptos = import ./monza-aptos.nix { inherit pkgs; };
 
-        };
-       
         # Specific version of toolchain
         rust = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
 
@@ -59,46 +43,37 @@
           rustc = rust;
         };
 
-        runtimeDependencies = with pkgs; [
+        dependencies = with pkgs; [
+          llvmPackages.bintools
           openssl
+          openssl.dev
+          libiconv 
+          pkg-config
           process-compose
           just
           jq
-        ];
-
-
-        buildDependencies = with pkgs; [
-            libclang.lib
-            libz
-            clang
-            pkg-config
-            protobuf
-            rustPlatform.bindgenHook
-            lld
-            coreutils
-          ]
-          ++ runtimeDependencies
-          # Be it Darwin
-          ++ lib.optionals stdenv.isDarwin [
-            frameworks.Security
-            frameworks.CoreServices
-            frameworks.SystemConfiguration
-            frameworks.AppKit
-          ]
-          ++ lib.optionals stdenv.isLinux [
-            systemd
-          ];
-
-        testingDependencies = with pkgs; [
-            celestia-node
-            celestia-app
-            monza-aptos
-        ]
-        ++ buildDependencies;
-
-        developmentDependencies = with pkgs; [
+          libclang.lib
+          libz
+          clang
+          pkg-config
+          protobuf
+          rustPlatform.bindgenHook
+          lld
+          coreutils
+          gcc
           rust
-        ] ++ testingDependencies;
+          celestia-node
+          celestia-app
+          monza-aptos
+        ] ++ lib.optionals stdenv.isDarwin [
+          frameworks.Security
+          frameworks.CoreServices
+          frameworks.SystemConfiguration
+          frameworks.AppKit
+        ] ++ lib.optionals stdenv.isLinux [
+          udev
+          systemd
+        ];
 
     
       in
@@ -109,7 +84,11 @@
 
           # Development Shell
           devShells.default = mkShell {
-            buildInputs = developmentDependencies;
+
+            OPENSSL_DEV=pkgs.openssl.dev;
+            PKG_CONFIG_PATH = "${pkgs.openssl.dev}/lib/pkgconfig";
+            buildInputs = dependencies;
+            nativeBuildInputs = dependencies;
 
             shellHook = ''
               #!/bin/bash
diff --git a/monza-aptos.nix b/monza-aptos.nix
index 7ea0d973c..0ea163bd2 100755
--- a/monza-aptos.nix
+++ b/monza-aptos.nix
@@ -8,13 +8,11 @@ pkgs.stdenv.mkDerivation {
         owner = "movementlabsxyz";
         repo = "aptos-core";
         rev = "06443b81f6b8b8742c4aa47eba9e315b5e6502ff";
-        sha256 = "sha256-bmFcJrC4ocbCw1pew2HKEdLj6+1D/0VuWtdoTs1S2sU=";
+        sha256 = "sha256-iIYGbIh9yPtC6c22+KDi/LgDbxLEMhk4JJMGvweMJ1Q=";
     };
 
     installPhase = ''
-        ls -al && sleep 30
-        mkdir -p $out
-        cp -r ./* $out/
+        cp -r . $out
     '';
 
     meta = with pkgs.lib; {
@@ -22,4 +20,4 @@ pkgs.stdenv.mkDerivation {
         homepage = "https://github.com/movementlabsxyz/aptos-core";
         license = licenses.asl20;
     };
-}
+}
\ No newline at end of file
diff --git a/process-compose/m1-da-light-node/process-compose.sequencer.yml b/process-compose/m1-da-light-node/process-compose.sequencer.yml
index b60b0fb8e..290976b3d 100644
--- a/process-compose/m1-da-light-node/process-compose.sequencer.yml
+++ b/process-compose/m1-da-light-node/process-compose.sequencer.yml
@@ -9,7 +9,7 @@ processes:
       cargo run -p m1-da-light-node --features "sequencer"
     depends_on:
       m1-da-light-node-verifier-tests:
-        condition: process_completed
+        condition: process_completed_successfully
       celestia-light-node:
         condition: process_healthy
     readiness_probe:
@@ -26,4 +26,4 @@ processes:
       m1-da-light-node: 
         condition: process_healthy
       m1-da-light-node-verifier-tests:
-        condition: process_completed
+        condition: process_completed_successfully
diff --git a/process-compose/m1-da-light-node/process-compose.test.yml b/process-compose/m1-da-light-node/process-compose.test.yml
index 70325c3af..2dfce10d5 100644
--- a/process-compose/m1-da-light-node/process-compose.test.yml
+++ b/process-compose/m1-da-light-node/process-compose.test.yml
@@ -11,7 +11,7 @@ processes:
       celestia-light-node: 
         condition: process_healthy
       celestia-light-node-synced:
-        condition: process_completed
+        condition: process_completed_successfully
 
     readiness_probe:
       exec:
@@ -27,7 +27,7 @@ processes:
       m1-da-light-node: 
         condition: process_healthy
       m1-da-light-node-verifier-tests:
-        condition: process_completed
+        condition: process_completed_successfully
     availability:
       # NOTE: `restart: exit_on_failure` is not needed since
       # exit_on_end implies it.
diff --git a/process-compose/m1-da-light-node/process-compose.yml b/process-compose/m1-da-light-node/process-compose.yml
index 2f9865fb9..6074363e3 100644
--- a/process-compose/m1-da-light-node/process-compose.yml
+++ b/process-compose/m1-da-light-node/process-compose.yml
@@ -13,7 +13,6 @@ processes:
 
   celestia-light-node-synced:
     command: |
-      sleep 10
       cargo run --bin wait-for-celestia-light-node
     depends_on:
       celestia-light-node:
@@ -21,10 +20,10 @@ processes:
 
   m1-da-light-node:
     command: |
-      cargo run -p m1-da-light-node
+      ./target/debug/m1-da-light-node
     depends_on:
       m1-da-light-node-verifier-tests:
-        condition: process_completed
+        condition: process_completed_successfully
       celestia-light-node:
         condition: process_healthy
     readiness_probe:
diff --git a/process-compose/monza-full-node/process-compose.local.yml b/process-compose/monza-full-node/process-compose.local.yml
index 8ac99d7fe..f68eb73e6 100644
--- a/process-compose/monza-full-node/process-compose.local.yml
+++ b/process-compose/monza-full-node/process-compose.local.yml
@@ -8,6 +8,11 @@ processes:
     command: |
       ./scripts/celestia/celestia-local-appd
     readiness_probe:
+      initial_delay_seconds: 10
+      exec:
+        command: echo "true"
+    liveness_probe:
+      initial_delay_seconds: 10
       exec:
         command: echo "true"
 
@@ -18,6 +23,10 @@ processes:
       initial_delay_seconds: 10
       exec:
         command: echo "true"
+    liveness_probe:
+      initial_delay_seconds: 10
+      exec:
+        command: echo "true"
     depends_on:
        celestia-node-appd:
         condition: process_healthy
@@ -27,7 +36,12 @@ processes:
       sleep 999999999d
       echo "started"
     readiness_probe:
-      initial_delay_seconds: 30
+      initial_delay_seconds: 10
+      exec:
+        command: |
+          echo "true"
+    liveness_probe:
+      initial_delay_seconds: 10
       exec:
         command: |
           echo "true"
diff --git a/process-compose/monza-full-node/process-compose.test.yml b/process-compose/monza-full-node/process-compose.test.yml
index de368e240..0a999c978 100644
--- a/process-compose/monza-full-node/process-compose.test.yml
+++ b/process-compose/monza-full-node/process-compose.test.yml
@@ -6,7 +6,7 @@ processes:
 
   monza-client-tests:
     command: |
-      sleep 30
+      # FIXME(nix-ci-fix): this is the latest we can push linking issues, here and in the Monza faucet process we will get a libssl linking issue
       cargo test -p monza-client -- --test-threads=1
     depends_on:
       monza-full-node:
@@ -14,6 +14,4 @@ processes:
       monza-faucet:
         condition: process_healthy
     availability:
-      # NOTE: `restart: exit_on_failure` is not needed since
-      # exit_on_end implies it.
       exit_on_end: true
\ No newline at end of file
diff --git a/process-compose/monza-full-node/process-compose.yml b/process-compose/monza-full-node/process-compose.yml
index cd8819d89..8e47b976a 100644
--- a/process-compose/monza-full-node/process-compose.yml
+++ b/process-compose/monza-full-node/process-compose.yml
@@ -4,17 +4,12 @@ environment:
 
 processes:
 
-  build:
-    command : |
-      exit 0
-
   celestia-light-node:
     command: |
       exit 1
 
   celestia-light-node-synced:
     command: |
-      sleep 10
       cargo run --bin wait-for-celestia-light-node
     depends_on:
       celestia-light-node:
@@ -22,13 +17,17 @@ processes:
 
   m1-da-light-node:
     command: |
+      # FIXME(nix-ci-fix): when we modify LD_PATH directly, we get a missing libstdc++ here
       ./target/debug/m1-da-light-node
     depends_on:
       celestia-light-node-synced:
-        condition: process_completed
-      celestia-light-node:
-        condition: process_healthy
+        condition: process_completed_successfully
     readiness_probe:
+      initial_delay_seconds: 10
+      exec:
+        command: echo "true"
+    liveness_probe:
+      initial_delay_seconds: 10
       exec:
         command: echo "true"
 
@@ -39,18 +38,20 @@ processes:
       m1-da-light-node:
         condition: process_healthy
     readiness_probe:
-      initial_delay_seconds: 60
+      initial_delay_seconds: 10
       exec:
         command: |
           echo "true"
 
   monza-faucet:
     command : |
+      # FIXME(nix-ci-fix): this is the latest we can push linking issues, here and in the Monza client tests we will get a libssl linking issue
       ./scripts/monza/faucet
     depends_on:
       monza-full-node:
         condition: process_healthy
     readiness_probe:
+      initial_delay_seconds: 10
       exec:
         command: echo "true"
 
diff --git a/protocol-units/da/m1/light-node/Cargo.toml b/protocol-units/da/m1/light-node/Cargo.toml
index ae5ff50d5..8c567950e 100644
--- a/protocol-units/da/m1/light-node/Cargo.toml
+++ b/protocol-units/da/m1/light-node/Cargo.toml
@@ -40,7 +40,7 @@ tracing-subscriber = { workspace = true, optional = true }
 
 [features]
 default = [
-    "sequencer",
+    # "sequencer",
     "logging"
 ]
 logging = [
diff --git a/scripts/celestia/celestia-env b/scripts/celestia/celestia-env
index 4ef6e1da1..fdfed4d72 100755
--- a/scripts/celestia/celestia-env
+++ b/scripts/celestia/celestia-env
@@ -4,8 +4,8 @@ export CELESTIA_NODE_AUTH_TOKEN=
 export CELESTIA_ADDRESS=
 export CELESTIA_NAMESPACE_BYTES="$(openssl rand -hex 10)"
 export CELESTIA_CHAIN_ID="$(openssl rand -hex 10)"
-export APP_PATH="./.etc/celestia/${CELESTIA_CHAIN_ID}/.celestia-app"
-export NODE_PATH="./.etc/celestia/${CELESTIA_CHAIN_ID}/bridge"
+export APP_PATH="$MOVEMENT_BASE_STORAGE_PATH/celestia/${CELESTIA_CHAIN_ID}/.celestia-app"
+export NODE_PATH="$MOVEMENT_BASE_STORAGE_PATH/celestia/${CELESTIA_CHAIN_ID}/bridge"
 
 contains() {
     local value="$1"
@@ -30,5 +30,5 @@ else
     ./scripts/celestia/celestia-local-init
     export CELESTIA_NODE_AUTH_TOKEN="$(celestia bridge auth admin --node.store ${NODE_PATH})"
     export CELESTIA_ADDRESS=$(./scripts/celestia/get-local-address)
-    echo "CELESTIA_ADDRESS=${CELESTIA_ADDRESS}"
+    echo "CELESTIA_ADDRESS=$CELESTIA_ADDRESS"
 fi
\ No newline at end of file
diff --git a/scripts/celestia/celestia-local-appd b/scripts/celestia/celestia-local-appd
index 96d4b1236..fb17a124f 100755
--- a/scripts/celestia/celestia-local-appd
+++ b/scripts/celestia/celestia-local-appd
@@ -1,4 +1,4 @@
 #!/bin/bash -e
-APP_PATH="./.etc/celestia/${CELESTIA_CHAIN_ID}/.celestia-app"
-NODE_PATH="./.etc/celestia/${CELESTIA_CHAIN_ID}/bridge"
+APP_PATH="$MOVEMENT_BASE_STORAGE_PATH/celestia/${CELESTIA_CHAIN_ID}/.celestia-app"
+NODE_PATH="$MOVEMENT_BASE_STORAGE_PATH/celestia/${CELESTIA_CHAIN_ID}/bridge"
 celestia-appd start --grpc.enable --home $APP_PATH
\ No newline at end of file
diff --git a/scripts/celestia/celestia-local-bridge b/scripts/celestia/celestia-local-bridge
index 418011d68..ff8ea5613 100755
--- a/scripts/celestia/celestia-local-bridge
+++ b/scripts/celestia/celestia-local-bridge
@@ -1,15 +1,27 @@
 #!/bin/bash -e
-APP_PATH="./.etc/celestia/${CELESTIA_CHAIN_ID}/.celestia-app"
-NODE_PATH="./.etc/celestia/${CELESTIA_CHAIN_ID}/bridge"
+APP_PATH="$MOVEMENT_BASE_STORAGE_PATH/celestia/${CELESTIA_CHAIN_ID}/.celestia-app"
+NODE_PATH="$MOVEMENT_BASE_STORAGE_PATH/celestia/${CELESTIA_CHAIN_ID}/bridge"
 
 GENESIS=
 CNT=0
 MAX=30
-while [ "${#GENESIS}" -le 4 -a $CNT -ne $MAX ]; do
-	GENESIS=$(curl -s http://127.0.0.1:26657/block?height=1 | jq '.result.block_id.hash' | tr -d '"')
-	((CNT++))
-	sleep 1
+
+# \leq 4 because null is 4 characters long, otherwise the genesis block hash is 64 characters long
+while [ "${#GENESIS}" -le 4 ] && [ $CNT -lt $MAX ]; do
+    # FIXME(nix-ci-fix): if nix environment is set up incorrectly, we will get something similar to: https://github.com/commercialhaskell/stack/issues/6331
+    echo "Waiting for genesis block..."
+    GENESIS=$(curl -s http://127.0.0.1:26657/block?height=1 | jq '.result.block_id.hash' | tr -d '"')
+    echo "Genesis: $GENESIS"
+    CNT=$((CNT+1))
+    sleep 1
+    echo "Attempt $CNT"
 done
+echo "Discovered genesis: $GENESIS"
+
+if [ "${#GENESIS}" -le 4 ]; then
+    echo "Failed to retrieve genesis block after $MAX attempts."
+    exit 1
+fi
 
 export CELESTIA_CUSTOM=$CELESTIA_CHAIN_ID:$GENESIS
 echo "$CELESTIA_CUSTOM"
diff --git a/scripts/celestia/celestia-local-init b/scripts/celestia/celestia-local-init
index fea422148..d9054310a 100755
--- a/scripts/celestia/celestia-local-init
+++ b/scripts/celestia/celestia-local-init
@@ -1,6 +1,6 @@
 #!/bin/bash -e
-APP_PATH="./.etc/celestia/${CELESTIA_CHAIN_ID}/.celestia-app"
-NODE_PATH="./.etc/celestia/${CELESTIA_CHAIN_ID}/bridge"
+APP_PATH="$MOVEMENT_BASE_STORAGE_PATH/celestia/${CELESTIA_CHAIN_ID}/.celestia-app"
+NODE_PATH="$MOVEMENT_BASE_STORAGE_PATH/celestia/${CELESTIA_CHAIN_ID}/bridge"
 
 # Check if the folder exists
 if [ -d "$APP_PATH" ]; then
diff --git a/scripts/monza/faucet b/scripts/monza/faucet
index bc36dcdcb..65b28bc9c 100755
--- a/scripts/monza/faucet
+++ b/scripts/monza/faucet
@@ -19,7 +19,8 @@ echo "  - Node URL: $MONZA_APTOS_REST_LISTEN_ADDR"
 echo "  - Faucet URL: $MONZA_APTOS_FAUCET_LISTEN_ADDR"
 
 # Run the faucet service using cargo
-cargo run -p aptos-faucet-service -- run-simple --key "$MONZA_APTOS_PRIVATE_KEY" \
+echo "Starting faucet service..."
+./target/debug/aptos-faucet-service run-simple --key "$MONZA_APTOS_PRIVATE_KEY" \
     --node-url "http://$MONZA_APTOS_REST_LISTEN_ADDR" --chain-id "$MONZA_CHAIN_ID" \
     --listen-address "$LISTEN_ADDR" --listen-port "$LISTEN_PORT"
 
diff --git a/scripts/movement/run b/scripts/movement/run
index dc5d1274a..4fafed2ac 100755
--- a/scripts/movement/run
+++ b/scripts/movement/run
@@ -40,5 +40,6 @@ for element in "${split[@]}"; do
     override_files+=("process-compose/$1/process-compose.$element.yml")
 done
 
+echo "Running process-compose for $1 with override files: ${override_files[@]}..."
 process-compose -f process-compose/$1/process-compose.yml "${override_files[@]}"  "${@:3}"
-cat $PC_LOG_FILE
\ No newline at end of file
+# cat $PC_LOG_FILE
\ No newline at end of file
diff --git a/scripts/preludes/m1-da-light-node/prelude b/scripts/preludes/m1-da-light-node/prelude
index 6b12e7424..0a18f3cf4 100755
--- a/scripts/preludes/m1-da-light-node/prelude
+++ b/scripts/preludes/m1-da-light-node/prelude
@@ -1,4 +1,8 @@
 #!/bin/bash -e
 export MOVE_ROCKS_CHAIN_ID="$(openssl rand -hex 10)"
-export MOVE_ROCKS_PATH="./.etc/move-rocks/${MOVE_ROCKS_CHAIN_ID}/.move-rocks"
-. ./scripts/celestia/celestia-env
\ No newline at end of file
+export MOVE_ROCKS_PATH="$MOVEMENT_BASE_STORAGE_PATH/move-rocks/${MOVE_ROCKS_CHAIN_ID}/.move-rocks"
+. ./scripts/celestia/celestia-env
+
+echo "Building m1-da-light-node..."
+cargo build -p m1-da-light-node
+echo "Built m1-da-light-node!"
\ No newline at end of file
diff --git a/scripts/preludes/monza-full-node/prelude b/scripts/preludes/monza-full-node/prelude
index 6005a6750..11cd19db6 100755
--- a/scripts/preludes/monza-full-node/prelude
+++ b/scripts/preludes/monza-full-node/prelude
@@ -1,12 +1,20 @@
 #!/bin/bash -e
 export MOVE_ROCKS_CHAIN_ID="$(openssl rand -hex 10)"
-export MOVE_ROCKS_PATH="./.etc/move-rocks/${MOVE_ROCKS_CHAIN_ID}/.move-rocks"
+export MOVE_ROCKS_PATH="$MOVEMENT_BASE_STORAGE_PATH/move-rocks/${MOVE_ROCKS_CHAIN_ID}/.move-rocks"
 . ./scripts/celestia/celestia-env
 
 # build monza
+echo "Building monza-config..."
 cargo build --bin monza-config
+echo "Built monza-config!"
+
+echo "Building m1-da-light-node..."
 cargo build -p m1-da-light-node --features "sequencer"
+echo "Built m1-da-light-node!"
+
+echo "Building monza-full-node..."
 cargo build -p monza-full-node
+echo "Built monza-full-node!"
 
 # build aptos
 WORKING_DIR=$(pwd)
@@ -14,7 +22,9 @@ temp_dir=$MOVEMENT_BASE_STORAGE_PATH/monza-aptos
 cp -R "$MONZA_APTOS_PATH" "$temp_dir"
 chmod -R 755 $temp_dir
 cd $MOVEMENT_BASE_STORAGE_PATH/monza-aptos
+echo "Building aptos-faucet-service..."
 cargo build -p aptos-faucet-service
+echo "Built aptos-faucet-service!"
 cd $WORKING_DIR
 
 eval $(./target/debug/monza-config)
\ No newline at end of file
diff --git a/util/movement-types/Cargo.toml b/util/movement-types/Cargo.toml
index a1b02251b..69ddb6ddf 100644
--- a/util/movement-types/Cargo.toml
+++ b/util/movement-types/Cargo.toml
@@ -12,9 +12,9 @@ rust-version = { workspace = true }
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-serde = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
 serde_with = { workspace = true }
-derivative = { workspace = true }
+# derivative = { workspace = true }
 anyhow = { workspace = true }
 sha2 = { workspace = true }