diff --git a/.github/workflows/on_main.yml b/.github/workflows/on_main.yml
index a3701f9..0fd8b2f 100644
--- a/.github/workflows/on_main.yml
+++ b/.github/workflows/on_main.yml
@@ -29,7 +29,7 @@ jobs:
         with:
           context: .
           push: true
-          file: Dockerfile
+          file: Dockerfile.offchain
           tags: |
             ghcr.io/near/near-light-client/light-client:${{ github.sha }}
             ghcr.io/near/near-light-client/light-client:latest
diff --git a/Dockerfile.offchain b/Dockerfile.offchain
index a6ef493..58b8b1d 100644
--- a/Dockerfile.offchain
+++ b/Dockerfile.offchain
@@ -15,19 +15,19 @@ RUN apt-get update && apt-get install -y \
     pkg-config \
     cbindgen
 
-COPY Cargo.toml Cargo.lock ./
-RUN mkdir -p src/bin && echo "fn main() {}" > src/bin/dummy.rs
-RUN cargo build --release --config net.git-fetch-with-cli=true --bin dummy
-
 COPY ./ ./
 RUN cargo build --release --config net.git-fetch-with-cli=true
-RUN ldd target/release/near-offchain-lightclient 
-RUN cp target/release/near-offchain-lightclient /near/near-offchain-light-client
+RUN ldd target/release/near-light-client 
+RUN cp target/release/near-light-client /near/near-light-client
 
 FROM debian:bookworm-slim
 RUN apt-get update && apt-get install -y openssl libssl-dev pkg-config ca-certificates && rm -rf /var/lib/apt/lists/*
-COPY --from=build /near/near-offchain-light-client /usr/local/bin
-COPY --from=build /near/default.toml /var/light-client.toml
+COPY --from=build /near/near-light-client /usr/local/bin
+COPY --from=build /near/config.toml /var/near-light-client/config.toml
+
+ENV NEAR_LIGHT_CLIENT_DIR=/var/near-light-client
+ENV NEAR_LIGHT_CLIENT_CONFIG_FILE=/var/near-light-client/config.toml
+ENV NEAR_LIGHT_CLIENT_MODE=default
 
-RUN ldd /usr/local/bin/near-offchain-light-client
-ENTRYPOINT ["/usr/local/bin/near-offchain-light-client"]
+RUN ldd /usr/local/bin/near-light-client
+ENTRYPOINT ["/usr/local/bin/near-light-client"]
diff --git a/Makefile b/Makefile
index 542355b..01f8b59 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,13 @@
 .EXPORT_ALL_VARIABLES:
 -include .env
 
-TAG_PREFIX?=us-docker.pkg.dev/pagoda-solutions-dev/rollup-data-availability/
+TAG_PREFIX?=us-docker.pkg.dev/pagoda-solutions-dev/rollup-data-availability
 IMAGE_TAG?=dev
 
-docker:
+docker-offchain:
 	DOCKER_BUILDKIT=1 docker build --progress=plain -t $(TAG_PREFIX)/light-client:$(IMAGE_TAG) -f Dockerfile.offchain .
+
+docker-operator:
 	docker build -t $(TAG_PREFIX)/nearx-operator:$(IMAGE_TAG) -f Dockerfile.operator .
 
 test: