diff --git a/src/bos/operators/utils/clients/s3.py b/src/bos/common/clients/s3.py
similarity index 100%
rename from src/bos/operators/utils/clients/s3.py
rename to src/bos/common/clients/s3.py
diff --git a/src/bos/operators/session_setup.py b/src/bos/operators/session_setup.py
index c24eb9ae..3b5d591b 100644
--- a/src/bos/operators/session_setup.py
+++ b/src/bos/operators/session_setup.py
@@ -28,13 +28,13 @@
 from botocore.exceptions import ClientError
 
 from bos.common.clients.bos.options import options
+from bos.common.clients.s3 import S3Object, S3ObjectNotFound
 from bos.common.tenant_utils import get_tenant_component_set, InvalidTenantException
 from bos.common.utils import exc_type_msg
 from bos.common.values import Action, EMPTY_ACTUAL_STATE, EMPTY_DESIRED_STATE, EMPTY_STAGED_STATE
 from bos.operators.base import BaseOperator, main, chunk_components
 from bos.operators.filters.filters import HSMState
 from bos.operators.utils.clients.hsm import Inventory
-from bos.operators.utils.clients.s3 import S3Object, S3ObjectNotFound
 from bos.operators.utils.boot_image_metadata.factory import BootImageMetaDataFactory
 from bos.operators.utils.rootfs.factory import ProviderFactory
 from bos.operators.session_completion import SessionCompletionOperator
diff --git a/src/bos/operators/utils/boot_image_metadata/s3_boot_image_metadata.py b/src/bos/operators/utils/boot_image_metadata/s3_boot_image_metadata.py
index 93929b2d..6ac6ed59 100644
--- a/src/bos/operators/utils/boot_image_metadata/s3_boot_image_metadata.py
+++ b/src/bos/operators/utils/boot_image_metadata/s3_boot_image_metadata.py
@@ -25,10 +25,10 @@
 
 from botocore.exceptions import ClientError
 
+from bos.common.clients.s3 import S3BootArtifacts, S3MissingConfiguration, S3Url, \
+                                           ArtifactNotFound
 from bos.common.utils import exc_type_msg
 from bos.operators.utils.boot_image_metadata import BootImageMetaData, BootImageMetaDataBadRead
-from bos.operators.utils.clients.s3 import S3BootArtifacts, S3MissingConfiguration, S3Url, \
-                                           ArtifactNotFound
 
 LOGGER = logging.getLogger(__name__)
 
diff --git a/src/bos/server/controllers/v2/boot_set/artifacts.py b/src/bos/server/controllers/v2/boot_set/artifacts.py
index 931508fd..ad9e6d34 100644
--- a/src/bos/server/controllers/v2/boot_set/artifacts.py
+++ b/src/bos/server/controllers/v2/boot_set/artifacts.py
@@ -22,9 +22,9 @@
 # OTHER DEALINGS IN THE SOFTWARE.
 #
 
+from bos.common.clients.s3 import S3Object, ArtifactNotFound
 from bos.common.utils import exc_type_msg
 from bos.operators.utils.boot_image_metadata.factory import BootImageMetaDataFactory
-from bos.operators.utils.clients.s3 import S3Object, ArtifactNotFound
 
 from .defs import LOGGER
 from .exceptions import BootSetError, BootSetWarning