diff --git a/src/device/Dockerfile b/src/device/Dockerfile
index 670b96cb372b749dbaf2b785c93f753185a10c71..d760e0c70d44fb4b53455ae60799e61964f5b23f 100644
--- a/src/device/Dockerfile
+++ b/src/device/Dockerfile
@@ -91,12 +91,13 @@ RUN touch tests/tools/mock_ietf_actn_sdn_ctrl/__init__.py
 COPY src/tests/tools/mock_ietf_actn_sdn_ctrl/. tests/tools/mock_ietf_actn_sdn_ctrl/
 
 # Clone OpenConfig YANG models
-RUN mkdir -p /var/teraflow/device/service/drivers/gnmi_openconfig/git/openconfig/public
 RUN mkdir -p /tmp/openconfig
 RUN git clone https://github.com/openconfig/public.git /tmp/openconfig
 WORKDIR /tmp/openconfig
 RUN git fetch
 RUN git checkout v4.4.0
+RUN rm -rf /var/teraflow/device/service/drivers/gnmi_openconfig/git
+RUN mkdir -p /var/teraflow/device/service/drivers/gnmi_openconfig/git/openconfig/public
 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