diff --git a/src/scripts/ci/setup_gh_actions.ps1 b/src/scripts/ci/setup_gh_actions.ps1
index 1fd505b08f6..44a15be6818 100644
--- a/src/scripts/ci/setup_gh_actions.ps1
+++ b/src/scripts/ci/setup_gh_actions.ps1
@@ -14,6 +14,12 @@ param(
 
 choco install -y sccache
 
+# Amalgamation builds also build the examples, which require boost
+$amalgamation_targets = @("amalgamation")
+if($amalgamation_targets -contains $TARGET ) {
+    choco install -y boost-msvc-14.3
+}
+
 # find the sccache cache location and store it in the build job's environment
 $raw_cl = (sccache --stats-format json --show-stats | ConvertFrom-Json).cache_location
 $cache_location = ([regex] 'Local disk: "(.*)"').Match($raw_cl).groups[1].value
diff --git a/src/scripts/ci/setup_gh_actions.sh b/src/scripts/ci/setup_gh_actions.sh
index 3f7944ef879..c1f83987009 100755
--- a/src/scripts/ci/setup_gh_actions.sh
+++ b/src/scripts/ci/setup_gh_actions.sh
@@ -138,7 +138,7 @@ else
     export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
     brew install ccache
 
-    if [ "$TARGET" = "shared" ]; then
+    if [ "$TARGET" = "shared" ]  || [ "$TARGET" = "amalgamation" ] ; then
         brew install boost
 
         # On Apple Silicon we need to specify the include directory
diff --git a/src/scripts/ci_build.py b/src/scripts/ci_build.py
index 36d3e41cc9f..2a9bd1dcd38 100755
--- a/src/scripts/ci_build.py
+++ b/src/scripts/ci_build.py
@@ -123,7 +123,7 @@ def build_targets(target, target_os):
         yield 'bogo_shim'
     if target in ['examples']:
         yield 'examples'
-    if target in ['amalgamation'] and target_os in ['linux']:
+    if target in ['amalgamation']:
         yield 'examples'
     if target in ['valgrind', 'valgrind-full']:
         yield 'ct_selftest'
@@ -216,7 +216,7 @@ def sanitize_kv(some_string):
     if target in ['amalgamation', 'cross-arm64-amalgamation', 'cross-android-arm64-amalgamation']:
         flags += ['--amalgamation']
 
-    if target in ['amalgamation'] and target_os in ['linux']:
+    if target in ['amalgamation']:
         flags += ['--with-boost']
 
     if target in ['bsi', 'nist']:
@@ -789,7 +789,7 @@ def main(args=None):
             if target in ['examples']:
                 make_targets += ['examples']
 
-            if target in ['amalgamation'] and options.os in ['linux']:
+            if target in ['amalgamation']:
                 make_targets += ['examples']
 
             if target in ['valgrind', 'valgrind-full']: