diff --git a/src/main/java/com/google/cloud/spanner/pgadapter/utils/MutationWriter.java b/src/main/java/com/google/cloud/spanner/pgadapter/utils/MutationWriter.java
index 1c792fce5..cbd660ab5 100644
--- a/src/main/java/com/google/cloud/spanner/pgadapter/utils/MutationWriter.java
+++ b/src/main/java/com/google/cloud/spanner/pgadapter/utils/MutationWriter.java
@@ -18,6 +18,8 @@
 import com.google.api.core.ApiFutures;
 import com.google.api.core.InternalApi;
 import com.google.api.core.SettableApiFuture;
+import com.google.api.gax.grpc.GrpcCallContext;
+import com.google.api.gax.rpc.ApiCallContext;
 import com.google.cloud.ByteArray;
 import com.google.cloud.spanner.DatabaseClient;
 import com.google.cloud.spanner.ErrorCode;
@@ -26,7 +28,7 @@
 import com.google.cloud.spanner.SpannerException;
 import com.google.cloud.spanner.SpannerExceptionFactory;
 import com.google.cloud.spanner.SpannerOptions;
-import com.google.cloud.spanner.SpannerOptions.SpannerCallContextTimeoutConfigurator;
+import com.google.cloud.spanner.SpannerOptions.CallContextConfigurator;
 import com.google.cloud.spanner.Type;
 import com.google.cloud.spanner.Value;
 import com.google.cloud.spanner.connection.Connection;
@@ -44,6 +46,7 @@
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 import io.grpc.Context;
+import io.grpc.MethodDescriptor;
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.InterruptedIOException;
@@ -367,9 +370,19 @@ private ApiFuture<Void> writeToSpannerAsync(
                   Context.current()
                       .withValue(
                           SpannerOptions.CALL_CONTEXT_CONFIGURATOR_KEY,
-                          SpannerCallContextTimeoutConfigurator.create()
-                              .withCommitTimeout(
-                                  Duration.ofSeconds(copySettings.getCommitTimeoutSeconds())));
+                          new CallContextConfigurator() {
+                            @Override
+                            public <ReqT, RespT> ApiCallContext configure(
+                                ApiCallContext context,
+                                ReqT request,
+                                MethodDescriptor<ReqT, RespT> method) {
+                              // Use the same timeout for all RPCs that are executed for the commit.
+                              // This could also include BeginTransaction and BatchCreateSessions.
+                              return GrpcCallContext.createDefault()
+                                  .withTimeout(
+                                      Duration.ofSeconds(copySettings.getCommitTimeoutSeconds()));
+                            }
+                          });
               context.run(() -> dbClient.write(immutableMutations));
               return null;
             });
diff --git a/src/test/java/com/google/cloud/spanner/pgadapter/nodejs/TypeORMMockServerTest.java b/src/test/java/com/google/cloud/spanner/pgadapter/nodejs/TypeORMMockServerTest.java
index f35547c28..e82ddedaa 100644
--- a/src/test/java/com/google/cloud/spanner/pgadapter/nodejs/TypeORMMockServerTest.java
+++ b/src/test/java/com/google/cloud/spanner/pgadapter/nodejs/TypeORMMockServerTest.java
@@ -502,7 +502,8 @@ public void testCreateAllTypes() throws IOException, InterruptedException {
     assertEquals(
         "some random string", insertRequest.getParams().getFieldsMap().get("p9").getStringValue());
     assertEquals(
-        "{\"key\":\"value\"}", insertRequest.getParams().getFieldsMap().get("p10").getStringValue());
+        "{\"key\":\"value\"}",
+        insertRequest.getParams().getFieldsMap().get("p10").getStringValue());
   }
 
   static String runTest(String testName, int port) throws IOException, InterruptedException {