diff --git a/build-deps.sh b/build-deps.sh
index 821186320..b38c70b7a 100755
--- a/build-deps.sh
+++ b/build-deps.sh
@@ -4,5 +4,5 @@ eval $(opam env)
 vendors/opam-repository-tools/rewrite-local-opam-repository.sh
 opam repository add localrepo "file://$PWD/vendors/ligo-opam-repository-local-generated/"
 opam install -y ocp-indent merlin alcotest-lwt crowbar
-opam user-setup install
+opam -y user-setup install
 opam install -y --build-test --deps-only ./src/ 
diff --git a/makefile b/makefile
index e775b0376..675e82ad8 100644
--- a/makefile
+++ b/makefile
@@ -5,7 +5,7 @@ build-deps:
 	./build-deps.sh
 
 build: build-deps
-	./build.sh
+	source ./build.sh
 
 test: build
 	dune build @ligo-test