diff --git a/.github/workflows/compiler-support.yml b/.github/workflows/compiler-support.yml
index 009f318f8b..3ad10c7391 100644
--- a/.github/workflows/compiler-support.yml
+++ b/.github/workflows/compiler-support.yml
@@ -36,7 +36,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [ { id: clang-18, base_image: silkeh/clang:18-bookworm },
+        platform: [ { id: clang-20, base_image: silkeh/clang:20-bookworm },
                     { id: clang-21, base_image: silkeh/clang:21-trixie } ]
 
     runs-on: ubuntu-24.04
diff --git a/README.md b/README.md
index 3652cf8bf4..a26a995c5e 100644
--- a/README.md
+++ b/README.md
@@ -123,7 +123,7 @@ Communicating with Apache NiFi can be done using the Site-to-Site protocol. More
 * CMake 3.26 or greater
 * Compiler
   * g++ 13 or greater
-  * clang 18 or greater
+  * clang 20 or greater
   * msvc 19.33 or greater
 * bison 3.0.x+ (3.2 has been shown to fail builds)
 * flex 2.6 or greater
diff --git a/behave_framework/src/minifi_behave/containers/minifi_linux_container.py b/behave_framework/src/minifi_behave/containers/minifi_linux_container.py
index 4658a82379..d5826f4e7f 100644
--- a/behave_framework/src/minifi_behave/containers/minifi_linux_container.py
+++ b/behave_framework/src/minifi_behave/containers/minifi_linux_container.py
@@ -131,7 +131,10 @@ def _fill_default_properties(self):
         self.properties["nifi.extension.path"] = self.deployment_type.extension_pattern
         self.properties["nifi.administrative.yield.duration"] = "1 sec"
         self.properties["nifi.bored.yield.duration"] = "100 millis"
-        self.properties["nifi.openssl.fips.support.enable"] = "false"
+        if 'MINIFI_FIPS' in os.environ and os.environ["MINIFI_FIPS"] == "true":
+            self.properties["nifi.openssl.fips.support.enable"] = "true"
+        else:
+            self.properties["nifi.openssl.fips.support.enable"] = "false"
         self.properties["nifi.provenance.repository.class.name"] = "NoOpRepository"
         self.properties["nifi.python.processor.dir"] = self.deployment_type.minifi_python_path
 
diff --git a/behave_framework/src/minifi_behave/containers/minifi_win_container.py b/behave_framework/src/minifi_behave/containers/minifi_win_container.py
index 9ece439b47..020ddbe6f3 100644
--- a/behave_framework/src/minifi_behave/containers/minifi_win_container.py
+++ b/behave_framework/src/minifi_behave/containers/minifi_win_container.py
@@ -20,6 +20,7 @@
 from .container_windows import WindowsContainer
 from .minifi_protocol import MinifiProtocol
 import logging
+import os
 
 
 class MinifiWindowsContainer(WindowsContainer, MinifiProtocol):
@@ -54,7 +55,10 @@ def _fill_default_properties(self):
         self.properties["nifi.extension.path"] = "../extensions/*"
         self.properties["nifi.administrative.yield.duration"] = "1 sec"
         self.properties["nifi.bored.yield.duration"] = "100 millis"
-        self.properties["nifi.openssl.fips.support.enable"] = "false"
+        if 'MINIFI_FIPS' in os.environ and os.environ["MINIFI_FIPS"] == "true":
+            self.properties["nifi.openssl.fips.support.enable"] = "true"
+        else:
+            self.properties["nifi.openssl.fips.support.enable"] = "false"
         self.properties["nifi.provenance.repository.class.name"] = "NoOpRepository"
 
     def _fill_default_log_properties(self):
diff --git a/cmake/GetCatch2.cmake b/cmake/GetCatch2.cmake
index 8d4d6c4e00..30f30bfc16 100644
--- a/cmake/GetCatch2.cmake
+++ b/cmake/GetCatch2.cmake
@@ -21,6 +21,9 @@ if(MINIFI_CATCH2_SOURCE STREQUAL "CONAN")
     if (NOT TARGET Catch2WithMain)
         add_library(Catch2WithMain ALIAS Catch2::Catch2WithMain)
     endif()
+    if (NOT TARGET Catch2)
+        add_library(Catch2 ALIAS Catch2::Catch2)
+    endif()
 elseif(MINIFI_CATCH2_SOURCE STREQUAL "BUILD")
     message("Using CMake to build Catch2 from source")
     include(Catch2)