diff --git a/.github/actions/docs/build-status/script.sh b/.github/actions/docs/build-status/script.sh
index 0b282557cf2..2e86de6c173 100755
--- a/.github/actions/docs/build-status/script.sh
+++ b/.github/actions/docs/build-status/script.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 BRANCH_NAME=$(echo "$BRANCH_NAME" | sed -e "s#refs/[^/]*/##")
 DEPLOY_STATUS=$(curl -X GET "https://api.netlify.com/api/v1/sites/$SITE_ID/deploys?branch=$BRANCH_NAME"  | jq -r '.[] | select(.created_at != null) | .state' | head -1)
diff --git a/Dockerfile b/Dockerfile
index ac818cb8bd2..000292e0a47 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,12 @@
-FROM rust:alpine3.17
-RUN apk update \
-    && apk upgrade \
-    && apk add --no-cache \
-        build-base \
-        bash
+FROM rust:bookworm
 WORKDIR /usr/src/noir
 COPY . .
 RUN ./scripts/bootstrap_native.sh
 
-# When running the container, mount the current working directory to /project.
-FROM alpine:3.17
+# When running the container, mount the users home directory to same location.
+FROM ubuntu:lunar
+# Install Tini as nargo doesn't handle signals properly.
+# Install git as nargo needs it to clone.
+RUN apt-get update && apt-get install -y git tini && rm -rf /var/lib/apt/lists/* && apt-get clean
 COPY --from=0 /usr/src/noir/target/release/nargo /usr/src/noir/target/release/nargo
-WORKDIR /project
-ENTRYPOINT ["/usr/src/noir/target/release/nargo"]
\ No newline at end of file
+ENTRYPOINT ["/usr/bin/tini", "--", "/usr/src/noir/target/release/nargo"]
\ No newline at end of file
diff --git a/bootstrap.sh b/bootstrap.sh
index bf672ac0ad2..5ebe7ade090 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -eu
 
 cd $(dirname "$0")
diff --git a/compiler/integration-tests/scripts/codegen-verifiers.sh b/compiler/integration-tests/scripts/codegen-verifiers.sh
index b3a52217271..e377a3ee3f8 100644
--- a/compiler/integration-tests/scripts/codegen-verifiers.sh
+++ b/compiler/integration-tests/scripts/codegen-verifiers.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 self_path=$(dirname "$(readlink -f "$0")")
 
diff --git a/scripts/bootstrap_native.sh b/scripts/bootstrap_native.sh
index 481c76a263e..3e0e2ed853a 100755
--- a/scripts/bootstrap_native.sh
+++ b/scripts/bootstrap_native.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -eu
 
 cd $(dirname "$0")/..
@@ -13,4 +13,8 @@ else
 fi
 
 # Build native.
-cargo build --release
+if [ -n "${DEBUG:-}" ]; then
+  cargo build
+else
+  cargo build --release
+fi
diff --git a/scripts/bootstrap_packages.sh b/scripts/bootstrap_packages.sh
index 2f293d93faf..df4ee5b3aed 100755
--- a/scripts/bootstrap_packages.sh
+++ b/scripts/bootstrap_packages.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -eu
 
 cd $(dirname "$0")/..
diff --git a/scripts/install_wasm-bindgen.sh b/scripts/install_wasm-bindgen.sh
index 5e9f9127506..c6e85bac50b 100755
--- a/scripts/install_wasm-bindgen.sh
+++ b/scripts/install_wasm-bindgen.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -eu
 
 cd $(dirname "$0")/..
diff --git a/test_programs/gates_report.sh b/test_programs/gates_report.sh
index e06e6812e9d..4192c581376 100755
--- a/test_programs/gates_report.sh
+++ b/test_programs/gates_report.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # These tests are incompatible with gas reporting
diff --git a/test_programs/rebuild.sh b/test_programs/rebuild.sh
index d879ca417ee..a3137920fd5 100755
--- a/test_programs/rebuild.sh
+++ b/test_programs/rebuild.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 process_dir() {
@@ -14,7 +14,7 @@ process_dir() {
     if [ -d ./target/ ]; then
       rm -r ./target/
     fi
-    cargo run compile --only-acir && cargo run execute witness
+    nargo compile --only-acir && nargo execute witness
 
     if [ -d "$current_dir/acir_artifacts/$dir_name/target" ]; then
       rm -r "$current_dir/acir_artifacts/$dir_name/target"