diff --git a/Dockerfile b/Dockerfile
index cf8617d..5e57bf7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,5 @@
 # SPDX-FileCopyrightText: 2021 Open Networking Foundation <info@opennetworking.org>
+# SPDX-FileCopyrightText: 2024 Intel Corporation
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -7,15 +8,23 @@ FROM golang:1.22.0-bookworm AS builder
 
 LABEL maintainer="ONF <omec-dev@opennetworking.org>"
 
-RUN apt-get update && apt-get -y install apt-transport-https ca-certificates
-RUN apt-get update && apt-get -y install gcc cmake autoconf libtool pkg-config libmnl-dev libyaml-dev
-RUN apt-get clean
+RUN apt-get update && \
+    apt-get -y install --no-install-recommends \
+    apt-transport-https \
+    ca-certificates \
+    gcc \
+    cmake \
+    autoconf \
+    libtool \
+    pkg-config \
+    libmnl-dev \
+    libyaml-dev && \
+    apt-get clean
 
+WORKDIR $GOPATH/src/pcf
 
-RUN cd $GOPATH/src && mkdir -p pcf
-COPY . $GOPATH/src/pcf
-RUN cd $GOPATH/src/pcf \
-    && make all
+COPY . .
+RUN make all
 
 FROM alpine:3.19 as pcf
 
@@ -25,12 +34,12 @@ LABEL description="ONF open source 5G Core Network" \
 ARG DEBUG_TOOLS
 
 # Install debug tools ~ 100MB (if DEBUG_TOOLS is set to true)
-RUN apk update && apk add -U vim strace net-tools curl netcat-openbsd bind-tools
+RUN if [ "$DEBUG_TOOLS" = "true" ]; then \
+        apk update && apk add --no-cache -U vim strace net-tools curl netcat-openbsd bind-tools; \
+        fi
 
 # Set working dir
-WORKDIR /free5gc
-RUN mkdir -p pcf/
+WORKDIR /free5gc/pcf
 
 # Copy executable and default certs
-COPY --from=builder /go/src/pcf/bin/* ./pcf
-WORKDIR /free5gc/pcf
+COPY --from=builder /go/src/pcf/bin/* .