diff --git a/third_party/pyth/p2w_autoattest.py b/third_party/pyth/p2w_autoattest.py
index ebbc72aaf2..8f8ed40a4d 100755
--- a/third_party/pyth/p2w_autoattest.py
+++ b/third_party/pyth/p2w_autoattest.py
@@ -166,7 +166,7 @@
 
 # Set helpfully chatty logging default, filtering especially annoying
 # modules like async HTTP requests and tokio runtime logs
-os.environ["RUST_LOG"] = os.environ.get("RUST_LOG", "pyth_wormhole_attester_client,solana_client,main,pyth_sdk_solana=trace")
+os.environ["RUST_LOG"] = os.environ.get("RUST_LOG", "info")
 
 # Send the first attestation in one-shot mode for testing
 first_attest_result = run_or_die(
@@ -187,6 +187,7 @@
         P2W_RPC_TIMEOUT_SECS,
     ],
     capture_output=True,
+    debug = True,
 )
 
 logging.info("p2w_autoattest ready to roll!")
diff --git a/tilt-devnet/docker-images/Dockerfile.client b/tilt-devnet/docker-images/Dockerfile.client
index 42fdc4c962..1db6746ee7 100644
--- a/tilt-devnet/docker-images/Dockerfile.client
+++ b/tilt-devnet/docker-images/Dockerfile.client
@@ -9,12 +9,11 @@ RUN apt-get update && apt-get install -yq libudev-dev ncat
 RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - && apt-get install -y nodejs
 
 ADD rust-toolchain /rust-toolchain
-ADD wormhole-attester/ /usr/src/wormhole-attester
-WORKDIR /usr/src/wormhole-attester
+WORKDIR /usr/src/bridge-client
 
 RUN --mount=type=cache,target=/root/.cache \
-    --mount=type=cache,target=/usr/local/cargo/registry,id=cargo_registry \
-    --mount=type=cache,target=/usr/src/solana/pyth2wormhole/target,id=p2w_cargo_build \
+    --mount=type=cache,target=/usr/local/cargo/registry \
+    --mount=type=cache,target=target \
     cargo install --version =2.0.12 --locked spl-token-cli --target-dir target
 
 
@@ -26,7 +25,7 @@ ENV BRIDGE_ADDRESS="Bridge1p5gheXUvJ6jGWGeCsgPKgnE3YgdGKRVCMY9o"
 
 RUN --mount=type=cache,target=/root/.cache \
     --mount=type=cache,target=/usr/local/cargo/registry \
-    --mount=type=cache,target=/usr/src/solana/pyth2wormhole/target \
+    --mount=type=cache,target=target \
 	set -xe && \
     cargo install bridge_client --git https://github.com/wormhole-foundation/wormhole --tag $WORMHOLE_TAG --locked --root /usr/local --target-dir target && \
     cargo install token_bridge_client --git https://github.com/wormhole-foundation/wormhole --tag $WORMHOLE_TAG --locked --root /usr/local --target-dir target
diff --git a/wormhole-attester/client/src/healthcheck.rs b/wormhole-attester/client/src/healthcheck.rs
index 696b21c2c8..f069c708c1 100644
--- a/wormhole-attester/client/src/healthcheck.rs
+++ b/wormhole-attester/client/src/healthcheck.rs
@@ -1,13 +1,15 @@
 use {
+    crate::attestation_cfg,
     std::{
         collections::VecDeque,
+        convert::TryInto,
         sync::Arc,
     },
     tokio::sync::Mutex,
 };
 
 lazy_static::lazy_static! {
-    pub static ref HEALTHCHECK_STATE: Arc<Mutex<HealthCheckState>> = Arc::new(Mutex::new(HealthCheckState::new(1, false)));
+    pub static ref HEALTHCHECK_STATE: Arc<Mutex<HealthCheckState>> = Arc::new(Mutex::new(HealthCheckState::new(attestation_cfg::default_healthcheck_window_size().try_into().expect("could not convert window size to usize"), attestation_cfg::default_enable_healthcheck())));
 }
 
 /// Helper structure for deciding service health
diff --git a/wormhole-attester/client/src/main.rs b/wormhole-attester/client/src/main.rs
index 4c321f0ca5..57ccab304c 100644
--- a/wormhole-attester/client/src/main.rs
+++ b/wormhole-attester/client/src/main.rs
@@ -41,6 +41,7 @@ use {
         gen_set_config_tx,
         gen_set_is_active_tx,
         get_config_account,
+        healthcheck::HealthCheckState,
         start_metrics_server,
         AttestationConfig,
         BatchState,
@@ -304,17 +305,20 @@ async fn handle_attest_daemon_mode(
     metrics_bind_addr: SocketAddr,
 ) -> Result<(), ErrBox> {
     // Update healthcheck window size from config
-    if attestation_cfg.enable_healthcheck {
-        if attestation_cfg.healthcheck_window_size == 0 {
-            return Err(format!(
-                "{} must be above 0",
-                stringify!(attestation_cfg.healthcheck_window_size)
-            )
-            .into());
-        }
-        let mut hc = HEALTHCHECK_STATE.lock().await;
-        hc.max_window_size = attestation_cfg.healthcheck_window_size as usize;
-    } else {
+    if attestation_cfg.healthcheck_window_size == 0 {
+        return Err(format!(
+            "{} must be above 0",
+            stringify!(attestation_cfg.healthcheck_window_size)
+        )
+        .into());
+    }
+
+    *HEALTHCHECK_STATE.lock().await = HealthCheckState::new(
+        attestation_cfg.healthcheck_window_size as usize,
+        attestation_cfg.enable_healthcheck,
+    );
+
+    if !attestation_cfg.enable_healthcheck {
         warn!("WARNING: Healthcheck is disabled");
     }