diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
index 3d2f8282..dddb13b8 100644
--- a/.github/.OwlBot.lock.yaml
+++ b/.github/.OwlBot.lock.yaml
@@ -1,3 +1,3 @@
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:a4d7b2cfc6a9d6b378a6b2458740eae15fcab28854bd23dad3a15102d2e47c87
+  digest: sha256:7f737996c88586c499f7b0c25294c760f9f5eec092289a0e08d2d3f42a069ebb
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index df5ef408..cdbebcbb 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -21,7 +21,7 @@ If you are still having issues, please include as much information as possible:
    General, Core, and Other are also allowed as types
 2. OS type and version:
 3. Java version:
-4. retail version(s):
+4.  version(s):
 
 #### Steps to reproduce
 
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
index e8f4fb89..208842d2 100755
--- a/.kokoro/build.sh
+++ b/.kokoro/build.sh
@@ -47,15 +47,15 @@ set +e
 
 case ${JOB_TYPE} in
 test)
-    mvn test -B -Dclirr.skip=true -Denforcer.skip=true
+    mvn test -B -ntp -Dclirr.skip=true -Denforcer.skip=true
     RETURN_CODE=$?
     ;;
 lint)
-    mvn com.coveo:fmt-maven-plugin:check
+    mvn com.coveo:fmt-maven-plugin:check -B -ntp
     RETURN_CODE=$?
     ;;
 javadoc)
-    mvn javadoc:javadoc javadoc:test-javadoc
+    mvn javadoc:javadoc javadoc:test-javadoc -B -ntp
     RETURN_CODE=$?
     ;;
 integration)
@@ -71,7 +71,7 @@ integration)
     ;;
 graalvm)
     # Run Unit and Integration Tests with Native Image
-    mvn -ntp -Pnative -Penable-integration-tests test
+    mvn -B ${INTEGRATION_TEST_ARGS} -ntp -Pnative -Penable-integration-tests test
     RETURN_CODE=$?
     ;;
 samples)
@@ -103,8 +103,32 @@ samples)
         echo "no sample pom.xml found - skipping sample tests"
     fi
     ;;
+tutorials-samples)
+    SAMPLES_DIR=samples/interactive-tutorials
+
+    if [[ -f ${SAMPLES_DIR}/pom.xml ]]
+    then
+        for FILE in ${KOKORO_GFILE_DIR}/secret_manager/*-samples-secrets; do
+          [[ -f "$FILE" ]] || continue
+          source "$FILE"
+        done
+
+        pushd ${SAMPLES_DIR}
+        mvn -B \
+          -ntp \
+          -DtrimStackTrace=false \
+          -Dclirr.skip=true \
+          -Denforcer.skip=true \
+          -fae \
+          verify
+        RETURN_CODE=$?
+        popd
+    else
+        echo "no interactive-tutorials pom.xml found - skipping interactive-tutorials tests"
+    fi
+    ;;
 clirr)
-    mvn -B -Denforcer.skip=true clirr:check
+    mvn -B -ntp -Denforcer.skip=true clirr:check
     RETURN_CODE=$?
     ;;
 *)
diff --git a/.repo-metadata.json b/.repo-metadata.json
index a3d9f9a6..568e00a0 100644
--- a/.repo-metadata.json
+++ b/.repo-metadata.json
@@ -1,5 +1,5 @@
 {
-    "name": "retail",
+    "api_shortname": "retail",
     "name_pretty": "Cloud Retail",
     "product_documentation": "https://cloud.google.com/solutions/retail",
     "api_description": "Retail solutions API.",
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 819d3784..c1d1d0f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+### [2.0.7](https://www.github.com/googleapis/java-retail/compare/v2.0.6...v2.0.7) (2022-01-07)
+
+
+### Bug Fixes
+
+* **java:** add -ntp flag to native image testing command ([#1299](https://www.github.com/googleapis/java-retail/issues/1299)) ([#250](https://www.github.com/googleapis/java-retail/issues/250)) ([dd942ab](https://www.github.com/googleapis/java-retail/commit/dd942ab9d8efd582f5c83c259c5ca6e0225c88a5))
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.6.0 ([#258](https://www.github.com/googleapis/java-retail/issues/258)) ([81f1a09](https://www.github.com/googleapis/java-retail/commit/81f1a0936e779e67d39aa4d68f19b99bea90a819))
+
 ### [2.0.6](https://www.github.com/googleapis/java-retail/compare/v2.0.5...v2.0.6) (2021-12-03)
 
 
diff --git a/google-cloud-retail-bom/pom.xml b/google-cloud-retail-bom/pom.xml
index d4415a05..e7651d86 100644
--- a/google-cloud-retail-bom/pom.xml
+++ b/google-cloud-retail-bom/pom.xml
@@ -3,12 +3,12 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-retail-bom</artifactId>
-  <version>2.0.7-SNAPSHOT</version><!-- {x-version-update:google-cloud-retail:current} -->
+  <version>2.0.8-SNAPSHOT</version><!-- {x-version-update:google-cloud-retail:current} -->
   <packaging>pom</packaging>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.2.2</version>
+    <version>1.2.4</version>
   </parent>
 
   <name>Google Cloud Retail BOM</name>
@@ -57,17 +57,17 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-retail</artifactId>
-        <version>2.0.7-SNAPSHOT</version><!-- {x-version-update:google-cloud-retail:current} -->
+        <version>2.0.8-SNAPSHOT</version><!-- {x-version-update:google-cloud-retail:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-retail-v2</artifactId>
-        <version>2.0.7-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-retail-v2:current} -->
+        <version>2.0.8-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-retail-v2:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-retail-v2</artifactId>
-        <version>2.0.7-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-retail-v2:current} -->
+        <version>2.0.8-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-retail-v2:current} -->
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/google-cloud-retail/pom.xml b/google-cloud-retail/pom.xml
index 3e3dabbd..fe61dbf0 100644
--- a/google-cloud-retail/pom.xml
+++ b/google-cloud-retail/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-retail</artifactId>
-  <version>2.0.7-SNAPSHOT</version><!-- {x-version-update:google-cloud-retail:current} -->
+  <version>2.0.8-SNAPSHOT</version><!-- {x-version-update:google-cloud-retail:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Retail</name>
   <url>https://github.com/googleapis/java-retail</url>
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-retail-parent</artifactId>
-    <version>2.0.7-SNAPSHOT</version><!-- {x-version-update:google-cloud-retail:current} -->
+    <version>2.0.8-SNAPSHOT</version><!-- {x-version-update:google-cloud-retail:current} -->
   </parent>
   <properties>
     <site.installationModule>google-cloud-retail</site.installationModule>
diff --git a/grpc-google-cloud-retail-v2/pom.xml b/grpc-google-cloud-retail-v2/pom.xml
index 4f894504..b4b6f390 100644
--- a/grpc-google-cloud-retail-v2/pom.xml
+++ b/grpc-google-cloud-retail-v2/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>grpc-google-cloud-retail-v2</artifactId>
-  <version>2.0.7-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-retail-v2:current} -->
+  <version>2.0.8-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-retail-v2:current} -->
   <name>grpc-google-cloud-retail-v2</name>
   <description>GRPC library for google-cloud-retail</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-retail-parent</artifactId>
-    <version>2.0.7-SNAPSHOT</version><!-- {x-version-update:google-cloud-retail:current} -->
+    <version>2.0.8-SNAPSHOT</version><!-- {x-version-update:google-cloud-retail:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/pom.xml b/pom.xml
index aff17b3e..c6ad801b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,7 +106,6 @@
     <module>grpc-google-cloud-retail-v2</module>
     <module>proto-google-cloud-retail-v2</module>
     <module>google-cloud-retail-bom</module>
-    <module>samples</module>
   </modules>
 
   <reporting>
@@ -178,4 +177,4 @@
       </plugin>
     </plugins>
   </reporting>
-</project>
\ No newline at end of file
+</project>
diff --git a/proto-google-cloud-retail-v2/pom.xml b/proto-google-cloud-retail-v2/pom.xml
index 08af24a7..5383c096 100644
--- a/proto-google-cloud-retail-v2/pom.xml
+++ b/proto-google-cloud-retail-v2/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>proto-google-cloud-retail-v2</artifactId>
-  <version>2.0.7-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-retail-v2:current} -->
+  <version>2.0.8-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-retail-v2:current} -->
   <name>proto-google-cloud-retail-v2</name>
   <description>Proto library for google-cloud-retail</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-retail-parent</artifactId>
-    <version>2.0.7-SNAPSHOT</version><!-- {x-version-update:google-cloud-retail:current} -->
+    <version>2.0.8-SNAPSHOT</version><!-- {x-version-update:google-cloud-retail:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 4ffe57b8..7b4914f9 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -12,9 +12,9 @@
     Removing or replacing it should not affect the execution of the samples in anyway.
   -->
   <parent>
-    <groupId>com.google.cloud</groupId>
-    <artifactId>google-cloud-retail-samples</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <groupId>com.google.cloud.samples</groupId>
+    <artifactId>shared-configuration</artifactId>
+    <version>1.2.0</version>
   </parent>
 
   <properties>
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index e55b7276..acff7188 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -12,9 +12,9 @@
     Removing or replacing it should not affect the execution of the samples in anyway.
   -->
   <parent>
-    <groupId>com.google.cloud</groupId>
-    <artifactId>google-cloud-retail-samples</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <groupId>com.google.cloud.samples</groupId>
+    <artifactId>shared-configuration</artifactId>
+    <version>1.2.0</version>
   </parent>
 
   <properties>
@@ -44,4 +44,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/versions.txt b/versions.txt
index 296d182e..3eba5f08 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,6 +1,6 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-retail:2.0.6:2.0.7-SNAPSHOT
-grpc-google-cloud-retail-v2:2.0.6:2.0.7-SNAPSHOT
-proto-google-cloud-retail-v2:2.0.6:2.0.7-SNAPSHOT
+google-cloud-retail:2.0.7:2.0.8-SNAPSHOT
+grpc-google-cloud-retail-v2:2.0.7:2.0.8-SNAPSHOT
+proto-google-cloud-retail-v2:2.0.7:2.0.8-SNAPSHOT