diff --git a/docker/NBI/Dockerfile b/docker/NBI/Dockerfile
index 664cc63..7a7b404 100644
--- a/docker/NBI/Dockerfile
+++ b/docker/NBI/Dockerfile
@@ -35,13 +35,23 @@
 #######################################################################################
 # End of common preparation
 
-ARG PYTHON3_OSM_COMMON_URL
+RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
+    DEBIAN_FRONTEND=noninteractive apt-get --yes install \
+    git \
+    && rm -rf /var/lib/apt/lists/*
+
+ARG COMMON_GERRIT_REFSPEC=v18.0
+RUN git clone --filter=blob:none --tags https://osm.etsi.org/gerrit/osm/common.git /tmp/osm-common && \
+    cd /tmp/osm-common && \
+    git fetch origin ${COMMON_GERRIT_REFSPEC} && \
+    git checkout FETCH_HEAD && \
+    cd - && \
+    pip install --no-cache-dir -r /tmp/osm-common/requirements.txt && \
+    pip install /tmp/osm-common
+
 ARG PYTHON3_OSM_IM_URL
 ARG PYTHON3_OSM_NBI_URL
 
-RUN curl $PYTHON3_OSM_COMMON_URL -o osm_common.deb
-RUN dpkg -i ./osm_common.deb
-
 RUN curl $PYTHON3_OSM_IM_URL -o osm_im.deb
 RUN dpkg -i ./osm_im.deb
 
@@ -49,7 +59,6 @@
 RUN dpkg -i ./osm_nbi.deb
 
 RUN pip3 install \
-    -r /usr/lib/python3/dist-packages/osm_common/requirements.txt \
     -r /usr/lib/python3/dist-packages/osm_im/requirements.txt \
     -r /usr/lib/python3/dist-packages/osm_nbi/requirements.txt