diff --git a/scripts/build_docker_image.sh b/scripts/build_docker_image.sh
index 260a530c7..0aaefe8c8 100755
--- a/scripts/build_docker_image.sh
+++ b/scripts/build_docker_image.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 set -e
-docker build -t "${LIGO_REGISTRY_IMAGE_BUILD:-ligolang/ligo}:next" -f ./docker/distribution/debian/distribute.Dockerfile .
\ No newline at end of file
+docker build -t "${LIGO_REGISTRY_IMAGE_BUILD:-ligolang/ligo}:next" -f ./docker/distribution/debian/distribute.Dockerfile .
diff --git a/scripts/distribution/generic/build.sh b/scripts/distribution/generic/build.sh
index 49aba15e1..48971962a 100755
--- a/scripts/distribution/generic/build.sh
+++ b/scripts/distribution/generic/build.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 dockerfile_name="build"
 # Generic dockerfile
diff --git a/scripts/distribution/generic/package.sh b/scripts/distribution/generic/package.sh
index 79be37d41..266678ec4 100755
--- a/scripts/distribution/generic/package.sh
+++ b/scripts/distribution/generic/package.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 dockerfile_name="package"
 dockerfile=""
diff --git a/scripts/distribution/generic/parameters.sh b/scripts/distribution/generic/parameters.sh
index 3899711d8..98e35e20c 100644
--- a/scripts/distribution/generic/parameters.sh
+++ b/scripts/distribution/generic/parameters.sh
@@ -1,11 +1,14 @@
+#!/bin/sh
+set -e
+
 # This script accepts three arguments, os family, os and its version,
 # which are subsequently used to fetch the respective docker
 # image from the ocaml/infrastructure project.
 #
 # https://github.com/ocaml/infrastructure/wiki/Containers#selecting-linux-distributions
-target_os_family=$1
-target_os=$2
-target_os_version=$3
+target_os_family="$1"
+target_os="$2"
+target_os_version="$3"
 
 # Variables configured at the CI level
 dist="$LIGO_DIST_DIR"
@@ -29,4 +32,4 @@ fi
 target_os_specific_dockerfile="./docker/distribution/$target_os_family/$target_os/$dockerfile_name.Dockerfile"
 if test -f "$target_os_specific_dockerfile"; then
     dockerfile="$target_os_specific_dockerfile"
-fi
\ No newline at end of file
+fi