diff --git a/build.sh b/build.sh
index 4fb28a58..b202827e 100755
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-BUILD_FOLDER=build
-VERSION=$(cat core/banner.go | grep Version | cut -d '"' -f 2)
+readonly BUILD_FOLDER=build
+readonly VERSION=$(cat core/banner.go | grep Version | cut -d '"' -f 2)
 
 bin_dep() {
   BIN=$1
@@ -11,7 +11,7 @@ bin_dep() {
 create_exe_archive() {
   bin_dep 'zip'
 
-  OUTPUT=$1
+  OUTPUT="$1"
 
   echo "[*] Creating archive $OUTPUT ..."
   zip -j "$OUTPUT" gitrob.exe ../README.md ../LICENSE.txt > /dev/null
@@ -21,7 +21,7 @@ create_exe_archive() {
 create_archive() {
   bin_dep 'zip'
 
-  OUTPUT=$1
+  OUTPUT="$1"
 
   echo "[*] Creating archive $OUTPUT ..."
   zip -j "$OUTPUT" gitrob ../README.md ../LICENSE.md > /dev/null
@@ -43,13 +43,13 @@ build_windows_amd64() {
   GOOS=windows GOARCH=amd64 go build -o gitrob.exe ..
 }
 
-rm -rf $BUILD_FOLDER
-mkdir $BUILD_FOLDER
-cd $BUILD_FOLDER
+rm -rf "$BUILD_FOLDER"
+mkdir "$BUILD_FOLDER"
+cd "$BUILD_FOLDER"
 
-build_linux_amd64 && create_archive gitrob_linux_amd64_$VERSION.zip
-build_macos_amd64 && create_archive gitrob_macos_amd64_$VERSION.zip
-build_windows_amd64 && create_exe_archive gitrob_windows_amd64_$VERSION.zip
+build_linux_amd64 && create_archive "gitrob_linux_amd64_$VERSION.zip"
+build_macos_amd64 && create_archive "gitrob_macos_amd64_$VERSION.zip"
+build_windows_amd64 && create_exe_archive "gitrob_windows_amd64_$VERSION.zip"
 shasum -a 256 * > checksums.txt
 
 echo
@@ -57,3 +57,4 @@ echo
 du -sh *
 
 cd --
+
diff --git a/release.sh b/release.sh
index c9795f00..c810f3b0 100755
--- a/release.sh
+++ b/release.sh
@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-CURRENT_VERSION=$(cat core/banner.go | grep Version | cut -d '"' -f 2)
-TO_UPDATE=(
+readonly CURRENT_VERSION=$(cat core/banner.go | grep Version | cut -d '"' -f 2)
+declare -a TO_UPDATE=(
     core/banner.go
 )
 
@@ -28,3 +28,4 @@ git push origin v$NEW_VERSION
 
 echo
 echo "[*] All done, v$NEW_VERSION released."
+