diff --git a/docs/dev_guide/ceph_s3_tests/ceph_s3_tests_pending_list_status.md b/docs/dev_guide/ceph_s3_tests/ceph_s3_tests_pending_list_status.md
index 5930b12b66..2d8f4c704b 100644
--- a/docs/dev_guide/ceph_s3_tests/ceph_s3_tests_pending_list_status.md
+++ b/docs/dev_guide/ceph_s3_tests/ceph_s3_tests_pending_list_status.md
@@ -51,4 +51,6 @@ Attached a table with tests that where investigated and their status (this table
 | test_get_bucket_encryption_kms | Faulty Test | [613](https://github.com/ceph/s3-tests/issues/613) | 
 | test_delete_bucket_encryption_s3 | Faulty Test | [613](https://github.com/ceph/s3-tests/issues/613) | 
 | test_delete_bucket_encryption_kms | Faulty Test | [613](https://github.com/ceph/s3-tests/issues/613) |
-| test_lifecycle_expiration_tags1 | Faulty Test | [638](https://github.com/ceph/s3-tests/issues/638) | There can be more such tests having the same issue (`Filter` is not aligned with aws structure in bucket lifecycle configuration) |
\ No newline at end of file
+| test_lifecycle_expiration_tags1 | Faulty Test | [638](https://github.com/ceph/s3-tests/issues/638) | There can be more such tests having the same issue (`Filter` is not aligned with aws structure in bucket lifecycle configuration) |
+| test_bucket_create_bad_ua_empty_aws2                 | Internal Component | [58059](https://tracker.ceph.com/issues/58059)                    | It is a known issue in ceph tests after updating botocore version (>1.28.0) it brokes v2 signatures |
+| test_bucket_create_bad_ua_none_aws2                 | Internal Component | [58059](https://tracker.ceph.com/issues/58059)                    | It is a known issue in ceph tests after updating botocore version (>1.28.0) it brokes v2 signatures |
\ No newline at end of file
diff --git a/src/test/external_tests/ceph_s3_tests/s3-tests-lists/nsfs_s3_tests_black_list.txt b/src/test/external_tests/ceph_s3_tests/s3-tests-lists/nsfs_s3_tests_black_list.txt
index e098992817..147c8c8367 100644
--- a/src/test/external_tests/ceph_s3_tests/s3-tests-lists/nsfs_s3_tests_black_list.txt
+++ b/src/test/external_tests/ceph_s3_tests/s3-tests-lists/nsfs_s3_tests_black_list.txt
@@ -400,4 +400,87 @@ s3tests_boto3/functional/test_s3.py::test_cors_presigned_get_object_tenant
 s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object_with_acl
 s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object_tenant
 s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object_tenant_with_acl
-
+s3tests_boto3/functional/test_s3.py::test_put_bucket_acl_grant_group_read
+s3tests_boto3/functional/test_s3.py::test_multipart_sse_c_get_part
+s3tests_boto3/functional/test_s3.py::test_multipart_single_get_part
+s3tests_boto3/functional/test_s3.py::test_non_multipart_sse_c_get_part
+s3tests_boto3/functional/test_s3.py::test_cors_presigned_get_object_v2
+s3tests_boto3/functional/test_s3.py::test_cors_presigned_get_object_tenant_v2
+s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object_v2
+s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object_tenant_v2
+s3tests_boto3/functional/test_s3.py::test_lifecycle_delete
+s3tests_boto3/functional/test_s3.py::test_lifecycle_deletemarker_expiration_with_days_tag
+s3tests_boto3/functional/test_s3.py::test_encryption_sse_c_enforced_with_bucket_policy
+s3tests_boto3/functional/test_s3.py::test_encryption_sse_c_deny_algo_with_bucket_policy
+s3tests_boto3/functional/test_s3.py::test_bucket_policy_multipart
+s3tests_boto3/functional/test_s3.py::test_bucket_policy_tenanted_bucket
+s3tests_boto3/functional/test_s3.py::test_set_get_del_bucket_policy
+s3tests_boto3/functional/test_s3.py::test_set_multipart_tagging
+s3tests_boto3/functional/test_s3.py::test_bucket_policy_upload_part_copy
+s3tests_boto3/functional/test_s3.py::test_bucket_policy_put_obj_s3_incorrect_algo_sse_s3
+s3tests_boto3/functional/test_s3.py::test_object_lock_put_obj_lock_enable_after_create
+s3tests_boto3/functional/test_s3.py::test_get_nonpublicpolicy_principal_bucket_policy_status
+s3tests_boto3/functional/test_s3.py::test_block_public_policy_with_principal
+s3tests_boto3/functional/test_s3.py::test_block_public_restrict_public_buckets
+s3tests_boto3/functional/test_s3.py::test_put_get_delete_public_block
+s3tests_boto3/functional/test_s3.py::test_object_checksum_sha256
+s3tests_boto3/functional/test_s3.py::test_object_checksum_crc64nvme
+s3tests_boto3/functional/test_s3.py::test_multipart_checksum_sha256
+s3tests_boto3/functional/test_s3.py::test_multipart_use_cksum_helper_sha256
+s3tests_boto3/functional/test_s3.py::test_multipart_use_cksum_helper_crc64nvme
+s3tests_boto3/functional/test_s3.py::test_multipart_use_cksum_helper_crc32
+s3tests_boto3/functional/test_s3.py::test_multipart_use_cksum_helper_crc32c
+s3tests_boto3/functional/test_s3.py::test_multipart_use_cksum_helper_sha1
+s3tests_boto3/functional/test_s3.py::test_post_object_upload_checksum
+s3tests_boto3/functional/test_s3.py::test_put_bucket_logging
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_mtime
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_simple_key
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_partitioned_key
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_bucket_auth_type
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_bucket_acl_required
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_object_acl_required
+s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_errors
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_owner
+s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_permissions
+s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_policy_wildcard
+s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_policy_wildcard_objects
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_permission_change_s
+s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_tenant_s
+s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_account_s
+s3tests_boto3/functional/test_s3.py::test_rm_bucket_logging
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_put_objects
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_put_objects_versioned
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_put_concurrency
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_delete_objects
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_delete_objects_versioned
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_get_objects
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_get_objects_versioned
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_copy_objects
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_copy_objects_versioned
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_copy_objects_bucket
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_copy_objects_bucket_versioned
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_head_objects
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_head_objects_versioned
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_mpu_s
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_mpu_versioned_s
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_mpu_copy
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_mpu_copy_versioned
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_multi_delete
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_multi_delete_versioned
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_multiple_prefixes
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_single_prefix
+s3tests_boto3/functional/test_s3.py::test_get_multipart_checksum_object_attributes
+s3tests_boto3/functional/test_s3.py::test_get_multipart_object_attributes
+s3tests_boto3/functional/test_s3.py::test_get_paginated_multipart_object_attributes
+s3tests_boto3/functional/test_s3.py::test_get_single_multipart_object_attributes
+s3tests_boto3/functional/test_s3.py::test_get_checksum_object_attributes
+s3tests_boto3/functional/test_s3.py::test_get_versioned_object_attributes
+s3tests_boto3/functional/test_s3.py::test_get_sse_c_encrypted_object_attributes
+s3tests_boto3/functional/test_s3.py::test_get_object_attributes
+s3tests_boto3/functional/test_s3.py::test_delete_marker_nonversioned
+s3tests_boto3/functional/test_s3.py::test_delete_marker_versioned
+s3tests_boto3/functional/test_s3.py::test_delete_marker_suspended
+s3tests_boto3/functional/test_s3.py::test_delete_marker_expiration
+s3tests_boto3/functional/test_sts.py::test_get_caller_identity_root
+s3tests_boto3/functional/test_sts.py::test_get_caller_identity_non_root_user
+s3tests_boto3/functional/test_sts.py::test_get_caller_identity_after_assume_role
\ No newline at end of file
diff --git a/src/test/external_tests/ceph_s3_tests/s3-tests-lists/nsfs_s3_tests_pending_list.txt b/src/test/external_tests/ceph_s3_tests/s3-tests-lists/nsfs_s3_tests_pending_list.txt
index c3ffea48e3..4d5066d740 100644
--- a/src/test/external_tests/ceph_s3_tests/s3-tests-lists/nsfs_s3_tests_pending_list.txt
+++ b/src/test/external_tests/ceph_s3_tests/s3-tests-lists/nsfs_s3_tests_pending_list.txt
@@ -154,4 +154,6 @@ s3tests_boto3/functional/test_s3.py::test_versioned_concurrent_object_create_and
 s3tests_boto3/functional/test_s3.py::test_object_presigned_put_object_with_acl_tenant
 s3tests_boto3/functional/test_s3.py::test_get_undefined_public_block
 s3tests_boto3/functional/test_s3.py::test_get_public_block_deny_bucket_policy
-s3tests_boto3/functional/test_s3.py::test_lifecycle_expiration_tags1
\ No newline at end of file
+s3tests_boto3/functional/test_s3.py::test_lifecycle_expiration_tags1
+s3tests_boto3/functional/test_headers.py::test_bucket_create_bad_ua_empty_aws2
+s3tests_boto3/functional/test_headers.py::test_bucket_create_bad_ua_none_aws2
\ No newline at end of file
diff --git a/src/test/external_tests/ceph_s3_tests/s3-tests-lists/s3_tests_black_list.txt b/src/test/external_tests/ceph_s3_tests/s3-tests-lists/s3_tests_black_list.txt
index dd35a31636..d54490a7ce 100644
--- a/src/test/external_tests/ceph_s3_tests/s3-tests-lists/s3_tests_black_list.txt
+++ b/src/test/external_tests/ceph_s3_tests/s3-tests-lists/s3_tests_black_list.txt
@@ -350,4 +350,88 @@ s3tests_boto3/functional/test_sts.py::test_assume_role_with_web_identity_resourc
 s3tests_boto3/functional/test_sts.py::test_assume_role_with_web_identity_resource_tag_copy_obj
 s3tests_boto3/functional/test_sts.py::test_assume_role_with_web_identity_role_resource_tag
 s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object_with_acl
-s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object_tenant_with_acl
\ No newline at end of file
+s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object_tenant_with_acl
+s3tests_boto3/functional/test_s3.py::test_put_bucket_acl_grant_group_read
+s3tests_boto3/functional/test_s3.py::test_multipart_sse_c_get_part
+s3tests_boto3/functional/test_s3.py::test_multipart_single_get_part
+s3tests_boto3/functional/test_s3.py::test_non_multipart_sse_c_get_part
+s3tests_boto3/functional/test_s3.py::test_cors_presigned_get_object_v2
+s3tests_boto3/functional/test_s3.py::test_cors_presigned_get_object_tenant_v2
+s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object_v2
+s3tests_boto3/functional/test_s3.py::test_cors_presigned_put_object_tenant_v2
+s3tests_boto3/functional/test_s3.py::test_lifecycle_delete
+s3tests_boto3/functional/test_s3.py::test_lifecycle_deletemarker_expiration_with_days_tag
+s3tests_boto3/functional/test_s3.py::test_encryption_sse_c_enforced_with_bucket_policy
+s3tests_boto3/functional/test_s3.py::test_encryption_sse_c_deny_algo_with_bucket_policy
+s3tests_boto3/functional/test_s3.py::test_bucket_policy_multipart
+s3tests_boto3/functional/test_s3.py::test_bucket_policy_tenanted_bucket
+s3tests_boto3/functional/test_s3.py::test_set_get_del_bucket_policy
+s3tests_boto3/functional/test_s3.py::test_bucket_policy_upload_part_copy
+s3tests_boto3/functional/test_s3.py::test_bucket_policy_put_obj_s3_incorrect_algo_sse_s3
+s3tests_boto3/functional/test_s3.py::test_object_lock_put_obj_lock_enable_after_create
+s3tests_boto3/functional/test_s3.py::test_get_nonpublicpolicy_principal_bucket_policy_status
+s3tests_boto3/functional/test_s3.py::test_block_public_policy_with_principal
+s3tests_boto3/functional/test_s3.py::test_block_public_restrict_public_buckets
+s3tests_boto3/functional/test_s3.py::test_put_get_delete_public_block
+s3tests_boto3/functional/test_s3.py::test_object_checksum_sha256
+s3tests_boto3/functional/test_s3.py::test_object_checksum_crc64nvme
+s3tests_boto3/functional/test_s3.py::test_multipart_checksum_sha256
+s3tests_boto3/functional/test_s3.py::test_multipart_use_cksum_helper_sha256
+s3tests_boto3/functional/test_s3.py::test_multipart_use_cksum_helper_crc64nvme
+s3tests_boto3/functional/test_s3.py::test_multipart_use_cksum_helper_crc32
+s3tests_boto3/functional/test_s3.py::test_multipart_use_cksum_helper_crc32c
+s3tests_boto3/functional/test_s3.py::test_multipart_use_cksum_helper_sha1
+s3tests_boto3/functional/test_s3.py::test_post_object_upload_checksum
+s3tests_boto3/functional/test_s3.py::test_put_bucket_logging
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_mtime
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_simple_key
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_partitioned_key
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_bucket_auth_type
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_bucket_acl_required
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_object_acl_required
+s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_errors
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_owner
+s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_permissions
+s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_policy_wildcard
+s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_policy_wildcard_objects
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_permission_change_s
+s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_tenant_s
+s3tests_boto3/functional/test_s3.py::test_put_bucket_logging_account_s
+s3tests_boto3/functional/test_s3.py::test_rm_bucket_logging
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_put_objects
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_put_objects_versioned
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_put_concurrency
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_delete_objects
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_delete_objects_versioned
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_get_objects
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_get_objects_versioned
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_copy_objects
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_copy_objects_versioned
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_copy_objects_bucket
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_copy_objects_bucket_versioned
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_head_objects
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_head_objects_versioned
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_mpu_s
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_mpu_versioned_s
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_mpu_copy
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_mpu_copy_versioned
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_multi_delete
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_multi_delete_versioned
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_multiple_prefixes
+s3tests_boto3/functional/test_s3.py::test_bucket_logging_single_prefix
+s3tests_boto3/functional/test_s3.py::test_get_multipart_checksum_object_attributes
+s3tests_boto3/functional/test_s3.py::test_get_multipart_object_attributes
+s3tests_boto3/functional/test_s3.py::test_get_paginated_multipart_object_attributes
+s3tests_boto3/functional/test_s3.py::test_get_single_multipart_object_attributes
+s3tests_boto3/functional/test_s3.py::test_get_checksum_object_attributes
+s3tests_boto3/functional/test_s3.py::test_get_versioned_object_attributes
+s3tests_boto3/functional/test_s3.py::test_get_sse_c_encrypted_object_attributes
+s3tests_boto3/functional/test_s3.py::test_get_object_attributes
+s3tests_boto3/functional/test_s3.py::test_upload_part_copy_percent_encoded_key
+s3tests_boto3/functional/test_s3.py::test_delete_marker_nonversioned
+s3tests_boto3/functional/test_s3.py::test_delete_marker_versioned
+s3tests_boto3/functional/test_s3.py::test_delete_marker_suspended
+s3tests_boto3/functional/test_s3.py::test_delete_marker_expiration
+s3tests_boto3/functional/test_sts.py::test_get_caller_identity_root
+s3tests_boto3/functional/test_sts.py::test_get_caller_identity_non_root_user
+s3tests_boto3/functional/test_sts.py::test_get_caller_identity_after_assume_role
\ No newline at end of file
diff --git a/src/test/external_tests/ceph_s3_tests/s3-tests-lists/s3_tests_pending_list.txt b/src/test/external_tests/ceph_s3_tests/s3-tests-lists/s3_tests_pending_list.txt
index 8f1d7b4db2..231b28b843 100644
--- a/src/test/external_tests/ceph_s3_tests/s3-tests-lists/s3_tests_pending_list.txt
+++ b/src/test/external_tests/ceph_s3_tests/s3-tests-lists/s3_tests_pending_list.txt
@@ -143,4 +143,11 @@ s3tests_boto3/functional/test_s3.py::test_get_bucket_encryption_s3
 s3tests_boto3/functional/test_s3.py::test_get_bucket_encryption_kms
 s3tests_boto3/functional/test_s3.py::test_delete_bucket_encryption_s3
 s3tests_boto3/functional/test_s3.py::test_delete_bucket_encryption_kms
-s3tests_boto3/functional/test_s3.py::test_lifecycle_expiration_tags1
\ No newline at end of file
+s3tests_boto3/functional/test_s3.py::test_lifecycle_expiration_tags1
+s3tests_boto3/functional/test_headers.py::test_bucket_create_bad_ua_empty_aws2
+s3tests_boto3/functional/test_headers.py::test_bucket_create_bad_ua_none_aws2
+s3tests_boto3/functional/test_headers.py::test_object_create_bad_md5_bad
+s3tests_boto3/functional/test_headers.py::test_object_create_bad_md5_none
+s3tests_boto3/functional/test_headers.py::test_object_create_bad_expect_mismatch
+s3tests_boto3/functional/test_headers.py::test_object_create_bad_expect_empty
+s3tests_boto3/functional/test_headers.py::test_object_create_bad_expect_none
\ No newline at end of file
diff --git a/src/test/external_tests/ceph_s3_tests/test_ceph_nsfs_s3_config_setup.js b/src/test/external_tests/ceph_s3_tests/test_ceph_nsfs_s3_config_setup.js
index e17fb6b2d2..149a42e63a 100644
--- a/src/test/external_tests/ceph_s3_tests/test_ceph_nsfs_s3_config_setup.js
+++ b/src/test/external_tests/ceph_s3_tests/test_ceph_nsfs_s3_config_setup.js
@@ -53,9 +53,6 @@ async function ceph_test_setup() {
     const cephalt_access_key = cephalt_access_keys.access_key;
     const cephalt_secret_key = cephalt_access_keys.secret_key;
 
-    await os_utils.exec(`echo access_key = ${cephalt_access_key} >> ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
-    await os_utils.exec(`echo secret_key = ${cephalt_secret_key} >> ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
-
     const cephtenant_access_keys = await get_access_keys(CEPH_TEST.nc_cephtenant_account_params.name);
     const cephtenant_access_key = cephtenant_access_keys.access_key;
     const cephtenant_secret_key = cephtenant_access_keys.secret_key;
@@ -63,6 +60,8 @@ async function ceph_test_setup() {
     if (os_utils.IS_MAC) {
         await os_utils.exec(`sed -i "" "s|tenant_access_key|"${cephtenant_access_key}"|g" ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
         await os_utils.exec(`sed -i "" "s|tenant_secret_key|${cephtenant_secret_key}|g" ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
+        await os_utils.exec(`sed -i "" "s|s3_access_key|${cephalt_access_key}|g" ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
+        await os_utils.exec(`sed -i "" "s|s3_secret_key|${cephalt_secret_key}|g" ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
     } else {
         await os_utils.exec(`sed -i -e 's:tenant_access_key:${cephtenant_access_key}:g' ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
         await os_utils.exec(`sed -i -e 's:tenant_secret_key:${cephtenant_secret_key}:g' ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
diff --git a/src/test/external_tests/ceph_s3_tests/test_ceph_s3.js b/src/test/external_tests/ceph_s3_tests/test_ceph_s3.js
index ffe434385c..bf7b91ebdb 100644
--- a/src/test/external_tests/ceph_s3_tests/test_ceph_s3.js
+++ b/src/test/external_tests/ceph_s3_tests/test_ceph_s3.js
@@ -76,7 +76,7 @@ async function run_s3_tests() {
 async function run_all_tests() {
     console.info('Running Ceph S3 Tests...');
     const tests_list_command =
-        `S3TEST_CONF=${process.cwd()}/${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config} tox ${TOX_ARGS} -- -q --collect-only --disable-pytest-warnings  2>&1 | awk '{print $1}' | grep test`;
+        `S3TEST_CONF=${process.cwd()}/${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config} tox ${TOX_ARGS} -- -q --collect-only --disable-pytest-warnings  2>&1 | awk '{print $1}' | grep "::test"`;
     try {
         tests_list = await os_utils.exec(tests_list_command, { ignore_rc: false, return_stdout: true });
     } catch (err) {
diff --git a/src/test/external_tests/ceph_s3_tests/test_ceph_s3_config.conf b/src/test/external_tests/ceph_s3_tests/test_ceph_s3_config.conf
index ca7c4a42e2..a022680eb1 100644
--- a/src/test/external_tests/ceph_s3_tests/test_ceph_s3_config.conf
+++ b/src/test/external_tests/ceph_s3_tests/test_ceph_s3_config.conf
@@ -19,6 +19,14 @@ ssl_verify = False
 ## the prefix to 30 characters long, and avoid collisions
 bucket prefix = ceph-{random}-
 
+# all the iam account resources (users, roles, etc) created
+# will start with this name prefix
+iam name prefix = s3-tests-
+
+# all the iam account resources (users, roles, etc) created
+# will start with this path prefix
+iam path prefix = /s3-tests/
+
 [s3 main]
 ## the tests assume two accounts are defined, "main" and "alt".
 email = main.alt@noobaa.com
@@ -51,9 +59,50 @@ secret_key = tenant_secret_key
 # tenant email set in vstart.sh
 email = ceph.tenant@noobaa.com
 
+# tenant name
+tenant = testx
+
 [s3 alt]
 ## another user account, used for ACL-related tests
 user_id = 56789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01234
 display_name = cephalt
 ## the "alt" user needs to have email set, too
 email = ceph.alt@noobaa.com
+## replace these with your access keys
+access_key = s3_access_key
+secret_key = s3_secret_key
+
+### Currently we are not supporting iam account tests, so we are adding the dummy values below as it is required by the test framework
+### This is a temporary fix and will be removed once we support iam account tests
+
+#following section needs to be added for all sts-tests
+[iam]
+#used for iam operations in sts-tests
+#email from vstart.sh
+email = ceph.alt@noobaa.com
+
+#user_id from vstart.sh
+user_id = 56789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01234
+
+#access_key from vstart.sh
+access_key = tenant_access_key
+
+#secret_key vstart.sh
+secret_key = tenant_secret_key
+
+#display_name from vstart.sh
+display_name = cephalt
+
+# iam account root user for iam_account tests
+[iam root]
+access_key = tenant_access_key
+secret_key = tenant_secret_key
+user_id = 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
+email = main.alt@noobaa.com
+
+# iam account root user in a different account than [iam root]
+[iam alt root]
+access_key = tenant_access_key
+secret_key = tenant_secret_key
+user_id = 56789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01234
+email = ceph.alt@noobaa.com
diff --git a/src/test/external_tests/ceph_s3_tests/test_ceph_s3_config_setup.js b/src/test/external_tests/ceph_s3_tests/test_ceph_s3_config_setup.js
index ea288764ca..5a58939380 100644
--- a/src/test/external_tests/ceph_s3_tests/test_ceph_s3_config_setup.js
+++ b/src/test/external_tests/ceph_s3_tests/test_ceph_s3_config_setup.js
@@ -87,13 +87,13 @@ async function ceph_test_setup() {
 
     console.info('CEPH TEST CONFIGURATION:', JSON.stringify(CEPH_TEST));
     const { access_key, secret_key } = ceph_account.access_keys[0];
-    await os_utils.exec(`echo access_key = ${access_key.unwrap()} >> ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
-    await os_utils.exec(`echo secret_key = ${secret_key.unwrap()} >> ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
-
     const { access_key: access_key_tenant, secret_key: secret_key_tenant } = ceph_account_tenant.access_keys[0];
+
     if (os_utils.IS_MAC) {
         await os_utils.exec(`sed -i "" "s|tenant_access_key|${access_key_tenant.unwrap()}|g" ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
         await os_utils.exec(`sed -i "" "s|tenant_secret_key|${secret_key_tenant.unwrap()}|g" ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
+        await os_utils.exec(`sed -i "" "s|s3_access_key|${access_key.unwrap()}|g" ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
+        await os_utils.exec(`sed -i "" "s|s3_secret_key|${secret_key.unwrap()}|g" ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
 
     } else {
         await os_utils.exec(`sed -i -e 's:tenant_access_key:${access_key_tenant.unwrap()}:g' ${CEPH_TEST.test_dir}${CEPH_TEST.ceph_config}`);
diff --git a/src/test/external_tests/ceph_s3_tests/test_ceph_s3_deploy.sh b/src/test/external_tests/ceph_s3_tests/test_ceph_s3_deploy.sh
index b432093bf4..a35152473f 100755
--- a/src/test/external_tests/ceph_s3_tests/test_ceph_s3_deploy.sh
+++ b/src/test/external_tests/ceph_s3_tests/test_ceph_s3_deploy.sh
@@ -17,7 +17,7 @@ DIRECTORY="s3-tests"
 CEPH_LINK="https://github.com/ceph/s3-tests.git"
 # using a fixed version (commit) of ceph tests to avoid sudden changes. 
 # we should retest and update the version once in a while
-CEPH_TESTS_VERSION=88fd8670072cf4b7559908419c67cfaaca02c794
+CEPH_TESTS_VERSION=dd6195cfb7ec97a178cb4aca5a8fbfb1d209607e
 if [ ! -d $DIRECTORY ]; then
     echo "Downloading Ceph S3 Tests..."
     git clone $CEPH_LINK
@@ -38,7 +38,7 @@ commit_epoch=$(git show -s --format=%ci ${CEPH_TESTS_VERSION} | awk '{print $1}'
 commit_date=$(date -d ${commit_epoch} +%s)
 current_date=$(date +%s)
 
-max_days="600"
+max_days="180"
 if [ $((current_date-commit_date)) -gt $((3600*24*${max_days})) ]
 then
     echo "ceph tests were not updated for ${max_days} days, Exiting"