diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1d107cd..cd8c37a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -54,8 +54,8 @@ jobs:
             OCTEZ_TAG=master
             OCTEZ_PROTO=PsParisC
             PACKAGE=evm_kernel
-            TEZOS_REPO=https://gitlab.com/baking-bad/tezos.git
-            TEZOS_REPO_BRANCH=feat/token-deposits-squashed-v6
+            TEZOS_REPO=https://gitlab.com/tezos/tezos.git
+            TEZOS_REPO_BRANCH=m-kus@etherlink-fa-withdrawals-part-3
             CACHEBUST=${{ steps.cachebust.outputs.date }}
             CI_COMMIT_SHA=dev
           push: true
diff --git a/build/etherlink/Dockerfile b/build/etherlink/Dockerfile
index 3ba0f1a..1231898 100644
--- a/build/etherlink/Dockerfile
+++ b/build/etherlink/Dockerfile
@@ -31,8 +31,6 @@ ARG PACKAGE
 ARG CI_COMMIT_SHA
 RUN make build-operator PACKAGE=${PACKAGE} CI_COMMIT_SHA=${CI_COMMIT_SHA}
 
-FROM ztepler/tezos-fabridge-bins:latest AS fa-bridge-bins
-
 FROM ubuntu:22.04 AS etherlink
 RUN apt-get -qq update && \
     apt-get install -y \
@@ -50,11 +48,11 @@ RUN apt-get -qq update && \
     netbase \
     wget \
     ca-certificates
-COPY --from=fa-bridge-bins /usr/bin/octez-smart-rollup-node /usr/bin/octez-smart-rollup-node
-COPY --from=fa-bridge-bins /usr/bin/octez-client /usr/bin/octez-client
-COPY --from=fa-bridge-bins /usr/bin/octez-node /usr/bin/octez-node
-COPY --from=fa-bridge-bins /usr/share/zcash-params/ /root/.zcash-params/
-COPY --from=fa-bridge-bins /usr/bin/octez-evm-node /usr/bin/octez-evm-node
+COPY --from=octez /usr/local/bin/octez-smart-rollup-node /usr/bin/octez-smart-rollup-node
+COPY --from=octez /usr/local/bin/octez-client /usr/bin/octez-client
+COPY --from=octez /usr/local/bin/octez-node /usr/bin/octez-node
+COPY --from=octez /usr/share/zcash-params/ /root/.zcash-params/
+COPY --from=octez /usr/local/bin/octez-evm-node /usr/bin/octez-evm-node
 COPY --from=builder /build/bin/wasm_2_0_0/ /root/wasm_2_0_0/
 ARG PACKAGE
 COPY --from=builder /build/bin/${PACKAGE}_installer.wasm /root/kernel.wasm
diff --git a/config/dev.yaml b/config/dev.yaml
index 17abf9f..6ae0ea6 100644
--- a/config/dev.yaml
+++ b/config/dev.yaml
@@ -18,3 +18,6 @@ instructions:
       # KT1Tdrs1K4B2upYmbHE1ZorcpgKEn5WhTwJk
       value: 4b543154647273314b3442327570596d624845315a6f726370674b456e35576854774a6b
       to: /evm/delayed_bridge
+  - set:
+      value: 42
+      to: /feature_flags/enable_fa_bridge
diff --git a/envs/etherlink-paris.env b/envs/etherlink-paris.env
index aa06ef6..f5c9c4c 100644
--- a/envs/etherlink-paris.env
+++ b/envs/etherlink-paris.env
@@ -1,5 +1,5 @@
 OCTEZ_TAG=master
 OCTEZ_PROTO=PsParisC
 NETWORK=pariscnet
-TEZOS_REPO=https://gitlab.com/baking-bad/tezos.git
-TEZOS_REPO_BRANCH=feat/token-deposits-squashed-v6
+TEZOS_REPO=https://gitlab.com/tezos/tezos.git
+TEZOS_REPO_BRANCH=m-kus@etherlink-fa-withdrawals-part-3