diff --git a/google/cloud/storage/google_cloud_cpp_storage_grpc.bzl b/google/cloud/storage/google_cloud_cpp_storage_grpc.bzl
index 4113b1e4cab04..ad210011ea06f 100644
--- a/google/cloud/storage/google_cloud_cpp_storage_grpc.bzl
+++ b/google/cloud/storage/google_cloud_cpp_storage_grpc.bzl
@@ -37,6 +37,7 @@ google_cloud_cpp_storage_grpc_hdrs = [
     "async/writer.h",
     "async/writer_connection.h",
     "grpc_plugin.h",
+    "internal/async/checksum_helpers.h",
     "internal/async/connection_fwd.h",
     "internal/async/connection_impl.h",
     "internal/async/connection_tracing.h",
diff --git a/google/cloud/storage/google_cloud_cpp_storage_grpc.cmake b/google/cloud/storage/google_cloud_cpp_storage_grpc.cmake
index e9b81bf9526be..952d6dbef46d2 100644
--- a/google/cloud/storage/google_cloud_cpp_storage_grpc.cmake
+++ b/google/cloud/storage/google_cloud_cpp_storage_grpc.cmake
@@ -99,6 +99,7 @@ add_library(
     async/writer_connection.h
     grpc_plugin.cc
     grpc_plugin.h
+    internal/async/checksum_helpers.h
     internal/async/connection_fwd.h
     internal/async/connection_impl.cc
     internal/async/connection_impl.h
diff --git a/google/cloud/storage/internal/async/checksum_helpers.h b/google/cloud/storage/internal/async/checksum_helpers.h
new file mode 100644
index 0000000000000..9937c75945236
--- /dev/null
+++ b/google/cloud/storage/internal/async/checksum_helpers.h
@@ -0,0 +1,59 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_ASYNC_CHECKSUM_HELPERS_H
+#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_ASYNC_CHECKSUM_HELPERS_H
+
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
+#include "google/cloud/storage/async/options.h"
+#include "google/cloud/storage/options.h"
+#include "google/cloud/options.h"
+
+namespace google {
+namespace cloud {
+namespace storage_internal {
+GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
+
+struct ChecksumSettings {
+  bool enable_crc32c;
+  bool enable_md5;
+};
+
+inline ChecksumSettings GetDownloadChecksumSettings(Options const& options) {
+  if (options.has<storage::DownloadChecksumValidationOption>()) {
+    auto const algo = options.get<storage::DownloadChecksumValidationOption>();
+    return {algo == storage::ChecksumAlgorithm::kCrc32c,
+            algo == storage::ChecksumAlgorithm::kMD5};
+  }
+  return {options.get<storage::EnableCrc32cValidationOption>(),
+          options.get<storage::EnableMD5ValidationOption>()};
+}
+
+inline ChecksumSettings GetUploadChecksumSettings(Options const& options) {
+  if (options.has<storage::UploadChecksumValidationOption>()) {
+    auto const algo = options.get<storage::UploadChecksumValidationOption>();
+    return {algo == storage::ChecksumAlgorithm::kCrc32c,
+            algo == storage::ChecksumAlgorithm::kMD5};
+  }
+  return {options.get<storage::EnableCrc32cValidationOption>(),
+          options.get<storage::EnableMD5ValidationOption>()};
+}
+
+GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
+}  // namespace storage_internal
+}  // namespace cloud
+}  // namespace google
+
+#include "google/cloud/internal/diagnostics_pop.inc"
+#endif  // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_STORAGE_INTERNAL_ASYNC_CHECKSUM_HELPERS_H
diff --git a/google/cloud/storage/internal/async/connection_impl.cc b/google/cloud/storage/internal/async/connection_impl.cc
index b1622bd87a386..cc3de87521cab 100644
--- a/google/cloud/storage/internal/async/connection_impl.cc
+++ b/google/cloud/storage/internal/async/connection_impl.cc
@@ -19,6 +19,7 @@
 #include "google/cloud/storage/async/reader.h"
 #include "google/cloud/storage/async/resume_policy.h"
 #include "google/cloud/storage/async/retry_policy.h"
+#include "google/cloud/storage/internal/async/checksum_helpers.h"
 #include "google/cloud/storage/internal/async/default_options.h"
 #include "google/cloud/storage/internal/async/handle_redirect_error.h"
 #include "google/cloud/storage/internal/async/insert_object.h"
@@ -80,14 +81,18 @@ inline std::unique_ptr<storage::AsyncIdempotencyPolicy> idempotency_policy(
 }
 
 std::unique_ptr<storage::internal::HashFunction> CreateHashFunction(
-    Options const& options) {
+    Options const& options,
+    storage_internal::ChecksumSettings const& settings) {
   auto crc32c = std::unique_ptr<storage::internal::HashFunction>();
+  auto const enable_crc32c = settings.enable_crc32c;
+  auto const enable_md5 = settings.enable_md5;
+
   if (options.has<storage::UseCrc32cValueOption>()) {
     crc32c = std::make_unique<storage::internal::PrecomputedHashFunction>(
         storage::internal::HashValues{
             Crc32cFromProto(options.get<storage::UseCrc32cValueOption>()),
             /*.md5=*/{}});
-  } else if (options.get<storage::EnableCrc32cValidationOption>()) {
+  } else if (enable_crc32c) {
     crc32c = std::make_unique<storage::internal::Crc32cHashFunction>();
   }
 
@@ -97,7 +102,7 @@ std::unique_ptr<storage::internal::HashFunction> CreateHashFunction(
         storage::internal::HashValues{
             /*.crc32=*/{},
             MD5FromProto(options.get<storage::UseMD5ValueOption>())});
-  } else if (options.get<storage::EnableMD5ValidationOption>()) {
+  } else if (enable_md5) {
     md5 = storage::internal::MD5HashFunction::Create();
   }
 
@@ -117,9 +122,9 @@ std::unique_ptr<storage::internal::HashValidator> CreateHashValidator(
       request.read_limit() != 0 || request.read_offset() != 0;
   if (is_ranged_read) return storage::internal::CreateNullHashValidator();
 
-  auto const enable_crc32c =
-      options.get<storage::EnableCrc32cValidationOption>();
-  auto const enable_md5 = options.get<storage::EnableMD5ValidationOption>();
+  auto const settings = GetDownloadChecksumSettings(options);
+  auto const enable_crc32c = settings.enable_crc32c;
+  auto const enable_md5 = settings.enable_md5;
 
   if (enable_crc32c && enable_md5) {
     return std::make_unique<storage::internal::CompositeValidator>(
@@ -167,7 +172,8 @@ future<StatusOr<google::storage::v2::Object>> AsyncConnectionImpl::InsertObject(
         options->get<storage::TransferStallMinimumRateOption>(),
         google::storage::v2::ServiceConstants::MAX_WRITE_CHUNK_BYTES);
 
-    auto hash_function = CreateHashFunction(*options);
+    auto hash_function =
+        CreateHashFunction(*options, GetUploadChecksumSettings(*options));
     ApplyRoutingHeaders(*context, request.write_object_spec());
     AddIdempotencyToken(*context, id);
     auto rpc = stub->AsyncWriteObject(cq, std::move(context), options);
@@ -271,9 +277,10 @@ AsyncConnectionImpl::ReadObject(ReadObjectParams p) {
   // Create the hash function and validator based on the original request. Note
   // that p.request will be moved-from, so we have to do it relatively early in
   // this function.
+  auto const settings = GetDownloadChecksumSettings(*current);
   auto hash_function =
       std::make_shared<storage::internal::Crc32cMessageHashFunction>(
-          CreateHashFunction(*current));
+          CreateHashFunction(*current, settings));
   auto hash_validator = CreateHashValidator(p.request, *current);
 
   std::optional<std::int64_t> requested_length;
@@ -323,7 +330,7 @@ AsyncConnectionImpl::AppendableObjectUploadImpl(AppendableUploadParams p) {
   auto current = internal::MakeImmutableOptions(std::move(p.options));
   auto request = p.request;
   std::shared_ptr<storage::internal::HashFunction> hash_function =
-      CreateHashFunction(*current);
+      CreateHashFunction(*current, GetUploadChecksumSettings(*current));
   auto retry =
       std::shared_ptr<storage::AsyncRetryPolicy>(retry_policy(*current));
   auto backoff =
@@ -703,7 +710,8 @@ AsyncConnectionImpl::StartUnbufferedUploadImpl(
         StatusOr<std::unique_ptr<storage::AsyncWriterConnection>>(
             std::move(response).status()));
   }
-  auto hash_function = CreateHashFunction(*current);
+  auto hash_function =
+      CreateHashFunction(*current, GetUploadChecksumSettings(*current));
   auto configure =
       [current, upload = response->upload_id()](grpc::ClientContext& context) {
         ApplyResumableUploadRoutingHeader(context, upload);
@@ -741,7 +749,8 @@ AsyncConnectionImpl::ResumeUnbufferedUploadImpl(
   // the upload resumes from the beginning of the file.
   auto hash_function = storage::internal::CreateNullHashFunction();
   if (response->persisted_size() == 0) {
-    hash_function = CreateHashFunction(*current);
+    hash_function =
+        CreateHashFunction(*current, GetUploadChecksumSettings(*current));
   }
   auto configure =
       [current, upload_id = query.upload_id()](grpc::ClientContext& context) {
diff --git a/google/cloud/storage/internal/async/connection_impl_read_hash_test.cc b/google/cloud/storage/internal/async/connection_impl_read_hash_test.cc
index 4b2658d83eb73..3c18df70bdb42 100644
--- a/google/cloud/storage/internal/async/connection_impl_read_hash_test.cc
+++ b/google/cloud/storage/internal/async/connection_impl_read_hash_test.cc
@@ -13,6 +13,10 @@
 // limitations under the License.
 
 #include "google/cloud/storage/async/options.h"
+
+// TODO(v-pratap): Remove this when EnableMD5ValidationOption and
+// EnableCrc32cValidationOption are removed.
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/storage/internal/async/connection_impl.h"
 #include "google/cloud/storage/internal/async/default_options.h"
 #include "google/cloud/storage/internal/crc32c.h"
@@ -75,15 +79,21 @@ auto GeneratedObjectChecksums(HashTestCase const& tc) {
 std::ostream& operator<<(std::ostream& os, HashTestCase const& rhs) {
   os << "HashTestCase={options={";
   os << "expected_status_code=" << rhs.expected_status_code  //
-     << std::boolalpha                                       //
-     << ", enable_crc32c_validation="
-     << rhs.options.get<storage::EnableCrc32cValidationOption>();
+     << std::boolalpha;                                      //
+  if (rhs.options.has<storage::DownloadChecksumValidationOption>()) {
+    os << ", download_checksum="
+       << static_cast<int>(
+              rhs.options.get<storage::DownloadChecksumValidationOption>());
+  } else {
+    os << ", enable_crc32c_validation="
+       << rhs.options.get<storage::EnableCrc32cValidationOption>();
+    os << ", enable_md5_validation="
+       << rhs.options.get<storage::EnableMD5ValidationOption>();
+  }
   if (rhs.options.has<storage::UseCrc32cValueOption>()) {
     os << ", use_crc32_value="
        << rhs.options.get<storage::UseCrc32cValueOption>();
   }
-  os << ", enable_md5_validation="
-     << rhs.options.get<storage::EnableMD5ValidationOption>();
   if (rhs.options.has<storage::UseMD5ValueOption>()) {
     os << ", use_md5_value=" << rhs.options.get<storage::UseMD5ValueOption>();
   }
@@ -129,16 +139,14 @@ INSTANTIATE_TEST_SUITE_P(
             // This is the common case. Only CRC32C is enabled by default. The
             // service returns both CRC32C and MD5 values.
             StatusCode::kOk,
-            Options{}
-                .set<storage::EnableCrc32cValidationOption>(true)
-                .set<storage::EnableMD5ValidationOption>(false),
+            Options{}.set<storage::DownloadChecksumValidationOption>(
+                storage::ChecksumAlgorithm::kCrc32c),
             kQuickFoxCrc32cChecksum, kQuickFoxMD5Hash},
         HashTestCase{
             // This is also common, the service does not return a MD5 value.
             StatusCode::kOk,
-            Options{}
-                .set<storage::EnableCrc32cValidationOption>(true)
-                .set<storage::EnableMD5ValidationOption>(false),
+            Options{}.set<storage::DownloadChecksumValidationOption>(
+                storage::ChecksumAlgorithm::kCrc32c),
             kQuickFoxCrc32cChecksum, ""},
         // Make sure things work when both hashes are validated too.
         HashTestCase{StatusCode::kOk,
@@ -148,6 +156,31 @@ INSTANTIATE_TEST_SUITE_P(
                      kQuickFoxCrc32cChecksum, kQuickFoxMD5Hash},
         // In the next three cases we verify that disabling some validation
         // works.
+        HashTestCase{StatusCode::kOk,
+                     Options{}.set<storage::DownloadChecksumValidationOption>(
+                         storage::ChecksumAlgorithm::kCrc32c),
+                     kQuickFoxCrc32cChecksum, kQuickFoxMD5HashBad},
+        HashTestCase{StatusCode::kOk,
+                     Options{}.set<storage::DownloadChecksumValidationOption>(
+                         storage::ChecksumAlgorithm::kMD5),
+                     kQuickFoxCrc32cChecksumBad, kQuickFoxMD5Hash},
+        HashTestCase{StatusCode::kOk,
+                     Options{}.set<storage::DownloadChecksumValidationOption>(
+                         storage::ChecksumAlgorithm::kNone),
+                     kQuickFoxCrc32cChecksumBad, kQuickFoxMD5HashBad},
+        HashTestCase{StatusCode::kOk,
+                     Options{}.set<storage::DownloadChecksumValidationOption>(
+                         storage::ChecksumAlgorithm::kCrc32c),
+                     kQuickFoxCrc32cChecksum, kQuickFoxMD5HashBad},
+        HashTestCase{StatusCode::kOk,
+                     Options{}.set<storage::DownloadChecksumValidationOption>(
+                         storage::ChecksumAlgorithm::kMD5),
+                     kQuickFoxCrc32cChecksumBad, kQuickFoxMD5Hash},
+        HashTestCase{StatusCode::kOk,
+                     Options{}.set<storage::DownloadChecksumValidationOption>(
+                         storage::ChecksumAlgorithm::kNone),
+                     kQuickFoxCrc32cChecksumBad, kQuickFoxMD5HashBad},
+        // Legacy options
         HashTestCase{StatusCode::kOk,
                      Options{}
                          .set<storage::EnableCrc32cValidationOption>(true)
@@ -165,20 +198,37 @@ INSTANTIATE_TEST_SUITE_P(
                      kQuickFoxCrc32cChecksumBad, kQuickFoxMD5HashBad},
         // In the next three cases we verify that validation works when the
         // returned values are not correct.
+        HashTestCase{StatusCode::kInvalidArgument,
+                     Options{}.set<storage::DownloadChecksumValidationOption>(
+                         storage::ChecksumAlgorithm::kMD5),
+                     kQuickFoxCrc32cChecksumBad, kQuickFoxMD5HashBad},
+        HashTestCase{StatusCode::kInvalidArgument,
+                     Options{}.set<storage::DownloadChecksumValidationOption>(
+                         storage::ChecksumAlgorithm::kCrc32c),
+                     kQuickFoxCrc32cChecksumBad, kQuickFoxMD5HashBad},
         HashTestCase{StatusCode::kInvalidArgument,
                      Options{}
-                         .set<storage::EnableCrc32cValidationOption>(false)
+                         .set<storage::EnableCrc32cValidationOption>(true)
                          .set<storage::EnableMD5ValidationOption>(true),
                      kQuickFoxCrc32cChecksumBad, kQuickFoxMD5HashBad},
+        HashTestCase{StatusCode::kInvalidArgument,
+                     Options{}.set<storage::DownloadChecksumValidationOption>(
+                         storage::ChecksumAlgorithm::kCrc32c),
+                     kQuickFoxCrc32cChecksumBad, kQuickFoxMD5HashBad},
+        HashTestCase{StatusCode::kInvalidArgument,
+                     Options{}.set<storage::DownloadChecksumValidationOption>(
+                         storage::ChecksumAlgorithm::kMD5),
+                     kQuickFoxCrc32cChecksumBad, kQuickFoxMD5HashBad},
+        // Legacy options
         HashTestCase{StatusCode::kInvalidArgument,
                      Options{}
-                         .set<storage::EnableCrc32cValidationOption>(true)
-                         .set<storage::EnableMD5ValidationOption>(false),
+                         .set<storage::EnableCrc32cValidationOption>(false)
+                         .set<storage::EnableMD5ValidationOption>(true),
                      kQuickFoxCrc32cChecksumBad, kQuickFoxMD5HashBad},
         HashTestCase{StatusCode::kInvalidArgument,
                      Options{}
                          .set<storage::EnableCrc32cValidationOption>(true)
-                         .set<storage::EnableMD5ValidationOption>(true),
+                         .set<storage::EnableMD5ValidationOption>(false),
                      kQuickFoxCrc32cChecksumBad, kQuickFoxMD5HashBad},
         // The application may know what the values should be. Verify the
         // validation works correctly when the application provides correct
@@ -186,8 +236,8 @@ INSTANTIATE_TEST_SUITE_P(
         HashTestCase{
             StatusCode::kOk,
             Options{}
-                .set<storage::EnableCrc32cValidationOption>(true)
-                .set<storage::EnableMD5ValidationOption>(true)
+                .set<storage::DownloadChecksumValidationOption>(
+                    storage::ChecksumAlgorithm::kCrc32c)
                 .set<storage::UseCrc32cValueOption>(kQuickFoxCrc32cChecksum)
                 .set<storage::UseMD5ValueOption>(BinaryMD5(kQuickFoxMD5Hash)),
             kQuickFoxCrc32cChecksum, kQuickFoxMD5Hash},
@@ -195,8 +245,8 @@ INSTANTIATE_TEST_SUITE_P(
         HashTestCase{
             StatusCode::kInvalidArgument,
             Options{}
-                .set<storage::EnableCrc32cValidationOption>(true)
-                .set<storage::EnableMD5ValidationOption>(true)
+                .set<storage::DownloadChecksumValidationOption>(
+                    storage::ChecksumAlgorithm::kCrc32c)
                 .set<storage::UseCrc32cValueOption>(kQuickFoxCrc32cChecksumBad)
                 .set<storage::UseMD5ValueOption>(BinaryMD5(kQuickFoxMD5Hash)),
             kQuickFoxCrc32cChecksum, kQuickFoxMD5Hash},
@@ -212,8 +262,8 @@ INSTANTIATE_TEST_SUITE_P(
         HashTestCase{
             StatusCode::kInvalidArgument,
             Options{}
-                .set<storage::EnableCrc32cValidationOption>(true)
-                .set<storage::EnableMD5ValidationOption>(true)
+                .set<storage::DownloadChecksumValidationOption>(
+                    storage::ChecksumAlgorithm::kCrc32c)
                 .set<storage::UseCrc32cValueOption>(kQuickFoxCrc32cChecksumBad)
                 .set<storage::UseMD5ValueOption>(
                     BinaryMD5(kQuickFoxMD5HashBad)),
@@ -477,3 +527,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace storage_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/storage/internal/async/connection_impl_upload_hash_test.cc b/google/cloud/storage/internal/async/connection_impl_upload_hash_test.cc
index 14db6158db840..37d2b3a71ffaa 100644
--- a/google/cloud/storage/internal/async/connection_impl_upload_hash_test.cc
+++ b/google/cloud/storage/internal/async/connection_impl_upload_hash_test.cc
@@ -13,6 +13,10 @@
 // limitations under the License.
 
 #include "google/cloud/storage/async/options.h"
+
+// TODO(v-pratap): Remove this when EnableMD5ValidationOption and
+// EnableCrc32cValidationOption are removed.
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/storage/async/writer_connection.h"
 #include "google/cloud/storage/internal/async/connection_impl.h"
 #include "google/cloud/storage/internal/async/default_options.h"
@@ -69,15 +73,21 @@ auto ExpectedObjectChecksums(HashTestCase const& tc) {
 
 std::ostream& operator<<(std::ostream& os, HashTestCase const& rhs) {
   os << "HashTestCase={options={";
-  os << std::boolalpha  //
-     << "enable_crc32c_validation="
-     << rhs.options.get<storage::EnableCrc32cValidationOption>();
+  os << std::boolalpha;  //
+  if (rhs.options.has<storage::UploadChecksumValidationOption>()) {
+    os << "upload_checksum="
+       << static_cast<int>(
+              rhs.options.get<storage::UploadChecksumValidationOption>());
+  } else {
+    os << "enable_crc32c_validation="
+       << rhs.options.get<storage::EnableCrc32cValidationOption>();
+    os << ", enable_md5_validation="
+       << rhs.options.get<storage::EnableMD5ValidationOption>();
+  }
   if (rhs.options.has<storage::UseCrc32cValueOption>()) {
     os << ", use_crc32_value="
        << rhs.options.get<storage::UseCrc32cValueOption>();
   }
-  os << ", enable_md5_validation="
-     << rhs.options.get<storage::EnableMD5ValidationOption>();
   if (rhs.options.has<storage::UseMD5ValueOption>()) {
     os << ", use_md5_value=" << rhs.options.get<storage::UseMD5ValueOption>();
   }
@@ -121,6 +131,10 @@ INSTANTIATE_TEST_SUITE_P(
                          .set<storage::EnableCrc32cValidationOption>(true)
                          .set<storage::EnableMD5ValidationOption>(true),
                      kQuickFoxCrc32cChecksum, kQuickFoxMD5Hash},
+        HashTestCase{Options{}.set<storage::UploadChecksumValidationOption>(
+                         storage::ChecksumAlgorithm::kCrc32c),
+                     kQuickFoxCrc32cChecksum, ""},
+        // Legacy options
         HashTestCase{Options{}
                          .set<storage::EnableCrc32cValidationOption>(true)
                          .set<storage::EnableMD5ValidationOption>(false),
@@ -132,6 +146,12 @@ INSTANTIATE_TEST_SUITE_P(
         HashTestCase{Options{}
                          .set<storage::EnableCrc32cValidationOption>(false)
                          .set<storage::EnableMD5ValidationOption>(false),
+                     std::nullopt, ""},
+        HashTestCase{Options{}.set<storage::UploadChecksumValidationOption>(
+                         storage::ChecksumAlgorithm::kMD5),
+                     std::nullopt, kQuickFoxMD5Hash},
+        HashTestCase{Options{}.set<storage::UploadChecksumValidationOption>(
+                         storage::ChecksumAlgorithm::kNone),
                      std::nullopt, ""}));
 
 INSTANTIATE_TEST_SUITE_P(
@@ -139,26 +159,30 @@ INSTANTIATE_TEST_SUITE_P(
     ::testing::Values(
         HashTestCase{
             Options{}
-                .set<storage::EnableCrc32cValidationOption>(false)
-                .set<storage::EnableMD5ValidationOption>(false)
+                .set<storage::UploadChecksumValidationOption>(
+                    storage::ChecksumAlgorithm::kNone)
                 .set<storage::UseCrc32cValueOption>(kQuickFoxCrc32cChecksum)
                 .set<storage::UseMD5ValueOption>(BinaryMD5(kQuickFoxMD5Hash)),
             kQuickFoxCrc32cChecksum, kQuickFoxMD5Hash},
         HashTestCase{
             Options{}
-                .set<storage::EnableCrc32cValidationOption>(false)
-                .set<storage::EnableMD5ValidationOption>(false)
+                .set<storage::UploadChecksumValidationOption>(
+                    storage::ChecksumAlgorithm::kNone)
                 .set<storage::UseCrc32cValueOption>(kQuickFoxCrc32cChecksum),
             kQuickFoxCrc32cChecksum, ""},
         HashTestCase{
             Options{}
-                .set<storage::EnableCrc32cValidationOption>(false)
-                .set<storage::EnableMD5ValidationOption>(false)
+                .set<storage::UploadChecksumValidationOption>(
+                    storage::ChecksumAlgorithm::kNone)
                 .set<storage::UseMD5ValueOption>(BinaryMD5(kQuickFoxMD5Hash)),
             std::nullopt, kQuickFoxMD5Hash},
+        // Legacy options
         HashTestCase{Options{}
                          .set<storage::EnableCrc32cValidationOption>(false)
                          .set<storage::EnableMD5ValidationOption>(false),
+                     std::nullopt, ""},
+        HashTestCase{Options{}.set<storage::UploadChecksumValidationOption>(
+                         storage::ChecksumAlgorithm::kNone),
                      std::nullopt, ""}));
 
 TEST_P(AsyncConnectionImplUploadHashTest, StartUnbuffered) {
@@ -781,3 +805,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace storage_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/storage/internal/async/default_options_test.cc b/google/cloud/storage/internal/async/default_options_test.cc
index dc7e4e8588be8..7bdc79553a84b 100644
--- a/google/cloud/storage/internal/async/default_options_test.cc
+++ b/google/cloud/storage/internal/async/default_options_test.cc
@@ -13,6 +13,10 @@
 // limitations under the License.
 
 #include "google/cloud/storage/internal/async/default_options.h"
+
+// TODO(v-pratap): Remove this when EnableMD5ValidationOption and
+// EnableCrc32cValidationOption are removed.
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/storage/async/idempotency_policy.h"
 #include "google/cloud/storage/async/options.h"
 #include "google/cloud/storage/async/resume_policy.h"
@@ -110,3 +114,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace storage_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/storage/internal/async/object_descriptor_impl.cc b/google/cloud/storage/internal/async/object_descriptor_impl.cc
index 4a331b3a34f65..9430880b8d966 100644
--- a/google/cloud/storage/internal/async/object_descriptor_impl.cc
+++ b/google/cloud/storage/internal/async/object_descriptor_impl.cc
@@ -14,6 +14,7 @@
 
 #include "google/cloud/storage/internal/async/object_descriptor_impl.h"
 #include "google/cloud/storage/async/options.h"
+#include "google/cloud/storage/internal/async/checksum_helpers.h"
 #include "google/cloud/storage/internal/async/handle_redirect_error.h"
 #include "google/cloud/storage/internal/async/multi_stream_manager.h"
 #include "google/cloud/storage/internal/async/object_descriptor_reader_tracing.h"
@@ -23,6 +24,7 @@
 #include "google/cloud/storage/internal/hash_validator.h"
 #include "google/cloud/storage/internal/hash_validator_impl.h"
 #include "google/cloud/storage/internal/hash_values.h"
+#include "google/cloud/storage/options.h"
 #include "google/cloud/grpc_error_delegate.h"
 #include "google/cloud/internal/opentelemetry.h"
 #include "google/rpc/status.pb.h"
@@ -221,9 +223,9 @@ std::unique_ptr<storage::AsyncReaderConnection> ObjectDescriptorImpl::Read(
 
 std::shared_ptr<storage::internal::HashFunction>
 ObjectDescriptorImpl::CreateHashFunction(bool is_full_read) const {
-  auto const enable_crc32c =
-      options_.get<storage::EnableCrc32cValidationOption>();
-  auto const enable_md5 = options_.get<storage::EnableMD5ValidationOption>();
+  auto const settings = GetDownloadChecksumSettings(options_);
+  auto const enable_crc32c = settings.enable_crc32c;
+  auto const enable_md5 = settings.enable_md5;
 
   if (enable_crc32c) {
     std::unique_ptr<storage::internal::HashFunction> child;
@@ -255,9 +257,9 @@ ObjectDescriptorImpl::CreateHashValidator(bool is_full_read) const {
     return storage::internal::CreateNullHashValidator();
   }
 
-  auto const enable_crc32c =
-      options_.get<storage::EnableCrc32cValidationOption>();
-  auto const enable_md5 = options_.get<storage::EnableMD5ValidationOption>();
+  auto const settings = GetDownloadChecksumSettings(options_);
+  auto const enable_crc32c = settings.enable_crc32c;
+  auto const enable_md5 = settings.enable_md5;
 
   std::unique_ptr<storage::internal::HashValidator> hash_validator;
   if (enable_crc32c && enable_md5) {
diff --git a/google/cloud/storage/internal/async/object_descriptor_impl_test.cc b/google/cloud/storage/internal/async/object_descriptor_impl_test.cc
index 68169ed48d8a6..07830a3e63fdb 100644
--- a/google/cloud/storage/internal/async/object_descriptor_impl_test.cc
+++ b/google/cloud/storage/internal/async/object_descriptor_impl_test.cc
@@ -13,6 +13,10 @@
 // limitations under the License.
 
 #include "google/cloud/storage/internal/async/object_descriptor_impl.h"
+
+// TODO(v-pratap): Remove this when EnableMD5ValidationOption and
+// EnableCrc32cValidationOption are removed.
+#include "google/cloud/internal/disable_deprecation_warnings.inc"
 #include "google/cloud/mocks/mock_async_streaming_read_write_rpc.h"
 #include "google/cloud/storage/async/options.h"
 #include "google/cloud/storage/async/resume_policy.h"
@@ -2299,3 +2303,4 @@ GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
 }  // namespace storage_internal
 }  // namespace cloud
 }  // namespace google
+#include "google/cloud/internal/diagnostics_pop.inc"
diff --git a/google/cloud/storage/tests/async_client_integration_test.cc b/google/cloud/storage/tests/async_client_integration_test.cc
index e383aeee30f14..aae9bfc02f1f9 100644
--- a/google/cloud/storage/tests/async_client_integration_test.cc
+++ b/google/cloud/storage/tests/async_client_integration_test.cc
@@ -1006,11 +1006,12 @@ TEST_F(AsyncClientIntegrationTest, Open) {
 
 TEST_F(AsyncClientIntegrationTest, OpenExceedMaximumRange) {
   if (!UsingEmulator()) GTEST_SKIP();
-  auto async =
-      AsyncClient(TestOptions()
-                      .set<storage::MaximumRangeSizeOption>(1024)
-                      .set<storage::EnableCrc32cValidationOption>(false)
-                      .set<storage::EnableMD5ValidationOption>(false));
+  auto async = AsyncClient(TestOptions()
+                               .set<storage::MaximumRangeSizeOption>(1024)
+                               .set<storage::UploadChecksumValidationOption>(
+                                   storage::ChecksumAlgorithm::kNone)
+                               .set<storage::DownloadChecksumValidationOption>(
+                                   storage::ChecksumAlgorithm::kNone));
   auto client = MakeIntegrationTestClient(true, TestOptions());
   auto object_name = MakeRandomObjectName();
 
@@ -1065,8 +1066,10 @@ TEST_F(AsyncClientIntegrationTest, OpenExceedMaximumRange) {
 TEST_F(AsyncClientIntegrationTest, OpenWithChecksumValidation) {
   if (!UsingEmulator()) GTEST_SKIP();
   auto async = AsyncClient(TestOptions()
-                               .set<storage::EnableCrc32cValidationOption>(true)
-                               .set<storage::EnableMD5ValidationOption>(true));
+                               .set<storage::UploadChecksumValidationOption>(
+                                   storage::ChecksumAlgorithm::kCrc32c)
+                               .set<storage::DownloadChecksumValidationOption>(
+                                   storage::ChecksumAlgorithm::kCrc32c));
   auto client = MakeIntegrationTestClient(true, TestOptions());
   auto object_name = MakeRandomObjectName();