diff --git a/WORKSPACE b/WORKSPACE
index 942da0c0..fc16d713 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -44,8 +44,8 @@ protobuf_deps()
 # section
 http_archive(
     name = "com_google_api_codegen",
-    strip_prefix = "gapic-generator-89ca580bf9534eaef2e06292c4b083c72dfa8ec1",
-    urls = ["https://github.com/googleapis/gapic-generator/archive/89ca580bf9534eaef2e06292c4b083c72dfa8ec1.zip"],
+    strip_prefix = "gapic-generator-48288a4abc4a55161f13ac0f0a73b840cf037817",
+    urls = ["https://github.com/googleapis/gapic-generator/archive/48288a4abc4a55161f13ac0f0a73b840cf037817.zip"],
 )
 
 ##############################################################################
@@ -99,8 +99,8 @@ apple_support_dependencies()
 
 http_archive(
     name = "com_google_api_gax_java",
-    strip_prefix = "gax-java-1.49.0",
-    urls = ["https://github.com/googleapis/gax-java/archive/v1.49.0.zip"],
+    strip_prefix = "gax-java-31b44b19cf7e312a1861310f049a18b69822eaca",
+    urls = ["https://github.com/googleapis/gax-java/archive/31b44b19cf7e312a1861310f049a18b69822eaca.zip"],
 )
 
 load("@com_google_api_gax_java//:repository_rules.bzl", "com_google_api_gax_java_properties")
diff --git a/google/devtools/clouddebugger/v2/BUILD.bazel b/google/devtools/clouddebugger/v2/BUILD.bazel
index 46bcca12..79da7958 100644
--- a/google/devtools/clouddebugger/v2/BUILD.bazel
+++ b/google/devtools/clouddebugger/v2/BUILD.bazel
@@ -15,6 +15,8 @@ proto_library(
     ],
     deps = [
         "//google/api:annotations_proto",
+        "//google/api:client_proto",
+        "//google/api:field_behavior_proto",
         "//google/devtools/source/v1:source_proto",
         "@com_google_protobuf//:duration_proto",
         "@com_google_protobuf//:empty_proto",
@@ -58,7 +60,8 @@ java_gapic_library(
     name = "debugger_java_gapic",
     src = ":debugger_proto_with_info",
     gapic_yaml = "clouddebugger_gapic.yaml",
-    service_yaml = "//google/devtools/clouddebugger:clouddebugger.yaml",
+    package = "google.devtools.clouddebugger.v2",
+    service_yaml = ":clouddebugger_v2.yaml",
     test_deps = [":debugger_java_grpc"],
     deps = [":debugger_java_proto"],
 )
@@ -110,7 +113,8 @@ go_gapic_library(
     src = ":debugger_proto_with_info",
     gapic_yaml = "clouddebugger_gapic.yaml",
     importpath = "cloud.google.com/go/debugger/apiv2",
-    service_yaml = "//google/devtools/clouddebugger:clouddebugger.yaml",
+    package = "google.devtools.clouddebugger.v2",
+    service_yaml = ":clouddebugger_v2.yaml",
     deps = [":debugger_go_proto"],
 )