diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index 178458be..fd9c186b 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -20,17 +20,22 @@ scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
 ## cd to the parent directory, i.e. the root of the git repo
 cd ${scriptDir}/..
 
+# include common functions
+source ${scriptDir}/common.sh
+
 # Print out Java version
 java -version
 echo ${JOB_TYPE}
 
-mvn install -B -V \
-  -DskipTests=true \
-  -Dclirr.skip=true \
-  -Denforcer.skip=true \
-  -Dmaven.javadoc.skip=true \
-  -Dgcloud.download.skip=true \
-  -T 1C
+# attempt to install 3 times with exponential backoff (starting with 10 seconds)
+retry_with_backoff 3 10 \
+  mvn install -B -V \
+    -DskipTests=true \
+    -Dclirr.skip=true \
+    -Denforcer.skip=true \
+    -Dmaven.javadoc.skip=true \
+    -Dgcloud.download.skip=true \
+    -T 1C
 
 # if GOOGLE_APPLICATION_CREDIENTIALS is specified as a relative path prepend Kokoro root directory onto it
 if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTIALS}" != /* ]]; then
diff --git a/.kokoro/common.sh b/.kokoro/common.sh
new file mode 100644
index 00000000..a3bbc5f6
--- /dev/null
+++ b/.kokoro/common.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+# Copyright 2020 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
+#
+#      http://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.
+
+# set -eo pipefail
+
+function retry_with_backoff {
+    attempts_left=$1
+    sleep_seconds=$2
+    shift 2
+    command=$@
+
+    echo "${command}"
+    ${command}
+    exit_code=$?
+
+    if [[ $exit_code == 0 ]]
+    then
+        return 0
+    fi
+
+    # failure
+    if [[ ${attempts_left} > 0 ]]
+    then
+        echo "failure (${exit_code}), sleeping ${sleep_seconds}..."
+        sleep ${sleep_seconds}
+        new_attempts=$((${attempts_left} - 1))
+        new_sleep=$((${sleep_seconds} * 2))
+        retry_with_backoff ${new_attempts} ${new_sleep} ${command}
+    fi
+
+    return $exit_code
+}
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index b3e110f5..0aade871 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -15,7 +15,13 @@
 
 set -eo pipefail
 
-cd github/java-webrisk/
+## Get the directory of the build script
+scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
+## cd to the parent directory, i.e. the root of the git repo
+cd ${scriptDir}/..
+
+# include common functions
+source ${scriptDir}/common.sh
 
 # Print out Java
 java -version
@@ -24,8 +30,9 @@ echo $JOB_TYPE
 export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
 
 # this should run maven enforcer
-mvn install -B -V \
-  -DskipTests=true \
-  -Dclirr.skip=true
+retry_with_backoff 3 10 \
+  mvn install -B -V \
+    -DskipTests=true \
+    -Dclirr.skip=true
 
 mvn -B dependency:analyze -DfailOnWarning=true
diff --git a/.kokoro/linkage-monitor.sh b/.kokoro/linkage-monitor.sh
index 1534f414..759ab4e2 100755
--- a/.kokoro/linkage-monitor.sh
+++ b/.kokoro/linkage-monitor.sh
@@ -17,18 +17,26 @@ set -eo pipefail
 # Display commands being run.
 set -x
 
-cd github/java-webrisk/
+## Get the directory of the build script
+scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
+## cd to the parent directory, i.e. the root of the git repo
+cd ${scriptDir}/..
+
+# include common functions
+source ${scriptDir}/common.sh
 
 # Print out Java version
 java -version
 echo ${JOB_TYPE}
 
-mvn install -B -V \
-  -DskipTests=true \
-  -Dclirr.skip=true \
-  -Denforcer.skip=true \
-  -Dmaven.javadoc.skip=true \
-  -Dgcloud.download.skip=true
+# attempt to install 3 times with exponential backoff (starting with 10 seconds)
+retry_with_backoff 3 10 \
+  mvn install -B -V \
+    -DskipTests=true \
+    -Dclirr.skip=true \
+    -Denforcer.skip=true \
+    -Dmaven.javadoc.skip=true \
+    -Dgcloud.download.skip=true
 
 # Kokoro job cloud-opensource-java/ubuntu/linkage-monitor-gcs creates this JAR
 JAR=linkage-monitor-latest-all-deps.jar
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81337bbb..d7568ee8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+### [0.33.1](https://www.github.com/googleapis/java-webrisk/compare/v0.33.0...v0.33.1) (2020-03-30)
+
+
+### Dependencies
+
+* update dependency com.google.api:api-common to v1.9.0 ([#102](https://www.github.com/googleapis/java-webrisk/issues/102)) ([0affdb9](https://www.github.com/googleapis/java-webrisk/commit/0affdb92f1b5fbc121a2b46e5c7af7c7d9a16c08))
+* update dependency com.google.cloud.samples:shared-configuration to v1.0.13 ([#101](https://www.github.com/googleapis/java-webrisk/issues/101)) ([49e6839](https://www.github.com/googleapis/java-webrisk/commit/49e68397c9547641d114f38bcb79eee184bbfb91))
+
 ## [0.33.0](https://www.github.com/googleapis/java-webrisk/compare/v0.32.1...v0.33.0) (2020-03-16)
 
 
diff --git a/README.md b/README.md
index 15a2bd4d..42e9ea5d 100644
--- a/README.md
+++ b/README.md
@@ -20,18 +20,19 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>libraries-bom</artifactId>
-      <version>4.2.0</version>
+      <version>4.3.0</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
   </dependencies>
 </dependencyManagement>
+
 <dependencies>
   <dependency>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-webrisk</artifactId>
   </dependency>
-</dependencies>
+
 ```
 
 [//]: # ({x-version-update-start:google-cloud-webrisk:released})
@@ -42,17 +43,18 @@ If you are using Maven without BOM, add this to your dependencies:
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-webrisk</artifactId>
-  <version>0.33.0</version>
+  <version>0.33.1</version>
 </dependency>
+
 ```
 
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-webrisk:0.33.0'
+compile 'com.google.cloud:google-cloud-webrisk:0.33.1'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-webrisk" % "0.33.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-webrisk" % "0.33.1"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-webrisk-bom/pom.xml b/google-cloud-webrisk-bom/pom.xml
index b05613f0..ef37571d 100644
--- a/google-cloud-webrisk-bom/pom.xml
+++ b/google-cloud-webrisk-bom/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-webrisk-bom</artifactId>
-  <version>0.33.0</version><!-- {x-version-update:google-cloud-webrisk:current} -->
+  <version>0.33.1</version><!-- {x-version-update:google-cloud-webrisk:current} -->
   <packaging>pom</packaging>
   <parent>
     <groupId>com.google.cloud</groupId>
@@ -63,7 +63,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-webrisk</artifactId>
-        <version>0.33.0</version><!-- {x-version-update:google-cloud-webrisk:current} -->
+        <version>0.33.1</version><!-- {x-version-update:google-cloud-webrisk:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
@@ -73,7 +73,7 @@
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-webrisk-v1beta1</artifactId>
-        <version>0.33.0</version><!-- {x-version-update:grpc-google-cloud-webrisk-v1beta1:current} -->
+        <version>0.33.1</version><!-- {x-version-update:grpc-google-cloud-webrisk-v1beta1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
@@ -83,7 +83,7 @@
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-webrisk-v1beta1</artifactId>
-        <version>0.33.0</version><!-- {x-version-update:proto-google-cloud-webrisk-v1beta1:current} -->
+        <version>0.33.1</version><!-- {x-version-update:proto-google-cloud-webrisk-v1beta1:current} -->
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/google-cloud-webrisk/pom.xml b/google-cloud-webrisk/pom.xml
index 06ab8696..3dc849ec 100644
--- a/google-cloud-webrisk/pom.xml
+++ b/google-cloud-webrisk/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-webrisk</artifactId>
-  <version>0.33.0</version><!-- {x-version-update:google-cloud-webrisk:current} -->
+  <version>0.33.1</version><!-- {x-version-update:google-cloud-webrisk:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Web Risk</name>
   <url>https://github.com/googleapis/java-webrisk</url>
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-webrisk-parent</artifactId>
-    <version>0.33.0</version><!-- {x-version-update:google-cloud-webrisk:current} -->
+    <version>0.33.1</version><!-- {x-version-update:google-cloud-webrisk:current} -->
   </parent>
   <properties>
     <site.installationModule>google-cloud-webrisk</site.installationModule>
diff --git a/grpc-google-cloud-webrisk-v1/pom.xml b/grpc-google-cloud-webrisk-v1/pom.xml
index 4c30b1a2..f50699a5 100644
--- a/grpc-google-cloud-webrisk-v1/pom.xml
+++ b/grpc-google-cloud-webrisk-v1/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-webrisk-parent</artifactId>
-    <version>0.33.0</version><!-- {x-version-update:google-cloud-webrisk:current} -->
+    <version>0.33.1</version><!-- {x-version-update:google-cloud-webrisk:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/grpc-google-cloud-webrisk-v1/src/main/java/com/google/webrisk/v1/WebRiskServiceGrpc.java b/grpc-google-cloud-webrisk-v1/src/main/java/com/google/webrisk/v1/WebRiskServiceGrpc.java
index a1eb73aa..213b7c0c 100644
--- a/grpc-google-cloud-webrisk-v1/src/main/java/com/google/webrisk/v1/WebRiskServiceGrpc.java
+++ b/grpc-google-cloud-webrisk-v1/src/main/java/com/google/webrisk/v1/WebRiskServiceGrpc.java
@@ -217,19 +217,43 @@ private WebRiskServiceGrpc() {}
 
   /** Creates a new async stub that supports all call types for the service */
   public static WebRiskServiceStub newStub(io.grpc.Channel channel) {
-    return new WebRiskServiceStub(channel);
+    io.grpc.stub.AbstractStub.StubFactory<WebRiskServiceStub> factory =
+        new io.grpc.stub.AbstractStub.StubFactory<WebRiskServiceStub>() {
+          @java.lang.Override
+          public WebRiskServiceStub newStub(
+              io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
+            return new WebRiskServiceStub(channel, callOptions);
+          }
+        };
+    return WebRiskServiceStub.newStub(factory, channel);
   }
 
   /**
    * Creates a new blocking-style stub that supports unary and streaming output calls on the service
    */
   public static WebRiskServiceBlockingStub newBlockingStub(io.grpc.Channel channel) {
-    return new WebRiskServiceBlockingStub(channel);
+    io.grpc.stub.AbstractStub.StubFactory<WebRiskServiceBlockingStub> factory =
+        new io.grpc.stub.AbstractStub.StubFactory<WebRiskServiceBlockingStub>() {
+          @java.lang.Override
+          public WebRiskServiceBlockingStub newStub(
+              io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
+            return new WebRiskServiceBlockingStub(channel, callOptions);
+          }
+        };
+    return WebRiskServiceBlockingStub.newStub(factory, channel);
   }
 
   /** Creates a new ListenableFuture-style stub that supports unary calls on the service */
   public static WebRiskServiceFutureStub newFutureStub(io.grpc.Channel channel) {
-    return new WebRiskServiceFutureStub(channel);
+    io.grpc.stub.AbstractStub.StubFactory<WebRiskServiceFutureStub> factory =
+        new io.grpc.stub.AbstractStub.StubFactory<WebRiskServiceFutureStub>() {
+          @java.lang.Override
+          public WebRiskServiceFutureStub newStub(
+              io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
+            return new WebRiskServiceFutureStub(channel, callOptions);
+          }
+        };
+    return WebRiskServiceFutureStub.newStub(factory, channel);
   }
 
   /**
@@ -354,11 +378,7 @@ public final io.grpc.ServerServiceDefinition bindService() {
    * </pre>
    */
   public static final class WebRiskServiceStub
-      extends io.grpc.stub.AbstractStub<WebRiskServiceStub> {
-    private WebRiskServiceStub(io.grpc.Channel channel) {
-      super(channel);
-    }
-
+      extends io.grpc.stub.AbstractAsyncStub<WebRiskServiceStub> {
     private WebRiskServiceStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
     }
@@ -459,11 +479,7 @@ public void createSubmission(
    * </pre>
    */
   public static final class WebRiskServiceBlockingStub
-      extends io.grpc.stub.AbstractStub<WebRiskServiceBlockingStub> {
-    private WebRiskServiceBlockingStub(io.grpc.Channel channel) {
-      super(channel);
-    }
-
+      extends io.grpc.stub.AbstractBlockingStub<WebRiskServiceBlockingStub> {
     private WebRiskServiceBlockingStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
     }
@@ -552,11 +568,7 @@ public com.google.webrisk.v1.Submission createSubmission(
    * </pre>
    */
   public static final class WebRiskServiceFutureStub
-      extends io.grpc.stub.AbstractStub<WebRiskServiceFutureStub> {
-    private WebRiskServiceFutureStub(io.grpc.Channel channel) {
-      super(channel);
-    }
-
+      extends io.grpc.stub.AbstractFutureStub<WebRiskServiceFutureStub> {
     private WebRiskServiceFutureStub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
     }
diff --git a/grpc-google-cloud-webrisk-v1beta1/clirr-ignored-differences.xml b/grpc-google-cloud-webrisk-v1beta1/clirr-ignored-differences.xml
new file mode 100644
index 00000000..fd100e61
--- /dev/null
+++ b/grpc-google-cloud-webrisk-v1beta1/clirr-ignored-differences.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
+<differences>
+  <difference>
+    <!-- TODO: remove after 0.33.1 released -->
+    <differenceType>6001</differenceType>
+    <className>com/google/webrisk/v1beta1/*Grpc</className>
+    <field>METHOD_*</field>
+  </difference>
+</differences>
diff --git a/grpc-google-cloud-webrisk-v1beta1/pom.xml b/grpc-google-cloud-webrisk-v1beta1/pom.xml
index 42dcb12e..99e9ce11 100644
--- a/grpc-google-cloud-webrisk-v1beta1/pom.xml
+++ b/grpc-google-cloud-webrisk-v1beta1/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>grpc-google-cloud-webrisk-v1beta1</artifactId>
-  <version>0.33.0</version><!-- {x-version-update:grpc-google-cloud-webrisk-v1beta1:current} -->
+  <version>0.33.1</version><!-- {x-version-update:grpc-google-cloud-webrisk-v1beta1:current} -->
   <name>grpc-google-cloud-webrisk-v1beta1</name>
   <description>GRPC library for grpc-google-cloud-webrisk-v1beta1</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-webrisk-parent</artifactId>
-    <version>0.33.0</version><!-- {x-version-update:google-cloud-webrisk:current} -->
+    <version>0.33.1</version><!-- {x-version-update:google-cloud-webrisk:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/grpc-google-cloud-webrisk-v1beta1/src/main/java/com/google/webrisk/v1beta1/WebRiskServiceV1Beta1Grpc.java b/grpc-google-cloud-webrisk-v1beta1/src/main/java/com/google/webrisk/v1beta1/WebRiskServiceV1Beta1Grpc.java
index b739eea7..5aec6b4d 100644
--- a/grpc-google-cloud-webrisk-v1beta1/src/main/java/com/google/webrisk/v1beta1/WebRiskServiceV1Beta1Grpc.java
+++ b/grpc-google-cloud-webrisk-v1beta1/src/main/java/com/google/webrisk/v1beta1/WebRiskServiceV1Beta1Grpc.java
@@ -31,7 +31,7 @@
  * </pre>
  */
 @javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.10.0)",
+    value = "by gRPC proto compiler",
     comments = "Source: google/cloud/webrisk/v1beta1/webrisk.proto")
 public final class WebRiskServiceV1Beta1Grpc {
 
@@ -40,30 +40,20 @@ private WebRiskServiceV1Beta1Grpc() {}
   public static final String SERVICE_NAME = "google.cloud.webrisk.v1beta1.WebRiskServiceV1Beta1";
 
   // Static method descriptors that strictly reflect the proto.
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
-  @java.lang.Deprecated // Use {@link #getComputeThreatListDiffMethod()} instead.
-  public static final io.grpc.MethodDescriptor<
-          com.google.webrisk.v1beta1.ComputeThreatListDiffRequest,
-          com.google.webrisk.v1beta1.ComputeThreatListDiffResponse>
-      METHOD_COMPUTE_THREAT_LIST_DIFF = getComputeThreatListDiffMethodHelper();
-
   private static volatile io.grpc.MethodDescriptor<
           com.google.webrisk.v1beta1.ComputeThreatListDiffRequest,
           com.google.webrisk.v1beta1.ComputeThreatListDiffResponse>
       getComputeThreatListDiffMethod;
 
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @io.grpc.stub.annotations.RpcMethod(
+      fullMethodName = SERVICE_NAME + '/' + "ComputeThreatListDiff",
+      requestType = com.google.webrisk.v1beta1.ComputeThreatListDiffRequest.class,
+      responseType = com.google.webrisk.v1beta1.ComputeThreatListDiffResponse.class,
+      methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
   public static io.grpc.MethodDescriptor<
           com.google.webrisk.v1beta1.ComputeThreatListDiffRequest,
           com.google.webrisk.v1beta1.ComputeThreatListDiffResponse>
       getComputeThreatListDiffMethod() {
-    return getComputeThreatListDiffMethodHelper();
-  }
-
-  private static io.grpc.MethodDescriptor<
-          com.google.webrisk.v1beta1.ComputeThreatListDiffRequest,
-          com.google.webrisk.v1beta1.ComputeThreatListDiffResponse>
-      getComputeThreatListDiffMethodHelper() {
     io.grpc.MethodDescriptor<
             com.google.webrisk.v1beta1.ComputeThreatListDiffRequest,
             com.google.webrisk.v1beta1.ComputeThreatListDiffResponse>
@@ -82,9 +72,7 @@ private WebRiskServiceV1Beta1Grpc() {}
                           newBuilder()
                       .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
                       .setFullMethodName(
-                          generateFullMethodName(
-                              "google.cloud.webrisk.v1beta1.WebRiskServiceV1Beta1",
-                              "ComputeThreatListDiff"))
+                          generateFullMethodName(SERVICE_NAME, "ComputeThreatListDiff"))
                       .setSampledToLocalTracing(true)
                       .setRequestMarshaller(
                           io.grpc.protobuf.ProtoUtils.marshaller(
@@ -104,30 +92,20 @@ private WebRiskServiceV1Beta1Grpc() {}
     return getComputeThreatListDiffMethod;
   }
 
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
-  @java.lang.Deprecated // Use {@link #getSearchUrisMethod()} instead.
-  public static final io.grpc.MethodDescriptor<
-          com.google.webrisk.v1beta1.SearchUrisRequest,
-          com.google.webrisk.v1beta1.SearchUrisResponse>
-      METHOD_SEARCH_URIS = getSearchUrisMethodHelper();
-
   private static volatile io.grpc.MethodDescriptor<
           com.google.webrisk.v1beta1.SearchUrisRequest,
           com.google.webrisk.v1beta1.SearchUrisResponse>
       getSearchUrisMethod;
 
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @io.grpc.stub.annotations.RpcMethod(
+      fullMethodName = SERVICE_NAME + '/' + "SearchUris",
+      requestType = com.google.webrisk.v1beta1.SearchUrisRequest.class,
+      responseType = com.google.webrisk.v1beta1.SearchUrisResponse.class,
+      methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
   public static io.grpc.MethodDescriptor<
           com.google.webrisk.v1beta1.SearchUrisRequest,
           com.google.webrisk.v1beta1.SearchUrisResponse>
       getSearchUrisMethod() {
-    return getSearchUrisMethodHelper();
-  }
-
-  private static io.grpc.MethodDescriptor<
-          com.google.webrisk.v1beta1.SearchUrisRequest,
-          com.google.webrisk.v1beta1.SearchUrisResponse>
-      getSearchUrisMethodHelper() {
     io.grpc.MethodDescriptor<
             com.google.webrisk.v1beta1.SearchUrisRequest,
             com.google.webrisk.v1beta1.SearchUrisResponse>
@@ -142,9 +120,7 @@ private WebRiskServiceV1Beta1Grpc() {}
                           com.google.webrisk.v1beta1.SearchUrisResponse>
                           newBuilder()
                       .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
-                      .setFullMethodName(
-                          generateFullMethodName(
-                              "google.cloud.webrisk.v1beta1.WebRiskServiceV1Beta1", "SearchUris"))
+                      .setFullMethodName(generateFullMethodName(SERVICE_NAME, "SearchUris"))
                       .setSampledToLocalTracing(true)
                       .setRequestMarshaller(
                           io.grpc.protobuf.ProtoUtils.marshaller(
@@ -161,30 +137,20 @@ private WebRiskServiceV1Beta1Grpc() {}
     return getSearchUrisMethod;
   }
 
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
-  @java.lang.Deprecated // Use {@link #getSearchHashesMethod()} instead.
-  public static final io.grpc.MethodDescriptor<
-          com.google.webrisk.v1beta1.SearchHashesRequest,
-          com.google.webrisk.v1beta1.SearchHashesResponse>
-      METHOD_SEARCH_HASHES = getSearchHashesMethodHelper();
-
   private static volatile io.grpc.MethodDescriptor<
           com.google.webrisk.v1beta1.SearchHashesRequest,
           com.google.webrisk.v1beta1.SearchHashesResponse>
       getSearchHashesMethod;
 
-  @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901")
+  @io.grpc.stub.annotations.RpcMethod(
+      fullMethodName = SERVICE_NAME + '/' + "SearchHashes",
+      requestType = com.google.webrisk.v1beta1.SearchHashesRequest.class,
+      responseType = com.google.webrisk.v1beta1.SearchHashesResponse.class,
+      methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
   public static io.grpc.MethodDescriptor<
           com.google.webrisk.v1beta1.SearchHashesRequest,
           com.google.webrisk.v1beta1.SearchHashesResponse>
       getSearchHashesMethod() {
-    return getSearchHashesMethodHelper();
-  }
-
-  private static io.grpc.MethodDescriptor<
-          com.google.webrisk.v1beta1.SearchHashesRequest,
-          com.google.webrisk.v1beta1.SearchHashesResponse>
-      getSearchHashesMethodHelper() {
     io.grpc.MethodDescriptor<
             com.google.webrisk.v1beta1.SearchHashesRequest,
             com.google.webrisk.v1beta1.SearchHashesResponse>
@@ -199,9 +165,7 @@ private WebRiskServiceV1Beta1Grpc() {}
                           com.google.webrisk.v1beta1.SearchHashesResponse>
                           newBuilder()
                       .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
-                      .setFullMethodName(
-                          generateFullMethodName(
-                              "google.cloud.webrisk.v1beta1.WebRiskServiceV1Beta1", "SearchHashes"))
+                      .setFullMethodName(generateFullMethodName(SERVICE_NAME, "SearchHashes"))
                       .setSampledToLocalTracing(true)
                       .setRequestMarshaller(
                           io.grpc.protobuf.ProtoUtils.marshaller(
@@ -220,19 +184,43 @@ private WebRiskServiceV1Beta1Grpc() {}
 
   /** Creates a new async stub that supports all call types for the service */
   public static WebRiskServiceV1Beta1Stub newStub(io.grpc.Channel channel) {
-    return new WebRiskServiceV1Beta1Stub(channel);
+    io.grpc.stub.AbstractStub.StubFactory<WebRiskServiceV1Beta1Stub> factory =
+        new io.grpc.stub.AbstractStub.StubFactory<WebRiskServiceV1Beta1Stub>() {
+          @java.lang.Override
+          public WebRiskServiceV1Beta1Stub newStub(
+              io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
+            return new WebRiskServiceV1Beta1Stub(channel, callOptions);
+          }
+        };
+    return WebRiskServiceV1Beta1Stub.newStub(factory, channel);
   }
 
   /**
    * Creates a new blocking-style stub that supports unary and streaming output calls on the service
    */
   public static WebRiskServiceV1Beta1BlockingStub newBlockingStub(io.grpc.Channel channel) {
-    return new WebRiskServiceV1Beta1BlockingStub(channel);
+    io.grpc.stub.AbstractStub.StubFactory<WebRiskServiceV1Beta1BlockingStub> factory =
+        new io.grpc.stub.AbstractStub.StubFactory<WebRiskServiceV1Beta1BlockingStub>() {
+          @java.lang.Override
+          public WebRiskServiceV1Beta1BlockingStub newStub(
+              io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
+            return new WebRiskServiceV1Beta1BlockingStub(channel, callOptions);
+          }
+        };
+    return WebRiskServiceV1Beta1BlockingStub.newStub(factory, channel);
   }
 
   /** Creates a new ListenableFuture-style stub that supports unary calls on the service */
   public static WebRiskServiceV1Beta1FutureStub newFutureStub(io.grpc.Channel channel) {
-    return new WebRiskServiceV1Beta1FutureStub(channel);
+    io.grpc.stub.AbstractStub.StubFactory<WebRiskServiceV1Beta1FutureStub> factory =
+        new io.grpc.stub.AbstractStub.StubFactory<WebRiskServiceV1Beta1FutureStub>() {
+          @java.lang.Override
+          public WebRiskServiceV1Beta1FutureStub newStub(
+              io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
+            return new WebRiskServiceV1Beta1FutureStub(channel, callOptions);
+          }
+        };
+    return WebRiskServiceV1Beta1FutureStub.newStub(factory, channel);
   }
 
   /**
@@ -256,7 +244,7 @@ public void computeThreatListDiff(
         com.google.webrisk.v1beta1.ComputeThreatListDiffRequest request,
         io.grpc.stub.StreamObserver<com.google.webrisk.v1beta1.ComputeThreatListDiffResponse>
             responseObserver) {
-      asyncUnimplementedUnaryCall(getComputeThreatListDiffMethodHelper(), responseObserver);
+      asyncUnimplementedUnaryCall(getComputeThreatListDiffMethod(), responseObserver);
     }
 
     /**
@@ -270,7 +258,7 @@ public void searchUris(
         com.google.webrisk.v1beta1.SearchUrisRequest request,
         io.grpc.stub.StreamObserver<com.google.webrisk.v1beta1.SearchUrisResponse>
             responseObserver) {
-      asyncUnimplementedUnaryCall(getSearchUrisMethodHelper(), responseObserver);
+      asyncUnimplementedUnaryCall(getSearchUrisMethod(), responseObserver);
     }
 
     /**
@@ -288,27 +276,27 @@ public void searchHashes(
         com.google.webrisk.v1beta1.SearchHashesRequest request,
         io.grpc.stub.StreamObserver<com.google.webrisk.v1beta1.SearchHashesResponse>
             responseObserver) {
-      asyncUnimplementedUnaryCall(getSearchHashesMethodHelper(), responseObserver);
+      asyncUnimplementedUnaryCall(getSearchHashesMethod(), responseObserver);
     }
 
     @java.lang.Override
     public final io.grpc.ServerServiceDefinition bindService() {
       return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
           .addMethod(
-              getComputeThreatListDiffMethodHelper(),
+              getComputeThreatListDiffMethod(),
               asyncUnaryCall(
                   new MethodHandlers<
                       com.google.webrisk.v1beta1.ComputeThreatListDiffRequest,
                       com.google.webrisk.v1beta1.ComputeThreatListDiffResponse>(
                       this, METHODID_COMPUTE_THREAT_LIST_DIFF)))
           .addMethod(
-              getSearchUrisMethodHelper(),
+              getSearchUrisMethod(),
               asyncUnaryCall(
                   new MethodHandlers<
                       com.google.webrisk.v1beta1.SearchUrisRequest,
                       com.google.webrisk.v1beta1.SearchUrisResponse>(this, METHODID_SEARCH_URIS)))
           .addMethod(
-              getSearchHashesMethodHelper(),
+              getSearchHashesMethod(),
               asyncUnaryCall(
                   new MethodHandlers<
                       com.google.webrisk.v1beta1.SearchHashesRequest,
@@ -327,11 +315,7 @@ public final io.grpc.ServerServiceDefinition bindService() {
    * </pre>
    */
   public static final class WebRiskServiceV1Beta1Stub
-      extends io.grpc.stub.AbstractStub<WebRiskServiceV1Beta1Stub> {
-    private WebRiskServiceV1Beta1Stub(io.grpc.Channel channel) {
-      super(channel);
-    }
-
+      extends io.grpc.stub.AbstractAsyncStub<WebRiskServiceV1Beta1Stub> {
     private WebRiskServiceV1Beta1Stub(io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
     }
@@ -354,7 +338,7 @@ public void computeThreatListDiff(
         io.grpc.stub.StreamObserver<com.google.webrisk.v1beta1.ComputeThreatListDiffResponse>
             responseObserver) {
       asyncUnaryCall(
-          getChannel().newCall(getComputeThreatListDiffMethodHelper(), getCallOptions()),
+          getChannel().newCall(getComputeThreatListDiffMethod(), getCallOptions()),
           request,
           responseObserver);
     }
@@ -371,9 +355,7 @@ public void searchUris(
         io.grpc.stub.StreamObserver<com.google.webrisk.v1beta1.SearchUrisResponse>
             responseObserver) {
       asyncUnaryCall(
-          getChannel().newCall(getSearchUrisMethodHelper(), getCallOptions()),
-          request,
-          responseObserver);
+          getChannel().newCall(getSearchUrisMethod(), getCallOptions()), request, responseObserver);
     }
 
     /**
@@ -392,7 +374,7 @@ public void searchHashes(
         io.grpc.stub.StreamObserver<com.google.webrisk.v1beta1.SearchHashesResponse>
             responseObserver) {
       asyncUnaryCall(
-          getChannel().newCall(getSearchHashesMethodHelper(), getCallOptions()),
+          getChannel().newCall(getSearchHashesMethod(), getCallOptions()),
           request,
           responseObserver);
     }
@@ -407,11 +389,7 @@ public void searchHashes(
    * </pre>
    */
   public static final class WebRiskServiceV1Beta1BlockingStub
-      extends io.grpc.stub.AbstractStub<WebRiskServiceV1Beta1BlockingStub> {
-    private WebRiskServiceV1Beta1BlockingStub(io.grpc.Channel channel) {
-      super(channel);
-    }
-
+      extends io.grpc.stub.AbstractBlockingStub<WebRiskServiceV1Beta1BlockingStub> {
     private WebRiskServiceV1Beta1BlockingStub(
         io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
@@ -433,7 +411,7 @@ protected WebRiskServiceV1Beta1BlockingStub build(
     public com.google.webrisk.v1beta1.ComputeThreatListDiffResponse computeThreatListDiff(
         com.google.webrisk.v1beta1.ComputeThreatListDiffRequest request) {
       return blockingUnaryCall(
-          getChannel(), getComputeThreatListDiffMethodHelper(), getCallOptions(), request);
+          getChannel(), getComputeThreatListDiffMethod(), getCallOptions(), request);
     }
 
     /**
@@ -445,8 +423,7 @@ public com.google.webrisk.v1beta1.ComputeThreatListDiffResponse computeThreatLis
      */
     public com.google.webrisk.v1beta1.SearchUrisResponse searchUris(
         com.google.webrisk.v1beta1.SearchUrisRequest request) {
-      return blockingUnaryCall(
-          getChannel(), getSearchUrisMethodHelper(), getCallOptions(), request);
+      return blockingUnaryCall(getChannel(), getSearchUrisMethod(), getCallOptions(), request);
     }
 
     /**
@@ -462,8 +439,7 @@ public com.google.webrisk.v1beta1.SearchUrisResponse searchUris(
      */
     public com.google.webrisk.v1beta1.SearchHashesResponse searchHashes(
         com.google.webrisk.v1beta1.SearchHashesRequest request) {
-      return blockingUnaryCall(
-          getChannel(), getSearchHashesMethodHelper(), getCallOptions(), request);
+      return blockingUnaryCall(getChannel(), getSearchHashesMethod(), getCallOptions(), request);
     }
   }
 
@@ -476,11 +452,7 @@ public com.google.webrisk.v1beta1.SearchHashesResponse searchHashes(
    * </pre>
    */
   public static final class WebRiskServiceV1Beta1FutureStub
-      extends io.grpc.stub.AbstractStub<WebRiskServiceV1Beta1FutureStub> {
-    private WebRiskServiceV1Beta1FutureStub(io.grpc.Channel channel) {
-      super(channel);
-    }
-
+      extends io.grpc.stub.AbstractFutureStub<WebRiskServiceV1Beta1FutureStub> {
     private WebRiskServiceV1Beta1FutureStub(
         io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
@@ -503,7 +475,7 @@ protected WebRiskServiceV1Beta1FutureStub build(
             com.google.webrisk.v1beta1.ComputeThreatListDiffResponse>
         computeThreatListDiff(com.google.webrisk.v1beta1.ComputeThreatListDiffRequest request) {
       return futureUnaryCall(
-          getChannel().newCall(getComputeThreatListDiffMethodHelper(), getCallOptions()), request);
+          getChannel().newCall(getComputeThreatListDiffMethod(), getCallOptions()), request);
     }
 
     /**
@@ -517,7 +489,7 @@ protected WebRiskServiceV1Beta1FutureStub build(
             com.google.webrisk.v1beta1.SearchUrisResponse>
         searchUris(com.google.webrisk.v1beta1.SearchUrisRequest request) {
       return futureUnaryCall(
-          getChannel().newCall(getSearchUrisMethodHelper(), getCallOptions()), request);
+          getChannel().newCall(getSearchUrisMethod(), getCallOptions()), request);
     }
 
     /**
@@ -535,7 +507,7 @@ protected WebRiskServiceV1Beta1FutureStub build(
             com.google.webrisk.v1beta1.SearchHashesResponse>
         searchHashes(com.google.webrisk.v1beta1.SearchHashesRequest request) {
       return futureUnaryCall(
-          getChannel().newCall(getSearchHashesMethodHelper(), getCallOptions()), request);
+          getChannel().newCall(getSearchHashesMethod(), getCallOptions()), request);
     }
   }
 
@@ -643,9 +615,9 @@ public static io.grpc.ServiceDescriptor getServiceDescriptor() {
               result =
                   io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
                       .setSchemaDescriptor(new WebRiskServiceV1Beta1FileDescriptorSupplier())
-                      .addMethod(getComputeThreatListDiffMethodHelper())
-                      .addMethod(getSearchUrisMethodHelper())
-                      .addMethod(getSearchHashesMethodHelper())
+                      .addMethod(getComputeThreatListDiffMethod())
+                      .addMethod(getSearchUrisMethod())
+                      .addMethod(getSearchHashesMethod())
                       .build();
         }
       }
diff --git a/pom.xml b/pom.xml
index 70b48b9a..517af6bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-webrisk-parent</artifactId>
   <packaging>pom</packaging>
-  <version>0.33.0</version><!-- {x-version-update:google-cloud-webrisk:current} -->
+  <version>0.33.1</version><!-- {x-version-update:google-cloud-webrisk:current} -->
   <name>Google Cloud Web Risk Parent</name>
   <url>https://github.com/googleapis/java-webrisk</url>
   <description>
@@ -64,7 +64,7 @@
     <github.global.server>github</github.global.server>
     <site.installationModule>google-cloud-webrisk-parent</site.installationModule>
     <google.core.version>1.91.1</google.core.version>
-    <google.api-common.version>1.8.1</google.api-common.version>
+    <google.api-common.version>1.9.0</google.api-common.version>
     <google.common-protos.version>1.17.0</google.common-protos.version>
     <gax.version>1.54.0</gax.version>
     <grpc.version>1.27.2</grpc.version>
@@ -86,7 +86,7 @@
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-webrisk-v1beta1</artifactId>
-        <version>0.33.0</version><!-- {x-version-update:proto-google-cloud-webrisk-v1beta1:current} -->
+        <version>0.33.1</version><!-- {x-version-update:proto-google-cloud-webrisk-v1beta1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
@@ -96,12 +96,12 @@
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-webrisk-v1beta1</artifactId>
-        <version>0.33.0</version><!-- {x-version-update:grpc-google-cloud-webrisk-v1beta1:current} -->
+        <version>0.33.1</version><!-- {x-version-update:grpc-google-cloud-webrisk-v1beta1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-webrisk</artifactId>
-        <version>0.33.0</version><!-- {x-version-update:google-cloud-webrisk:current} -->
+        <version>0.33.1</version><!-- {x-version-update:google-cloud-webrisk:current} -->
       </dependency>
 
       <dependency>
diff --git a/proto-google-cloud-webrisk-v1/pom.xml b/proto-google-cloud-webrisk-v1/pom.xml
index 4411b0b1..9a0c4ef9 100644
--- a/proto-google-cloud-webrisk-v1/pom.xml
+++ b/proto-google-cloud-webrisk-v1/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-webrisk-parent</artifactId>
-    <version>0.33.0</version><!-- {x-version-update:google-cloud-webrisk:current} -->
+    <version>0.33.1</version><!-- {x-version-update:google-cloud-webrisk:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/proto-google-cloud-webrisk-v1beta1/pom.xml b/proto-google-cloud-webrisk-v1beta1/pom.xml
index 3c2a8743..0c5dffbc 100644
--- a/proto-google-cloud-webrisk-v1beta1/pom.xml
+++ b/proto-google-cloud-webrisk-v1beta1/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>proto-google-cloud-webrisk-v1beta1</artifactId>
-  <version>0.33.0</version><!-- {x-version-update:proto-google-cloud-webrisk-v1beta1:current} -->
+  <version>0.33.1</version><!-- {x-version-update:proto-google-cloud-webrisk-v1beta1:current} -->
   <name>proto-google-cloud-webrisk-v1beta1</name>
   <description>PROTO library for proto-google-cloud-webrisk-v1beta1</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-webrisk-parent</artifactId>
-    <version>0.33.0</version><!-- {x-version-update:google-cloud-webrisk:current} -->
+    <version>0.33.1</version><!-- {x-version-update:google-cloud-webrisk:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/renovate.json b/renovate.json
index fc641270..ff17a672 100644
--- a/renovate.json
+++ b/renovate.json
@@ -56,7 +56,9 @@
     },
     {
       "packagePatterns": [
-        "^com.google.cloud:libraries-bom"
+        "^com.google.cloud:google-cloud-webrisk",
+        "^com.google.cloud:libraries-bom",
+        "^com.google.cloud.samples:shared-configuration"
       ],
       "semanticCommitType": "chore",
       "semanticCommitScope": "deps"
@@ -75,4 +77,4 @@
     }
   ],
   "semanticCommits": true
-}
+}
\ No newline at end of file
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
new file mode 100644
index 00000000..054bc99d
--- /dev/null
+++ b/samples/install-without-bom/pom.xml
@@ -0,0 +1,84 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.google.cloud</groupId>
+  <artifactId>webrisk-install-without-bom</artifactId>
+  <packaging>jar</packaging>
+  <name>Google Web Risk Install Without Bom</name>
+  <url>https://github.com/googleapis/java-webrisk</url>
+
+  <!--
+    The parent pom defines common style checks and testing strategies for our samples.
+    Removing or replacing it should not affect the execution of the samples in anyway.
+  -->
+  <parent>
+    <groupId>com.google.cloud.samples</groupId>
+    <artifactId>shared-configuration</artifactId>
+    <version>1.0.14</version>
+  </parent>
+
+  <properties>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+
+  <dependencies>
+    <!-- [START webrisk_install_without_bom] -->
+    <dependency>
+      <groupId>com.google.cloud</groupId>
+      <artifactId>google-cloud-webrisk</artifactId>
+      <version>0.33.0</version>
+    </dependency>
+    <!-- [END webrisk_install_without_bom] -->
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.13</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.truth</groupId>
+      <artifactId>truth</artifactId>
+      <version>1.0.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <!-- compile and run all snippet tests -->
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>3.1.0</version>
+        <executions>
+          <execution>
+            <id>add-snippets-source</id>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>../snippets/src/main/java</source>
+              </sources>
+            </configuration>
+          </execution>
+          <execution>
+            <id>add-snippets-tests</id>
+            <goals>
+              <goal>add-test-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>../snippets/src/test/java</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/samples/pom.xml b/samples/pom.xml
new file mode 100644
index 00000000..508759df
--- /dev/null
+++ b/samples/pom.xml
@@ -0,0 +1,56 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.google.cloud</groupId>
+  <artifactId>google-cloud-webrisk-samples</artifactId>
+  <version>0.0.1-SNAPSHOT</version><!-- This artifact should not be released -->
+  <packaging>pom</packaging>
+  <name>Google Web Risk Samples Parent</name>
+  <url>https://github.com/googleapis/java-webrisk</url>
+  <description>
+    Java idiomatic client for Google Cloud Platform services.
+  </description>
+
+  <!--
+    The parent pom defines common style checks and testing strategies for our samples.
+    Removing or replacing it should not affect the execution of the samples in anyway.
+  -->
+  <parent>
+    <groupId>com.google.cloud.samples</groupId>
+    <artifactId>shared-configuration</artifactId>
+    <version>1.0.14</version>
+  </parent>
+
+  <properties>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <modules>
+    <module>install-without-bom</module>
+    <module>snapshot</module>
+    <module>snippets</module>
+  </modules>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <version>2.8.2</version>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.sonatype.plugins</groupId>
+        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <version>1.6.8</version>
+        <configuration>
+          <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project> 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
new file mode 100644
index 00000000..28f11f55
--- /dev/null
+++ b/samples/snapshot/pom.xml
@@ -0,0 +1,83 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.google.cloud</groupId>
+  <artifactId>webrisk-snapshot</artifactId>
+  <packaging>jar</packaging>
+  <name>Google Web Risk Snapshot Samples</name>
+  <url>https://github.com/googleapis/java-webrisk</url>
+
+  <!--
+    The parent pom defines common style checks and testing strategies for our samples.
+    Removing or replacing it should not affect the execution of the samples in anyway.
+  -->
+  <parent>
+    <groupId>com.google.cloud.samples</groupId>
+    <artifactId>shared-configuration</artifactId>
+    <version>1.0.14</version>
+  </parent>
+
+  <properties>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <!-- {x-version-update-start::current} -->
+  <dependencies>
+    <dependency>
+      <groupId>com.google.cloud</groupId>
+      <artifactId>google-cloud-webrisk</artifactId>
+      <version>0.33.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.13</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.truth</groupId>
+      <artifactId>truth</artifactId>
+      <version>1.0.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <!-- {x-version-update-end} -->
+
+  <!-- compile and run all snippet tests -->
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>3.1.0</version>
+        <executions>
+          <execution>
+            <id>add-snippets-source</id>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>../snippets/src/main/java</source>
+              </sources>
+            </configuration>
+          </execution>
+          <execution>
+            <id>add-snippets-tests</id>
+            <goals>
+              <goal>add-test-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>../snippets/src/test/java</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
\ No newline at end of file
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
new file mode 100644
index 00000000..999e9eb8
--- /dev/null
+++ b/samples/snippets/pom.xml
@@ -0,0 +1,60 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.google.cloud</groupId>
+  <artifactId>webrisk-snippets</artifactId>
+  <packaging>jar</packaging>
+  <name>Google Web Risk Snippets</name>
+  <url>https://github.com/googleapis/java-webrisk</url>
+
+  <!--
+    The parent pom defines common style checks and testing strategies for our samples.
+    Removing or replacing it should not affect the execution of the samples in anyway.
+  -->
+  <parent>
+    <groupId>com.google.cloud.samples</groupId>
+    <artifactId>shared-configuration</artifactId>
+    <version>1.0.14</version>
+  </parent>
+
+  <properties>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+
+  <!-- [START webrisk_install_with_bom] -->
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>com.google.cloud</groupId>
+        <artifactId>libraries-bom</artifactId>
+        <version>4.3.0</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.google.cloud</groupId>
+      <artifactId>google-cloud-webrisk</artifactId>
+    </dependency>
+    <!-- [END webrisk_install_with_bom] -->
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.13</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.truth</groupId>
+      <artifactId>truth</artifactId>
+      <version>1.0.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/synth.metadata b/synth.metadata
index a82c6677..6f9154a5 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -1,34 +1,29 @@
 {
-  "updateTime": "2020-03-16T17:51:44.887676Z",
+  "updateTime": "2020-03-25T23:22:04.500328Z",
   "sources": [
-    {
-      "generator": {
-        "name": "artman",
-        "version": "1.1.0",
-        "dockerImage": "googleapis/artman@sha256:f54b7644a1d2e7a37b23f5c0dfe9bba473e41c675002a507a244389e27487ca9"
-      }
-    },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "ae78682c05e864d71223ce22532219813b0245ac",
-        "internalRef": "301185150"
+        "sha": "0341fa3fc2f4073a1b1f260d37b2ce620799f545",
+        "internalRef": "302980301"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "ae78682c05e864d71223ce22532219813b0245ac",
-        "internalRef": "301185150"
+        "sha": "0341fa3fc2f4073a1b1f260d37b2ce620799f545",
+        "internalRef": "302980301",
+        "log": "0341fa3fc2f4073a1b1f260d37b2ce620799f545\nTurn on gapic config v2 for kms.\n\nCommitter: @hzyi-google\nPiperOrigin-RevId: 302980301\n\n32dc6e832039b61ac3fb82c72eb0a27570aebcd6\nredis: v1beta1 enables REDIS_5_0 as an option for redis_version field and adds two new redis configs --stream-node-max-entries --stream-node-max-bytes\n\nPiperOrigin-RevId: 302958009\n\n685f16483cc4d87c35051f21f8f13ef4fdc919b4\nredis: v1 enables REDIS_5_0 as an option for redis_version field and adds two new redis configs --stream-node-max-entries --stream-node-max-bytes\n\nPiperOrigin-RevId: 302957729\n\n733cb282ae5e64673ef86c9a5dff647df803d8b7\nAdd GAPIC cofiguration for v1 client library genetration.\n\nPiperOrigin-RevId: 302928200\n\n1b0fff5f2ec6dc4a9443d9b50e70e9c94c30c45b\ndocs: remove an internal lint declaration\n\nPiperOrigin-RevId: 302928106\n\n2be23f3f3036a6f7ce0844def3d2d3da74e5d415\nfix(google/maps): Add post-processing rules for Google Maps APIs\n\nPiperOrigin-RevId: 302925222\n\nfd83ab212176a1042e8d45ea90766b3bf59ac679\nfix: migrate osconfig/agentendpoint/v1 go_gapic_library target to microgen impl\n\nPiperOrigin-RevId: 302913609\n\n0e07113e776bdd8fcc0783372e08bb6e76cb1b5b\ndocs: Update documentation with links to smart home developer guides and reference pages. Remove outdated authorization instructions.\n\nPiperOrigin-RevId: 302892245\n\n551cf1e6e3addcc63740427c4f9b40dedd3dac27\nfeat: Add OS Config AgentEndpointService v1 PatchJobs and Tasks APIs.\n\nPiperOrigin-RevId: 302792195\n\n1df117114c73299b614dfd3ba3632bf246669336\nSynchronize new proto/yaml changes.\n\nPiperOrigin-RevId: 302753982\n\n71d6c56a14bb433beb1237dccb48dabcd9597924\nRefresh monitoring client libraries.\nRename to Cloud Monitoring API.\nAdded support for TimeSeriesQueryLanguageCondition condition type in alert policies.\n\nPiperOrigin-RevId: 302735422\n\n25a1781c096974df99d556cc5888fefa82bc6425\nbazel: migrate all go_gapic_library targets to microgenerator implementation\n\n* update rules_go and gazelle bazel dependencies\n* update gapic-generator bazel dependency (with build file generator changes)\n\nPiperOrigin-RevId: 302730217\n\n"
       }
     },
     {
-      "template": {
-        "name": "java_library",
-        "origin": "synthtool.gcp",
-        "version": "2020.2.4"
+      "git": {
+        "name": "synthtool",
+        "remote": "https://github.com/googleapis/synthtool.git",
+        "sha": "e36822bfa0acb355502dab391b8ef9c4f30208d8",
+        "log": "e36822bfa0acb355502dab391b8ef9c4f30208d8\nchore(java): treat samples shared configuration dependency update as chore (#457)\n\n\n1b4cc80a7aaf164f6241937dd87f3bd1f4149e0c\nfix: do not run node 8 CI (#456)\n\n\nee4330a0e5f4b93978e8683fbda8e6d4148326b7\nchore(java_templates): mark version bumps of current library as a chore (#452)\n\nWith the samples/install-without-bom/pom.xml referencing the latest released library, we want to mark updates of this version as a chore for renovate bot.\na0d3133a5d45544a66345059eebf76933265c099\nfix(java): run mvn install with retry (#453)\n\n* fix(java): run mvn install with retry\n\n* fix invocation of command\n"
       }
     }
   ],
@@ -39,8 +34,7 @@
         "apiName": "webrisk",
         "apiVersion": "v1beta1",
         "language": "java",
-        "generator": "gapic",
-        "config": "google/cloud/webrisk/artman_webrisk_v1beta1.yaml"
+        "generator": "bazel"
       }
     },
     {
diff --git a/synth.py b/synth.py
index eeefbec1..831a9bcc 100644
--- a/synth.py
+++ b/synth.py
@@ -14,28 +14,18 @@
 
 """This script is used to synthesize generated parts of this library."""
 
-import synthtool.gcp as gcp
 import synthtool.languages.java as java
 
-gapic = gcp.GAPICGenerator()
-common_templates = gcp.CommonTemplates()
+AUTOSYNTH_MULTIPLE_COMMITS = True
 
-versions = ['v1beta1']
+versions = ['v1beta1', 'v1']
 service = 'webrisk'
-config_pattern = '/google/cloud/webrisk/artman_webrisk_{version}.yaml'
 
 for version in versions:
-  java.gapic_library(
-    service=service,
-    version=version,
-    config_pattern=config_pattern,
-    package_pattern='com.google.webrisk.{version}',
-    gapic=gapic,
+  library = java.bazel_library(
+      service=service,
+      version=version,
+      bazel_target=f'//google/cloud/{service}/{version}:google-cloud-{service}-{version}-java',
   )
 
-java.bazel_library(
-  service=service,
-  version='v1',
-)
-
 java.common_templates()
diff --git a/versions.txt b/versions.txt
index edd3fbe8..1edcd9a1 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,6 +1,6 @@
 # Format:
 # module:released-version:current-version
 
-proto-google-cloud-webrisk-v1beta1:0.33.0:0.33.0
-grpc-google-cloud-webrisk-v1beta1:0.33.0:0.33.0
-google-cloud-webrisk:0.33.0:0.33.0
+proto-google-cloud-webrisk-v1beta1:0.33.1:0.33.1
+grpc-google-cloud-webrisk-v1beta1:0.33.1:0.33.1
+google-cloud-webrisk:0.33.1:0.33.1