diff --git a/components/gcp/bigquery/query/component.yaml b/components/gcp/bigquery/query/component.yaml
index e3d427986a6..52b870835c5 100644
--- a/components/gcp/bigquery/query/component.yaml
+++ b/components/gcp/bigquery/query/component.yaml
@@ -16,6 +16,9 @@ name: Bigquery - Query
 description: |
   A Kubeflow Pipeline component to submit a query to Google Cloud Bigquery 
   service and dump outputs to a Google Cloud Storage blob. 
+metadata:
+  labels:
+    add-pod-env: 'true'
 inputs:
   - name: query
     description: 'The query used by Bigquery service to fetch the results.'
diff --git a/components/gcp/dataflow/launch_python/component.yaml b/components/gcp/dataflow/launch_python/component.yaml
index 15cbd1ffa36..d44fb8fd95d 100644
--- a/components/gcp/dataflow/launch_python/component.yaml
+++ b/components/gcp/dataflow/launch_python/component.yaml
@@ -15,6 +15,9 @@
 name: Launch Python
 description: |
   Launch a self-executing beam python file.
+metadata:
+  labels:
+    add-pod-env: 'true'
 inputs:
   - name: python_file_path
     description: 'The gcs or local path to the python file to run.'
diff --git a/components/gcp/dataflow/launch_template/component.yaml b/components/gcp/dataflow/launch_template/component.yaml
index d4d614891c6..5cc965f55cc 100644
--- a/components/gcp/dataflow/launch_template/component.yaml
+++ b/components/gcp/dataflow/launch_template/component.yaml
@@ -15,6 +15,9 @@
 name: Launch Dataflow Template
 description: |
   Launchs a dataflow job from template.
+metadata:
+  labels:
+    add-pod-env: 'true'
 inputs:
   - name: project_id
     description: 'Required. The ID of the Cloud Platform project that the job belongs to.'
diff --git a/components/gcp/dataproc/create_cluster/component.yaml b/components/gcp/dataproc/create_cluster/component.yaml
index 7fc62dc4b24..5acb08dbb38 100644
--- a/components/gcp/dataproc/create_cluster/component.yaml
+++ b/components/gcp/dataproc/create_cluster/component.yaml
@@ -15,6 +15,9 @@
 name: dataproc_create_cluster
 description: |
   Creates a DataProc cluster under a project.
+metadata:
+  labels:
+    add-pod-env: 'true'
 inputs:
   - name: project_id
     description: >-
diff --git a/components/gcp/dataproc/delete_cluster/component.yaml b/components/gcp/dataproc/delete_cluster/component.yaml
index f248c627016..6f0ec54f969 100644
--- a/components/gcp/dataproc/delete_cluster/component.yaml
+++ b/components/gcp/dataproc/delete_cluster/component.yaml
@@ -15,6 +15,9 @@
 name: dataproc_delete_cluster
 description: |
   Deletes a DataProc cluster.
+metadata:
+  labels:
+    add-pod-env: 'true'
 inputs:
   - name: project_id
     description: >-
diff --git a/components/gcp/dataproc/submit_hadoop_job/component.yaml b/components/gcp/dataproc/submit_hadoop_job/component.yaml
index 37e1f439b87..716b9123bd0 100644
--- a/components/gcp/dataproc/submit_hadoop_job/component.yaml
+++ b/components/gcp/dataproc/submit_hadoop_job/component.yaml
@@ -16,6 +16,9 @@ name: dataproc_submit_hadoop_job
 description: >-
   Submits a Cloud Dataproc job for running Apache Hadoop MapReduce jobs on 
   Apache Hadoop YARN.
+metadata:
+  labels:
+    add-pod-env: 'true'
 inputs:
   - name: project_id
     description: >-
diff --git a/components/gcp/dataproc/submit_hive_job/component.yaml b/components/gcp/dataproc/submit_hive_job/component.yaml
index 4f3eda1daee..e8b655a3027 100644
--- a/components/gcp/dataproc/submit_hive_job/component.yaml
+++ b/components/gcp/dataproc/submit_hive_job/component.yaml
@@ -15,6 +15,9 @@
 name: dataproc_submit_hive_job
 description: >-
   Submits a Cloud Dataproc job for running Apache Hive queries on YARN.
+metadata:
+  labels:
+    add-pod-env: 'true'
 inputs:
   - name: project_id
     description: >-
diff --git a/components/gcp/dataproc/submit_pig_job/component.yaml b/components/gcp/dataproc/submit_pig_job/component.yaml
index 1135573d016..77dd401727a 100644
--- a/components/gcp/dataproc/submit_pig_job/component.yaml
+++ b/components/gcp/dataproc/submit_pig_job/component.yaml
@@ -15,6 +15,9 @@
 name: dataproc_submit_pig_job
 description: >-
   Submits a Cloud Dataproc job for running Apache Pig queries on YARN.
+metadata:
+  labels:
+    add-pod-env: 'true'
 inputs:
   - name: project_id
     description: >-
diff --git a/components/gcp/dataproc/submit_pyspark_job/component.yaml b/components/gcp/dataproc/submit_pyspark_job/component.yaml
index ea1b878b260..e34d0dda690 100644
--- a/components/gcp/dataproc/submit_pyspark_job/component.yaml
+++ b/components/gcp/dataproc/submit_pyspark_job/component.yaml
@@ -15,6 +15,9 @@
 name: dataproc_submit_pyspark_job
 description: >-
   Submits a Cloud Dataproc job for running Apache PySpark applications on YARN.
+metadata:
+  labels:
+    add-pod-env: 'true'
 inputs:
   - name: project_id
     description: >-
diff --git a/components/gcp/dataproc/submit_spark_job/component.yaml b/components/gcp/dataproc/submit_spark_job/component.yaml
index e48c1fe3918..e10a8f08ea5 100644
--- a/components/gcp/dataproc/submit_spark_job/component.yaml
+++ b/components/gcp/dataproc/submit_spark_job/component.yaml
@@ -15,6 +15,9 @@
 name: dataproc_submit_spark_job
 description: >-
   Submits a Cloud Dataproc job for running Apache Spark applications on YARN.
+metadata:
+  labels:
+    add-pod-env: 'true'
 inputs:
   - name: project_id
     description: >-
diff --git a/components/gcp/dataproc/submit_sparksql_job/component.yaml b/components/gcp/dataproc/submit_sparksql_job/component.yaml
index ab4a4713fa6..f827c73709d 100644
--- a/components/gcp/dataproc/submit_sparksql_job/component.yaml
+++ b/components/gcp/dataproc/submit_sparksql_job/component.yaml
@@ -15,6 +15,9 @@
 name: dataproc_submit_sparksql_job
 description: >-
   Submits a Cloud Dataproc job for running Apache Spark SQL queries.
+metadata:
+  labels:
+    add-pod-env: 'true'
 inputs:
   - name: project_id
     description: >-
diff --git a/components/gcp/ml_engine/batch_predict/component.yaml b/components/gcp/ml_engine/batch_predict/component.yaml
index be66ef62fff..2a36247f85f 100644
--- a/components/gcp/ml_engine/batch_predict/component.yaml
+++ b/components/gcp/ml_engine/batch_predict/component.yaml
@@ -15,6 +15,9 @@
 name: Batch predict against a model with Cloud ML Engine
 description: |
   Creates a MLEngine batch prediction job.
+metadata:
+  labels:
+    add-pod-env: 'true'
 inputs:
   - name: project_id
     description: 'Required. The ID of the parent project of the job.'
diff --git a/components/gcp/ml_engine/deploy/component.yaml b/components/gcp/ml_engine/deploy/component.yaml
index 3701f41acd7..2208c994a31 100644
--- a/components/gcp/ml_engine/deploy/component.yaml
+++ b/components/gcp/ml_engine/deploy/component.yaml
@@ -16,6 +16,9 @@ name: Deploying a trained model to Cloud Machine Learning Engine
 description: |
   A Kubeflow Pipeline component to deploy a trained model from a Cloud Storage
   path to a Cloud Machine Learning Engine service.
+metadata:
+  labels:
+    add-pod-env: 'true'
 inputs:
   - name: model_uri
     description: >-
diff --git a/components/gcp/ml_engine/train/component.yaml b/components/gcp/ml_engine/train/component.yaml
index b00ff4da1ab..39c925e49dd 100644
--- a/components/gcp/ml_engine/train/component.yaml
+++ b/components/gcp/ml_engine/train/component.yaml
@@ -16,6 +16,9 @@ name: Submitting a Cloud ML training job as a pipeline step
 description: |
   A Kubeflow Pipeline component to submit a Cloud Machine Learning (Cloud ML) 
   Engine training job as a step in a pipeline.
+metadata:
+  labels:
+    add-pod-env: 'true'
 inputs:
   - name: project_id
     description: 'Required. The ID of the parent project of the job.'