diff --git a/README.md b/README.md
index adf8a1d74..422313080 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ see the [SDK section of the book](https://anton-rs.github.io/kona/sdk/intro.html
 **Build Pipelines**
 
 - [`cannon`](./build/cannon): Docker image for compiling to the bare-metal `mips-unknown-none` target.
-- [`asterisc`](./build/asterisc): Docker image for compiling to the bare-metal `riscv64gc-unknown-none-elf` target.
+- [`asterisc`](./build/asterisc): Docker image for compiling to the bare-metal `riscv64imac-unknown-none-elf` target.
 
 **Protocol**
 - [`mpt`](./crates/mpt): Utilities for interacting with the Merkle Patricia Trie in the client program.
diff --git a/bin/client/justfile b/bin/client/justfile
index 5bd260a29..4964c3aa9 100644
--- a/bin/client/justfile
+++ b/bin/client/justfile
@@ -14,7 +14,7 @@ run-client-asterisc block_number l1_rpc l1_beacon_rpc l2_rpc rollup_node_rpc ver
   OP_NODE_ADDRESS="{{rollup_node_rpc}}"
 
   HOST_BIN_PATH="./target/release/kona-host"
-  CLIENT_BIN_PATH="./target/riscv64gc-unknown-none-elf/release-client-lto/kona"
+  CLIENT_BIN_PATH="./target/riscv64imac-unknown-none-elf/release-client-lto/kona"
   STATE_PATH="./state.bin.gz"
 
   CLAIMED_L2_BLOCK_NUMBER={{block_number}}
@@ -140,7 +140,7 @@ run-client-asterisc-offline block_number l2_claim l2_output_root l2_head l1_head
   #!/usr/bin/env bash
 
   HOST_BIN_PATH="./target/release/kona-host"
-  CLIENT_BIN_PATH="./target/riscv64gc-unknown-none-elf/release-client-lto/kona"
+  CLIENT_BIN_PATH="./target/riscv64imac-unknown-none-elf/release-client-lto/kona"
   STATE_PATH="./state.bin.gz"
 
   CLAIMED_L2_BLOCK_NUMBER={{block_number}}
diff --git a/build/asterisc/asterisc-repro.dockerfile b/build/asterisc/asterisc-repro.dockerfile
index a644df173..b0b83fedc 100644
--- a/build/asterisc/asterisc-repro.dockerfile
+++ b/build/asterisc/asterisc-repro.dockerfile
@@ -47,7 +47,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends git
 # Build kona-client on the selected tag
 RUN git checkout $CLIENT_TAG && \
   cargo build -Zbuild-std=core,alloc --workspace --bin kona --locked --profile release-client-lto --exclude kona-host --exclude kona-derive-alloy && \
-  mv ./target/riscv64gc-unknown-none-elf/release-client-lto/kona /kona-client-elf
+  mv ./target/riscv64imac-unknown-none-elf/release-client-lto/kona /kona-client-elf
 
 ################################################################
 #                Build kona-host @ `CLIENT_TAG`                #
diff --git a/build/asterisc/asterisc.dockerfile b/build/asterisc/asterisc.dockerfile
index 5e8e4a4c5..249975835 100644
--- a/build/asterisc/asterisc.dockerfile
+++ b/build/asterisc/asterisc.dockerfile
@@ -17,7 +17,7 @@ RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
   clang \
   make \
   cmake \
-  git 
+  git
 
 # Install Rustup and Rust
 RUN curl https://sh.rustup.rs -sSf | bash -s -- -y --default-toolchain ${RUST_VERSION} --component rust-src
@@ -28,6 +28,6 @@ ENV PATH="/root/.cargo/bin:${PATH}"
 ENV CC_riscv64_unknown_none_elf=riscv64-linux-gnu-gcc \
   CXX_riscv64_unknown_none_elf=riscv64-linux-gnu-g++ \
   CARGO_TARGET_RISCV64_UNKNOWN_NONE_ELF_LINKER=riscv64-linux-gnu-gcc \
-  RUSTFLAGS="-Clink-arg=-e_start -Ctarget-feature=-c" \
-  CARGO_BUILD_TARGET="riscv64gc-unknown-none-elf" \
+  RUSTFLAGS="-Clink-arg=-e_start -Ctarget-feature=-c,-zicsr,-zifencei,-zicntr,zihpm" \
+  CARGO_BUILD_TARGET="riscv64imac-unknown-none-elf" \
   RUSTUP_TOOLCHAIN=${RUST_VERSION}
diff --git a/crates/proof-sdk/std-fpvm/src/riscv64/mod.rs b/crates/proof-sdk/std-fpvm/src/riscv64/mod.rs
index dd28a94b7..f90970ea7 100644
--- a/crates/proof-sdk/std-fpvm/src/riscv64/mod.rs
+++ b/crates/proof-sdk/std-fpvm/src/riscv64/mod.rs
@@ -1,5 +1,5 @@
-//! This module contains raw syscall bindings for the `riscv64gc` target architecture, as well as a
-//! high-level implementation of the [crate::BasicKernelInterface] trait for the kernel.
+//! This module contains raw syscall bindings for the `riscv64imac` target architecture, as well as
+//! a high-level implementation of the [crate::BasicKernelInterface] trait for the kernel.
 
 pub(crate) mod io;
 mod syscall;
diff --git a/justfile b/justfile
index 2678f06ab..0fd6f8020 100644
--- a/justfile
+++ b/justfile
@@ -82,7 +82,7 @@ lint-asterisc:
     --platform linux/amd64 \
     -v `pwd`/:/workdir \
     -w="/workdir" \
-    ghcr.io/anton-rs/kona/asterisc-builder:main cargo +nightly clippy -p kona-std-fpvm --all-features --target riscv64gc-unknown-linux-gnu -Zbuild-std=core,alloc -- -D warnings
+    ghcr.io/anton-rs/kona/asterisc-builder:main cargo +nightly clippy -p kona-std-fpvm --all-features --target riscv64imac-unknown-none-elf -Zbuild-std=core,alloc -- -D warnings
 
 # Lint the Rust documentation
 lint-docs: