diff --git a/src/oracle/bncWatcher/Dockerfile b/src/oracle/bncWatcher/Dockerfile
index c8ee2a9..eb1fb00 100644
--- a/src/oracle/bncWatcher/Dockerfile
+++ b/src/oracle/bncWatcher/Dockerfile
@@ -5,10 +5,10 @@ WORKDIR /watcher
 RUN apk update && \
     apk add libssl1.1 libressl-dev curl
 
-COPY package.json /watcher/
+COPY ./bncWatcher/package.json /watcher/
 
 RUN npm install
 
-COPY bncWatcher.js db.js /watcher/
+COPY ./bncWatcher/bncWatcher.js ./bncWatcher/db.js /watcher/
 
 ENTRYPOINT ["node", "bncWatcher.js"]
diff --git a/src/oracle/docker-compose-test.yml b/src/oracle/docker-compose-test.yml
index 0047236..9cca490 100644
--- a/src/oracle/docker-compose-test.yml
+++ b/src/oracle/docker-compose-test.yml
@@ -2,7 +2,9 @@ version: '3.7'
 services:
   proxy:
     image: blockchain-proxy
-    build: ./proxy
+    build:
+      dockerfile: proxy/Dockerfile
+      context: .
     environment:
       - HOME_RPC_URL
       - HOME_BRIDGE_ADDRESS
@@ -26,7 +28,9 @@ services:
       - blockchain_side
   keygen:
     image: keygen-client
-    build: ./tss-keygen
+    build:
+      dockerfile: tss-keygen/Dockerfile
+      context: .
     environment:
       - 'RABBITMQ_URL=amqp://rabbitmq:5672'
       - 'PROXY_URL=http://proxy:8001'
@@ -36,7 +40,9 @@ services:
       - test_network
   signer:
     image: sign-client
-    build: ./tss-sign
+    build:
+      dockerfile: tss-sign/Dockerfile
+      context: .
     environment:
       - 'RABBITMQ_URL=amqp://rabbitmq:5672'
       - 'PROXY_URL=http://proxy:8001'
@@ -65,7 +71,9 @@ services:
     networks:
       - test_network
   eth-watcher:
-    build: ethWatcher
+    build:
+      dockerfile: ethWatcher/Dockerfile
+      context: .
     image: eth-watcher
     environment:
       - HOME_RPC_URL
@@ -81,7 +89,9 @@ services:
       - test_network
       - blockchain_home
   bnc-watcher:
-    build: bncWatcher
+    build:
+      dockerfile: bncWatcher/Dockerfile
+      context: .
     image: bnc-watcher
     environment:
       - FOREIGN_URL
diff --git a/src/oracle/docker-compose.yml b/src/oracle/docker-compose.yml
index d06ecaf..77a9dc5 100644
--- a/src/oracle/docker-compose.yml
+++ b/src/oracle/docker-compose.yml
@@ -2,7 +2,9 @@ version: '3.7'
 services:
   proxy:
     image: blockchain-proxy
-    build: ./proxy
+    build:
+      dockerfile: proxy/Dockerfile
+      context: .
     environment:
       - HOME_RPC_URL
       - HOME_BRIDGE_ADDRESS
@@ -26,7 +28,9 @@ services:
       - bncwatcher-proxy-net
   keygen:
     image: keygen-client
-    build: ./tss-keygen
+    build:
+      dockerfile: tss-keygen/Dockerfile
+      context: .
     environment:
       - 'RABBITMQ_URL=amqp://rabbitmq:5672'
       - 'PROXY_URL=http://proxy:8001'
@@ -38,7 +42,9 @@ services:
       - redis-keygen-net
   signer:
     image: sign-client
-    build: ./tss-sign
+    build:
+      dockerfile: tss-sign/Dockerfile
+      context: .
     environment:
       - 'RABBITMQ_URL=amqp://rabbitmq:5672'
       - 'PROXY_URL=http://proxy:8001'
@@ -75,7 +81,9 @@ services:
       - rabbit-ethwatcher-net
       - rabbit-bncwatcher-net
   eth-watcher:
-    build: ethWatcher
+    build:
+      dockerfile: ethWatcher/Dockerfile
+      context: .
     image: eth-watcher
     environment:
       - HOME_RPC_URL
@@ -91,7 +99,9 @@ services:
       - rabbit-ethwatcher-net
       - redis-ethwatcher-net
   bnc-watcher:
-    build: bncWatcher
+    build:
+      dockerfile: bncWatcher
+      context: .
     image: bnc-watcher
     environment:
       - FOREIGN_URL
diff --git a/src/oracle/ethWatcher/Dockerfile b/src/oracle/ethWatcher/Dockerfile
index 9c691ea..358abea 100644
--- a/src/oracle/ethWatcher/Dockerfile
+++ b/src/oracle/ethWatcher/Dockerfile
@@ -5,10 +5,10 @@ WORKDIR /watcher
 RUN apk update && \
     apk add libssl1.1 libressl-dev curl
 
-COPY package.json /watcher/
+COPY ./ethWatcher/package.json /watcher/
 
 RUN npm install
 
-COPY ethWatcher.js db.js /watcher/
+COPY ./ethWatcher/ethWatcher.js ./ethWatcher/db.js /watcher/
 
 ENTRYPOINT ["node", "ethWatcher.js"]
diff --git a/src/oracle/proxy/Dockerfile b/src/oracle/proxy/Dockerfile
index 654855f..bba1b5f 100644
--- a/src/oracle/proxy/Dockerfile
+++ b/src/oracle/proxy/Dockerfile
@@ -2,10 +2,10 @@ FROM node:10.16.0-alpine
 
 WORKDIR /proxy
 
-COPY package.json /proxy/
+COPY ./proxy/package.json /proxy/
 
 RUN npm install
 
-COPY index.js encode.js decode.js /proxy/
+COPY ./proxy/index.js ./proxy/encode.js ./proxy/decode.js /proxy/
 
 ENTRYPOINT ["node", "index.js"]
diff --git a/src/oracle/tss-keygen/Dockerfile b/src/oracle/tss-keygen/Dockerfile
index 707e606..df55ef5 100644
--- a/src/oracle/tss-keygen/Dockerfile
+++ b/src/oracle/tss-keygen/Dockerfile
@@ -5,11 +5,11 @@ WORKDIR /tss
 RUN apt-get update && \
     apt-get install -y libssl1.1 libssl-dev curl procps
 
-COPY package.json /tss/
+COPY ./tss-keygen/package.json /tss/
 
 RUN npm install
 
-COPY keygen-entrypoint.sh keygen.js /tss/
+COPY ./tss-keygen/keygen-entrypoint.sh ./tss-keygen/keygen.js /tss/
 
 COPY --from=tss /tss/target/release/gg18_keygen_client /tss/
 
diff --git a/src/oracle/tss-sign/Dockerfile b/src/oracle/tss-sign/Dockerfile
index e003a5a..e44b104 100644
--- a/src/oracle/tss-sign/Dockerfile
+++ b/src/oracle/tss-sign/Dockerfile
@@ -6,11 +6,11 @@ RUN apt-get update && \
     apt-get install -y libssl1.1 libssl-dev curl python make g++ libudev-dev libusb-dev usbutils procps
 #apk packages: libssl1.1 eudev-dev libressl-dev curl build-base python linux-headers libusb-dev
 
-COPY package.json /tss/
+COPY ./tss-sign/package.json /tss/
 
 RUN npm install --no-optional
 
-COPY sign-entrypoint.sh signer.js tx.js /tss/
+COPY ./tss-sign/sign-entrypoint.sh ./tss-sign/signer.js ./tss-sign/tx.js /tss/
 
 COPY --from=tss /tss/target/release/gg18_sign_client /tss/