diff --git a/docker/Dockerfile.openolt b/docker/Dockerfile.openolt
index bde3d17..ded4efa 100644
--- a/docker/Dockerfile.openolt
+++ b/docker/Dockerfile.openolt
@@ -21,7 +21,7 @@
 RUN apk add --no-cache build-base=0.5-r1
 
 # Prepare directory structure
-WORKDIR /go/src
+WORKDIR /go/src/github.com/opencord/voltha-openolt-adapter
 COPY . .
 
 ARG org_label_schema_version=unknown
@@ -42,7 +42,7 @@
 	 -X github.com/opencord/voltha-lib-go/v3/pkg/version.os=$(go env GOHOSTOS) \
 	 -X github.com/opencord/voltha-lib-go/v3/pkg/version.arch=$(go env GOHOSTARCH) \
 	 -X github.com/opencord/voltha-lib-go/v3/pkg/version.buildTime=$org_label_schema_build_date" \
-	 cmd/openolt-adapter/main.go
+	 ./cmd/openolt-adapter/
 
 # -------------
 # Image creation stage