diff --git a/src/checkoutservice/Dockerfile b/src/checkoutservice/Dockerfile
index 8b5ae93..2888137 100644
--- a/src/checkoutservice/Dockerfile
+++ b/src/checkoutservice/Dockerfile
@@ -10,4 +10,4 @@ RUN apk add --no-cache \
   ca-certificates
 COPY --from=builder /catalogservice /catalogservice
 EXPOSE 5000
-ENTRYPOINT /catalogservice
+ENTRYPOINT ["/catalogservice"]
diff --git a/src/productcatalogservice/Dockerfile b/src/productcatalogservice/Dockerfile
index 12878d9..b98ee61 100644
--- a/src/productcatalogservice/Dockerfile
+++ b/src/productcatalogservice/Dockerfile
@@ -12,5 +12,5 @@ RUN apk add --no-cache \
   ca-certificates
 COPY --from=builder /productcatalogservice /productcatalogservice
 EXPOSE 3550
-ENTRYPOINT /productcatalogservice
+ENTRYPOINT ["/productcatalogservice"]
 
diff --git a/src/recommendationservice/Dockerfile b/src/recommendationservice/Dockerfile
index 0491e6f..b0e4331 100644
--- a/src/recommendationservice/Dockerfile
+++ b/src/recommendationservice/Dockerfile
@@ -4,11 +4,11 @@ FROM grpc/python:1.0
 ENV PYTHONUNBUFFERED=0
 
 # add files into working directory
-ADD ./*.py /home/
+COPY . /home/
 WORKDIR /home
 
 # set listen port
 ENV PORT "8080"
 EXPOSE 8080
 
-ENTRYPOINT python /home/recommendation_server.py
+ENTRYPOINT ["python", "/home/recommendation_server.py"]
diff --git a/src/shippingservice/Dockerfile b/src/shippingservice/Dockerfile
index 2066a07..8d66d35 100644
--- a/src/shippingservice/Dockerfile
+++ b/src/shippingservice/Dockerfile
@@ -11,4 +11,4 @@ FROM alpine as release
 COPY --from=builder /shippingservice /shippingservice
 ENV APP_PORT=50051
 EXPOSE 50051
-ENTRYPOINT /shippingservice
+ENTRYPOINT ["/shippingservice"]