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