diff --git a/src/device/Dockerfile b/src/device/Dockerfile
index 4a86b79bac17973f8e3a7b5eceb549c0ef418a0a..b4db685552f6fe95458f689ccc903acc59317630 100644
--- a/src/device/Dockerfile
+++ b/src/device/Dockerfile
@@ -98,10 +98,12 @@ RUN mkdir -p /var/teraflow/device/service/drivers/gnmi_openconfig/git/openconfig
 RUN mkdir -p /tmp/openconfig
 RUN git clone https://github.com/openconfig/public.git /tmp/openconfig
 RUN git fetch
+WORKDIR /tmp/openconfig
 RUN git checkout v4.4.0
 RUN mv /tmp/openconfig/release /var/teraflow/device/service/drivers/gnmi_openconfig/git/openconfig/public
 RUN mv /tmp/openconfig/third_party /var/teraflow/device/service/drivers/gnmi_openconfig/git/openconfig/public
 RUN rm -rf /tmp/openconfig
+WORKDIR /var/teraflow
 
 # Start the service
 ENTRYPOINT ["python", "-m", "device.service"]