diff --git a/docker/distribution/generic/build.Dockerfile b/docker/distribution/generic/build.Dockerfile
index e183fc683..f6c9358e9 100644
--- a/docker/distribution/generic/build.Dockerfile
+++ b/docker/distribution/generic/build.Dockerfile
@@ -1,6 +1,9 @@
 ARG target
 FROM ocaml/opam2:${target}
 
+ARG ci_job_id
+ENV CI_JOB_ID=$ci_job_id
+
 RUN opam switch 4.07 && eval $(opam env)
 
 USER root
@@ -26,7 +29,7 @@ RUN opam update
 
 # Install ligo
 RUN sh scripts/install_vendors_deps.sh
-RUN opam install -y ./src
+RUN opam install -y .
 
 # Use the ligo binary as a default command
 ENTRYPOINT [ "/home/opam/.opam/4.07/bin/ligo" ]
diff --git a/src/ligo.opam b/ligo.opam
similarity index 100%
rename from src/ligo.opam
rename to ligo.opam
diff --git a/scripts/distribution/generic/build.sh b/scripts/distribution/generic/build.sh
index 7f4a89e9a..49aba15e1 100755
--- a/scripts/distribution/generic/build.sh
+++ b/scripts/distribution/generic/build.sh
@@ -8,4 +8,4 @@ dockerfile="./docker/distribution/generic/build.Dockerfile"
 echo "Building LIGO for $target"
 echo "Using Dockerfile: $dockerfile"
 echo "Tagging as: $tag_build\n"
-docker build --build-arg target="$target" -t "$tag_build" -f "$dockerfile" .
\ No newline at end of file
+docker build --build-arg ci_job_id="${CI_JOB_ID}" --build-arg target="$target" -t "$tag_build" -f "$dockerfile" .
diff --git a/scripts/install_native_dependencies.sh b/scripts/install_native_dependencies.sh
index 46e354711..2a0e56903 100755
--- a/scripts/install_native_dependencies.sh
+++ b/scripts/install_native_dependencies.sh
@@ -14,7 +14,8 @@ then
         m4 \
         libcap \
         bubblewrap \
-        rsync
+        rsync \
+        git
 
 else
     apt-get update -qq
@@ -27,5 +28,6 @@ else
         m4 \
         libcap-dev \
         bubblewrap \
-        rsync
+        rsync \
+        git
 fi
diff --git a/scripts/install_vendors_deps.sh b/scripts/install_vendors_deps.sh
index 3da674636..15f9b47d4 100755
--- a/scripts/install_vendors_deps.sh
+++ b/scripts/install_vendors_deps.sh
@@ -2,5 +2,5 @@
 set -e
 
 # Install local dependencies
-opam install -y --deps-only --with-test $(find src vendors -name \*.opam)
+opam install -y --deps-only --with-test ./ligo.opam $(find vendors -name \*.opam)
 opam install -y $(find vendors -name \*.opam)
diff --git a/scripts/setup_switch.sh b/scripts/setup_switch.sh
index ee1179109..8810e4483 100755
--- a/scripts/setup_switch.sh
+++ b/scripts/setup_switch.sh
@@ -2,5 +2,5 @@
 set -e
 set -x
 
-printf '' | opam switch create . ocaml-base-compiler.4.07.1 # toto ocaml-base-compiler.4.06.1
+printf '' | opam switch create . ocaml-base-compiler.4.07.1 --no-install
 eval $(opam config env)