diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 137f523..3b5d58e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,7 +4,7 @@ on:
   push:
 
 env:
-  STACKS_BLOCKCHAIN_COMMIT: "feat/epoch-2.4"
+  STACKS_BLOCKCHAIN_COMMIT: 14fc7fee769bfa01484d130a4f269884b0b0e9a8
 
 jobs:
   cancel-previous-runs:
@@ -115,13 +115,13 @@ jobs:
           images: hirosystems/stacks-api-e2e
           tags: |
             type=raw,value=latest,enable={{is_default_branch}}
-            type=raw,value=stacks2.4,enable={{is_default_branch}}
-            type=raw,value=stacks2.4-{{branch}}-{{sha}}
-            type=ref,event=branch,prefix=stacks2.4-
-            type=ref,event=pr,prefix=stacks2.4-
-            type=semver,pattern={{version}},prefix=stacks2.4-
-            type=semver,pattern={{major}}.{{minor}},prefix=stacks2.4-
-            type=sha,prefix=stacks2.4-
+            type=raw,value=stacks3.0,enable={{is_default_branch}}
+            type=raw,value=stacks3.0-{{branch}}-{{sha}}
+            type=ref,event=branch,prefix=stacks3.0-
+            type=ref,event=pr,prefix=stacks3.0-
+            type=semver,pattern={{version}},prefix=stacks3.0-
+            type=semver,pattern={{major}}.{{minor}},prefix=stacks3.0-
+            type=sha,prefix=stacks3.0-
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
diff --git a/Dockerfile.e2e b/Dockerfile.e2e
index b09f0ed..f7eba9f 100644
--- a/Dockerfile.e2e
+++ b/Dockerfile.e2e
@@ -3,7 +3,7 @@
 FROM rust:bullseye as builder
 
 # A commit hash, tag, or branch
-ARG GIT_COMMIT=feat/epoch-2.4
+ARG GIT_COMMIT=14fc7fee769bfa01484d130a4f269884b0b0e9a8
 ARG BLOCKCHAIN_REPO=https://github.com/stacks-network/stacks-blockchain.git
 
 ARG TARGETPLATFORM
@@ -94,6 +94,13 @@ ENV STACKS_23_HEIGHT=$STACKS_23_HEIGHT
 ARG STACKS_24_HEIGHT=111
 ENV STACKS_24_HEIGHT=$STACKS_24_HEIGHT
 
+ARG STACKS_25_HEIGHT=112
+ENV STACKS_25_HEIGHT=$STACKS_25_HEIGHT
+
+# do not boot into epoch3.0 for now (it doesn't work yet)
+ARG STACKS_30_HEIGHT=999999 
+ENV STACKS_30_HEIGHT=$STACKS_30_HEIGHT
+
 # priv: 6ad9cadb42d4edbfbe0c5bfb3b8a4125ddced021c4174f829b714ccbf527f02001
 # ARG REWARD_RECIPIENT=STQM73RQC4EX0A07KWG1J5ECZJYBZS4SJ4ERC6WN
 ARG REWARD_RECIPIENT
@@ -177,7 +184,7 @@ RUN <<EOF
         sleep 0.1s
       done
 
-      if [ "$chain_height" = "$STACKS_24_HEIGHT" ]; then
+      if [ "$chain_height" = "$STACKS_25_HEIGHT" ]; then
         break
       fi
 
diff --git a/Dockerfile.stacks-node b/Dockerfile.stacks-node
index f290a4e..7691a26 100644
--- a/Dockerfile.stacks-node
+++ b/Dockerfile.stacks-node
@@ -6,6 +6,10 @@ RUN test -n "$GIT_COMMIT" || (echo "GIT_COMMIT not set" && false)
 
 RUN echo "Building stacks-node from commit: https://github.com/stacks-network/stacks-blockchain/commit/$GIT_COMMIT"
 
+RUN apt-get update && apt-get install -y libclang-dev
+RUN rustup toolchain install stable
+RUN rustup component add rustfmt --toolchain stable
+
 WORKDIR /stacks
 RUN git init && \
     git remote add origin https://github.com/stacks-network/stacks-blockchain.git && \
diff --git a/docker-compose-miner.yml b/docker-compose-miner.yml
index 12b6f06..8faf9a5 100644
--- a/docker-compose-miner.yml
+++ b/docker-compose-miner.yml
@@ -1,7 +1,7 @@
 version: "3.9"
 
 x-common-vars:
-  - &STACKS_BLOCKCHAIN_COMMIT master
+  - &STACKS_BLOCKCHAIN_COMMIT feat/naka-neon
   - &BTC_ADDR miEJtNKa3ASpA19v5ZhvbKTEieYjLpzCYT
   - &MINER_SEED 9e446f6b0c6a96cf2190e54bcd5a8569c3e386f091605499464389b8d4e0bfc201 # stx: STEW4ZNT093ZHK4NEQKX8QJGM2Y7WWJ2FQQS5C19, btc: miEJtNKa3ASpA19v5ZhvbKTEieYjLpzCYT, pub_key: 035379aa40c02890d253cfa577964116eb5295570ae9f7287cbae5f2585f5b2c7c, wif: cStMQXkK5yTFGP3KbNXYQ3sJf2qwQiKrZwR9QJnksp32eKzef1za
   - &BITCOIN_PEER_PORT 18444
@@ -16,6 +16,8 @@ x-common-vars:
   - &STACKS_22_HEIGHT ${STACKS_22_HEIGHT:-105}
   - &STACKS_23_HEIGHT ${STACKS_23_HEIGHT:-106}
   - &STACKS_24_HEIGHT ${STACKS_24_HEIGHT:-107}
+  - &STACKS_25_HEIGHT ${STACKS_25_HEIGHT:-108}
+  - &STACKS_30_HEIGHT ${STACKS_30_HEIGHT:-999999} # do not boot into epoch3.0 for now (it doesn't work yet)
   - &REWARD_RECIPIENT ${REWARD_RECIPIENT:-STQM73RQC4EX0A07KWG1J5ECZJYBZS4SJ4ERC6WN} # priv: 6ad9cadb42d4edbfbe0c5bfb3b8a4125ddced021c4174f829b714ccbf527f02001
 
 services:
@@ -116,6 +118,8 @@ services:
       STACKS_22_HEIGHT: *STACKS_22_HEIGHT
       STACKS_23_HEIGHT: *STACKS_23_HEIGHT
       STACKS_24_HEIGHT: *STACKS_24_HEIGHT
+      STACKS_25_HEIGHT: *STACKS_25_HEIGHT
+      STACKS_30_HEIGHT: *STACKS_30_HEIGHT
       REWARD_RECIPIENT: *REWARD_RECIPIENT
     entrypoint:
       - /bin/bash
diff --git a/stacks-krypton-miner.toml b/stacks-krypton-miner.toml
index f803db9..d62a66d 100644
--- a/stacks-krypton-miner.toml
+++ b/stacks-krypton-miner.toml
@@ -32,7 +32,7 @@ public_ip_address = "1.1.1.1:1234"
 
 [burnchain]
 chain = "bitcoin"
-mode = "krypton"
+mode = "neon"
 poll_time_secs = 1
 pox_2_activation = $STACKS_POX2_HEIGHT
 
@@ -73,6 +73,15 @@ start_height = $STACKS_23_HEIGHT
 epoch_name = "2.4"
 start_height = $STACKS_24_HEIGHT
 
+[[burnchain.epochs]]
+epoch_name = "2.5"
+start_height = $STACKS_25_HEIGHT
+
+[[burnchain.epochs]]
+epoch_name = "3.0"
+start_height = $STACKS_30_HEIGHT
+
+
 [[ustx_balance]]
 address = "STB44HYPYAT2BB2QE513NSP81HTMYWBJP02HPGK6"
 amount = 10000000000000000