diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..d4f4169b
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+*.ts text eol=lf
+*.js text eol=lf
+protos/* linguist-generated
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000..676131fe
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,9 @@
+# Code owners file.
+# This file controls who is tagged for review for any given pull request.
+#
+# For syntax help see:
+# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
+
+
+# The yoshi-nodejs team is the default owner for nodejs repositories.
+*     @googleapis/yoshi-nodejs @googleapis/ml-apis
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 511b628e..7a53bec5 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -8,13 +8,18 @@ Thanks for stopping by to let us know something could be better!
 
 **PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response.
 
-Please run down the following list and make sure you've tried the usual "quick fixes":
+1) Is this a client library issue or a product issue?
+This is the client library for . We will only be able to assist with issues that pertain to the behaviors of this library. If the issue you're experiencing is due to the behavior of the product itself, please visit the [ Support page]() to reach the most relevant engineers.
 
+2) Did someone already solve this?
   - Search the issues already opened: https://github.com/googleapis/nodejs-vision/issues
   - Search the issues on our "catch-all" repository: https://github.com/googleapis/google-cloud-node
-  - Search StackOverflow: http://stackoverflow.com/questions/tagged/google-cloud-platform+node.js
+  - Search or ask on StackOverflow (engineers monitor these tags): http://stackoverflow.com/questions/tagged/google-cloud-platform+node.js
 
-If you are still having issues, please be sure to include as much information as possible:
+3) Do you have a support contract?
+Please create an issue in the [support console](https://cloud.google.com/support/) to ensure a timely response.
+
+If the support paths suggested above still do not result in a resolution, please provide the following details.
 
 #### Environment details
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4cac13b..843bf811 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,13 @@
 
 [1]: https://www.npmjs.com/package/@google-cloud/nodejs-vision?activeTab=versions
 
+### [2.1.1](https://www.github.com/googleapis/nodejs-vision/compare/v2.1.0...v2.1.1) (2020-07-10)
+
+
+### Bug Fixes
+
+* update node issue template ([#795](https://www.github.com/googleapis/nodejs-vision/issues/795)) ([e975833](https://www.github.com/googleapis/nodejs-vision/commit/e975833eb5b11d3c3834bfea9697a9611cae6a8f))
+
 ## [2.1.0](https://www.github.com/googleapis/nodejs-vision/compare/v2.0.0...v2.1.0) (2020-06-12)
 
 
diff --git a/package.json b/package.json
index 83a5b113..ff88c9ef 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@google-cloud/vision",
   "description": "Google Cloud Vision API client for Node.js",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "license": "Apache-2.0",
   "author": "Google Inc",
   "engines": {
@@ -62,7 +62,7 @@
     "jsdoc-fresh": "^1.0.2",
     "jsdoc-region-tag": "^1.0.4",
     "linkinator": "^2.0.3",
-    "mocha": "^7.0.1",
+    "mocha": "^8.0.0",
     "null-loader": "^4.0.0",
     "pack-n-play": "^1.0.0-2",
     "sinon": "^9.0.1",
diff --git a/samples/package.json b/samples/package.json
index 4ceb2ed3..b22e711c 100644
--- a/samples/package.json
+++ b/samples/package.json
@@ -13,7 +13,7 @@
     "test": "mocha system-test --timeout 600000"
   },
   "dependencies": {
-    "@google-cloud/vision": "^2.1.0",
+    "@google-cloud/vision": "^2.1.1",
     "mathjs": "^7.0.0",
     "natural": "^2.0.0",
     "pureimage": "^0.2.1",
@@ -23,7 +23,7 @@
   "devDependencies": {
     "@google-cloud/storage": "^5.0.0",
     "chai": "^4.2.0",
-    "mocha": "^7.0.0",
+    "mocha": "^8.0.0",
     "uuid": "^8.0.0"
   }
 }
diff --git a/synth.metadata b/synth.metadata
index 29b9478b..9ecd8e93 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,22 +4,22 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/nodejs-vision.git",
-        "sha": "7df91d4fc15f64aa9e462af45136ae5a361cc162"
+        "sha": "b37f5f6712cee73d8e335f18f3810c51572bc98a"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "7683d068453196e0f33366f6cc492649bfa750cc",
-        "internalRef": "311836104"
+        "sha": "4f4aa3a03e470f1390758b9d89eb1aa88837a5be",
+        "internalRef": "320300472"
       }
     },
     {
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "e7034945fbdc0e79d3c57f6e299e5c90b0f11469"
+        "sha": "799d8e6522c1ef7cb55a70d9ea0b15e045c3d00b"
       }
     }
   ],
@@ -29,8 +29,8 @@
         "source": "googleapis",
         "apiName": "vision",
         "apiVersion": "v1",
-        "language": "typescript",
-        "generator": "gapic-generator-typescript"
+        "language": "nodejs",
+        "generator": "bazel"
       }
     },
     {
@@ -38,8 +38,8 @@
         "source": "googleapis",
         "apiName": "vision",
         "apiVersion": "v1p1beta1",
-        "language": "typescript",
-        "generator": "gapic-generator-typescript"
+        "language": "nodejs",
+        "generator": "bazel"
       }
     },
     {
@@ -47,8 +47,8 @@
         "source": "googleapis",
         "apiName": "vision",
         "apiVersion": "v1p2beta1",
-        "language": "typescript",
-        "generator": "gapic-generator-typescript"
+        "language": "nodejs",
+        "generator": "bazel"
       }
     },
     {
@@ -56,8 +56,8 @@
         "source": "googleapis",
         "apiName": "vision",
         "apiVersion": "v1p3beta1",
-        "language": "typescript",
-        "generator": "gapic-generator-typescript"
+        "language": "nodejs",
+        "generator": "bazel"
       }
     },
     {
@@ -65,8 +65,8 @@
         "source": "googleapis",
         "apiName": "vision",
         "apiVersion": "v1p4beta1",
-        "language": "typescript",
-        "generator": "gapic-generator-typescript"
+        "language": "nodejs",
+        "generator": "bazel"
       }
     }
   ]
diff --git a/synth.py b/synth.py
index 6baeac2c..cb550992 100644
--- a/synth.py
+++ b/synth.py
@@ -25,19 +25,10 @@
 
 
 # Run the gapic generator
-gapic = gcp.GAPICMicrogenerator()
+gapic = gcp.GAPICBazel()
 versions = ['v1', 'v1p1beta1', 'v1p2beta1', 'v1p3beta1', 'v1p4beta1']
 for version in versions:
-    library = gapic.typescript_library(
-        'vision', version,
-        generator_args={
-            "grpc-service-config": f"google/cloud/vision/{version}/vision_grpc_service_config.json",
-            "package-name": f"@google-cloud/vision",
-            "main-service": f"vision"
-            },
-        proto_path=f'/google/cloud/vision/{version}',
-        extra_proto_files=['google/cloud/common_resources.proto'],
-    )
+    library = gapic.node_library('vision', version)
     s.copy(library, excludes=['src/index.ts', 'package.json'])
 # extends interface for client.ts
 for version in versions: