diff --git a/src/scripts/ci/setup_gh_actions.ps1 b/src/scripts/ci/setup_gh_actions.ps1
index 44a15be6818..1fd505b08f6 100644
--- a/src/scripts/ci/setup_gh_actions.ps1
+++ b/src/scripts/ci/setup_gh_actions.ps1
@@ -14,12 +14,6 @@ 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_after_vcvars.ps1 b/src/scripts/ci/setup_gh_actions_after_vcvars.ps1
index 06dd072ab0d..290db6340ea 100644
--- a/src/scripts/ci/setup_gh_actions_after_vcvars.ps1
+++ b/src/scripts/ci/setup_gh_actions_after_vcvars.ps1
@@ -6,7 +6,9 @@
 #
 # Botan is released under the Simplified BSD License (see license.txt)
 
-if ($args[0] -in @('shared')) {
+$targets_with_boost = @("shared", "amalgamation")
+
+if ($targets_with_boost -contains $args[0]) {
     nuget install -NonInteractive -OutputDirectory $env:DEPENDENCIES_LOCATION -Version 1.79.0 boost
 
     $boostincdir = Join-Path -Path $env:DEPENDENCIES_LOCATION -ChildPath "boost.1.79.0/lib/native/include"
diff --git a/src/scripts/ci_build.py b/src/scripts/ci_build.py
index 2a9bd1dcd38..9d7ac7486ed 100755
--- a/src/scripts/ci_build.py
+++ b/src/scripts/ci_build.py
@@ -430,7 +430,7 @@ def sanitize_kv(some_string):
             flags += ['--with-commoncrypto']
 
         def add_boost_support(target, target_os):
-            if target in ['coverage', 'shared']:
+            if target in ['coverage', 'shared', 'amalgamation']:
                 return True
 
             if target == 'sanitizer' and target_os == 'linux':