diff --git a/provider-ci/Makefile b/provider-ci/Makefile
index 8c09937d97..abbdc15cb3 100644
--- a/provider-ci/Makefile
+++ b/provider-ci/Makefile
@@ -1,4 +1,5 @@
-SHELL := /bin/bash -o pipefail
+SHELL := /bin/bash
+.SHELLFLAGS := -eo pipefail -c
 NAME ?= all
 PROVIDERS := $(patsubst %/, %, $(wildcard providers/*/))
 PROVIDER_REPOS := $(addsuffix /repo, $(PROVIDERS))
diff --git a/provider-ci/internal/pkg/templates/base/scripts/crossbuild.mk b/provider-ci/internal/pkg/templates/base/scripts/crossbuild.mk
index 83d5cb3ab8..23e9ef66a9 100644
--- a/provider-ci/internal/pkg/templates/base/scripts/crossbuild.mk
+++ b/provider-ci/internal/pkg/templates/base/scripts/crossbuild.mk
@@ -1,6 +1,7 @@
 # Provider cross-platform build & packaging
 
-SHELL := /bin/bash -o pipefail
+SHELL := /bin/bash
+.SHELLFLAGS := -eo pipefail -c
 
 # Set these variables to enable signing of the windows binary with Azure Trusted Signing.
 AZURE_SIGNING_CLIENT_ID ?=
diff --git a/provider-ci/test-providers/aws/scripts/crossbuild.mk b/provider-ci/test-providers/aws/scripts/crossbuild.mk
index 83d5cb3ab8..23e9ef66a9 100644
--- a/provider-ci/test-providers/aws/scripts/crossbuild.mk
+++ b/provider-ci/test-providers/aws/scripts/crossbuild.mk
@@ -1,6 +1,7 @@
 # Provider cross-platform build & packaging
 
-SHELL := /bin/bash -o pipefail
+SHELL := /bin/bash
+.SHELLFLAGS := -eo pipefail -c
 
 # Set these variables to enable signing of the windows binary with Azure Trusted Signing.
 AZURE_SIGNING_CLIENT_ID ?=
diff --git a/provider-ci/test-providers/cloudflare/scripts/crossbuild.mk b/provider-ci/test-providers/cloudflare/scripts/crossbuild.mk
index 83d5cb3ab8..23e9ef66a9 100644
--- a/provider-ci/test-providers/cloudflare/scripts/crossbuild.mk
+++ b/provider-ci/test-providers/cloudflare/scripts/crossbuild.mk
@@ -1,6 +1,7 @@
 # Provider cross-platform build & packaging
 
-SHELL := /bin/bash -o pipefail
+SHELL := /bin/bash
+.SHELLFLAGS := -eo pipefail -c
 
 # Set these variables to enable signing of the windows binary with Azure Trusted Signing.
 AZURE_SIGNING_CLIENT_ID ?=
diff --git a/provider-ci/test-providers/docker/scripts/crossbuild.mk b/provider-ci/test-providers/docker/scripts/crossbuild.mk
index 83d5cb3ab8..23e9ef66a9 100644
--- a/provider-ci/test-providers/docker/scripts/crossbuild.mk
+++ b/provider-ci/test-providers/docker/scripts/crossbuild.mk
@@ -1,6 +1,7 @@
 # Provider cross-platform build & packaging
 
-SHELL := /bin/bash -o pipefail
+SHELL := /bin/bash
+.SHELLFLAGS := -eo pipefail -c
 
 # Set these variables to enable signing of the windows binary with Azure Trusted Signing.
 AZURE_SIGNING_CLIENT_ID ?=
diff --git a/provider-ci/test-providers/eks/scripts/crossbuild.mk b/provider-ci/test-providers/eks/scripts/crossbuild.mk
index 83d5cb3ab8..23e9ef66a9 100644
--- a/provider-ci/test-providers/eks/scripts/crossbuild.mk
+++ b/provider-ci/test-providers/eks/scripts/crossbuild.mk
@@ -1,6 +1,7 @@
 # Provider cross-platform build & packaging
 
-SHELL := /bin/bash -o pipefail
+SHELL := /bin/bash
+.SHELLFLAGS := -eo pipefail -c
 
 # Set these variables to enable signing of the windows binary with Azure Trusted Signing.
 AZURE_SIGNING_CLIENT_ID ?=
diff --git a/provider-ci/test-providers/pulumiservice/scripts/crossbuild.mk b/provider-ci/test-providers/pulumiservice/scripts/crossbuild.mk
index 83d5cb3ab8..23e9ef66a9 100644
--- a/provider-ci/test-providers/pulumiservice/scripts/crossbuild.mk
+++ b/provider-ci/test-providers/pulumiservice/scripts/crossbuild.mk
@@ -1,6 +1,7 @@
 # Provider cross-platform build & packaging
 
-SHELL := /bin/bash -o pipefail
+SHELL := /bin/bash
+.SHELLFLAGS := -eo pipefail -c
 
 # Set these variables to enable signing of the windows binary with Azure Trusted Signing.
 AZURE_SIGNING_CLIENT_ID ?=
diff --git a/provider-ci/test-providers/terraform-module/scripts/crossbuild.mk b/provider-ci/test-providers/terraform-module/scripts/crossbuild.mk
index 83d5cb3ab8..23e9ef66a9 100644
--- a/provider-ci/test-providers/terraform-module/scripts/crossbuild.mk
+++ b/provider-ci/test-providers/terraform-module/scripts/crossbuild.mk
@@ -1,6 +1,7 @@
 # Provider cross-platform build & packaging
 
-SHELL := /bin/bash -o pipefail
+SHELL := /bin/bash
+.SHELLFLAGS := -eo pipefail -c
 
 # Set these variables to enable signing of the windows binary with Azure Trusted Signing.
 AZURE_SIGNING_CLIENT_ID ?=
diff --git a/provider-ci/test-providers/xyz/scripts/crossbuild.mk b/provider-ci/test-providers/xyz/scripts/crossbuild.mk
index 83d5cb3ab8..23e9ef66a9 100644
--- a/provider-ci/test-providers/xyz/scripts/crossbuild.mk
+++ b/provider-ci/test-providers/xyz/scripts/crossbuild.mk
@@ -1,6 +1,7 @@
 # Provider cross-platform build & packaging
 
-SHELL := /bin/bash -o pipefail
+SHELL := /bin/bash
+.SHELLFLAGS := -eo pipefail -c
 
 # Set these variables to enable signing of the windows binary with Azure Trusted Signing.
 AZURE_SIGNING_CLIENT_ID ?=