diff --git a/docker/Airflow/Dockerfile b/docker/Airflow/Dockerfile
index 1a4184c..6619db7 100644
--- a/docker/Airflow/Dockerfile
+++ b/docker/Airflow/Dockerfile
@@ -25,16 +25,26 @@
 
 USER airflow
 
-ARG PYTHON3_OSM_COMMON_URL
+# Install base requirements
+RUN pip install --no-cache-dir setuptools-scm wheel
+
+# Install OSM common from Git
+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 - && \
+  pip3 wheel --no-cache-dir -r /tmp/osm-common/requirements.txt -w /tmp/wheels && \
+  pip3 wheel --no-cache-dir /tmp/osm-common -w /tmp/wheels
+RUN pip install --no-cache-dir --no-index --find-links=/tmp/wheels \
+    -r /tmp/osm-common/requirements.txt \
+    osm_common && \
+    rm -rf /tmp/wheels
+
 ARG PYTHON3_OSM_NGSA_URL
-RUN curl $PYTHON3_OSM_COMMON_URL -o osm_common.deb
 RUN curl $PYTHON3_OSM_NGSA_URL -o osm_ngsa.deb
 
-RUN ar x osm_common.deb && \
-    zstd -d < control.tar.zst | xz > control.tar.xz && \
-    zstd -d < data.tar.zst | xz > data.tar.xz && \
-    ar -m -c -a sdsd osm_common_repacked.deb debian-binary control.tar.xz data.tar.xz && \
-    rm debian-binary control.tar.xz data.tar.xz control.tar.zst data.tar.zst
 RUN ar x osm_ngsa.deb && \
    zstd -d < control.tar.zst | xz > control.tar.xz && \
    zstd -d < data.tar.zst | xz > data.tar.xz && \
@@ -42,12 +52,10 @@
    rm debian-binary control.tar.xz data.tar.xz control.tar.zst data.tar.zst
 
 RUN mkdir /tmp/osm
-RUN dpkg-deb -x osm_common_repacked.deb /tmp/osm
 RUN dpkg-deb -x osm_ngsa_repacked.deb /tmp/osm
 RUN mv /tmp/osm/usr/lib/python3/dist-packages/* /home/airflow/.local/lib/python3.10/site-packages/
 RUN rm -rf /tmp/osm
 
 RUN pip3 install \
-   -r /home/airflow/.local/lib/python3.10/site-packages/osm_common/requirements.txt \
    -r /home/airflow/.local/lib/python3.10/site-packages/osm_ngsa/requirements.txt
 
diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile
index 97ebd09..d2b1666 100644
--- a/docker/LCM/Dockerfile
+++ b/docker/LCM/Dockerfile
@@ -39,6 +39,7 @@
     apt-transport-https=2.4.* \
     gnupg2=2.2.* \
     openssh-client=1:8.* \
+    git \
     && rm -rf /var/lib/apt/lists/*
 
 # https://kubernetes.io/releases/
@@ -52,17 +53,20 @@
     && mv linux-amd64/helm /usr/local/bin/helm3 \
     && rm -r linux-amd64/
 
-ARG PYTHON3_OSM_COMMON_URL
+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_LCM_URL
-
-RUN curl $PYTHON3_OSM_COMMON_URL -o osm_common.deb
-RUN dpkg -i ./osm_common.deb
-
 RUN curl $PYTHON3_OSM_LCM_URL -o osm_lcm.deb
 RUN dpkg -i ./osm_lcm.deb
 
 RUN pip3 install \
-    -r /usr/lib/python3/dist-packages/osm_common/requirements.txt \
     -r /usr/lib/python3/dist-packages/osm_lcm/requirements.txt
 
 #######################################################################################
diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile
index 55255ec..8242f68 100644
--- a/docker/MON/Dockerfile
+++ b/docker/MON/Dockerfile
@@ -37,19 +37,22 @@
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get --yes update && \
     DEBIAN_FRONTEND=noninteractive apt-get --yes install \
-    openssh-client=1:8.*
+    openssh-client=1:8.* git
 
-ARG PYTHON3_OSM_COMMON_URL
+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_MON_URL
-
-RUN curl $PYTHON3_OSM_COMMON_URL -o osm_common.deb
-RUN dpkg -i ./osm_common.deb
-
 RUN curl $PYTHON3_OSM_MON_URL -o osm_mon.deb
 RUN dpkg -i ./osm_mon.deb
 
 RUN pip3 install \
-    -r /usr/lib/python3/dist-packages/osm_common/requirements.txt \
     -r /usr/lib/python3/dist-packages/osm_mon/requirements.txt
 
 #######################################################################################
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
 
diff --git a/docker/RO/Dockerfile b/docker/RO/Dockerfile
index 0d84dac..f6d25e3 100644
--- a/docker/RO/Dockerfile
+++ b/docker/RO/Dockerfile
@@ -39,9 +39,18 @@
     DEBIAN_FRONTEND=noninteractive apt-get --yes install \
     genisoimage=9:1.1.* \
     libmagic1 \
-    netbase=6.*
+    netbase=6.* \
+    git
 
-ARG PYTHON3_OSM_COMMON_URL
+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_NG_RO_URL
 ARG PYTHON3_OSM_RO_PLUGIN_URL
 ARG PYTHON3_OSM_ROSDN_ARISTA_CLOUDVISION_URL
@@ -62,7 +71,6 @@
 ARG PYTHON3_OSM_ROVIM_VMWARE_URL
 
 RUN for URL in \
-    $PYTHON3_OSM_COMMON_URL \
     $PYTHON3_OSM_NG_RO_URL \
     $PYTHON3_OSM_RO_PLUGIN_URL \
     $PYTHON3_OSM_ROSDN_ARISTA_CLOUDVISION_URL \
@@ -87,7 +95,6 @@
 RUN dpkg -i *.deb
 
 RUN pip3 install \
-    -r /usr/lib/python3/dist-packages/osm_common/requirements.txt \
     -r /usr/lib/python3/dist-packages/osm_ng_ro/requirements.txt
 
 #######################################################################################