diff --git a/src/compiler/php_generator.cc b/src/compiler/php_generator.cc
index 47207c8317340..40f32123338f1 100644
--- a/src/compiler/php_generator.cc
+++ b/src/compiler/php_generator.cc
@@ -287,8 +287,10 @@ void PrintService(const ServiceDescriptor* service,
   map<grpc::string, grpc::string> response_vars;
   for (int i = 0; i < service->method_count(); i++) {
     const Descriptor* output_type = service->method(i)->output_type();
-    response_vars["method_name"] = grpc_generator::LowercaseFirstLetter(service->method(i)->name());
-    response_vars["output_type_id"] = MessageIdentifierName(GeneratedClassName(output_type), output_type->file());
+    response_vars["method_name"] =
+        grpc_generator::LowercaseFirstLetter(service->method(i)->name());
+    response_vars["output_type_id"] = MessageIdentifierName(
+        GeneratedClassName(output_type), output_type->file());
     out->Print(response_vars, "'$method_name$' => '\\$output_type_id$',\n");
   }
   out->Outdent();
diff --git a/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile
index c3b4a9a28e6a8..3e659f8a823e9 100644
--- a/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile
+++ b/tools/dockerfile/interoptest/grpc_interop_go/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.16
+FROM golang:1.18.8
 
 # Using login shell removes Go from path, so we add it.
 RUN ln -s /usr/local/go/bin/go /usr/local/bin