diff --git a/Dockerfile.local b/Dockerfile.local
index 1ec838a69ed26351774e128b9dc606d93f68bc2f..f3512c9f9893e08688771a3621b7f658a8729c2a 100644
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -16,7 +16,7 @@ RUN apt-get update && apt-get install -y git python3 python3-jsonschema \
 
 # OSM_COMMON
 RUN git clone https://osm.etsi.org/gerrit/osm/common.git \
-    && cd common  && python3 setup.py develop && cd ..
+    && cd common  && git checkout v4.0 && python3 setup.py develop && cd ..
 #    && pip3 install -U -r requirements.txt \
 #    && cd ..
 
@@ -25,6 +25,7 @@ RUN pip3 install pyang && mkdir -p /app && cd /app \
     && git clone https://github.com/robshakir/pyangbind \
     && pip3 install -e pyangbind \
     && git clone  https://osm.etsi.org/gerrit/osm/IM \
+    && git -C IM checkout v4.0 \
     && cd /app/IM/models/yang \
     && pyang --plugindir /app/pyangbind/pyangbind/plugin -f pybind -o /app/osm_nbi/vnfd_catalog.py vnfd.yang \
     && pyang --plugindir /app/pyangbind/pyangbind/plugin -f pybind -o /app/osm_nbi/nsd_catalog.py nsd.yang
diff --git a/setup.py b/setup.py
index 68aa1fcbc2dc2966287af1ff9695c15443ea306c..24c72d553ba30a05e992e376e114fab60dcdd7f4 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,7 @@ setup(
     name=_name,
     description='OSM North Bound Interface',
     long_description=README,
-    version_command=('git describe --tags --long --dirty --match v*', 'pep440-git'),
+    version_command=('git describe --match v* --tags --long --dirty', 'pep440-git-full'),
     # version=VERSION,
     # python_requires='>3.5.0',
     author='ETSI OSM',