diff --git a/google/appengine/artman_appengine.yaml b/google/appengine/artman_appengine.yaml
index 8142b09e..e8cc71e3 100644
--- a/google/appengine/artman_appengine.yaml
+++ b/google/appengine/artman_appengine.yaml
@@ -8,8 +8,8 @@ common:
   - name: google-common-protos
   - name: google-iam-v1
 artifacts:
-- name: java_grpc
-  type: GRPC
+- name: java_proto
+  type: PROTOBUF
   language: JAVA
   publish_targets:
   - name: staging
@@ -18,6 +18,14 @@ artifacts:
     directory_mappings:
     - name: proto
       dest: generated/java/proto-google-appengine
+- name: java_grpc
+  type: GRPC
+  language: JAVA
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
     - name: grpc
       dest: generated/java/grpc-google-appengine
 - name: php_grpc
diff --git a/google/artman_core.yaml b/google/artman_core.yaml
index 28fc5615..a83e02f8 100644
--- a/google/artman_core.yaml
+++ b/google/artman_core.yaml
@@ -12,16 +12,6 @@ common:
   - -api/servicemanagement
   - -api/servicecontrol
 artifacts:
-- name: java_grpc
-  type: GRPC_COMMON
-  language: JAVA
-  publish_targets:
-  - name: staging
-    type: GITHUB
-    location: git@github.com:googleapis/api-client-staging.git
-    directory_mappings:
-    - name: grpc
-      dest: generated/java/grpc-google-common-protos
 - name: java_proto
   type: PROTOBUF
   language: JAVA
diff --git a/google/iam/artman_iam.yaml b/google/iam/artman_iam.yaml
index e0e2255b..553c0f59 100644
--- a/google/iam/artman_iam.yaml
+++ b/google/iam/artman_iam.yaml
@@ -8,6 +8,16 @@ common:
   proto_deps:
   - name: google-common-protos
 artifacts:
+- name: java_proto
+  type: PROTOBUF
+  language: JAVA
+  publish_targets:
+  - name: staging
+    type: GITHUB
+    location: git@github.com:googleapis/api-client-staging.git
+    directory_mappings:
+    - name: proto
+      dest: generated/java/proto-google-iam-v1
 - name: java_grpc
   type: GRPC
   language: JAVA
@@ -18,8 +28,6 @@ artifacts:
     directory_mappings:
     - name: grpc
       dest: generated/java/grpc-google-iam-v1
-    - name: proto
-      dest: generated/java/proto-google-iam-v1
 - name: php_grpc
   type: GRPC
   language: PHP