diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 20c7b0c62ff61e26997876111b003b0f11b6f0df..54251c75bf70d5940b894ea901b8f7dd1120d6a6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,17 +5,18 @@ publish-repository:
   stage: deploy
   script:
     - DEBIAN_FRONTEND=noninteractive apt update
-    - DEBIAN_FRONTEND=noninteractive apt install -y git python3-pip sshpass software-properties-common wget
+    - DEBIAN_FRONTEND=noninteractive apt install -y gcc git make python3 python3 python3-pip python3-pycurl python3-setuptools sshpass software-properties-common wget
     - git submodule init
     - git submodule update
-    - python3 -m pip install python-magic pyangbind verboselogs
-    - wget -qO - https://osm-download.etsi.org/repository/osm/debian/ReleaseEIGHT/OSM%20ETSI%20Release%20Key.gpg | apt-key add -
-    - add-apt-repository -y "deb [arch=amd64] https://osm-download.etsi.org/repository/osm/debian/ReleaseEIGHT stable devops IM osmclient"
-    - DEBIAN_FRONTEND=noninteractive apt update
-    - DEBIAN_FRONTEND=noninteractive apt install -y python3-osmclient
+    - python3 -m pip install wheel pyang pyangbind
+    - git clone https://osm.etsi.org/gerrit/osm/IM.git
+    - pip3 install IM/
+    - git clone https://osm.etsi.org/gerrit/osm/osmclient.git
+    - pip3 install osmclient/
+    - rm -rf osmclient/ IM/
     - mv magma/* .
     - mv charm-packages/* .
-    - LC_ALL=C.UTF-8 oLANG=C.UTF-8 osm repo-index --origin . --destination vnf-catalog
+    - LC_ALL=C.UTF-8 oLANG=C.UTF-8 osm -vvv repo-index --origin . --destination vnf-catalog
     - |
         sshpass -p "$VNF_CATALOG_CREDENTIALS" sftp -o "StrictHostKeyChecking no" -P 29419 osmsupport@vnf-catalog.etsi.org << EOF
           put -r vnf-catalog/* Testing
@@ -28,21 +29,22 @@ publish-repository:
 build-local-repository:
   # Builds the repository locally but does not push if this is a new MR that
   # is still in development
-  image: ubuntu:18.04
+  image: python:latest
   stage: build
   script:
     - DEBIAN_FRONTEND=noninteractive apt update
-    - DEBIAN_FRONTEND=noninteractive apt install -y git python3-pip sshpass software-properties-common wget
+    - DEBIAN_FRONTEND=noninteractive apt install -y gcc git make python3 python3 python3-pip python3-pycurl python3-setuptools sshpass software-properties-common wget
     - git submodule init
     - git submodule update
-    - python3 -m pip install python-magic pyangbind verboselogs
-    - wget -qO - https://osm-download.etsi.org/repository/osm/debian/ReleaseEIGHT/OSM%20ETSI%20Release%20Key.gpg | apt-key add -
-    - add-apt-repository -y "deb [arch=amd64] https://osm-download.etsi.org/repository/osm/debian/ReleaseEIGHT stable devops IM osmclient"
-    - DEBIAN_FRONTEND=noninteractive apt update
-    - DEBIAN_FRONTEND=noninteractive apt install -y python3-osmclient
+    - python3 -m pip install wheel pyang pyangbind
+    - git clone https://osm.etsi.org/gerrit/osm/IM.git
+    - pip3 install IM/
+    - git clone https://osm.etsi.org/gerrit/osm/osmclient.git
+    - pip3 install osmclient/
+    - rm -rf osmclient/ IM/
     - mv magma/* .
     - mv charm-packages/* .
-    - LC_ALL=C.UTF-8 oLANG=C.UTF-8 osm repo-index --origin . --destination vnf-catalog
+    - LC_ALL=C.UTF-8 oLANG=C.UTF-8 osm -vvv repo-index --origin . --destination vnf-catalog
   rules:
     - if: '$CI_COMMIT_REF_PROTECTED == "false"'
       when: on_success