Merge branch 'master' of github.com:googleapis/googleapis into public-master
diff --git a/gapic/api/artman_bigtable.yaml b/gapic/api/artman_bigtable.yaml
index 9fcd288..b226109 100644
--- a/gapic/api/artman_bigtable.yaml
+++ b/gapic/api/artman_bigtable.yaml
@@ -1,90 +1,105 @@
 common:
   api_name: bigtable
   api_version: v2
-  package_type: grpc_client
-  packaging: google-cloud
   organization_name: google-cloud
+  service_yaml: google/bigtable/bigtable.yaml
+  gapic_yaml: google/bigtable/v2/bigtable_gapic.yaml
+  src_proto_paths:
+  - google/bigtable/v2
   proto_deps:
-    - google-common-protos
-  import_proto_path:
-    - ${GOOGLEAPIS}
-  src_proto_path:
-    - ${GOOGLEAPIS}/google/bigtable/v2
-  service_yaml:
-    - ${GOOGLEAPIS}/google/bigtable/bigtable.yaml
-  output_dir: ${REPOROOT}/artman/output
-  git_repos:
-    staging:
-      location: git@github.com:googleapis/api-client-staging.git
-  gapic_api_yaml:
-    - ${GOOGLEAPIS}/google/bigtable/v2/bigtable_gapic.yaml
-csharp:
-  gapic_code_dir: ${REPOROOT}/artman/output/csharp/google-cloud-bigtable
-go:
-  gapic_code_dir: ${REPOROOT}/gapi-cloud-bigtable-go
-  git_repos:
-    go:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
-      paths:
-        - bigtable/apiv2
-    staging:
-      paths:
-        - generated/go/vendor/cloud.google.com/go/google-cloud-bigtable-v2/vendor
-java:
-  gapic_code_dir: ${REPOROOT}/artman/output/java/google-cloud-bigtable
-  git_repos:
-    java:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
-      paths:
-        - google-cloud-bigtable
-    staging:
-      paths:
-        - generated/java/google-cloud-bigtable-v2
-nodejs:
-  gapic_code_dir: ${REPOROOT}/artman/output/js/bigtable-v2
-  git_repos:
-    nodejs:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
-      paths:
-        - src: src/v2
-          dest: packages/bigtable/src/v2
-    staging:
-      paths:
-        - generated/nodejs/bigtable
-  skip_packman: True
-php:
-  gapic_code_dir: ${REPOROOT}/artman/output/php/google-cloud-bigtable-v2
-  git_repos:
-    staging:
-      paths:
-        - generated/php/google-cloud-bigtable-v2
-python:
-  gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-bigtable-v2
-  git_repos:
-    python:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-python.git
-      paths:
-        - src: google/cloud/bigtable_v2
-          dest: bigtable/google/cloud/bigtable_v2
-        - src: tests/unit/gapic/v1
-          dest: bigtable/tests/gapic
-        - artifact: grpc
-          src: google/cloud/proto
-          dest: bigtable/google/cloud/proto
-    staging:
-      paths:
-        - generated/python/gapic-google-cloud-bigtable-v2
-        - artifact: grpc
-          dest: generated/python/proto-google-cloud-bigtable-v2
-ruby:
-  gapic_code_dir: ${REPOROOT}/artman/output/ruby/google-cloud-ruby/google-cloud-bigtable
-  git_repos:
-    ruby:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
-      paths:
-        - src: lib/google/cloud/bigtable/v2
-          dest: google-cloud-bigtable/lib/google/cloud/bigtable/v2
-    staging:
-      paths:
-        - generated/ruby/google-cloud-bigtable
-  skip_packman: True
+  - name: google-common-protos
+artifacts:
+- name: java_gapic
+  type: GAPIC_ONLY
+  language: JAVA
+  publish_targets:
+  - name: java
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
+    directory_mappings:
+    - dest: google-cloud-bigtable
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/java/google-cloud-bigtable-v2
+- name: python_gapic
+  type: GAPIC_ONLY
+  language: PYTHON
+  publish_targets:
+  - name: python
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-python.git
+    directory_mappings:
+    - src: google/cloud/bigtable_v2
+      dest: bigtable/google/cloud/bigtable_v2
+    - src: tests/unit/gapic/v1
+      dest: bigtable/tests/gapic
+    - name: grpc
+      src: google/cloud/proto
+      dest: bigtable/google/cloud/proto
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/python/gapic-google-cloud-bigtable-v2
+    - name: grpc
+      dest: generated/python/proto-google-cloud-bigtable-v2
+- name: php_gapic
+  type: GAPIC_ONLY
+  language: PHP
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/php/google-cloud-bigtable-v2
+- name: ruby_gapic
+  type: GAPIC_ONLY
+  language: RUBY
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/ruby/google-cloud-bigtable
+  - name: ruby
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
+    directory_mappings:
+    - src: lib/google/cloud/bigtable/v2
+      dest: google-cloud-bigtable/lib/google/cloud/bigtable/v2
+- name: go_gapic
+  type: GAPIC_ONLY
+  language: GO
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/go/vendor/cloud.google.com/go/google-cloud-bigtable-v2/vendor
+  - name: go
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
+    directory_mappings:
+    - dest: bigtable/apiv2
+- name: csharp_gapic
+  type: GAPIC_ONLY
+  language: CSHARP
+- name: nodejs_gapic
+  type: GAPIC_ONLY
+  language: NODEJS
+  publish_targets:
+  - name: nodejs
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
+    directory_mappings:
+    - src: src/v2
+      dest: packages/bigtable/src/v2
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/nodejs/bigtable
+- name: gapic_config
+  type: GAPIC_CONFIG
diff --git a/gapic/api/artman_bigtable_admin.yaml b/gapic/api/artman_bigtable_admin.yaml
index 1be39b8..9aeb072 100644
--- a/gapic/api/artman_bigtable_admin.yaml
+++ b/gapic/api/artman_bigtable_admin.yaml
@@ -1,80 +1,94 @@
 common:
   api_name: bigtable-admin
   api_version: v2
-  package_type: grpc_client
-  packaging: google-cloud
   organization_name: google-cloud
+  service_yaml: google/bigtable/admin/bigtableadmin.yaml
+  gapic_yaml: google/bigtable/admin/v2/bigtable_admin_gapic.yaml
+  src_proto_paths:
+  - google/bigtable/admin/v2
   proto_deps:
-    - google-common-protos
-  import_proto_path:
-    - ${GOOGLEAPIS}
-  src_proto_path:
-    - ${GOOGLEAPIS}/google/bigtable/admin/v2
-  service_yaml:
-    - ${GOOGLEAPIS}/google/bigtable/admin/bigtableadmin.yaml
-  output_dir: ${REPOROOT}/artman/output
-  git_repos:
-    staging:
-      location: git@github.com:googleapis/api-client-staging.git
-  gapic_api_yaml:
-    - ${GOOGLEAPIS}/google/bigtable/admin/v2/bigtable_admin_gapic.yaml
-csharp:
-  gapic_code_dir: ${REPOROOT}/artman/output/csharp/google-cloud-bigtable-admin
-go:
-  gapic_code_dir: ${REPOROOT}/gapi-cloud-bigtable-admin-go
-  git_repos:
-    go:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
-      paths:
-        - bigtable-admin/apiv2
-    staging:
-      paths:
-        - generated/go/vendor/cloud.google.com/go/google-bigtable-admin-v2/vendor
-java:
-  gapic_code_dir: ${REPOROOT}/artman/output/java/google-cloud-bigtable-admin
-  git_repos:
-    java:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
-      paths:
-        - google-cloud-bigtable-admin
-    staging:
-      paths:
-        - generated/java/google-cloud-bigtable-admin-v2
-nodejs:
-  gapic_code_dir: ${REPOROOT}/artman/output/js/bigtable-admin-v2
-  git_repos:
-    nodejs:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
-      paths:
-        - src: src/v2
-          dest: packages/bigtable-admin/src/v2
-    staging:
-      paths:
-        - generated/nodejs/bigtable-admin
-  skip_packman: True
-php:
-  gapic_code_dir: ${REPOROOT}/artman/output/php/google-cloud-bigtable-admin-v2
-  git_repos:
-    staging:
-      paths:
-        - generated/php/google-cloud-bigtable-admin-v2
-python:
-  gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-bigtable-admin-v2
-  git_repos:
-    staging:
-      paths:
-        - generated/python/gapic-google-cloud-bigtable-admin-v2
-        - artifact: grpc
-          dest: generated/python/proto-google-cloud-bigtable-admin-v2
-ruby:
-  gapic_code_dir: ${REPOROOT}/artman/output/ruby/google-cloud-ruby/google-cloud-bigtable-admin
-  git_repos:
-    ruby:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
-      paths:
-        - src: lib/google/cloud/bigtable-admin/v2
-          dest: google-cloud-bigtable-admin/lib/google/cloud/bigtable-admin/v2
-    staging:
-      paths:
-        - generated/ruby/google-cloud-bigtable-admin
-  skip_packman: True
+  - name: google-common-protos
+artifacts:
+- name: java_gapic
+  type: GAPIC_ONLY
+  language: JAVA
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/java/google-cloud-bigtable-admin-v2
+  - name: java
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
+    directory_mappings:
+    - dest: google-cloud-bigtable-admin
+- name: python_gapic
+  type: GAPIC_ONLY
+  language: PYTHON
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/python/gapic-google-cloud-bigtable-admin-v2
+    - name: grpc
+      dest: generated/python/proto-google-cloud-bigtable-admin-v2
+- name: php_gapic
+  type: GAPIC_ONLY
+  language: PHP
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/php/google-cloud-bigtable-admin-v2
+- name: ruby_gapic
+  type: GAPIC_ONLY
+  language: RUBY
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/ruby/google-cloud-bigtable-admin
+  - name: ruby
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
+    directory_mappings:
+    - src: lib/google/cloud/bigtable-admin/v2
+      dest: google-cloud-bigtable-admin/lib/google/cloud/bigtable-admin/v2
+- name: go_gapic
+  type: GAPIC_ONLY
+  language: GO
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/go/vendor/cloud.google.com/go/google-bigtable-admin-v2/vendor
+  - name: go
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
+    directory_mappings:
+    - dest: bigtable-admin/apiv2
+- name: csharp_gapic
+  type: GAPIC_ONLY
+  language: CSHARP
+- name: nodejs_gapic
+  type: GAPIC_ONLY
+  language: NODEJS
+  publish_targets:
+  - name: nodejs
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
+    directory_mappings:
+    - src: src/v2
+      dest: packages/bigtable-admin/src/v2
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/nodejs/bigtable-admin
+- name: gapic_config
+  type: GAPIC_CONFIG
diff --git a/gapic/api/artman_clouddebugger.yaml b/gapic/api/artman_clouddebugger.yaml
index 8c3bde8..a5dd426 100644
--- a/gapic/api/artman_clouddebugger.yaml
+++ b/gapic/api/artman_clouddebugger.yaml
@@ -1,81 +1,95 @@
 common:
   api_name: debugger
   api_version: v2
-  package_type: grpc_client
-  packaging: google-cloud
   organization_name: google-cloud
+  service_yaml: google/devtools/clouddebugger/clouddebugger.yaml
+  gapic_yaml: google/devtools/clouddebugger/v2/clouddebugger_gapic.yaml
+  src_proto_paths:
+  - google/devtools/clouddebugger/v2
+  - google/devtools/source/v1
   proto_deps:
-    - google-common-protos
-  import_proto_path:
-    - ${GOOGLEAPIS}
-  src_proto_path:
-    - ${GOOGLEAPIS}/google/devtools/clouddebugger/v2
-    - ${GOOGLEAPIS}/google/devtools/source/v1
-  service_yaml:
-    - ${GOOGLEAPIS}/google/devtools/clouddebugger/clouddebugger.yaml
-  gapic_api_yaml:
-    - ${GOOGLEAPIS}/google/devtools/clouddebugger/v2/clouddebugger_gapic.yaml
-  git_repos:
-    staging:
-      location: git@github.com:googleapis/api-client-staging.git
-  output_dir: ${REPOROOT}/artman/output
-csharp:
-  gapic_code_dir: ${REPOROOT}/artman/output/csharp/google-cloud-debugger
-go:
-  gapic_code_dir: ${REPOROOT}/gapi-cloud-debugger-go
-  git_repos:
-    go:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
-      paths:
-        - debugger/apiv2
-    staging:
-      paths:
-        - generated/go/vendor/cloud.google.com/go/google-devtools-clouddebugger-v2/vendor
-java:
-  gapic_code_dir: ${REPOROOT}/artman/output/java/google-cloud-debugger
-  git_repos:
-    java:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
-      paths:
-        - google-cloud-debugger
-    staging:
-      paths:
-        - generated/java/google-cloud-debugger-v2
-nodejs:
-  gapic_code_dir: ${REPOROOT}/artman/output/js/debugger-v2
-  git_repos:
-    nodejs:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
-      paths:
-        - src: src/v2
-          dest: packages/debugger/src/v2
-    staging:
-      paths:
-        - generated/nodejs/debugger
-  skip_packman: True
-php:
-  gapic_code_dir: ${REPOROOT}/artman/output/php/google-cloud-debugger-v2
-  git_repos:
-    staging:
-      paths:
-        - generated/php/google-cloud-debugger-v2
-python:
-  gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-debugger-v2
-  git_repos:
-    staging:
-      paths:
-        - generated/python/gapic-google-cloud-debugger-v2
-        - artifact: grpc
-          dest: generated/python/proto-google-cloud-debugger-v2
-ruby:
-  gapic_code_dir: ${REPOROOT}/artman/output/ruby/google-cloud-ruby/google-cloud-debugger
-  git_repos:
-    ruby:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
-      paths:
-        - src: lib/google/cloud/debugger/v2
-          dest: google-cloud-debugger/lib/google/cloud/debugger/v2
-    staging:
-      paths:
-        - generated/ruby/google-cloud-debugger
-  skip_packman: True
+  - name: google-common-protos
+artifacts:
+- name: java_gapic
+  type: GAPIC_ONLY
+  language: JAVA
+  publish_targets:
+  - name: java
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
+    directory_mappings:
+    - dest: google-cloud-debugger
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/java/google-cloud-debugger-v2
+- name: python_gapic
+  type: GAPIC_ONLY
+  language: PYTHON
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/python/gapic-google-cloud-debugger-v2
+    - name: grpc
+      dest: generated/python/proto-google-cloud-debugger-v2
+- name: php_gapic
+  type: GAPIC_ONLY
+  language: PHP
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/php/google-cloud-debugger-v2
+- name: ruby_gapic
+  type: GAPIC_ONLY
+  language: RUBY
+  publish_targets:
+  - name: ruby
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
+    directory_mappings:
+    - src: lib/google/cloud/debugger/v2
+      dest: google-cloud-debugger/lib/google/cloud/debugger/v2
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/ruby/google-cloud-debugger
+- name: go_gapic
+  type: GAPIC_ONLY
+  language: GO
+  publish_targets:
+  - name: go
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
+    directory_mappings:
+    - dest: debugger/apiv2
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/go/vendor/cloud.google.com/go/google-devtools-clouddebugger-v2/vendor
+- name: csharp_gapic
+  type: GAPIC_ONLY
+  language: CSHARP
+- name: nodejs_gapic
+  type: GAPIC_ONLY
+  language: NODEJS
+  publish_targets:
+  - name: nodejs
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
+    directory_mappings:
+    - src: src/v2
+      dest: packages/debugger/src/v2
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/nodejs/debugger
+- name: gapic_config
+  type: GAPIC_CONFIG
diff --git a/gapic/api/artman_datastore.yaml b/gapic/api/artman_datastore.yaml
index 744b815..338e452 100644
--- a/gapic/api/artman_datastore.yaml
+++ b/gapic/api/artman_datastore.yaml
@@ -1,94 +1,109 @@
 common:
   api_name: datastore
   api_version: v1
-  package_type: grpc_client
-  packaging: google-cloud
   organization_name: google-cloud
+  service_yaml: google/datastore/datastore.yaml
+  gapic_yaml: google/datastore/v1/datastore_gapic.yaml
+  src_proto_paths:
+  - google/datastore/v1
   proto_deps:
-    - google-common-protos
-  import_proto_path:
-    - ${GOOGLEAPIS}
-  src_proto_path:
-    - ${GOOGLEAPIS}/google/datastore/v1
-  service_yaml:
-    - ${GOOGLEAPIS}/google/datastore/datastore.yaml
-  output_dir: ${REPOROOT}/artman/output
-  git_repos:
-    staging:
-      location: git@github.com:googleapis/api-client-staging.git
-  gapic_api_yaml:
-    - ${GOOGLEAPIS}/google/datastore/v1/datastore_gapic.yaml
-csharp:
-  gapic_code_dir: ${REPOROOT}/artman/output/csharp/google-cloud-datastore
-go:
-  gapic_code_dir: ${REPOROOT}/gapi-cloud-datastore-go
-  git_repos:
-    go:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
-      paths:
-        - datastore/apiv1
-    staging:
-      paths:
-        - generated/go/vendor/cloud.google.com/go/google-datastore-v1/vendor
-java:
-  gapic_code_dir: ${REPOROOT}/artman/output/java/google-cloud-datastore
-  git_repos:
-    java:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
-      paths:
-        - google-cloud-datastore
-    staging:
-      paths:
-        - generated/java/google-cloud-datastore-v1
-nodejs:
-  gapic_code_dir: ${REPOROOT}/artman/output/js/datastore-v1
-  git_repos:
-    nodejs:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
-      paths:
-        - src: src/v1
-          dest: packages/datastore/src/v1
-    staging:
-      paths:
-        - generated/nodejs/datastore
-  skip_packman: True
-php:
-  gapic_code_dir: ${REPOROOT}/artman/output/php/google-cloud-datastore-v1
-  git_repos:
-    staging:
-      paths:
-        - generated/php/google-cloud-datastore-v1
-python:
-  release_level: beta
-  generated_package_version:
-    lower: 0.90.4
-    upper: 0.91dev
-  gapic_code_dir: ${REPOROOT}/artman/output/python/gapic-google-cloud-datastore-v1
-  git_repos:
-    python:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-python.git
-      paths:
-        - src: google/cloud/datastore_v1
-          dest: datastore/google/cloud/datastore_v1
-        - src: tests/unit/gapic/v1
-          dest: datastore/tests/gapic
-        - artifact: grpc
-          src: google/cloud/proto
-          dest: datastore/google/cloud/proto
-    staging:
-      paths:
-        - generated/python/gapic-google-cloud-datastore-v1
-        - artifact: grpc
-          dest: generated/python/proto-google-cloud-datastore-v1
-ruby:
-  gapic_code_dir: ${REPOROOT}/artman/output/ruby/google-cloud-ruby/google-cloud-datastore
-  git_repos:
-    ruby:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
-      paths:
-        - src: lib/google/cloud/datastore/v1
-          dest: google-cloud-datastore/lib/google/cloud/datastore/v1
-    staging:
-      paths:
-        - generated/ruby/google-cloud-datastore
-  skip_packman: True
+  - name: google-common-protos
+artifacts:
+- name: java_gapic
+  type: GAPIC_ONLY
+  language: JAVA
+  publish_targets:
+  - name: java
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
+    directory_mappings:
+    - dest: google-cloud-datastore
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/java/google-cloud-datastore-v1
+- name: python_gapic
+  type: GAPIC_ONLY
+  language: PYTHON
+  release_level: BETA
+  package_version:
+    grpc_dep_lower_bound: 0.90.4
+    grpc_dep_upper_bound: 0.91dev
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/python/gapic-google-cloud-datastore-v1
+    - name: grpc
+      dest: generated/python/proto-google-cloud-datastore-v1
+  - name: python
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-python.git
+    directory_mappings:
+    - src: google/cloud/datastore_v1
+      dest: datastore/google/cloud/datastore_v1
+    - src: tests/unit/gapic/v1
+      dest: datastore/tests/gapic
+    - name: grpc
+      src: google/cloud/proto
+      dest: datastore/google/cloud/proto
+- name: php_gapic
+  type: GAPIC_ONLY
+  language: PHP
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/php/google-cloud-datastore-v1
+- name: ruby_gapic
+  type: GAPIC_ONLY
+  language: RUBY
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/ruby/google-cloud-datastore
+  - name: ruby
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
+    directory_mappings:
+    - src: lib/google/cloud/datastore/v1
+      dest: google-cloud-datastore/lib/google/cloud/datastore/v1
+- name: go_gapic
+  type: GAPIC_ONLY
+  language: GO
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/go/vendor/cloud.google.com/go/google-datastore-v1/vendor
+  - name: go
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
+    directory_mappings:
+    - dest: datastore/apiv1
+- name: csharp_gapic
+  type: GAPIC_ONLY
+  language: CSHARP
+- name: nodejs_gapic
+  type: GAPIC_ONLY
+  language: NODEJS
+  publish_targets:
+  - name: nodejs
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
+    directory_mappings:
+    - src: src/v1
+      dest: packages/datastore/src/v1
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/nodejs/datastore
+- name: gapic_config
+  type: GAPIC_CONFIG
diff --git a/gapic/api/artman_dlp.yaml b/gapic/api/artman_dlp.yaml
index 48ac8e1..3d5598d 100644
--- a/gapic/api/artman_dlp.yaml
+++ b/gapic/api/artman_dlp.yaml
@@ -1,96 +1,110 @@
 common:
   api_name: dlp
   api_version: v2beta1
-  package_type: grpc_client
-  packaging: google-cloud
   organization_name: google-cloud
+  service_yaml: google/privacy/dlp/dlp.yaml
+  gapic_yaml: google/privacy/dlp/v2beta1/dlp_gapic.yaml
+  src_proto_paths:
+  - google/privacy/dlp/v2beta1
   proto_deps:
-    - google-common-protos
-  import_proto_path:
-    - ${GOOGLEAPIS}
-  src_proto_path:
-    - ${GOOGLEAPIS}/google/privacy/dlp/v2beta1
-  service_yaml:
-    - ${GOOGLEAPIS}/google/privacy/dlp/dlp.yaml
-  gapic_api_yaml:
-    - ${GOOGLEAPIS}/google/privacy/dlp/v2beta1/dlp_gapic.yaml
-  output_dir: ${REPOROOT}/artman/output
-  git_repos:
-    staging:
-      location: git@github.com:googleapis/api-client-staging.git
-java:
-  gapic_code_dir: ${REPOROOT}/artman/output/java/google-cloud-dlp
-  git_repos:
-    java:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
-      gapic_subpath: google-cloud-dlp
-    staging:
-      paths:
-        - generated/java/gapic-google-cloud-dlp-v2beta1
-        - artifact: grpc
-          dest: generated/java/grpc-google-cloud-dlp-v2beta1
-        - artifact: proto
-          dest: generated/java/proto-google-cloud-dlp-v2beta1
-nodejs:
-  gapic_code_dir: ${REPOROOT}/artman/output/js/dlp-v2beta1
-  git_repos:
-    nodejs:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
-      paths:
-        - src: src/v2beta1
-          dest: packages/dlp/src/v2beta1
-        - src: test/test.js
-          dest: packages/dlp/test/gapic-v2beta1.js
-    staging:
-      paths:
-        - dest: generated/nodejs/dlp
-  skip_packman: True
-  generated_package_version:
-    lower: 0.0.0
-python:
-  gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-dlp-v2beta1
-  git_repos:
-    python:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-python.git
-      paths:
-        - src: .
-          dest: dlp
-        - artifact: grpc
-          src: google/cloud/proto
-          dest: dlp/google/cloud/proto
-    staging:
-      paths:
-        - generated/python/gapic-google-cloud-dlp-v2beta1
-        - artifact: grpc
-          dest: generated/python/proto-google-cloud-dlp-v2beta1
-ruby:
-  gapic_code_dir: ${REPOROOT}/artman/output/ruby/google-cloud-ruby/google-cloud-dlp
-  git_repos:
-    ruby:
-      paths:
-        - src: lib/google/cloud/dlp/v2beta1
-          dest: google-cloud-dlp/lib/google/cloud/dlp/v2beta1
-        - src: test/google/cloud/privacy/dlp/v2beta1
-          dest: google-cloud-dlp/test/google/cloud/dlp/v2beta1
-      location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
-    staging:
-      paths:
-        - generated/ruby/google-cloud-dlp
-  generated_package_version:
-    lower: 0.20.0
-go:
-  gapic_code_dir: ${REPOROOT}/gapi-cloud-dlp
-  git_repos:
-    go:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
-      paths:
-        - dest: dlp/apiv2beta1
-    staging:
-      paths:
-        - dest: generated/go/vendor/cloud.google.com/go/google-cloud-dlp-v2beta1/vendor
-php:
-  gapic_code_dir: ${REPOROOT}/artman/output/php/google-cloud-dlp-v2beta1
-  git_repos:
-    staging:
-      paths:
-        - generated/php/google-cloud-dlp-v2beta1
+  - name: google-common-protos
+artifacts:
+- name: java_gapic
+  type: GAPIC_ONLY
+  language: JAVA
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/java/gapic-google-cloud-dlp-v2beta1
+    - name: grpc
+      dest: generated/java/grpc-google-cloud-dlp-v2beta1
+    - name: proto
+      dest: generated/java/proto-google-cloud-dlp-v2beta1
+  - name: java
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
+- name: python_gapic
+  type: GAPIC_ONLY
+  language: PYTHON
+  publish_targets:
+  - name: python
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-python.git
+    directory_mappings:
+    - src: .
+      dest: dlp
+    - name: grpc
+      src: google/cloud/proto
+      dest: dlp/google/cloud/proto
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/python/gapic-google-cloud-dlp-v2beta1
+    - name: grpc
+      dest: generated/python/proto-google-cloud-dlp-v2beta1
+- name: php_gapic
+  type: GAPIC_ONLY
+  language: PHP
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/php/google-cloud-dlp-v2beta1
+- name: ruby_gapic
+  type: GAPIC_ONLY
+  language: RUBY
+  package_version:
+    grpc_dep_lower_bound: 0.20.0
+  publish_targets:
+  - name: ruby
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
+    directory_mappings:
+    - src: lib/google/cloud/dlp/v2beta1
+      dest: google-cloud-dlp/lib/google/cloud/dlp/v2beta1
+    - src: test/google/cloud/privacy/dlp/v2beta1
+      dest: google-cloud-dlp/test/google/cloud/dlp/v2beta1
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/ruby/google-cloud-dlp
+- name: go_gapic
+  type: GAPIC_ONLY
+  language: GO
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/go/vendor/cloud.google.com/go/google-cloud-dlp-v2beta1/vendor
+  - name: go
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
+    directory_mappings:
+    - dest: dlp/apiv2beta1
+- name: nodejs_gapic
+  type: GAPIC_ONLY
+  language: NODEJS
+  package_version:
+    grpc_dep_lower_bound: 0.0.0
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/nodejs/dlp
+  - name: nodejs
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
+    directory_mappings:
+    - src: src/v2beta1
+      dest: packages/dlp/src/v2beta1
+    - src: test/test.js
+      dest: packages/dlp/test/gapic-v2beta1.js
+- name: gapic_config
+  type: GAPIC_CONFIG
diff --git a/gapic/api/artman_errorreporting.yaml b/gapic/api/artman_errorreporting.yaml
index c341234..296d60c 100644
--- a/gapic/api/artman_errorreporting.yaml
+++ b/gapic/api/artman_errorreporting.yaml
@@ -1,94 +1,109 @@
 common:
   api_name: error-reporting
   api_version: v1beta1
-  package_type: grpc_client
-  packaging: google-cloud
   organization_name: google-cloud
+  service_yaml: google/devtools/clouderrorreporting/errorreporting.yaml
+  gapic_yaml: google/devtools/clouderrorreporting/v1beta1/errorreporting_gapic.yaml
+  src_proto_paths:
+  - google/devtools/clouderrorreporting/v1beta1
   proto_deps:
-    - google-common-protos
-  import_proto_path:
-    - ${GOOGLEAPIS}
-  src_proto_path:
-    - ${GOOGLEAPIS}/google/devtools/clouderrorreporting/v1beta1
-  service_yaml:
-    - ${GOOGLEAPIS}/google/devtools/clouderrorreporting/errorreporting.yaml
-  gapic_api_yaml:
-    - ${GOOGLEAPIS}/google/devtools/clouderrorreporting/v1beta1/errorreporting_gapic.yaml
-  git_repos:
-    staging:
-      location: git@github.com:googleapis/api-client-staging.git
-  output_dir: ${REPOROOT}/artman/output
-csharp:
-  gapic_code_dir: ${REPOROOT}/artman/output/csharp/google-cloud-error-reporting
-go:
-  gapic_code_dir: ${REPOROOT}/gapi-cloud-error-reporting-go
-  git_repos:
-    go:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
-      paths:
-        - error-reporting/apiv1beta1
-    staging:
-      paths:
-        - generated/go/vendor/cloud.google.com/go/google-devtools-clouderrorreporting-v1beta1/vendor
-java:
-  gapic_code_dir: ${REPOROOT}/artman/output/java/google-cloud-error-reporting
-  git_repos:
-    java:
-      paths:
-        - google-cloud-errorreporting
-      location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
-    staging:
-      paths:
-        - generated/java/gapic-google-cloud-error-reporting-v1beta1
-        - artifact: grpc
-          dest: generated/java/grpc-google-cloud-error-reporting-v1beta1
-        - artifact: proto
-          dest: generated/java/proto-google-cloud-error-reporting-v1beta1
-nodejs:
-  gapic_code_dir: ${REPOROOT}/artman/output/js/error-reporting-v1beta1
-  git_repos:
-    nodejs:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
-      paths:
-        - src: src/v1beta1
-          dest: packages/error-reporting/src/v1beta1
-    staging:
-      paths:
-        - generated/nodejs/errorreporting
-  skip_packman: True
-php:
-  gapic_code_dir: ${REPOROOT}/artman/output/php/google-cloud-error-reporting-v1beta1
-  git_repos:
-    staging:
-      paths:
-        - generated/php/google-cloud-error-reporting-v1beta1
-python:
-  gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-error-reporting-v1beta1
-  git_repos:
-    python:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-python.git
-      paths:
-        - src: google/cloud/errorreporting_v1beta1
-          dest: errorreporting/google/cloud/errorreporting_v1beta1
-        - src: tests/unit/gapic/v1beta1
-          dest: errorreporting/tests/gapic
-        - artifact: grpc
-          src: google/cloud/proto
-          dest: errorreporting/google/cloud/proto
-    staging:
-      paths:
-        - generated/python/gapic-google-cloud-error-reporting-v1beta1
-        - artifact: grpc
-          dest: generated/python/proto-google-cloud-error-reporting-v1beta1
-ruby:
-  gapic_code_dir: ${REPOROOT}/artman/output/ruby/google-cloud-ruby/google-cloud-error-reporting
-  git_repos:
-    ruby:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
-      paths:
-        - src: lib/google/cloud/error_reporting/v1beta1
-          dest: google-cloud-error_reporting/lib/google/cloud/error_reporting/v1beta1
-    staging:
-      paths:
-        - generated/ruby/google-cloud-error_reporting
-  skip_packman: True
+  - name: google-common-protos
+artifacts:
+- name: java_gapic
+  type: GAPIC_ONLY
+  language: JAVA
+  publish_targets:
+  - name: java
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
+    directory_mappings:
+    - dest: google-cloud-errorreporting
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/java/gapic-google-cloud-error-reporting-v1beta1
+    - name: grpc
+      dest: generated/java/grpc-google-cloud-error-reporting-v1beta1
+    - name: proto
+      dest: generated/java/proto-google-cloud-error-reporting-v1beta1
+- name: python_gapic
+  type: GAPIC_ONLY
+  language: PYTHON
+  publish_targets:
+  - name: python
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-python.git
+    directory_mappings:
+    - src: google/cloud/errorreporting_v1beta1
+      dest: errorreporting/google/cloud/errorreporting_v1beta1
+    - src: tests/unit/gapic/v1beta1
+      dest: errorreporting/tests/gapic
+    - name: grpc
+      src: google/cloud/proto
+      dest: errorreporting/google/cloud/proto
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/python/gapic-google-cloud-error-reporting-v1beta1
+    - name: grpc
+      dest: generated/python/proto-google-cloud-error-reporting-v1beta1
+- name: php_gapic
+  type: GAPIC_ONLY
+  language: PHP
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/php/google-cloud-error-reporting-v1beta1
+- name: ruby_gapic
+  type: GAPIC_ONLY
+  language: RUBY
+  publish_targets:
+  - name: ruby
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
+    directory_mappings:
+    - src: lib/google/cloud/error_reporting/v1beta1
+      dest: google-cloud-error_reporting/lib/google/cloud/error_reporting/v1beta1
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/ruby/google-cloud-error_reporting
+- name: go_gapic
+  type: GAPIC_ONLY
+  language: GO
+  publish_targets:
+  - name: go
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
+    directory_mappings:
+    - dest: error-reporting/apiv1beta1
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/go/vendor/cloud.google.com/go/google-devtools-clouderrorreporting-v1beta1/vendor
+- name: csharp_gapic
+  type: GAPIC_ONLY
+  language: CSHARP
+- name: nodejs_gapic
+  type: GAPIC_ONLY
+  language: NODEJS
+  publish_targets:
+  - name: nodejs
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
+    directory_mappings:
+    - src: src/v1beta1
+      dest: packages/error-reporting/src/v1beta1
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/nodejs/errorreporting
+- name: gapic_config
+  type: GAPIC_CONFIG
diff --git a/gapic/api/artman_functions.yaml b/gapic/api/artman_functions.yaml
index 6eb81bc..3795cec 100644
--- a/gapic/api/artman_functions.yaml
+++ b/gapic/api/artman_functions.yaml
@@ -1,80 +1,94 @@
 common:
   api_name: functions
   api_version: v1beta2
-  package_type: grpc_client
-  packaging: google-cloud
   organization_name: google-cloud
+  service_yaml: google/cloud/functions/functions.yaml
+  gapic_yaml: google/cloud/functions/v1beta2/functions_gapic.yaml
+  src_proto_paths:
+  - google/cloud/functions/v1beta2
   proto_deps:
-    - google-common-protos
-  import_proto_path:
-    - ${GOOGLEAPIS}
-  src_proto_path:
-    - ${GOOGLEAPIS}/google/cloud/functions/v1beta2
-  service_yaml:
-    - ${GOOGLEAPIS}/google/cloud/functions/functions.yaml
-  output_dir: ${REPOROOT}/artman/output
-  gapic_api_yaml:
-    - ${GOOGLEAPIS}/google/cloud/functions/v1beta2/functions_gapic.yaml
-  git_repos:
-    staging:
-      location: git@github.com:googleapis/api-client-staging.git
-csharp:
-  gapic_code_dir: ${REPOROOT}/artman/output/csharp/google-cloud-functions
-go:
-  gapic_code_dir: ${REPOROOT}/gapi-cloud-functions-go
-  git_repos:
-    go:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
-      paths:
-        - functions/apiv1beta2
-    staging:
-      paths:
-        - google-functions-v1beta2/cloud.google.com/go/functions/apiv1beta2
-java:
-  gapic_code_dir: ${REPOROOT}/artman/output/java/google-cloud-functions
-  git_repos:
-    java:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
-      paths:
-        - google-cloud-functions
-    staging:
-      paths:
-        - generated/java/google-cloud-functions-v1beta2
-nodejs:
-  gapic_code_dir: ${REPOROOT}/artman/output/js/functions-v1beta2
-  git_repos:
-    nodejs:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
-      paths:
-        - src: src/v1beta2
-          dest: packages/functions/src/v1beta2
-    staging:
-      paths:
-        - generated/nodejs/functions
-  skip_packman: True
-php:
-  gapic_code_dir: ${REPOROOT}/artman/output/php/google-cloud-functions-v1beta2
-  git_repos:
-    staging:
-      paths:
-        - generated/php/google-cloud-functions-v1beta2
-python:
-  gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-functions-v1beta2
-  git_repos:
-    staging:
-      paths:
-        - generated/python/gapic-google-cloud-functions-v1beta2
-        - artifact: grpc
-          dest: generated/python/proto-google-cloud-functions-v1beta2
-ruby:
-  gapic_code_dir: ${REPOROOT}/artman/output/ruby/google-cloud-ruby/google-cloud-functions
-  git_repos:
-    ruby:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
-      paths:
-        - src: lib/google/cloud/functions/v1beta2
-          dest: google-cloud-functions/lib/google/cloud/functions/v1beta2
-    staging:
-      paths:
-        - generated/ruby/google-cloud-functions
-  skip_packman: True
+  - name: google-common-protos
+artifacts:
+- name: java_gapic
+  type: GAPIC_ONLY
+  language: JAVA
+  publish_targets:
+  - name: java
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
+    directory_mappings:
+    - dest: google-cloud-functions
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/java/google-cloud-functions-v1beta2
+- name: python_gapic
+  type: GAPIC_ONLY
+  language: PYTHON
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/python/gapic-google-cloud-functions-v1beta2
+    - name: grpc
+      dest: generated/python/proto-google-cloud-functions-v1beta2
+- name: php_gapic
+  type: GAPIC_ONLY
+  language: PHP
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/php/google-cloud-functions-v1beta2
+- name: ruby_gapic
+  type: GAPIC_ONLY
+  language: RUBY
+  publish_targets:
+  - name: ruby
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
+    directory_mappings:
+    - src: lib/google/cloud/functions/v1beta2
+      dest: google-cloud-functions/lib/google/cloud/functions/v1beta2
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/ruby/google-cloud-functions
+- name: go_gapic
+  type: GAPIC_ONLY
+  language: GO
+  publish_targets:
+  - name: go
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
+    directory_mappings:
+    - dest: functions/apiv1beta2
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: google-functions-v1beta2/cloud.google.com/go/functions/apiv1beta2
+- name: csharp_gapic
+  type: GAPIC_ONLY
+  language: CSHARP
+- name: nodejs_gapic
+  type: GAPIC_ONLY
+  language: NODEJS
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/nodejs/functions
+  - name: nodejs
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
+    directory_mappings:
+    - src: src/v1beta2
+      dest: packages/functions/src/v1beta2
+- name: gapic_config
+  type: GAPIC_CONFIG
diff --git a/gapic/api/artman_genomics.yaml b/gapic/api/artman_genomics.yaml
index b7873c0..c0096db 100644
--- a/gapic/api/artman_genomics.yaml
+++ b/gapic/api/artman_genomics.yaml
@@ -1,14 +1,12 @@
 common:
   api_name: genomics
   api_version: v1
-  package_type: grpc_client
-  packaging: google-cloud
   organization_name: google-cloud
+  src_proto_paths:
+  - google/genomics/v1
   proto_deps:
-    - google-common-protos
-    - google-iam-v1
-  import_proto_path:
-    - ${GOOGLEAPIS}
-  src_proto_path:
-    - ${GOOGLEAPIS}/google/genomics/v1
-  output_dir: ${REPOROOT}/artman/output
+  - name: google-common-protos
+  - name: google-iam-v1
+artifacts:
+- name: gapic_config
+  type: GAPIC_CONFIG
diff --git a/gapic/api/artman_iam.yaml b/gapic/api/artman_iam.yaml
index ffd6cc3..65bf99f 100644
--- a/gapic/api/artman_iam.yaml
+++ b/gapic/api/artman_iam.yaml
@@ -1,66 +1,77 @@
 common:
   api_name: iam-admin
   api_version: v1
-  package_type: grpc_client
-  packaging: google-cloud
   organization_name: google-cloud
+  service_yaml: google/iam/iam.yaml
+  gapic_yaml: google/iam/admin/v1/iam_gapic.yaml
+  src_proto_paths:
+  - google/iam/admin/v1
   proto_deps:
-    - google-iam-v1
-  import_proto_path:
-    - ${GOOGLEAPIS}
-  src_proto_path:
-    - ${GOOGLEAPIS}/google/iam/admin/v1
-  service_yaml:
-    - ${GOOGLEAPIS}/google/iam/iam.yaml
-  gapic_api_yaml:
-    - ${GOOGLEAPIS}/google/iam/admin/v1/iam_gapic.yaml
-  output_dir: ${REPOROOT}/artman/output
-  git_repos:
-    staging:
-      location: git@github.com:googleapis/api-client-staging.git
-java:
-  gapic_code_dir: ${REPOROOT}/artman/output/java/google-cloud-iam
-  git_repos:
-    staging:
-      paths:
-        - generated/java/google-cloud-iam-v1
-python:
-  gapic_code_dir: ${REPOROOT}/artman/output/gcloud-python-iam
-go:
-  gapic_code_dir: ${REPOROOT}/gapi-cloud-language-go
-  git_repos:
-    go:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
-      paths:
-        - language/apiv1
-    staging:
-      paths:
-        - generated/go/vendor/cloud.google.com/go/google-iam-admin-v1/vendor
-csharp:
-  gapic_code_dir: ${REPOROOT}/artman/output/csharp/google-cloud-iam
-php:
-  gapic_code_dir: ${REPOROOT}/artman/output/php/google-iam-admin-v1
-  git_repos:
-    staging:
-      paths:
-        - generated/php/google-iam-admin-v1
-ruby:
-  gapic_code_dir: ${REPOROOT}/artman/output/ruby/google-cloud-ruby/google-cloud-iam
-  git_repos:
-    staging:
-      paths:
-        - generated/ruby/google-cloud-iam
-nodejs:
-  gapic_code_dir: ${REPOROOT}/artman/output/js/iam-v1
-  git_repos:
-    nodejs:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
-      paths:
-        - src: src/v1beta1
-          dest: packages/iam/src/v1
-        - src: test/test.js
-          dest: packages/iam/test/gapic-v1.js
-    staging:
-      paths:
-        - dest: generated/nodejs/iam
-  skip_packman: True
+  - name: google-iam-v1
+artifacts:
+- name: java_gapic
+  type: GAPIC_ONLY
+  language: JAVA
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/java/google-cloud-iam-v1
+- name: python_gapic
+  type: GAPIC_ONLY
+  language: PYTHON
+- name: php_gapic
+  type: GAPIC_ONLY
+  language: PHP
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/php/google-iam-admin-v1
+- name: ruby_gapic
+  type: GAPIC_ONLY
+  language: RUBY
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/ruby/google-cloud-iam
+- name: go_gapic
+  type: GAPIC_ONLY
+  language: GO
+  publish_targets:
+  - name: go
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
+    directory_mappings:
+    - dest: language/apiv1
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/go/vendor/cloud.google.com/go/google-iam-admin-v1/vendor
+- name: csharp_gapic
+  type: GAPIC_ONLY
+  language: CSHARP
+- name: nodejs_gapic
+  type: GAPIC_ONLY
+  language: NODEJS
+  publish_targets:
+  - name: nodejs
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
+    directory_mappings:
+    - src: src/v1beta1
+      dest: packages/iam/src/v1
+    - src: test/test.js
+      dest: packages/iam/test/gapic-v1.js
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/nodejs/iam
+- name: gapic_config
+  type: GAPIC_CONFIG
diff --git a/gapic/api/artman_language_v1.yaml b/gapic/api/artman_language_v1.yaml
index accfeea..23c1a20 100644
--- a/gapic/api/artman_language_v1.yaml
+++ b/gapic/api/artman_language_v1.yaml
@@ -1,97 +1,112 @@
 common:
   api_name: language
   api_version: v1
-  package_type: grpc_client
-  packaging: google-cloud
   organization_name: google-cloud
+  service_yaml: google/cloud/language/language_v1.yaml
+  gapic_yaml: google/cloud/language/v1/language_gapic.yaml
+  src_proto_paths:
+  - google/cloud/language/v1
   proto_deps:
-    - google-common-protos
-  import_proto_path:
-    - ${GOOGLEAPIS}
-  src_proto_path:
-    - ${GOOGLEAPIS}/google/cloud/language/v1
-  service_yaml:
-    - ${GOOGLEAPIS}/google/cloud/language/language_v1.yaml
-  output_dir: ${REPOROOT}/artman/output
-  git_repos:
-    staging:
-      location: git@github.com:googleapis/api-client-staging.git
-  gapic_api_yaml:
-    - ${GOOGLEAPIS}/google/cloud/language/v1/language_gapic.yaml
-csharp:
-  gapic_code_dir: ${REPOROOT}/artman/output/csharp/google-cloud-language
-go:
-  gapic_code_dir: ${REPOROOT}/gapi-cloud-language-go
-  git_repos:
-    go:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
-      paths:
-        - language/apiv1
-    staging:
-      paths:
-        - generated/go/vendor/cloud.google.com/go/google-cloud-language-v1/vendor
-java:
-  gapic_code_dir: ${REPOROOT}/artman/output/java/google-cloud-language
-  git_repos:
-    java:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
-      paths:
-        - google-cloud-language
-    staging:
-      paths:
-        - generated/java/gapic-google-cloud-language-v1
-        - artifact: grpc
-          dest: generated/java/grpc-google-cloud-language-v1
-        - artifact: proto
-          dest: generated/java/proto-google-cloud-language-v1
-nodejs:
-  release_level: beta
-  gapic_code_dir: ${REPOROOT}/artman/output/js/language-v1
-  git_repos:
-    nodejs:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
-      paths:
-        - src: src/v1
-          dest: packages/language/src/v1
-    staging:
-      paths:
-        - generated/nodejs/language
-  skip_packman: True
-  generated_package_version:
-    lower: 0.11.0
-php:
-  gapic_code_dir: ${REPOROOT}/artman/output/php/google-cloud-language-v1
-  git_repos:
-    staging:
-      paths:
-        - generated/php/google-cloud-language-v1
-python:
-  gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-language-v1
-  git_repos:
-    python:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-python.git
-      paths:
-        - src: google/cloud/language_v1
-          dest: language/google/cloud/language_v1
-        - src: tests/unit/gapic/v1
-          dest: language/tests/gapic
-        - artifact: grpc
-          src: google/cloud/proto
-          dest: language/google/cloud/proto
-    staging:
-      paths:
-        - generated/python/gapic-google-cloud-language-v1
-        - artifact: grpc
-          dest: generated/python/proto-google-cloud-language-v1
-ruby:
-  gapic_code_dir: ${REPOROOT}/artman/output/ruby/google-cloud-ruby/google-cloud-language
-  git_repos:
-    ruby:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
-      paths:
-        - src: lib/google/cloud/language/v1
-          dest: google-cloud-language/lib/google/cloud/language/v1
-    staging:
-      paths:
-        - generated/ruby/google-cloud-language
-  skip_packman: True
+  - name: google-common-protos
+artifacts:
+- name: java_gapic
+  type: GAPIC_ONLY
+  language: JAVA
+  publish_targets:
+  - name: java
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
+    directory_mappings:
+    - dest: google-cloud-language
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/java/gapic-google-cloud-language-v1
+    - name: grpc
+      dest: generated/java/grpc-google-cloud-language-v1
+    - name: proto
+      dest: generated/java/proto-google-cloud-language-v1
+- name: python_gapic
+  type: GAPIC_ONLY
+  language: PYTHON
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/python/gapic-google-cloud-language-v1
+    - name: grpc
+      dest: generated/python/proto-google-cloud-language-v1
+  - name: python
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-python.git
+    directory_mappings:
+    - src: google/cloud/language_v1
+      dest: language/google/cloud/language_v1
+    - src: tests/unit/gapic/v1
+      dest: language/tests/gapic
+    - name: grpc
+      src: google/cloud/proto
+      dest: language/google/cloud/proto
+- name: php_gapic
+  type: GAPIC_ONLY
+  language: PHP
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/php/google-cloud-language-v1
+- name: ruby_gapic
+  type: GAPIC_ONLY
+  language: RUBY
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/ruby/google-cloud-language
+  - name: ruby
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
+    directory_mappings:
+    - src: lib/google/cloud/language/v1
+      dest: google-cloud-language/lib/google/cloud/language/v1
+- name: go_gapic
+  type: GAPIC_ONLY
+  language: GO
+  publish_targets:
+  - name: go
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
+    directory_mappings:
+    - dest: language/apiv1
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/go/vendor/cloud.google.com/go/google-cloud-language-v1/vendor
+- name: csharp_gapic
+  type: GAPIC_ONLY
+  language: CSHARP
+- name: nodejs_gapic
+  type: GAPIC_ONLY
+  language: NODEJS
+  release_level: BETA
+  package_version:
+    grpc_dep_lower_bound: 0.11.0
+  publish_targets:
+  - name: nodejs
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
+    directory_mappings:
+    - src: src/v1
+      dest: packages/language/src/v1
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/nodejs/language
+- name: gapic_config
+  type: GAPIC_CONFIG
diff --git a/gapic/api/artman_language_v1beta2.yaml b/gapic/api/artman_language_v1beta2.yaml
index 884123a..dbcc55c 100644
--- a/gapic/api/artman_language_v1beta2.yaml
+++ b/gapic/api/artman_language_v1beta2.yaml
@@ -1,97 +1,112 @@
 common:
   api_name: language
   api_version: v1beta2
-  package_type: grpc_client
-  packaging: google-cloud
   organization_name: google-cloud
+  service_yaml: google/cloud/language/language_v1beta2.yaml
+  gapic_yaml: google/cloud/language/v1beta2/language_gapic.yaml
+  src_proto_paths:
+  - google/cloud/language/v1beta2
   proto_deps:
-    - google-common-protos
-  import_proto_path:
-    - ${GOOGLEAPIS}
-  src_proto_path:
-    - ${GOOGLEAPIS}/google/cloud/language/v1beta2
-  service_yaml:
-    - ${GOOGLEAPIS}/google/cloud/language/language_v1beta2.yaml
-  output_dir: ${REPOROOT}/artman/output
-  git_repos:
-    staging:
-      location: git@github.com:googleapis/api-client-staging.git
-  gapic_api_yaml:
-    - ${GOOGLEAPIS}/google/cloud/language/v1beta2/language_gapic.yaml
-csharp:
-  gapic_code_dir: ${REPOROOT}/artman/output/csharp/google-cloud-language
-go:
-  gapic_code_dir: ${REPOROOT}/gapi-cloud-language-go
-  git_repos:
-    go:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
-      paths:
-        - language/apiv1beta2
-    staging:
-      paths:
-        - generated/go/vendor/cloud.google.com/go/google-cloud-language-v1beta2/vendor
-java:
-  gapic_code_dir: ${REPOROOT}/artman/output/java/google-cloud-language
-  git_repos:
-    java:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
-      paths:
-        - google-cloud-language
-    staging:
-      paths:
-        - generated/java/gapic-google-cloud-language-v1beta2
-        - artifact: grpc
-          dest: generated/java/grpc-google-cloud-language-v1beta2
-        - artifact: proto
-          dest: generated/java/proto-google-cloud-language-v1beta2
-nodejs:
-  release_level: beta
-  gapic_code_dir: ${REPOROOT}/artman/output/js/language-v1beta2
-  git_repos:
-    nodejs:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
-      paths:
-        - src: src/v1beta2
-          dest: packages/language/src/v1beta2
-    staging:
-      paths:
-        - generated/nodejs/language-v1beta2
-  skip_packman: True
-  generated_package_version:
-    lower: 0.11.0
-php:
-  gapic_code_dir: ${REPOROOT}/artman/output/php/google-cloud-language-v1beta2
-  git_repos:
-    staging:
-      paths:
-        - generated/php/google-cloud-language-v1beta2
-python:
-  gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-language-v1beta2
-  git_repos:
-    python:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-python.git
-      paths:
-        - src: google/cloud/language_v1beta2
-          dest: language/google/cloud/language_v1beta2
-        - src: tests/unit/gapic/v1beta2
-          dest: language/tests/gapic
-        - artifact: grpc
-          src: google/cloud/proto/language/v1beta2
-          dest: language/google/cloud/proto/language/v1beta2
-    staging:
-      paths:
-        - generated/python/gapic-google-cloud-language-v1beta2
-        - artifact: grpc
-          dest: generated/python/proto-google-cloud-language-v1beta2
-ruby:
-  gapic_code_dir: ${REPOROOT}/artman/output/ruby/google-cloud-ruby/google-cloud-language
-  git_repos:
-    ruby:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
-      paths:
-        - src: lib/google/cloud/language/v1beta2
-          dest: google-cloud-language/lib/google/cloud/language/v1beta2
-    staging:
-      paths:
-        - generated/ruby/google-cloud-language-v1beta2
-  skip_packman: True
+  - name: google-common-protos
+artifacts:
+- name: java_gapic
+  type: GAPIC_ONLY
+  language: JAVA
+  publish_targets:
+  - name: java
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
+    directory_mappings:
+    - dest: google-cloud-language
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/java/gapic-google-cloud-language-v1beta2
+    - name: grpc
+      dest: generated/java/grpc-google-cloud-language-v1beta2
+    - name: proto
+      dest: generated/java/proto-google-cloud-language-v1beta2
+- name: python_gapic
+  type: GAPIC_ONLY
+  language: PYTHON
+  publish_targets:
+  - name: python
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-python.git
+    directory_mappings:
+    - src: google/cloud/language_v1beta2
+      dest: language/google/cloud/language_v1beta2
+    - src: tests/unit/gapic/v1beta2
+      dest: language/tests/gapic
+    - name: grpc
+      src: google/cloud/proto/language/v1beta2
+      dest: language/google/cloud/proto/language/v1beta2
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/python/gapic-google-cloud-language-v1beta2
+    - name: grpc
+      dest: generated/python/proto-google-cloud-language-v1beta2
+- name: php_gapic
+  type: GAPIC_ONLY
+  language: PHP
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/php/google-cloud-language-v1beta2
+- name: ruby_gapic
+  type: GAPIC_ONLY
+  language: RUBY
+  publish_targets:
+  - name: ruby
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
+    directory_mappings:
+    - src: lib/google/cloud/language/v1beta2
+      dest: google-cloud-language/lib/google/cloud/language/v1beta2
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/ruby/google-cloud-language-v1beta2
+- name: go_gapic
+  type: GAPIC_ONLY
+  language: GO
+  publish_targets:
+  - name: go
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
+    directory_mappings:
+    - dest: language/apiv1beta2
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/go/vendor/cloud.google.com/go/google-cloud-language-v1beta2/vendor
+- name: csharp_gapic
+  type: GAPIC_ONLY
+  language: CSHARP
+- name: nodejs_gapic
+  type: GAPIC_ONLY
+  language: NODEJS
+  release_level: BETA
+  package_version:
+    grpc_dep_lower_bound: 0.11.0
+  publish_targets:
+  - name: nodejs
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
+    directory_mappings:
+    - src: src/v1beta2
+      dest: packages/language/src/v1beta2
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/nodejs/language-v1beta2
+- name: gapic_config
+  type: GAPIC_CONFIG
diff --git a/gapic/api/artman_logging.yaml b/gapic/api/artman_logging.yaml
index 4c9a0f2..43b6093 100644
--- a/gapic/api/artman_logging.yaml
+++ b/gapic/api/artman_logging.yaml
@@ -1,99 +1,114 @@
 common:
   api_name: logging
   api_version: v2
-  package_type: grpc_client
-  packaging: google-cloud
   organization_name: google-cloud
+  service_yaml: google/logging/logging.yaml
+  gapic_yaml: google/logging/v2/logging_gapic.yaml
+  src_proto_paths:
+  - google/logging/v2
   proto_deps:
-    - google-common-protos
-  import_proto_path:
-    - ${GOOGLEAPIS}
-  src_proto_path:
-    - ${GOOGLEAPIS}/google/logging/v2
-  service_yaml:
-    - ${GOOGLEAPIS}/google/logging/logging.yaml
-  output_dir: ${REPOROOT}/artman/output
-  gapic_api_yaml:
-    - ${GOOGLEAPIS}/google/logging/v2/logging_gapic.yaml
-  git_repos:
-    staging:
-      location: git@github.com:googleapis/api-client-staging.git
-csharp:
-  gapic_code_dir: ${REPOROOT}/artman/output/csharp/google-cloud-logging
-go:
-  gapic_code_dir: ${REPOROOT}/gapi-cloud-logging-go
-  git_repos:
-    go:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
-      paths:
-        - logging/apiv2
-    staging:
-      paths:
-        - generated/go/vendor/cloud.google.com/go/google-logging-v2/vendor
-java:
-  release_level: beta
-  gapic_code_dir: ${REPOROOT}/artman/output/java/google-cloud-logging
-  git_repos:
-    java:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
-      paths:
-        - google-cloud-logging
-    staging:
-      paths:
-        - generated/java/gapic-google-cloud-logging-v2
-        - artifact: grpc
-          dest: generated/java/grpc-google-cloud-logging-v2
-        - artifact: proto
-          dest: generated/java/proto-google-cloud-logging-v2
-nodejs:
-  gapic_code_dir: ${REPOROOT}/artman/output/js/logging-v2
-  git_repos:
-    nodejs:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
-      paths:
-        - src: src/v2
-          dest: packages/logging/src/v2
-    staging:
-      paths:
-        - generated/nodejs/logging
-  skip_packman: True
-php:
-  gapic_code_dir: ${REPOROOT}/artman/output/php/google-cloud-logging-v2
-  git_repos:
-    staging:
-      paths:
-        - generated/php/google-cloud-logging-v2
-python:
-  release_level: beta
-  generated_package_version:
-    lower: 0.91.4
-    upper: 0.92dev
-  gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-logging-v2
-  git_repos:
-    python:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-python.git
-      paths:
-        - src: google/cloud/logging_v2
-          dest: logging/google/cloud/logging_v2
-        - src: tests/unit/gapic/v2
-          dest: logging/tests/gapic
-        - artifact: grpc
-          src: google/cloud/proto
-          dest: logging/google/cloud/proto
-    staging:
-      paths:
-        - generated/python/gapic-google-cloud-logging-v2
-        - artifact: grpc
-          dest: generated/python/proto-google-cloud-logging-v2
-ruby:
-  gapic_code_dir: ${REPOROOT}/artman/output/ruby/google-cloud-ruby/google-cloud-logging
-  git_repos:
-    ruby:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
-      paths:
-        - src: lib/google/cloud/logging/v2
-          dest: google-cloud-logging/lib/google/cloud/logging/v2
-    staging:
-      paths:
-        - generated/ruby/google-cloud-logging
-  skip_packman: True
+  - name: google-common-protos
+artifacts:
+- name: java_gapic
+  type: GAPIC_ONLY
+  language: JAVA
+  release_level: BETA
+  publish_targets:
+  - name: java
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
+    directory_mappings:
+    - dest: google-cloud-logging
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/java/gapic-google-cloud-logging-v2
+    - name: grpc
+      dest: generated/java/grpc-google-cloud-logging-v2
+    - name: proto
+      dest: generated/java/proto-google-cloud-logging-v2
+- name: python_gapic
+  type: GAPIC_ONLY
+  language: PYTHON
+  release_level: BETA
+  package_version:
+    grpc_dep_lower_bound: 0.91.4
+    grpc_dep_upper_bound: 0.92dev
+  publish_targets:
+  - name: python
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-python.git
+    directory_mappings:
+    - src: google/cloud/logging_v2
+      dest: logging/google/cloud/logging_v2
+    - src: tests/unit/gapic/v2
+      dest: logging/tests/gapic
+    - name: grpc
+      src: google/cloud/proto
+      dest: logging/google/cloud/proto
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/python/gapic-google-cloud-logging-v2
+    - name: grpc
+      dest: generated/python/proto-google-cloud-logging-v2
+- name: php_gapic
+  type: GAPIC_ONLY
+  language: PHP
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/php/google-cloud-logging-v2
+- name: ruby_gapic
+  type: GAPIC_ONLY
+  language: RUBY
+  publish_targets:
+  - name: ruby
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
+    directory_mappings:
+    - src: lib/google/cloud/logging/v2
+      dest: google-cloud-logging/lib/google/cloud/logging/v2
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/ruby/google-cloud-logging
+- name: go_gapic
+  type: GAPIC_ONLY
+  language: GO
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/go/vendor/cloud.google.com/go/google-logging-v2/vendor
+  - name: go
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
+    directory_mappings:
+    - dest: logging/apiv2
+- name: csharp_gapic
+  type: GAPIC_ONLY
+  language: CSHARP
+- name: nodejs_gapic
+  type: GAPIC_ONLY
+  language: NODEJS
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/nodejs/logging
+  - name: nodejs
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
+    directory_mappings:
+    - src: src/v2
+      dest: packages/logging/src/v2
+- name: gapic_config
+  type: GAPIC_CONFIG
diff --git a/gapic/api/artman_longrunning.yaml b/gapic/api/artman_longrunning.yaml
index 9a8ae1b..1c0ba0b 100644
--- a/gapic/api/artman_longrunning.yaml
+++ b/gapic/api/artman_longrunning.yaml
@@ -1,87 +1,100 @@
 common:
   api_name: longrunning
   api_version: v1
-  package_type: grpc_client
-  packaging: google-cloud
   organization_name: google
+  service_yaml: google/longrunning/longrunning.yaml
+  gapic_yaml: google/longrunning/longrunning_gapic.yaml
+  src_proto_paths:
+  - google/longrunning
   proto_deps:
-    - google-common-protos
-  import_proto_path:
-    - ${GOOGLEAPIS}
-  src_proto_path:
-    - ${GOOGLEAPIS}/google/longrunning
-  service_yaml:
-    - ${GOOGLEAPIS}/google/longrunning/longrunning.yaml
-  gapic_api_yaml:
-    - ${GOOGLEAPIS}/google/longrunning/longrunning_gapic.yaml
-  output_dir: ${REPOROOT}/artman/output
-  git_repos:
-    staging:
-      location: git@github.com:googleapis/api-client-staging.git
-csharp:
-  gapic_code_dir: ${REPOROOT}/artman/output/csharp/google-longrunning
-java:
-  gapic_code_dir: ${REPOROOT}/artman/output/gax-java
-  git_repos:
-    gax:
-      location: git@github.com:googleapis/gax-java.git
-      paths:
-        - src: src/main/java/com/google/longrunning
-          dest: src/main/java/com/google/longrunning
-    staging:
-      paths:
-        - generated/java/gapic-google-longrunning-v1
-        - artifact: grpc
-          dest: generated/java/grpc-google-longrunning-v1
-        - artifact: proto
-          dest: generated/java/proto-google-longrunning-v1
-go:
-  gapic_code_dir: ${REPOROOT}/gapi-longrunning-go
-  git_repos:
-    go:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
-      paths:
-        - longrunning/autogen
-    staging:
-      paths:
-        - generated/go/vendor/cloud.google.com/go/google-longrunning/vendor
-nodejs:
-  gapic_code_dir: ${REPOROOT}/artman/output/gax-nodejs
-  git_repos:
-    gax:
-      location: git@github.com:googleapis/gax-nodejs.git
-      gapic_component: src/operation*
-      paths:
-        - lib/operation*
-php:
-  gapic_code_dir: ${REPOROOT}/artman/output/gax-php
-  git_repos:
-    staging:
-      paths:
-        - generated/php/google-longrunning-v1
-        - artifact: grpc
-          dest: generated/php/google-longrunning-v1/proto
-    gax:
-      location: git@github.com:googleapis/gax-php.git
-      paths:
-        - src: src/Longrunning
-          dest: src/Longrunning
-python:
-  gapic_code_dir: ${REPOROOT}/artman/output/gax-python
-  git_repos:
-    gax:
-      location: git@github.com:googleapis/gax-python.git
-      paths:
-        - src: google/gapic/longrunning
-          dest: google/gapic/longrunning
-ruby:
-  gapic_code_dir: ${REPOROOT}/artman/output/gax-ruby
-  git_repos:
-    gax:
-      location: git@github.com:googleapis/gax-ruby.git
-      paths:
-        - src: lib/google/longrunning
-          dest: lib/google/longrunning
-    staging:
-      paths:
-        - generated/ruby/google-cloud-longrunning
+  - name: google-common-protos
+artifacts:
+- name: java_gapic
+  type: GAPIC_ONLY
+  language: JAVA
+  publish_targets:
+  - name: gax
+    type: GITHUB
+    location: git@github.com:googleapis/gax-java.git
+    directory_mappings:
+    - src: src/main/java/com/google/longrunning
+      dest: src/main/java/com/google/longrunning
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/java/gapic-google-longrunning-v1
+    - name: grpc
+      dest: generated/java/grpc-google-longrunning-v1
+    - name: proto
+      dest: generated/java/proto-google-longrunning-v1
+- name: python_gapic
+  type: GAPIC_ONLY
+  language: PYTHON
+  publish_targets:
+  - name: gax
+    type: GITHUB
+    location: git@github.com:googleapis/gax-python.git
+    directory_mappings:
+    - src: google/gapic/longrunning
+      dest: google/gapic/longrunning
+- name: php_gapic
+  type: GAPIC_ONLY
+  language: PHP
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/php/google-longrunning-v1
+    - name: grpc
+      dest: generated/php/google-longrunning-v1/proto
+  - name: gax
+    type: GITHUB
+    location: git@github.com:googleapis/gax-php.git
+    directory_mappings:
+    - src: src/Longrunning
+      dest: src/Longrunning
+- name: ruby_gapic
+  type: GAPIC_ONLY
+  language: RUBY
+  publish_targets:
+  - name: gax
+    type: GITHUB
+    location: git@github.com:googleapis/gax-ruby.git
+    directory_mappings:
+    - src: lib/google/longrunning
+      dest: lib/google/longrunning
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/ruby/google-cloud-longrunning
+- name: go_gapic
+  type: GAPIC_ONLY
+  language: GO
+  publish_targets:
+  - name: go
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
+    directory_mappings:
+    - dest: longrunning/autogen
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/go/vendor/cloud.google.com/go/google-longrunning/vendor
+- name: csharp_gapic
+  type: GAPIC_ONLY
+  language: CSHARP
+- name: nodejs_gapic
+  type: GAPIC_ONLY
+  language: NODEJS
+  publish_targets:
+  - name: gax
+    type: GITHUB
+    location: git@github.com:googleapis/gax-nodejs.git
+    directory_mappings:
+    - dest: lib/operation*
+- name: gapic_config
+  type: GAPIC_CONFIG
diff --git a/gapic/api/artman_monitoring.yaml b/gapic/api/artman_monitoring.yaml
index 7362875..e70c87c 100644
--- a/gapic/api/artman_monitoring.yaml
+++ b/gapic/api/artman_monitoring.yaml
@@ -1,97 +1,112 @@
 common:
   api_name: monitoring
   api_version: v3
-  package_type: grpc_client
-  packaging: google-cloud
   organization_name: google-cloud
+  service_yaml: google/monitoring/monitoring.yaml
+  gapic_yaml: google/monitoring/v3/monitoring_gapic.yaml
+  src_proto_paths:
+  - google/monitoring/v3
   proto_deps:
-    - google-common-protos
-  import_proto_path:
-    - ${GOOGLEAPIS}
-  src_proto_path:
-    - ${GOOGLEAPIS}/google/monitoring/v3
-  service_yaml:
-    - ${GOOGLEAPIS}/google/monitoring/monitoring.yaml
-  gapic_api_yaml:
-    - ${GOOGLEAPIS}/google/monitoring/v3/monitoring_gapic.yaml
-  output_dir: ${REPOROOT}/artman/output
-  git_repos:
-    staging:
-      location: git@github.com:googleapis/api-client-staging.git
-csharp:
-  gapic_code_dir: ${REPOROOT}/artman/output/csharp/google-cloud-monitoring
-go:
-  gapic_code_dir: ${REPOROOT}/gapi-cloud-monitoring-go
-  git_repos:
-    go:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
-      paths:
-        - monitoring/apiv3
-    staging:
-      paths:
-        - generated/go/vendor/cloud.google.com/go/google-monitoring-v3/vendor
-java:
-  gapic_code_dir: ${REPOROOT}/artman/output/java/google-cloud-monitoring
-  git_repos:
-    java:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
-      paths:
-        - google-cloud-monitoring
-    staging:
-      paths:
-        - generated/java/gapic-google-cloud-monitoring-v3
-        - artifact: grpc
-          dest: generated/java/grpc-google-cloud-monitoring-v3
-        - artifact: proto
-          dest: generated/java/proto-google-cloud-monitoring-v3
-nodejs:
-  release_level: beta
-  gapic_code_dir: ${REPOROOT}/artman/output/js/monitoring-v3
-  git_repos:
-    nodejs:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
-      paths:
-        - src: src/v3
-          dest: packages/monitoring/src/v3
-    staging:
-      paths:
-        - generated/nodejs/monitoring
-  skip_packman: True
-  generated_package_version:
-    lower: 0.3.0
-php:
-  gapic_code_dir: ${REPOROOT}/artman/output/php/google-cloud-monitoring-v3
-  git_repos:
-    staging:
-      paths:
-        - generated/php/google-cloud-monitoring-v3
-python:
-  gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-monitoring-v3
-  git_repos:
-    python:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-python.git
-      paths:
-        - src: google/cloud/monitoring_v3
-          dest: monitoring/google/cloud/monitoring_v3
-        - src: tests/unit/gapic/v3
-          dest: monitoring/tests/gapic
-        - artifact: grpc
-          src: google/cloud/proto
-          dest: monitoring/google/cloud/proto
-    staging:
-      paths:
-        - generated/python/gapic-google-cloud-monitoring-v3
-        - artifact: grpc
-          dest: generated/python/proto-google-cloud-monitoring-v3
-ruby:
-  gapic_code_dir: ${REPOROOT}/artman/output/ruby/google-cloud-ruby/google-cloud-monitoring
-  git_repos:
-    ruby:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
-      paths:
-        - src: lib/google/cloud/monitoring/v3
-          dest: google-cloud-monitoring/lib/google/cloud/monitoring/v3
-    staging:
-      paths:
-        - generated/ruby/google-cloud-monitoring
-  skip_packman: True
+  - name: google-common-protos
+artifacts:
+- name: java_gapic
+  type: GAPIC_ONLY
+  language: JAVA
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/java/gapic-google-cloud-monitoring-v3
+    - name: grpc
+      dest: generated/java/grpc-google-cloud-monitoring-v3
+    - name: proto
+      dest: generated/java/proto-google-cloud-monitoring-v3
+  - name: java
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
+    directory_mappings:
+    - dest: google-cloud-monitoring
+- name: python_gapic
+  type: GAPIC_ONLY
+  language: PYTHON
+  publish_targets:
+  - name: python
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-python.git
+    directory_mappings:
+    - src: google/cloud/monitoring_v3
+      dest: monitoring/google/cloud/monitoring_v3
+    - src: tests/unit/gapic/v3
+      dest: monitoring/tests/gapic
+    - name: grpc
+      src: google/cloud/proto
+      dest: monitoring/google/cloud/proto
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/python/gapic-google-cloud-monitoring-v3
+    - name: grpc
+      dest: generated/python/proto-google-cloud-monitoring-v3
+- name: php_gapic
+  type: GAPIC_ONLY
+  language: PHP
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/php/google-cloud-monitoring-v3
+- name: ruby_gapic
+  type: GAPIC_ONLY
+  language: RUBY
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/ruby/google-cloud-monitoring
+  - name: ruby
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
+    directory_mappings:
+    - src: lib/google/cloud/monitoring/v3
+      dest: google-cloud-monitoring/lib/google/cloud/monitoring/v3
+- name: go_gapic
+  type: GAPIC_ONLY
+  language: GO
+  publish_targets:
+  - name: go
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
+    directory_mappings:
+    - dest: monitoring/apiv3
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/go/vendor/cloud.google.com/go/google-monitoring-v3/vendor
+- name: csharp_gapic
+  type: GAPIC_ONLY
+  language: CSHARP
+- name: nodejs_gapic
+  type: GAPIC_ONLY
+  language: NODEJS
+  release_level: BETA
+  package_version:
+    grpc_dep_lower_bound: 0.3.0
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/nodejs/monitoring
+  - name: nodejs
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
+    directory_mappings:
+    - src: src/v3
+      dest: packages/monitoring/src/v3
+- name: gapic_config
+  type: GAPIC_CONFIG
diff --git a/gapic/api/artman_pubsub.yaml b/gapic/api/artman_pubsub.yaml
index 90ae9f0..1742db7 100644
--- a/gapic/api/artman_pubsub.yaml
+++ b/gapic/api/artman_pubsub.yaml
@@ -1,99 +1,112 @@
 common:
   api_name: pubsub
   api_version: v1
-  package_type: grpc_client
-  packaging: google-cloud
   organization_name: google-cloud
+  service_yaml: google/pubsub/pubsub.yaml
+  gapic_yaml: google/pubsub/v1/pubsub_gapic.yaml
+  src_proto_paths:
+  - google/pubsub/v1
   proto_deps:
-    - google-common-protos
-    - google-iam-v1
-  proto_test_deps:
-    - google-iam-v1
-  import_proto_path:
-    - ${GOOGLEAPIS}
-  desc_proto_path:
-    - ${GOOGLEAPIS}/google/iam/v1
-  src_proto_path:
-    - ${GOOGLEAPIS}/google/pubsub/v1
-  service_yaml:
-    - ${GOOGLEAPIS}/google/pubsub/pubsub.yaml
-  gapic_api_yaml:
-    - ${GOOGLEAPIS}/google/pubsub/v1/pubsub_gapic.yaml
-  output_dir: ${REPOROOT}/artman/output
-  git_repos:
-    staging:
-      location: git@github.com:googleapis/api-client-staging.git
-csharp:
-  gapic_code_dir: ${REPOROOT}/artman/output/csharp/google-cloud-pubsub
-go:
-  gapic_code_dir: ${REPOROOT}/gapi-pubsub-go
-  git_repos:
-    go:
-      paths:
-        - pubsub/apiv1
-      location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
-    staging:
-      paths:
-        - generated/go/vendor/cloud.google.com/go/google-pubsub-v1/vendor
-java:
-  gapic_code_dir: ${REPOROOT}/artman/output/java/google-cloud-pubsub
-  git_repos:
-    java:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
-      paths:
-        - google-cloud-pubsub
-    staging:
-      paths:
-        - generated/java/gapic-google-cloud-pubsub-v1
-        - artifact: grpc
-          dest: generated/java/grpc-google-cloud-pubsub-v1
-        - artifact: proto
-          dest: generated/java/proto-google-cloud-pubsub-v1
-nodejs:
-  gapic_code_dir: ${REPOROOT}/artman/output/js/pubsub-v1
-  git_repos:
-    nodejs:
-      paths:
-        - src: src/v1
-          dest: packages/pubsub/src/v1
-      location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
-    staging:
-      paths:
-        - generated/nodejs/pubsub
-  skip_packman: True
-php:
-  gapic_code_dir: ${REPOROOT}/artman/output/php/google-cloud-pubsub-v1
-  git_repos:
-    staging:
-      paths:
-        - generated/php/google-cloud-pubsub-v1
-python:
-  gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-pubsub-v1
-  git_repos:
-    python:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-python.git
-      paths:
-        - src: google/cloud/pubsub_v1
-          dest: pubsub/google/cloud/pubsub_v1
-        - src: tests/unit/gapic/v1
-          dest: pubsub/tests/gapic
-        - artifact: grpc
-          src: google/cloud/proto
-          dest: pubsub/google/cloud/proto
-    staging:
-      paths:
-        - generated/python/gapic-google-cloud-pubsub-v1
-        - artifact: grpc
-          dest: generated/python/proto-google-cloud-pubsub-v1
-ruby:
-  gapic_code_dir: ${REPOROOT}/artman/output/ruby/google-cloud-ruby/google-cloud-pubsub
-  git_repos:
-    ruby:
-      paths:
-        - src: lib/google/cloud/pubsub/v1
-          dest: google-cloud-pubsub/lib/google/cloud/pubsub/v1
-      location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
-    staging:
-      paths:
-        - generated/ruby/google-cloud-pubsub
-  skip_packman: True
+  - name: google-common-protos
+  - name: google-iam-v1
+  test_proto_deps:
+  - name: google-iam-v1
+artifacts:
+- name: java_gapic
+  type: GAPIC_ONLY
+  language: JAVA
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/java/gapic-google-cloud-pubsub-v1
+    - name: grpc
+      dest: generated/java/grpc-google-cloud-pubsub-v1
+    - name: proto
+      dest: generated/java/proto-google-cloud-pubsub-v1
+  - name: java
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
+    directory_mappings:
+    - dest: google-cloud-pubsub
+- name: python_gapic
+  type: GAPIC_ONLY
+  language: PYTHON
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/python/gapic-google-cloud-pubsub-v1
+    - name: grpc
+      dest: generated/python/proto-google-cloud-pubsub-v1
+  - name: python
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-python.git
+    directory_mappings:
+    - src: google/cloud/pubsub_v1
+      dest: pubsub/google/cloud/pubsub_v1
+    - src: tests/unit/gapic/v1
+      dest: pubsub/tests/gapic
+    - name: grpc
+      src: google/cloud/proto
+      dest: pubsub/google/cloud/proto
+- name: php_gapic
+  type: GAPIC_ONLY
+  language: PHP
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/php/google-cloud-pubsub-v1
+- name: ruby_gapic
+  type: GAPIC_ONLY
+  language: RUBY
+  publish_targets:
+  - name: ruby
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
+    directory_mappings:
+    - src: lib/google/cloud/pubsub/v1
+      dest: google-cloud-pubsub/lib/google/cloud/pubsub/v1
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/ruby/google-cloud-pubsub
+- name: go_gapic
+  type: GAPIC_ONLY
+  language: GO
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/go/vendor/cloud.google.com/go/google-pubsub-v1/vendor
+  - name: go
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
+    directory_mappings:
+    - dest: pubsub/apiv1
+- name: csharp_gapic
+  type: GAPIC_ONLY
+  language: CSHARP
+- name: nodejs_gapic
+  type: GAPIC_ONLY
+  language: NODEJS
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/nodejs/pubsub
+  - name: nodejs
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
+    directory_mappings:
+    - src: src/v1
+      dest: packages/pubsub/src/v1
+- name: gapic_config
+  type: GAPIC_CONFIG
diff --git a/gapic/api/artman_spanner.yaml b/gapic/api/artman_spanner.yaml
index 50a9dde..54076ca 100644
--- a/gapic/api/artman_spanner.yaml
+++ b/gapic/api/artman_spanner.yaml
@@ -1,94 +1,109 @@
 common:
   api_name: spanner
   api_version: v1
-  package_type: grpc_client
-  packaging: google-cloud
   organization_name: google-cloud
+  service_yaml: google/spanner/spanner.yaml
+  gapic_yaml: google/spanner/v1/spanner_gapic.yaml
+  src_proto_paths:
+  - google/spanner/v1
   proto_deps:
-    - google-common-protos
-  import_proto_path:
-    - ${GOOGLEAPIS}
-  src_proto_path:
-    - ${GOOGLEAPIS}/google/spanner/v1
-  service_yaml:
-    - ${GOOGLEAPIS}/google/spanner/spanner.yaml
-  gapic_api_yaml:
-    - ${GOOGLEAPIS}/google/spanner/v1/spanner_gapic.yaml
-  output_dir: ${REPOROOT}/artman/output
-  git_repos:
-    staging:
-      location: git@github.com:googleapis/api-client-staging.git
-csharp:
-  gapic_code_dir: ${REPOROOT}/artman/output/csharp/google-cloud-spanner
-go:
-  gapic_code_dir: ${REPOROOT}/gapi-cloud-spanner-go
-  git_repos:
-    go:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
-      paths:
-        - spanner/apiv1
-    staging:
-      paths:
-        - generated/go/vendor/cloud.google.com/go/google-spanner-v1/vendor
-java:
-  gapic_code_dir: ${REPOROOT}/artman/output/java/google-cloud-spanner
-  git_repos:
-    java:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
-      paths:
-        - google-cloud-spanner
-    staging:
-      paths:
-        - generated/java/gapic-google-cloud-spanner-v1
-        - artifact: grpc
-          dest: generated/java/grpc-google-cloud-spanner-v1
-        - artifact: proto
-          dest: generated/java/proto-google-cloud-spanner-v1
-nodejs:
-  gapic_code_dir: ${REPOROOT}/artman/output/js/spanner-v1
-  git_repos:
-    nodejs:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
-      paths:
-        - src: src/v1
-          dest: packages/spanner/src/v1
-    staging:
-      paths:
-        - generated/nodejs/spanner
-  skip_packman: True
-php:
-  gapic_code_dir: ${REPOROOT}/artman/output/php/google-cloud-spanner-v1
-  git_repos:
-    staging:
-      paths:
-        - generated/php/google-cloud-spanner-v1
-python:
-  gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-spanner-v1
-  git_repos:
-    python:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-python.git
-      paths:
-        - src: google/cloud/spanner_v1
-          dest: spanner/google/cloud/spanner_v1
-        - src: tests/unit/gapic/v1
-          dest: spanner/tests/gapic
-        - artifact: grpc
-          src: google/cloud/proto
-          dest: spanner/google/cloud/proto
-    staging:
-      paths:
-        - generated/python/gapic-google-cloud-spanner-v1
-        - artifact: grpc
-          dest: generated/python/proto-google-cloud-spanner-v1
-ruby:
-  gapic_code_dir: ${REPOROOT}/artman/output/ruby/google-cloud-ruby/google-cloud-spanner
-  git_repos:
-    ruby:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
-      paths:
-        - src: lib/google/cloud/spanner/v1
-          dest: google-cloud-spanner/lib/google/cloud/spanner/v1
-    staging:
-      paths:
-        - generated/ruby/google-cloud-spanner
-  skip_packman: True
+  - name: google-common-protos
+artifacts:
+- name: java_gapic
+  type: GAPIC_ONLY
+  language: JAVA
+  publish_targets:
+  - name: java
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
+    directory_mappings:
+    - dest: google-cloud-spanner
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/java/gapic-google-cloud-spanner-v1
+    - name: grpc
+      dest: generated/java/grpc-google-cloud-spanner-v1
+    - name: proto
+      dest: generated/java/proto-google-cloud-spanner-v1
+- name: python_gapic
+  type: GAPIC_ONLY
+  language: PYTHON
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/python/gapic-google-cloud-spanner-v1
+    - name: grpc
+      dest: generated/python/proto-google-cloud-spanner-v1
+  - name: python
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-python.git
+    directory_mappings:
+    - src: google/cloud/spanner_v1
+      dest: spanner/google/cloud/spanner_v1
+    - src: tests/unit/gapic/v1
+      dest: spanner/tests/gapic
+    - name: grpc
+      src: google/cloud/proto
+      dest: spanner/google/cloud/proto
+- name: php_gapic
+  type: GAPIC_ONLY
+  language: PHP
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/php/google-cloud-spanner-v1
+- name: ruby_gapic
+  type: GAPIC_ONLY
+  language: RUBY
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/ruby/google-cloud-spanner
+  - name: ruby
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
+    directory_mappings:
+    - src: lib/google/cloud/spanner/v1
+      dest: google-cloud-spanner/lib/google/cloud/spanner/v1
+- name: go_gapic
+  type: GAPIC_ONLY
+  language: GO
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/go/vendor/cloud.google.com/go/google-spanner-v1/vendor
+  - name: go
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
+    directory_mappings:
+    - dest: spanner/apiv1
+- name: csharp_gapic
+  type: GAPIC_ONLY
+  language: CSHARP
+- name: nodejs_gapic
+  type: GAPIC_ONLY
+  language: NODEJS
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/nodejs/spanner
+  - name: nodejs
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
+    directory_mappings:
+    - src: src/v1
+      dest: packages/spanner/src/v1
+- name: gapic_config
+  type: GAPIC_CONFIG
diff --git a/gapic/api/artman_spanner_admin_database.yaml b/gapic/api/artman_spanner_admin_database.yaml
index c1d8bb0..b7f719e 100644
--- a/gapic/api/artman_spanner_admin_database.yaml
+++ b/gapic/api/artman_spanner_admin_database.yaml
@@ -1,82 +1,94 @@
 common:
   api_name: spanner-admin-database
   api_version: v1
-  package_type: grpc_client
-  packaging: google-cloud
   organization_name: google-cloud
+  service_yaml: google/spanner/admin/database/spanner_admin_database.yaml
+  gapic_yaml: google/spanner/admin/database/v1/spanner_admin_database_gapic.yaml
+  src_proto_paths:
+  - google/spanner/admin/database/v1
   proto_deps:
-    - google-common-protos
-    - google-iam-v1
-  import_proto_path:
-    - ${GOOGLEAPIS}
-  src_proto_path:
-    - ${GOOGLEAPIS}/google/spanner/admin/database/v1
-  service_yaml:
-    - ${GOOGLEAPIS}/google/spanner/admin/database/spanner_admin_database.yaml
-  gapic_api_yaml:
-    - ${GOOGLEAPIS}/google/spanner/admin/database/v1/spanner_admin_database_gapic.yaml
-  output_dir: ${REPOROOT}/artman/output
-  git_repos:
-    staging:
-      location: git@github.com:googleapis/api-client-staging.git
-csharp:
-  gapic_code_dir: ${REPOROOT}/artman/output/csharp/google-cloud-spanner-admin-database
-go:
-  gapic_code_dir: ${REPOROOT}/gapi-cloud-spanner-admin-database-go
-  git_repos:
-    go:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
-      gapic_component: cloud.google.com/go/spanner/admin/database/apiv1
-      paths:
-        - spanner/admin/database/apiv1
-    staging:
-      paths:
-        - generated/go/vendor/cloud.google.com/go/google-spanner-admin-database-v1/vendor
-java:
-  gapic_code_dir: ${REPOROOT}/artman/output/java/google-cloud-spanner-admin-database
-  git_repos:
-    staging:
-      paths:
-        - generated/java/gapic-google-cloud-spanner-admin-database-v1
-        - artifact: grpc
-          dest: generated/java/grpc-google-cloud-spanner-admin-database-v1
-        - artifact: proto
-          dest: generated/java/proto-google-cloud-spanner-admin-database-v1
-nodejs:
-  gapic_code_dir: ${REPOROOT}/artman/output/js/spanner-admin-database-v1
-  git_repos:
-    nodejs:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
-      paths:
-        - src: src
-          dest: packages/spanner/src/admin/database
-    staging:
-      paths:
-        - generated/nodejs/spanner-admin-database
-  skip_packman: True
-php:
-  gapic_code_dir: ${REPOROOT}/artman/output/php/google-cloud-spanner-admin-database-v1
-  git_repos:
-    staging:
-      paths:
-        - generated/php/google-cloud-spanner-admin-database-v1
-python:
-  gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-spanner-admin-database-v1
-  git_repos:
-    staging:
-      paths:
-        - generated/python/gapic-google-cloud-spanner-admin-database-v1
-        - artifact: grpc
-          dest: generated/python/proto-google-cloud-spanner-admin-database-v1
-ruby:
-  gapic_code_dir: ${REPOROOT}/artman/output/ruby/google-cloud-ruby/google-cloud-spanner-admin-database
-  git_repos:
-    ruby:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
-      paths:
-        - src: lib/google/cloud/spanner-admin-database
-          dest: google-cloud-spanner/lib/google/cloud/spanner/admin/database
-    staging:
-      paths:
-        - generated/ruby/google-cloud-spanner-admin-database
-  skip_packman: True
+  - name: google-common-protos
+  - name: google-iam-v1
+artifacts:
+- name: java_gapic
+  type: GAPIC_ONLY
+  language: JAVA
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/java/gapic-google-cloud-spanner-admin-database-v1
+    - name: grpc
+      dest: generated/java/grpc-google-cloud-spanner-admin-database-v1
+    - name: proto
+      dest: generated/java/proto-google-cloud-spanner-admin-database-v1
+- name: python_gapic
+  type: GAPIC_ONLY
+  language: PYTHON
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/python/gapic-google-cloud-spanner-admin-database-v1
+    - name: grpc
+      dest: generated/python/proto-google-cloud-spanner-admin-database-v1
+- name: php_gapic
+  type: GAPIC_ONLY
+  language: PHP
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/php/google-cloud-spanner-admin-database-v1
+- name: ruby_gapic
+  type: GAPIC_ONLY
+  language: RUBY
+  publish_targets:
+  - name: ruby
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
+    directory_mappings:
+    - src: lib/google/cloud/spanner-admin-database
+      dest: google-cloud-spanner/lib/google/cloud/spanner/admin/database
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/ruby/google-cloud-spanner-admin-database
+- name: go_gapic
+  type: GAPIC_ONLY
+  language: GO
+  publish_targets:
+  - name: go
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
+    directory_mappings:
+    - dest: spanner/admin/database/apiv1
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/go/vendor/cloud.google.com/go/google-spanner-admin-database-v1/vendor
+- name: csharp_gapic
+  type: GAPIC_ONLY
+  language: CSHARP
+- name: nodejs_gapic
+  type: GAPIC_ONLY
+  language: NODEJS
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/nodejs/spanner-admin-database
+  - name: nodejs
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
+    directory_mappings:
+    - src: src
+      dest: packages/spanner/src/admin/database
+- name: gapic_config
+  type: GAPIC_CONFIG
diff --git a/gapic/api/artman_spanner_admin_instance.yaml b/gapic/api/artman_spanner_admin_instance.yaml
index 74fd025..2efd92a 100644
--- a/gapic/api/artman_spanner_admin_instance.yaml
+++ b/gapic/api/artman_spanner_admin_instance.yaml
@@ -1,82 +1,94 @@
 common:
   api_name: spanner-admin-instance
   api_version: v1
-  package_type: grpc_client
-  packaging: google-cloud
   organization_name: google-cloud
+  service_yaml: google/spanner/admin/instance/spanner_admin_instance.yaml
+  gapic_yaml: google/spanner/admin/instance/v1/spanner_admin_instance_gapic.yaml
+  src_proto_paths:
+  - google/spanner/admin/instance/v1
   proto_deps:
-    - google-common-protos
-    - google-iam-v1
-  import_proto_path:
-    - ${GOOGLEAPIS}
-  src_proto_path:
-    - ${GOOGLEAPIS}/google/spanner/admin/instance/v1
-  service_yaml:
-    - ${GOOGLEAPIS}/google/spanner/admin/instance/spanner_admin_instance.yaml
-  gapic_api_yaml:
-    - ${GOOGLEAPIS}/google/spanner/admin/instance/v1/spanner_admin_instance_gapic.yaml
-  output_dir: ${REPOROOT}/artman/output
-  git_repos:
-    staging:
-      location: git@github.com:googleapis/api-client-staging.git
-csharp:
-  gapic_code_dir: ${REPOROOT}/artman/output/csharp/google-cloud-spanner-admin-instance
-go:
-  gapic_code_dir: ${REPOROOT}/gapi-cloud-spanner-admin-instance-go
-  git_repos:
-    go:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
-      gapic_component: cloud.google.com/go/spanner/admin/instance/apiv1
-      paths:
-        - spanner/admin/instance/apiv1
-    staging:
-      paths:
-        - generated/go/vendor/cloud.google.com/go/google-spanner-admin-instance-v1/vendor
-java:
-  gapic_code_dir: ${REPOROOT}/artman/output/java/google-cloud-spanner-admin-instance
-  git_repos:
-    staging:
-      paths:
-        - generated/java/gapic-google-cloud-spanner-admin-instance-v1
-        - artifact: grpc
-          dest: generated/java/grpc-google-cloud-spanner-admin-instance-v1
-        - artifact: proto
-          dest: generated/java/proto-google-cloud-spanner-admin-instance-v1
-nodejs:
-  gapic_code_dir: ${REPOROOT}/artman/output/js/spanner-admin-instance-v1
-  git_repos:
-    nodejs:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
-      paths:
-        - src: src
-          dest: packages/spanner/src/admin/instance
-    staging:
-      paths:
-        - generated/nodejs/spanner-admin-instance
-  skip_packman: True
-php:
-  gapic_code_dir: ${REPOROOT}/artman/output/php/google-cloud-spanner-admin-instance-v1
-  git_repos:
-    staging:
-      paths:
-        - generated/php/google-cloud-spanner-admin-instance-v1
-python:
-  gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-spanner-admin-instance-v1
-  git_repos:
-    staging:
-      paths:
-        - generated/python/gapic-google-cloud-spanner-admin-instance-v1
-        - artifact: grpc
-          dest: generated/python/proto-google-cloud-spanner-admin-instance-v1
-ruby:
-  gapic_code_dir: ${REPOROOT}/artman/output/ruby/google-cloud-ruby/google-cloud-spanner-admin-instance
-  git_repos:
-    ruby:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
-      paths:
-        - src: lib/google/cloud/spanner-admin-instance
-          dest: google-cloud-spanner/lib/google/cloud/spanner/admin/instance
-    staging:
-      paths:
-        - generated/ruby/google-cloud-spanner-admin-instance
-  skip_packman: True
+  - name: google-common-protos
+  - name: google-iam-v1
+artifacts:
+- name: java_gapic
+  type: GAPIC_ONLY
+  language: JAVA
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/java/gapic-google-cloud-spanner-admin-instance-v1
+    - name: grpc
+      dest: generated/java/grpc-google-cloud-spanner-admin-instance-v1
+    - name: proto
+      dest: generated/java/proto-google-cloud-spanner-admin-instance-v1
+- name: python_gapic
+  type: GAPIC_ONLY
+  language: PYTHON
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/python/gapic-google-cloud-spanner-admin-instance-v1
+    - name: grpc
+      dest: generated/python/proto-google-cloud-spanner-admin-instance-v1
+- name: php_gapic
+  type: GAPIC_ONLY
+  language: PHP
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/php/google-cloud-spanner-admin-instance-v1
+- name: ruby_gapic
+  type: GAPIC_ONLY
+  language: RUBY
+  publish_targets:
+  - name: ruby
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
+    directory_mappings:
+    - src: lib/google/cloud/spanner-admin-instance
+      dest: google-cloud-spanner/lib/google/cloud/spanner/admin/instance
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/ruby/google-cloud-spanner-admin-instance
+- name: go_gapic
+  type: GAPIC_ONLY
+  language: GO
+  publish_targets:
+  - name: go
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
+    directory_mappings:
+    - dest: spanner/admin/instance/apiv1
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/go/vendor/cloud.google.com/go/google-spanner-admin-instance-v1/vendor
+- name: csharp_gapic
+  type: GAPIC_ONLY
+  language: CSHARP
+- name: nodejs_gapic
+  type: GAPIC_ONLY
+  language: NODEJS
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/nodejs/spanner-admin-instance
+  - name: nodejs
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
+    directory_mappings:
+    - src: src
+      dest: packages/spanner/src/admin/instance
+- name: gapic_config
+  type: GAPIC_CONFIG
diff --git a/gapic/api/artman_speech_v1.yaml b/gapic/api/artman_speech_v1.yaml
index 7f2920e..c8274c5 100644
--- a/gapic/api/artman_speech_v1.yaml
+++ b/gapic/api/artman_speech_v1.yaml
@@ -1,97 +1,112 @@
 common:
   api_name: speech
   api_version: v1
-  package_type: grpc_client
-  packaging: google-cloud
   organization_name: google-cloud
+  service_yaml: google/cloud/speech/cloud_speech_v1.yaml
+  gapic_yaml: google/cloud/speech/v1/cloud_speech_gapic.yaml
+  src_proto_paths:
+  - google/cloud/speech/v1
   proto_deps:
-    - google-common-protos
-  import_proto_path:
-    - ${GOOGLEAPIS}
-  src_proto_path:
-    - ${GOOGLEAPIS}/google/cloud/speech/v1
-  service_yaml:
-    - ${GOOGLEAPIS}/google/cloud/speech/cloud_speech_v1.yaml
-  output_dir: ${REPOROOT}/artman/output
-  gapic_api_yaml:
-    - ${GOOGLEAPIS}/google/cloud/speech/v1/cloud_speech_gapic.yaml
-  git_repos:
-    staging:
-      location: git@github.com:googleapis/api-client-staging.git
-csharp:
-  gapic_code_dir: ${REPOROOT}/artman/output/csharp/google-cloud-speech
-go:
-  gapic_code_dir: ${REPOROOT}/gapi-cloud-speech-go
-  git_repos:
-    go:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
-      paths:
-        - speech/apiv1
-    staging:
-      paths:
-        - generated/go/vendor/cloud.google.com/go/google-speech-v1/vendor
-java:
-  gapic_code_dir: ${REPOROOT}/artman/output/java/google-cloud-speech
-  git_repos:
-    java:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
-      paths:
-        - google-cloud-speech
-    staging:
-      paths:
-        - generated/java/gapic-google-cloud-speech-v1
-        - artifact: grpc
-          dest: generated/java/grpc-google-cloud-speech-v1
-        - artifact: proto
-          dest: generated/java/proto-google-cloud-speech-v1
-nodejs:
-  release_level: beta
-  gapic_code_dir: ${REPOROOT}/artman/output/js/speech-v1
-  git_repos:
-    nodejs:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
-      paths:
-        - src: src/v1
-          dest: packages/speech/src/v1
-    staging:
-      paths:
-        - generated/nodejs/speech
-  skip_packman: True
-  generated_package_version:
-    lower: 0.10.0
-php:
-  gapic_code_dir: ${REPOROOT}/artman/output/php/google-cloud-speech-v1
-  git_repos:
-    staging:
-      paths:
-        - generated/php/google-cloud-speech-v1
-python:
-  gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-speech-v1
-  git_repos:
-    python:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-python.git
-      paths:
-        - src: google/cloud/speech_v1
-          dest: speech/google/cloud/speech_v1
-        - src: tests/unit/gapic/v1
-          dest: speech/tests/gapic
-        - artifact: grpc
-          src: google/cloud/proto
-          dest: speech/google/cloud/proto
-    staging:
-      paths:
-        - generated/python/gapic-google-cloud-speech-v1
-        - artifact: grpc
-          dest: generated/python/proto-google-cloud-speech-v1
-ruby:
-  gapic_code_dir: ${REPOROOT}/artman/output/ruby/google-cloud-ruby/google-cloud-speech
-  git_repos:
-    ruby:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
-      paths:
-        - src: lib/google/cloud/speech/v1
-          dest: google-cloud-speech/lib/google/cloud/speech/v1
-    staging:
-      paths:
-        - generated/ruby/google-cloud-speech-v1
-  skip_packman: True
+  - name: google-common-protos
+artifacts:
+- name: java_gapic
+  type: GAPIC_ONLY
+  language: JAVA
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/java/gapic-google-cloud-speech-v1
+    - name: grpc
+      dest: generated/java/grpc-google-cloud-speech-v1
+    - name: proto
+      dest: generated/java/proto-google-cloud-speech-v1
+  - name: java
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
+    directory_mappings:
+    - dest: google-cloud-speech
+- name: python_gapic
+  type: GAPIC_ONLY
+  language: PYTHON
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/python/gapic-google-cloud-speech-v1
+    - name: grpc
+      dest: generated/python/proto-google-cloud-speech-v1
+  - name: python
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-python.git
+    directory_mappings:
+    - src: google/cloud/speech_v1
+      dest: speech/google/cloud/speech_v1
+    - src: tests/unit/gapic/v1
+      dest: speech/tests/gapic
+    - name: grpc
+      src: google/cloud/proto
+      dest: speech/google/cloud/proto
+- name: php_gapic
+  type: GAPIC_ONLY
+  language: PHP
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/php/google-cloud-speech-v1
+- name: ruby_gapic
+  type: GAPIC_ONLY
+  language: RUBY
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/ruby/google-cloud-speech-v1
+  - name: ruby
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
+    directory_mappings:
+    - src: lib/google/cloud/speech/v1
+      dest: google-cloud-speech/lib/google/cloud/speech/v1
+- name: go_gapic
+  type: GAPIC_ONLY
+  language: GO
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/go/vendor/cloud.google.com/go/google-speech-v1/vendor
+  - name: go
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
+    directory_mappings:
+    - dest: speech/apiv1
+- name: csharp_gapic
+  type: GAPIC_ONLY
+  language: CSHARP
+- name: nodejs_gapic
+  type: GAPIC_ONLY
+  language: NODEJS
+  release_level: BETA
+  package_version:
+    grpc_dep_lower_bound: 0.10.0
+  publish_targets:
+  - name: nodejs
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
+    directory_mappings:
+    - src: src/v1
+      dest: packages/speech/src/v1
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/nodejs/speech
+- name: gapic_config
+  type: GAPIC_CONFIG
diff --git a/gapic/api/artman_speech_v1beta1.yaml b/gapic/api/artman_speech_v1beta1.yaml
index f11f0b2..2de01c6 100644
--- a/gapic/api/artman_speech_v1beta1.yaml
+++ b/gapic/api/artman_speech_v1beta1.yaml
@@ -1,82 +1,94 @@
 common:
   api_name: speech
   api_version: v1beta1
-  package_type: grpc_client
-  packaging: google-cloud
   organization_name: google-cloud
+  service_yaml: google/cloud/speech/cloud_speech_v1beta1.yaml
+  gapic_yaml: google/cloud/speech/v1beta1/cloud_speech_gapic.yaml
+  src_proto_paths:
+  - google/cloud/speech/v1beta1
   proto_deps:
-    - google-common-protos
-  import_proto_path:
-    - ${GOOGLEAPIS}
-  src_proto_path:
-    - ${GOOGLEAPIS}/google/cloud/speech/v1beta1
-  service_yaml:
-    - ${GOOGLEAPIS}/google/cloud/speech/cloud_speech_v1beta1.yaml
-  output_dir: ${REPOROOT}/artman/output
-  gapic_api_yaml:
-    - ${GOOGLEAPIS}/google/cloud/speech/v1beta1/cloud_speech_gapic.yaml
-  git_repos:
-    staging:
-      location: git@github.com:googleapis/api-client-staging.git
-csharp:
-  gapic_code_dir: ${REPOROOT}/artman/output/csharp/google-cloud-speech
-go:
-  gapic_code_dir: ${REPOROOT}/gapi-cloud-speech-go
-  git_repos:
-    go:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
-      paths:
-        - speech/apiv1beta1
-    staging:
-      paths:
-        - generated/go/vendor/cloud.google.com/go/google-speech-v1beta1/vendor
-java:
-  gapic_code_dir: ${REPOROOT}/artman/output/java/google-cloud-speech
-  git_repos:
-    staging:
-      paths:
-        - generated/java/gapic-google-cloud-speech-v1beta1
-        - artifact: grpc
-          dest: generated/java/grpc-google-cloud-speech-v1beta1
-        - artifact: proto
-          dest: generated/java/proto-google-cloud-speech-v1beta1
-nodejs:
-  gapic_code_dir: ${REPOROOT}/artman/output/js/speech-v1beta1
-  git_repos:
-    staging:
-      paths:
-        - generated/nodejs/speech-v1beta1
-  skip_packman: True
-  generated_package_version:
-    lower: 0.10.0
-php:
-  gapic_code_dir: ${REPOROOT}/artman/output/php/google-cloud-speech-v1beta1
-  git_repos:
-    staging:
-      paths:
-        - generated/php/google-cloud-speech-v1beta1
-python:
-  gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-speech-v1beta1
-  git_repos:
-    python:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-python.git
-      paths:
-        - src: google/cloud/speech_v1beta1
-          dest: speech/google/cloud/speech_v1beta1
-        - src: tests/unit/gapic/v1beta1
-          dest: speech/tests/gapic
-        - artifact: grpc
-          src: google/cloud/proto/speech/v1beta1
-          dest: speech/google/cloud/proto/speech/v1beta1
-    staging:
-      paths:
-        - generated/python/gapic-google-cloud-speech-v1beta1
-        - artifact: grpc
-          dest: generated/python/proto-google-cloud-speech-v1beta1
-ruby:
-  gapic_code_dir: ${REPOROOT}/artman/output/ruby/google-cloud-ruby/google-cloud-speech
-  git_repos:
-    staging:
-      paths:
-        - generated/ruby/google-cloud-speech-v1beta1
-  skip_packman: True
+  - name: google-common-protos
+artifacts:
+- name: java_gapic
+  type: GAPIC_ONLY
+  language: JAVA
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/java/gapic-google-cloud-speech-v1beta1
+    - name: grpc
+      dest: generated/java/grpc-google-cloud-speech-v1beta1
+    - name: proto
+      dest: generated/java/proto-google-cloud-speech-v1beta1
+- name: python_gapic
+  type: GAPIC_ONLY
+  language: PYTHON
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/python/gapic-google-cloud-speech-v1beta1
+    - name: grpc
+      dest: generated/python/proto-google-cloud-speech-v1beta1
+  - name: python
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-python.git
+    directory_mappings:
+    - src: google/cloud/speech_v1beta1
+      dest: speech/google/cloud/speech_v1beta1
+    - src: tests/unit/gapic/v1beta1
+      dest: speech/tests/gapic
+    - name: grpc
+      src: google/cloud/proto/speech/v1beta1
+      dest: speech/google/cloud/proto/speech/v1beta1
+- name: php_gapic
+  type: GAPIC_ONLY
+  language: PHP
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/php/google-cloud-speech-v1beta1
+- name: ruby_gapic
+  type: GAPIC_ONLY
+  language: RUBY
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/ruby/google-cloud-speech-v1beta1
+- name: go_gapic
+  type: GAPIC_ONLY
+  language: GO
+  publish_targets:
+  - name: go
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
+    directory_mappings:
+    - dest: speech/apiv1beta1
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/go/vendor/cloud.google.com/go/google-speech-v1beta1/vendor
+- name: csharp_gapic
+  type: GAPIC_ONLY
+  language: CSHARP
+- name: nodejs_gapic
+  type: GAPIC_ONLY
+  language: NODEJS
+  package_version:
+    grpc_dep_lower_bound: 0.10.0
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/nodejs/speech-v1beta1
+- name: gapic_config
+  type: GAPIC_CONFIG
diff --git a/gapic/api/artman_trace.yaml b/gapic/api/artman_trace.yaml
index 7a583db..ba23117 100644
--- a/gapic/api/artman_trace.yaml
+++ b/gapic/api/artman_trace.yaml
@@ -1,93 +1,108 @@
 common:
   api_name: trace
   api_version: v1
-  package_type: grpc_client
-  packaging: google-cloud
   organization_name: google-cloud
+  service_yaml: google/devtools/cloudtrace/trace.yaml
+  gapic_yaml: google/devtools/cloudtrace/v1/trace_gapic.yaml
+  src_proto_paths:
+  - google/devtools/cloudtrace/v1
   proto_deps:
-    - google-common-protos
-  import_proto_path:
-    - ${GOOGLEAPIS}
-  src_proto_path:
-    - ${GOOGLEAPIS}/google/devtools/cloudtrace/v1
-  service_yaml:
-    - ${GOOGLEAPIS}/google/devtools/cloudtrace/trace.yaml
-  gapic_api_yaml:
-    - ${GOOGLEAPIS}/google/devtools/cloudtrace/v1/trace_gapic.yaml
-  output_dir: ${REPOROOT}/artman/output
-  git_repos:
-    staging:
-      location: git@github.com:googleapis/api-client-staging.git
-csharp:
-  gapic_code_dir: ${REPOROOT}/artman/output/csharp/google-cloud-trace
-go:
-  gapic_code_dir: ${REPOROOT}/gapi-cloud-trace-go
-  git_repos:
-    go:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
-      paths:
-        - trace/apiv1
-    staging:
-      paths:
-        - generated/go/vendor/cloud.google.com/go/google-trace-v1/vendor
-java:
-  gapic_code_dir: ${REPOROOT}/artman/output/java/google-cloud-trace
-  git_repos:
-    java:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
-      paths:
-        - google-cloud-trace
-    staging:
-      paths:
-        - generated/java/gapic-google-cloud-trace-v1
-        - artifact: grpc
-          dest: generated/java/grpc-google-cloud-trace-v1
-        - artifact: proto
-          dest: generated/java/proto-google-cloud-trace-v1
-nodejs:
-  gapic_code_dir: ${REPOROOT}/artman/output/js/trace-v1
-  git_repos:
-    node:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
-      paths:
-        - packages/trace
-    staging:
-      paths:
-        - generated/nodejs/trace
-  skip_packman: True
-php:
-  gapic_code_dir: ${REPOROOT}/artman/output/php/google-cloud-trace-v1
-  git_repos:
-    staging:
-      paths:
-        - generated/php/google-cloud-trace-v1
-python:
-  gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-trace-v1
-  git_repos:
-    python:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-python.git
-      paths:
-        - src: google/cloud/trace_v1
-          dest: trace/google/cloud/trace_v1
-        - src: tests/unit/gapic/v1
-          dest: trace/tests/gapic
-        - artifact: grpc
-          src: google/cloud/proto
-          dest: trace/google/cloud/proto
-    staging:
-      paths:
-        - generated/python/gapic-google-cloud-trace-v1
-        - artifact: grpc
-          dest: generated/python/proto-google-cloud-trace-v1
-ruby:
-  gapic_code_dir: ${REPOROOT}/artman/output/ruby/google-cloud-ruby/google-cloud-trace
-  git_repos:
-    ruby:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
-      paths:
-        - src: lib/google/cloud/trace/v1
-          dest: google-cloud-trace/lib/google/cloud/trace/v1
-    staging:
-      paths:
-        - generated/ruby/google-cloud-trace
-  skip_packman: True
+  - name: google-common-protos
+artifacts:
+- name: java_gapic
+  type: GAPIC_ONLY
+  language: JAVA
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/java/gapic-google-cloud-trace-v1
+    - name: grpc
+      dest: generated/java/grpc-google-cloud-trace-v1
+    - name: proto
+      dest: generated/java/proto-google-cloud-trace-v1
+  - name: java
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
+    directory_mappings:
+    - dest: google-cloud-trace
+- name: python_gapic
+  type: GAPIC_ONLY
+  language: PYTHON
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/python/gapic-google-cloud-trace-v1
+    - name: grpc
+      dest: generated/python/proto-google-cloud-trace-v1
+  - name: python
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-python.git
+    directory_mappings:
+    - src: google/cloud/trace_v1
+      dest: trace/google/cloud/trace_v1
+    - src: tests/unit/gapic/v1
+      dest: trace/tests/gapic
+    - name: grpc
+      src: google/cloud/proto
+      dest: trace/google/cloud/proto
+- name: php_gapic
+  type: GAPIC_ONLY
+  language: PHP
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/php/google-cloud-trace-v1
+- name: ruby_gapic
+  type: GAPIC_ONLY
+  language: RUBY
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/ruby/google-cloud-trace
+  - name: ruby
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
+    directory_mappings:
+    - src: lib/google/cloud/trace/v1
+      dest: google-cloud-trace/lib/google/cloud/trace/v1
+- name: go_gapic
+  type: GAPIC_ONLY
+  language: GO
+  publish_targets:
+  - name: go
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
+    directory_mappings:
+    - dest: trace/apiv1
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/go/vendor/cloud.google.com/go/google-trace-v1/vendor
+- name: csharp_gapic
+  type: GAPIC_ONLY
+  language: CSHARP
+- name: nodejs_gapic
+  type: GAPIC_ONLY
+  language: NODEJS
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/nodejs/trace
+  - name: node
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
+    directory_mappings:
+    - dest: packages/trace
+- name: gapic_config
+  type: GAPIC_CONFIG
diff --git a/gapic/api/artman_videointelligence_v1beta1.yaml b/gapic/api/artman_videointelligence_v1beta1.yaml
index 031835b..91d43a6 100644
--- a/gapic/api/artman_videointelligence_v1beta1.yaml
+++ b/gapic/api/artman_videointelligence_v1beta1.yaml
@@ -1,103 +1,116 @@
 common:
   api_name: video-intelligence
   api_version: v1beta1
-  package_type: grpc_client
-  packaging: google-cloud
   organization_name: google-cloud
+  service_yaml: google/cloud/videointelligence/videointelligence.yaml
+  gapic_yaml: google/cloud/videointelligence/v1beta1/videointelligence_gapic.yaml
+  src_proto_paths:
+  - google/cloud/videointelligence/v1beta1
   proto_deps:
-    - google-common-protos
-  import_proto_path:
-    - ${GOOGLEAPIS}
-  src_proto_path:
-    - ${GOOGLEAPIS}/google/cloud/videointelligence/v1beta1
-  service_yaml:
-    - ${GOOGLEAPIS}/google/cloud/videointelligence/videointelligence.yaml
-  gapic_api_yaml:
-    - ${GOOGLEAPIS}/google/cloud/videointelligence/v1beta1/videointelligence_gapic.yaml
-  git_repos:
-    staging:
-      location: git@github.com:googleapis/api-client-staging.git
-  output_dir: ${REPOROOT}/artman/output
-csharp:
-  gapic_code_dir: ${REPOROOT}/artman/output/csharp/google-cloud-video-intelligence
-go:
-  enable_batch_generation: True
-  gapic_code_dir: ${REPOROOT}/gapi-cloud-video-intelligence-go
-  git_repos:
-    go:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
-      paths:
-        - dest: video-intelligence/apiv1beta1
-    staging:
-      paths:
-        - dest: generated/go/vendor/cloud.google.com/go/google-cloud-videointelligence-v1beta1/vendor
-java:
-  gapic_code_dir: ${REPOROOT}/artman/output/java/google-cloud-video-intelligence
-  git_repos:
-    java:
-      paths:
-        - dest: google-cloud-videointelligence
-      location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
-    staging:
-      paths:
-        - generated/java/gapic-google-cloud-video-intelligence-v1beta1
-        - artifact: grpc
-          dest: generated/java/grpc-google-cloud-video-intelligence-v1beta1
-        - artifact: proto
-          dest: generated/java/proto-google-cloud-video-intelligence-v1beta1
-nodejs:
-  release_level: beta
-  gapic_code_dir: ${REPOROOT}/artman/output/js/video-intelligence-v1beta1
-  git_repos:
-    nodejs:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
-      paths:
-        - src: src/v1beta1
-          dest: packages/video-intelligence/src/v1beta1
-        - src: test/gapic-v1beta1.js
-          dest: packages/video-intelligence/test/gapic-v1beta1.js
-    staging:
-      paths:
-        - dest: generated/nodejs/videointelligence
-  skip_packman: True
-  generated_package_version:
-    lower: 0.1.0
-php:
-  gapic_code_dir: ${REPOROOT}/artman/output/gcloud-php-cloud-video-intelligence
-  git_repos:
-    staging:
-      paths:
-        - generated/php/google-cloud-video-intelligence-v1beta1
-        - artifact: grpc
-          dest: generated/php/google-cloud-video-intelligence-v1beta1/proto
-  enable_batch_generation: True
-python:
-  gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-video-intelligence-v1beta1
-  git_repos:
-    staging:
-      paths:
-        - dest: generated/python/gapic-google-cloud-video-intelligence-v1beta1
-        - artifact: grpc
-          dest: generated/python/proto-google-cloud-video-intelligence-v1beta1
-    python:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-python.git
-      paths:
-        - src: google/cloud/gapic
-          dest: videointelligence/google/cloud/gapic
-        - src: tests/unit/gapic/v1beta1
-          dest: videointelligence/tests/gapic
-        - artifact: grpc
-          src: google/cloud/proto
-          dest: videointelligence/google/cloud/proto
-ruby:
-  gapic_code_dir: ${REPOROOT}/artman/output/ruby/google-cloud-ruby/google-cloud-video_intelligence
-  git_repos:
-    ruby:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
-      paths:
-        - src: lib/google/cloud/video_intelligence/v1beta1
-          dest: google-cloud-video_intelligence/lib/google/cloud/video_intelligence/v1beta1
-    staging:
-      paths:
-        - dest: generated/ruby/google-cloud-ruby/google-cloud-video_intelligence
-  skip_packman: True
+  - name: google-common-protos
+artifacts:
+- name: java_gapic
+  type: GAPIC_ONLY
+  language: JAVA
+  publish_targets:
+  - name: java
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
+    directory_mappings:
+    - dest: google-cloud-videointelligence
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/java/gapic-google-cloud-video-intelligence-v1beta1
+    - name: grpc
+      dest: generated/java/grpc-google-cloud-video-intelligence-v1beta1
+    - name: proto
+      dest: generated/java/proto-google-cloud-video-intelligence-v1beta1
+- name: python_gapic
+  type: GAPIC_ONLY
+  language: PYTHON
+  publish_targets:
+  - name: python
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-python.git
+    directory_mappings:
+    - src: google/cloud/gapic
+      dest: videointelligence/google/cloud/gapic
+    - src: tests/unit/gapic/v1beta1
+      dest: videointelligence/tests/gapic
+    - name: grpc
+      src: google/cloud/proto
+      dest: videointelligence/google/cloud/proto
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/python/gapic-google-cloud-video-intelligence-v1beta1
+    - name: grpc
+      dest: generated/python/proto-google-cloud-video-intelligence-v1beta1
+- name: php_gapic
+  type: GAPIC_ONLY
+  language: PHP
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/php/google-cloud-video-intelligence-v1beta1
+    - name: grpc
+      dest: generated/php/google-cloud-video-intelligence-v1beta1/proto
+- name: ruby_gapic
+  type: GAPIC_ONLY
+  language: RUBY
+  publish_targets:
+  - name: ruby
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
+    directory_mappings:
+    - src: lib/google/cloud/video_intelligence/v1beta1
+      dest: google-cloud-video_intelligence/lib/google/cloud/video_intelligence/v1beta1
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/ruby/google-cloud-ruby/google-cloud-video_intelligence
+- name: go_gapic
+  type: GAPIC_ONLY
+  language: GO
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/go/vendor/cloud.google.com/go/google-cloud-videointelligence-v1beta1/vendor
+  - name: go
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
+    directory_mappings:
+    - dest: video-intelligence/apiv1beta1
+- name: csharp_gapic
+  type: GAPIC_ONLY
+  language: CSHARP
+- name: nodejs_gapic
+  type: GAPIC_ONLY
+  language: NODEJS
+  release_level: BETA
+  package_version:
+    grpc_dep_lower_bound: 0.1.0
+  publish_targets:
+  - name: nodejs
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
+    directory_mappings:
+    - src: src/v1beta1
+      dest: packages/video-intelligence/src/v1beta1
+    - src: test/gapic-v1beta1.js
+      dest: packages/video-intelligence/test/gapic-v1beta1.js
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/nodejs/videointelligence
+- name: gapic_config
+  type: GAPIC_CONFIG
diff --git a/gapic/api/artman_videointelligence_v1beta2.yaml b/gapic/api/artman_videointelligence_v1beta2.yaml
index 30a0ae6..3add0af 100644
--- a/gapic/api/artman_videointelligence_v1beta2.yaml
+++ b/gapic/api/artman_videointelligence_v1beta2.yaml
@@ -1,103 +1,116 @@
 common:
   api_name: video-intelligence
   api_version: v1beta2
-  package_type: grpc_client
-  packaging: google-cloud
   organization_name: google-cloud
+  service_yaml: google/cloud/videointelligence/videointelligence_v1beta2.yaml
+  gapic_yaml: google/cloud/videointelligence/v1beta2/videointelligence_gapic.yaml
+  src_proto_paths:
+  - google/cloud/videointelligence/v1beta2
   proto_deps:
-    - google-common-protos
-  import_proto_path:
-    - ${GOOGLEAPIS}
-  src_proto_path:
-    - ${GOOGLEAPIS}/google/cloud/videointelligence/v1beta2
-  service_yaml:
-    - ${GOOGLEAPIS}/google/cloud/videointelligence/videointelligence_v1beta2.yaml
-  gapic_api_yaml:
-    - ${GOOGLEAPIS}/google/cloud/videointelligence/v1beta2/videointelligence_gapic.yaml
-  git_repos:
-    staging:
-      location: git@github.com:googleapis/api-client-staging.git
-  output_dir: ${REPOROOT}/artman/output
-csharp:
-  gapic_code_dir: ${REPOROOT}/artman/output/csharp/google-cloud-video-intelligence
-go:
-  enable_batch_generation: True
-  gapic_code_dir: ${REPOROOT}/gapi-cloud-video-intelligence-go
-  git_repos:
-    go:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
-      paths:
-        - dest: video-intelligence/apiv1beta2
-    staging:
-      paths:
-        - dest: generated/go/vendor/cloud.google.com/go/google-cloud-videointelligence-v1beta2/vendor
-java:
-  gapic_code_dir: ${REPOROOT}/artman/output/java/google-cloud-video-intelligence
-  git_repos:
-    java:
-      paths:
-        - dest: google-cloud-videointelligence
-      location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
-    staging:
-      paths:
-        - generated/java/gapic-google-cloud-video-intelligence-v1beta2
-        - artifact: grpc
-          dest: generated/java/grpc-google-cloud-video-intelligence-v1beta2
-        - artifact: proto
-          dest: generated/java/proto-google-cloud-video-intelligence-v1beta2
-nodejs:
-  release_level: beta
-  gapic_code_dir: ${REPOROOT}/artman/output/js/video-intelligence-v1beta2
-  git_repos:
-    nodejs:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
-      paths:
-        - src: src/v1beta2
-          dest: packages/video-intelligence/src/v1beta2
-        - src: test/gapic-v1beta2.js
-          dest: packages/video-intelligence/test/gapic-v1beta2.js
-    staging:
-      paths:
-        - dest: generated/nodejs/videointelligence
-  skip_packman: True
-  generated_package_version:
-    lower: 0.1.0
-php:
-  gapic_code_dir: ${REPOROOT}/artman/output/gcloud-php-cloud-video-intelligence
-  git_repos:
-    staging:
-      paths:
-        - generated/php/google-cloud-video-intelligence-v1beta2
-        - artifact: grpc
-          dest: generated/php/google-cloud-video-intelligence-v1beta2/proto
-  enable_batch_generation: True
-python:
-  gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-video-intelligence-v1beta2
-  git_repos:
-    staging:
-      paths:
-        - dest: generated/python/gapic-google-cloud-video-intelligence-v1beta2
-        - artifact: grpc
-          dest: generated/python/proto-google-cloud-video-intelligence-v1beta2
-    python:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-python.git
-      paths:
-        - src: google/cloud/gapic
-          dest: videointelligence/google/cloud/gapic
-        - src: tests/unit/gapic/v1beta2
-          dest: videointelligence/tests/gapic
-        - artifact: grpc
-          src: google/cloud/proto
-          dest: videointelligence/google/cloud/proto
-ruby:
-  gapic_code_dir: ${REPOROOT}/artman/output/ruby/google-cloud-ruby/google-cloud-video_intelligence
-  git_repos:
-    ruby:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
-      paths:
-        - src: lib/google/cloud/video_intelligence/v1beta2
-          dest: google-cloud-video_intelligence/lib/google/cloud/video_intelligence/v1beta2
-    staging:
-      paths:
-        - dest: generated/ruby/google-cloud-ruby/google-cloud-video_intelligence
-  skip_packman: True
+  - name: google-common-protos
+artifacts:
+- name: java_gapic
+  type: GAPIC_ONLY
+  language: JAVA
+  publish_targets:
+  - name: java
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
+    directory_mappings:
+    - dest: google-cloud-videointelligence
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/java/gapic-google-cloud-video-intelligence-v1beta2
+    - name: grpc
+      dest: generated/java/grpc-google-cloud-video-intelligence-v1beta2
+    - name: proto
+      dest: generated/java/proto-google-cloud-video-intelligence-v1beta2
+- name: python_gapic
+  type: GAPIC_ONLY
+  language: PYTHON
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/python/gapic-google-cloud-video-intelligence-v1beta2
+    - name: grpc
+      dest: generated/python/proto-google-cloud-video-intelligence-v1beta2
+  - name: python
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-python.git
+    directory_mappings:
+    - src: google/cloud/gapic
+      dest: videointelligence/google/cloud/gapic
+    - src: tests/unit/gapic/v1beta2
+      dest: videointelligence/tests/gapic
+    - name: grpc
+      src: google/cloud/proto
+      dest: videointelligence/google/cloud/proto
+- name: php_gapic
+  type: GAPIC_ONLY
+  language: PHP
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/php/google-cloud-video-intelligence-v1beta2
+    - name: grpc
+      dest: generated/php/google-cloud-video-intelligence-v1beta2/proto
+- name: ruby_gapic
+  type: GAPIC_ONLY
+  language: RUBY
+  publish_targets:
+  - name: ruby
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
+    directory_mappings:
+    - src: lib/google/cloud/video_intelligence/v1beta2
+      dest: google-cloud-video_intelligence/lib/google/cloud/video_intelligence/v1beta2
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/ruby/google-cloud-ruby/google-cloud-video_intelligence
+- name: go_gapic
+  type: GAPIC_ONLY
+  language: GO
+  publish_targets:
+  - name: go
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
+    directory_mappings:
+    - dest: video-intelligence/apiv1beta2
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/go/vendor/cloud.google.com/go/google-cloud-videointelligence-v1beta2/vendor
+- name: csharp_gapic
+  type: GAPIC_ONLY
+  language: CSHARP
+- name: nodejs_gapic
+  type: GAPIC_ONLY
+  language: NODEJS
+  release_level: BETA
+  package_version:
+    grpc_dep_lower_bound: 0.1.0
+  publish_targets:
+  - name: nodejs
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
+    directory_mappings:
+    - src: src/v1beta2
+      dest: packages/video-intelligence/src/v1beta2
+    - src: test/gapic-v1beta2.js
+      dest: packages/video-intelligence/test/gapic-v1beta2.js
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/nodejs/videointelligence
+- name: gapic_config
+  type: GAPIC_CONFIG
diff --git a/gapic/api/artman_vision.yaml b/gapic/api/artman_vision.yaml
index 50e0565..6f7493b 100644
--- a/gapic/api/artman_vision.yaml
+++ b/gapic/api/artman_vision.yaml
@@ -1,98 +1,118 @@
 common:
   api_name: vision
   api_version: v1
-  package_type: grpc_client
-  packaging: google-cloud
   organization_name: google-cloud
+  service_yaml: google/cloud/vision/vision.yaml
+  gapic_yaml: google/cloud/vision/v1/vision_gapic.yaml
+  src_proto_paths:
+  - google/cloud/vision/v1
   proto_deps:
-    - google-common-protos
-  import_proto_path:
-    - ${GOOGLEAPIS}
-  src_proto_path:
-    - ${GOOGLEAPIS}/google/cloud/vision/v1
-  service_yaml:
-    - ${GOOGLEAPIS}/google/cloud/vision/vision.yaml
-  gapic_api_yaml:
-    - ${GOOGLEAPIS}/google/cloud/vision/v1/vision_gapic.yaml
-  output_dir: ${REPOROOT}/artman/output
-  git_repos:
-    staging:
-      location: git@github.com:googleapis/api-client-staging.git
-csharp:
-  gapic_code_dir: ${REPOROOT}/artman/output/csharp/google-cloud-vision
-go:
-  gapic_code_dir: ${REPOROOT}/gapi-cloud-vision-go
-  git_repos:
-    go:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
-      paths:
-        - vision/apiv1
-    staging:
-      paths:
-        - generated/go/vendor/cloud.google.com/go/google-vision-v1/vendor
-java:
-  gapic_code_dir: ${REPOROOT}/artman/output/java/google-cloud-vision
-  git_repos:
-    java:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
-      paths:
-        - google-cloud-vision
-    staging:
-      paths:
-        - generated/java/gapic-google-cloud-vision-v1
-        - artifact: grpc
-          dest: generated/java/grpc-google-cloud-vision-v1
-        - artifact: proto
-          dest: generated/java/proto-google-cloud-vision-v1
-nodejs:
-  release_level: beta
-  gapic_code_dir: ${REPOROOT}/artman/output/js/vision-v1
-  git_repos:
-    nodejs:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
-      paths:
-        - src: src/v1
-          dest: packages/vision/src/v1
-        - src: test/test.js
-          dest: packages/vision/test/gapic-v1.js
-    staging:
-      paths:
-        - generated/nodejs/vision
-  skip_packman: True
-  generated_package_version:
-    lower: 0.12.0
-php:
-  gapic_code_dir: ${REPOROOT}/artman/output/php/google-cloud-vision-v1
-  git_repos:
-    staging:
-      paths:
-        - generated/php/google-cloud-vision-v1
-python:
-  release_level: beta
-  generated_package_version:
-    lower: 0.90.3
-    upper: 0.91dev
-  gapic_code_dir: ${REPOROOT}/artman/output/gapic-google-cloud-vision-v1
-  git_repos:
-    python:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-python.git
-      paths:
-        - src: google/cloud/vision_v1
-          dest: vision/google/cloud/vision_v1
-        - src: tests/unit/gapic/v1
-          dest: vision/tests/gapic/v1
-    staging:
-      paths:
-        - generated/python/gapic-google-cloud-vision-v1
-ruby:
-  gapic_code_dir: ${REPOROOT}/artman/output/ruby/google-cloud-ruby/google-cloud-vision
-  git_repos:
-    ruby:
-      location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
-      paths:
-        - src: lib/google/cloud/vision/v1
-          dest: google-cloud-vision/lib/google/cloud/vision/v1
-    staging:
-      paths:
-        - generated/ruby/google-cloud-vision
-  skip_packman: True
+  - name: google-common-protos
+artifacts:
+- name: java_gapic
+  type: GAPIC_ONLY
+  language: JAVA
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/java/gapic-google-cloud-vision-v1
+    - name: grpc
+      dest: generated/java/grpc-google-cloud-vision-v1
+    - name: proto
+      dest: generated/java/proto-google-cloud-vision-v1
+  - name: java
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-java.git
+    directory_mappings:
+    - dest: google-cloud-vision
+- name: python_gapic
+  type: GAPIC_ONLY
+  language: PYTHON
+  release_level: BETA
+  package_version:
+    grpc_dep_lower_bound: 0.90.3
+    grpc_dep_upper_bound: 0.91dev
+  publish_targets:
+  - name: python
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-python.git
+    directory_mappings:
+    - src: google/cloud/vision_v1
+      dest: vision/google/cloud/vision_v1
+    - src: tests/unit/gapic/v1
+      dest: vision/tests/gapic
+    - name: grpc
+      src: google/cloud/proto
+      dest: vision/google/cloud/proto
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/python/gapic-google-cloud-vision-v1
+    - name: grpc
+      dest: generated/python/proto-google-cloud-vision-v1
+- name: php_gapic
+  type: GAPIC_ONLY
+  language: PHP
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/php/google-cloud-vision-v1
+- name: ruby_gapic
+  type: GAPIC_ONLY
+  language: RUBY
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/ruby/google-cloud-vision
+  - name: ruby
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-ruby.git
+    directory_mappings:
+    - src: lib/google/cloud/vision/v1
+      dest: google-cloud-vision/lib/google/cloud/vision/v1
+- name: go_gapic
+  type: GAPIC_ONLY
+  language: GO
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/go/vendor/cloud.google.com/go/google-vision-v1/vendor
+  - name: go
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-go.git
+    directory_mappings:
+    - dest: vision/apiv1
+- name: csharp_gapic
+  type: GAPIC_ONLY
+  language: CSHARP
+- name: nodejs_gapic
+  type: GAPIC_ONLY
+  language: NODEJS
+  release_level: BETA
+  package_version:
+    grpc_dep_lower_bound: 0.12.0
+  publish_targets:
+  - name: nodejs
+    type: GITHUB
+    location: git@github.com:GoogleCloudPlatform/google-cloud-node.git
+    directory_mappings:
+    - src: src/v1
+      dest: packages/vision/src/v1
+    - src: test/test.js
+      dest: packages/vision/test/gapic-v1.js
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - dest: generated/nodejs/vision
+- name: gapic_config
+  type: GAPIC_CONFIG
diff --git a/gapic/batch/common.yaml b/gapic/batch/common.yaml
index c35442f..1c9342d 100644
--- a/gapic/batch/common.yaml
+++ b/gapic/batch/common.yaml
@@ -13,6 +13,7 @@
     - ${GOOGLEAPIS}/gapic/api/artman_functions.yaml
     - ${GOOGLEAPIS}/gapic/api/artman_genomics.yaml
     - ${GOOGLEAPIS}/gapic/api/artman_iam.yaml
+    - ${GOOGLEAPIS}/gapic/api/artman_streetview_publish.yaml
 go:
   exclude_apis:
     - ${GOOGLEAPIS}/gapic/core/artman_core.yaml
diff --git a/gapic/packaging/api_defaults.yaml b/gapic/packaging/api_defaults.yaml
index 19926b1..3be555a 100644
--- a/gapic/packaging/api_defaults.yaml
+++ b/gapic/packaging/api_defaults.yaml
@@ -39,7 +39,7 @@
   ruby:
     lower: '0.6.8'
   java:
-    lower: '0.1.15'
+    lower: '0.1.18'
 
 generated_ga_package_version:
   java:
diff --git a/gapic/packaging/dependencies.yaml b/gapic/packaging/dependencies.yaml
index 2481a21..489cdd2 100644
--- a/gapic/packaging/dependencies.yaml
+++ b/gapic/packaging/dependencies.yaml
@@ -36,7 +36,7 @@
   ruby:
     lower: '1.0'
   java:
-    lower: '1.4.0'
+    lower: '1.6.1'
 
 gax_version:
   python:
@@ -45,15 +45,15 @@
   nodejs:
     lower: '0.13.2'
   php:
-    lower: '0.20.0'
+    lower: '0.23.0'
   ruby:
     lower: '0.8.6'
   java:
-    lower: '1.5.0'
+    lower: '1.8.1'
 
 gax_grpc_version:
   java:
-    lower: '0.22.0'
+    lower: '0.25.1'
 
 proto_version:
   python:
@@ -84,7 +84,7 @@
     name_override: googleapis-common-protos
     lower: '1.3.1'
   java:
-    lower: '0.1.14'
+    lower: '0.1.18'
 
 google-iam-v1_version:
   python:
@@ -95,7 +95,7 @@
     name_override: grpc-google-iam-v1
     lower: '0.6.8'
   java:
-    lower: '0.1.14'
+    lower: '0.1.18'
 
 api_common_version:
   java:
diff --git a/google/bigtable/admin/v2/bigtable_admin_gapic.yaml b/google/bigtable/admin/v2/bigtable_admin_gapic.yaml
index 0968b8f..4c7a019 100644
--- a/google/bigtable/admin/v2/bigtable_admin_gapic.yaml
+++ b/google/bigtable/admin/v2/bigtable_admin_gapic.yaml
@@ -7,7 +7,7 @@
   go:
     package_name: cloud.google.com/go/bigtable/admin/apiv2
   csharp:
-    package_name: Google.Bigtable.Admin.V2
+    package_name: Google.Cloud.Bigtable.Admin.V2
   ruby:
     package_name: Google::Cloud::Bigtable::Admin::V2
   php:
diff --git a/google/streetview/publish/streetview_publish_gapic.yaml b/google/streetview/publish/streetview_publish_gapic.yaml
index 2cfb16c..3733415 100644
--- a/google/streetview/publish/streetview_publish_gapic.yaml
+++ b/google/streetview/publish/streetview_publish_gapic.yaml
@@ -3,7 +3,7 @@
   java:
     package_name: com.google.streetview.publish.v1
   python:
-    package_name: google.streetview.publish.v1
+    package_name: google.streetview.publish_v1.gapic
   go:
     # Seems to match other formats, e.g.
     # https://github.com/google/google-api-go-client/blob/master/examples/youtube.go