diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d9be18b0ea..3f62ab761b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -642,7 +642,7 @@ jobs:
         if: needs.set-condition.outputs.rebuild_omni_executor == 'true'
         uses: docker/build-push-action@v6
         with:
-          context: .
+          context: tee-worker/omni-executor/
           file: tee-worker/omni-executor/Dockerfile
           tags: litentry/omni-executor:latest
           target: executor-worker
diff --git a/tee-worker/omni-executor/Dockerfile b/tee-worker/omni-executor/Dockerfile
index 7e46d40ac5..8e84fc6337 100644
--- a/tee-worker/omni-executor/Dockerfile
+++ b/tee-worker/omni-executor/Dockerfile
@@ -5,11 +5,10 @@
 # rust:1.82 is a Debian GNU/Linux 12 (bookworm) image
 FROM rust:1.82-bookworm AS plain-builder
 
-ENV HOME=/home/ubuntu
-ENV BUILD_DIR=$HOME/tee-worker/omni-executor
+ENV SRC_DIR=/home/ubuntu/omni-executor
 
-COPY . $HOME
-WORKDIR $BUILD_DIR
+COPY . $SRC_DIR
+WORKDIR $SRC_DIR
 
 RUN cargo build --release
 
@@ -18,18 +17,17 @@ RUN cargo build --release
 ##################################################
 FROM node:20-bookworm-slim AS executor-worker
 
-ENV HOME=/home/ubuntu
-ENV BUILD_DIR=$HOME/tee-worker/omni-executor
-ENV EXECUT_DIR=/usr/local/bin
-WORKDIR $EXECUT_DIR
+ENV SRC_DIR=/home/ubuntu/omni-executor
+ENV BIN_DIR=/usr/local/bin
+WORKDIR $BIN_DIR
 
 RUN apt update && apt install -y ca-certificates
-COPY --from=plain-builder $BUILD_DIR/target/release/executor-worker $EXECUT_DIR/executor-worker
+COPY --from=plain-builder $SRC_DIR/target/release/executor-worker $BIN_DIR/executor-worker
 
-RUN chmod +x $EXECUT_DIR/executor-worker
-RUN ls -al $EXECUT_DIR
-RUN ldd $EXECUT_DIR/executor-worker && $EXECUT_DIR/executor-worker --version
-CMD ["$EXECUT_DIR/executor-worker"]
+RUN chmod +x $BIN_DIR/executor-worker
+RUN ls -al $BIN_DIR
+RUN ldd $BIN_DIR/executor-worker && $BIN_DIR/executor-worker --version
+CMD ["$BIN_DIR/executor-worker"]
 
 
 
diff --git a/tee-worker/omni-executor/Makefile b/tee-worker/omni-executor/Makefile
index ca29247675..72b7499099 100644
--- a/tee-worker/omni-executor/Makefile
+++ b/tee-worker/omni-executor/Makefile
@@ -8,7 +8,7 @@ SELF_EXE = omni-executor-worker
 COMPILATION_FEATURES =
 
 ROOTDIR := $(shell git rev-parse --show-toplevel)
-EXECUTOR_DIR := $(ROOTDIR)/tee-worker/omni-executor
+OMNI_DIR := $(ROOTDIR)/tee-worker/omni-executor
 
 .PHONY: all
 all: $(SELF_EXE) omni-executor.manifest
@@ -69,16 +69,15 @@ distclean: clean
 # By default SGX_MODE=SW for docker image
 .PHONY: build-docker
 build-docker:
-	docker build --target builder -t local-builder:latest -f $(EXECUTOR_DIR)/Dockerfile $(ROOTDIR)
-	docker build --target executor-worker -t litentry/omni-executor:latest -f -f $(EXECUTOR_DIR)/Dockerfile $(ROOTDIR)
+	docker build --target executor-worker -t litentry/omni-executor:latest -f $(OMNI_DIR)/Dockerfile $(OMNI_DIR)
 
 .PHONY: start-local
 start-local:
-	docker compose -f $(EXECUTOR_DIR)/docker/docker-compose.yml up
+	docker compose -f $(OMNI_DIR)/docker/docker-compose.yml up
 
 .PHONY: stop-local
 stop-local:
-	docker compose -f $(EXECUTOR_DIR)/docker/docker-compose.yml down
+	docker compose -f $(OMNI_DIR)/docker/docker-compose.yml down
 
 .PHONY: get-pallet-metadata
 get-pallet-metadata: