diff --git a/requirements-dev.lock.txt b/requirements-dev.lock.txt
index bd3ea924..1acae64b 100644
--- a/requirements-dev.lock.txt
+++ b/requirements-dev.lock.txt
@@ -14,7 +14,7 @@ coverage==6.3.2
 cray-product-catalog==2.3.1
 croniter==0.3.37
 cryptography==42.0.4
-csm-api-client==2.1.0
+csm-api-client==2.2.1
 dataclasses-json==0.5.6
 docutils==0.17.1
 google-auth==2.6.0
diff --git a/requirements.lock.txt b/requirements.lock.txt
index e7d7136b..5947770e 100644
--- a/requirements.lock.txt
+++ b/requirements.lock.txt
@@ -11,7 +11,7 @@ click==8.0.4
 cray-product-catalog==2.3.1
 croniter==0.3.37
 cryptography==42.0.4
-csm-api-client==2.1.0
+csm-api-client==2.2.1
 dataclasses-json==0.5.6
 google-auth==2.6.0
 htmlmin==0.1.12
diff --git a/requirements.txt b/requirements.txt
index 4949ba33..2eb5ce15 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -22,7 +22,7 @@ argcomplete
 boto3
 botocore
 cray-product-catalog >= 2.3.1
-csm-api-client >= 2.1.0, <3.0
+csm-api-client >= 2.2.1, <3.0
 croniter >= 0.3, < 1.0
 inflect >= 0.2.5, < 3.0
 Jinja2 >= 3.0, < 4.0
diff --git a/sat/cli/bootsys/service_activity.py b/sat/cli/bootsys/service_activity.py
index 3d58b770..fa28fef0 100644
--- a/sat/cli/bootsys/service_activity.py
+++ b/sat/cli/bootsys/service_activity.py
@@ -1,7 +1,7 @@
 #
 # MIT License
 #
-# (C) Copyright 2020-2023 Hewlett Packard Enterprise Development LP
+# (C) Copyright 2020-2024 Hewlett Packard Enterprise Development LP
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -38,7 +38,7 @@
 
 from sat.apiclient import (
     APIError,
-    CFSClient,
+    CFSClientBase,
     NMDClient
 )
 from sat.apiclient.bos import BOSClientCommon
@@ -383,7 +383,7 @@ def get_active_sessions(self):
         Raises:
             ServiceCheckError: if unable to get the active CFS sessions.
         """
-        cfs_client = CFSClient(SATSession())
+        cfs_client = CFSClientBase.get_cfs_client(SATSession(), 'v2')
         try:
             sessions = cfs_client.get('sessions').json()
         except (APIError, ValueError) as err:
diff --git a/tests/cli/bootprep/input/test_image.py b/tests/cli/bootprep/input/test_image.py
index d874dd21..dc9544bd 100644
--- a/tests/cli/bootprep/input/test_image.py
+++ b/tests/cli/bootprep/input/test_image.py
@@ -1,7 +1,7 @@
 #
 # MIT License
 #
-# (C) Copyright 2023 Hewlett Packard Enterprise Development LP
+# (C) Copyright 2023-2024 Hewlett Packard Enterprise Development LP
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
diff --git a/tests/cli/bootprep/test_main.py b/tests/cli/bootprep/test_main.py
index 3e65e2bf..fce2c136 100644
--- a/tests/cli/bootprep/test_main.py
+++ b/tests/cli/bootprep/test_main.py
@@ -131,7 +131,7 @@ def setUp(self):
         self.mock_input_instance_cls = patch('sat.cli.bootprep.main.InputInstance').start()
         self.mock_input_instance = self.mock_input_instance_cls.return_value
         self.mock_sat_session = patch('sat.cli.bootprep.main.SATSession').start()
-        self.mock_cfs_client = patch('sat.cli.bootprep.main.CFSV2Client').start().return_value
+        self.mock_cfs_client = patch('sat.cli.bootprep.main.CFSClientBase.get_cfs_client').start().return_value
         self.mock_ims_client = patch('sat.cli.bootprep.main.IMSClient').start().return_value
         self.mock_bos_client = patch('sat.cli.bootprep.main.BOSClientCommon.get_bos_client').start().return_value
         self.mock_configurations = self.mock_input_instance.input_configurations
diff --git a/tests/cli/bootsys/test_service_activity.py b/tests/cli/bootsys/test_service_activity.py
index 5b101c6c..3a82432e 100644
--- a/tests/cli/bootsys/test_service_activity.py
+++ b/tests/cli/bootsys/test_service_activity.py
@@ -508,7 +508,7 @@ def json():
 
         patch('sat.cli.bootsys.service_activity.SATSession').start()
         self.mock_cfs_client = patch(
-            'sat.cli.bootsys.service_activity.CFSClient').start()
+            'sat.cli.bootsys.service_activity.CFSClientBase.get_cfs_client').start()
         self.mock_cfs_client.return_value.get = mock_cfs_get
 
     def tearDown(self):