diff --git a/components/gcp/bigquery/query/component.yaml b/components/gcp/bigquery/query/component.yaml
index 76d682b17c2..1a55dd4afb3 100644
--- a/components/gcp/bigquery/query/component.yaml
+++ b/components/gcp/bigquery/query/component.yaml
@@ -61,6 +61,7 @@ implementation:
   container:
     image: gcr.io/ml-pipeline/ml-pipeline-gcp:a8fcec5f702fc2528c87ed6fd698b9cfca8b509e
     args: [
+      --ui_metadata_path, {outputPath: MLPipeline UI metadata},
       kfp_component.google.bigquery, query,
       --query, {inputValue: query},
       --project_id, {inputValue: project_id},
@@ -69,7 +70,6 @@ implementation:
       --dataset_location, {inputValue: dataset_location},
       --output_gcs_path, {inputValue: output_gcs_path},
       --job_config, {inputValue: job_config},
-      --ui-metadata-path, {outputPath: MLPipeline UI metadata},
     ]
     env:
       KFP_POD_NAME: "{{pod.name}}"
diff --git a/components/gcp/dataflow/launch_python/component.yaml b/components/gcp/dataflow/launch_python/component.yaml
index 0cd95d36fe8..217729f82f5 100644
--- a/components/gcp/dataflow/launch_python/component.yaml
+++ b/components/gcp/dataflow/launch_python/component.yaml
@@ -55,6 +55,7 @@ implementation:
   container:
     image: gcr.io/ml-pipeline/ml-pipeline-gcp:a8fcec5f702fc2528c87ed6fd698b9cfca8b509e
     args: [
+      --ui_metadata_path, {outputPath: MLPipeline UI metadata},
       kfp_component.google.dataflow, launch_python,
       --python_file_path, {inputValue: python_file_path},
       --project_id, {inputValue: project_id},
@@ -62,7 +63,6 @@ implementation:
       --requirements_file_path, {inputValue: requirements_file_path},
       --args, {inputValue: args},
       --wait_interval, {inputValue: wait_interval},
-      --ui-metadata-path, {outputPath: MLPipeline UI metadata},
     ]
     env:
       KFP_POD_NAME: "{{pod.name}}"
diff --git a/components/gcp/dataflow/launch_template/component.yaml b/components/gcp/dataflow/launch_template/component.yaml
index 267d9d2c770..9b77a749866 100644
--- a/components/gcp/dataflow/launch_template/component.yaml
+++ b/components/gcp/dataflow/launch_template/component.yaml
@@ -65,6 +65,7 @@ implementation:
   container:
     image: gcr.io/ml-pipeline/ml-pipeline-gcp:a8fcec5f702fc2528c87ed6fd698b9cfca8b509e
     args: [
+      --ui_metadata_path, {outputPath: MLPipeline UI metadata},
       kfp_component.google.dataflow, launch_template,
       --project_id, {inputValue: project_id},
       --gcs_path, {inputValue: gcs_path},
@@ -73,7 +74,6 @@ implementation:
       --validate_only, {inputValue: validate_only},
       --staging_dir, {inputValue: staging_dir},
       --wait_interval, {inputValue: wait_interval},
-      --ui-metadata-path, {outputPath: MLPipeline UI metadata},
     ]
     env:
       KFP_POD_NAME: "{{pod.name}}"
diff --git a/components/gcp/dataproc/create_cluster/component.yaml b/components/gcp/dataproc/create_cluster/component.yaml
index 09c3a4b0001..c31bb4344ff 100644
--- a/components/gcp/dataproc/create_cluster/component.yaml
+++ b/components/gcp/dataproc/create_cluster/component.yaml
@@ -72,6 +72,7 @@ implementation:
   container:
     image: gcr.io/ml-pipeline/ml-pipeline-gcp:a8fcec5f702fc2528c87ed6fd698b9cfca8b509e
     args: [
+      --ui_metadata_path, {outputPath: MLPipeline UI metadata},
       kfp_component.google.dataproc, create_cluster,
       --project_id, {inputValue: project_id},
       --region, {inputValue: region},
@@ -82,7 +83,6 @@ implementation:
       --image_version, {inputValue: image_version},
       --cluster, {inputValue: cluster},
       --wait_interval, {inputValue: wait_interval},
-      --ui-metadata-path, {outputPath: MLPipeline UI metadata},
     ]
     env:
       KFP_POD_NAME: "{{pod.name}}"
diff --git a/components/gcp/dataproc/submit_hadoop_job/component.yaml b/components/gcp/dataproc/submit_hadoop_job/component.yaml
index 90a41d9555d..0c23e6d473d 100644
--- a/components/gcp/dataproc/submit_hadoop_job/component.yaml
+++ b/components/gcp/dataproc/submit_hadoop_job/component.yaml
@@ -82,6 +82,7 @@ implementation:
   container:
     image: gcr.io/ml-pipeline/ml-pipeline-gcp:a8fcec5f702fc2528c87ed6fd698b9cfca8b509e
     args: [
+      --ui_metadata_path, {outputPath: MLPipeline UI metadata},
       kfp_component.google.dataproc, submit_hadoop_job,
       --project_id, {inputValue: project_id},
       --region, {inputValue: region},
@@ -92,7 +93,6 @@ implementation:
       --hadoop_job, {inputValue: hadoop_job},
       --job, {inputValue: job},
       --wait_interval, {inputValue: wait_interval},
-      --ui-metadata-path, {outputPath: MLPipeline UI metadata},
     ]
     env:
       KFP_POD_NAME: "{{pod.name}}"
diff --git a/components/gcp/dataproc/submit_hive_job/component.yaml b/components/gcp/dataproc/submit_hive_job/component.yaml
index 13d672c9110..f51e8394165 100644
--- a/components/gcp/dataproc/submit_hive_job/component.yaml
+++ b/components/gcp/dataproc/submit_hive_job/component.yaml
@@ -77,6 +77,7 @@ implementation:
   container:
     image: gcr.io/ml-pipeline/ml-pipeline-gcp:a8fcec5f702fc2528c87ed6fd698b9cfca8b509e
     args: [
+      --ui_metadata_path, {outputPath: MLPipeline UI metadata},
       kfp_component.google.dataproc, submit_hive_job,
       --project_id, {inputValue: project_id},
       --region, {inputValue: region},
@@ -87,7 +88,6 @@ implementation:
       --hive_job, {inputValue: hive_job},
       --job, {inputValue: job},
       --wait_interval, {inputValue: wait_interval},
-      --ui-metadata-path, {outputPath: MLPipeline UI metadata},
     ]
     env:
       KFP_POD_NAME: "{{pod.name}}"
diff --git a/components/gcp/dataproc/submit_pig_job/component.yaml b/components/gcp/dataproc/submit_pig_job/component.yaml
index ae4ac03ceee..524e5f1c379 100644
--- a/components/gcp/dataproc/submit_pig_job/component.yaml
+++ b/components/gcp/dataproc/submit_pig_job/component.yaml
@@ -77,6 +77,7 @@ implementation:
   container:
     image: gcr.io/ml-pipeline/ml-pipeline-gcp:a8fcec5f702fc2528c87ed6fd698b9cfca8b509e
     args: [
+      --ui_metadata_path, {outputPath: MLPipeline UI metadata},
       kfp_component.google.dataproc, submit_pig_job,
       --project_id, {inputValue: project_id},
       --region, {inputValue: region},
@@ -87,7 +88,6 @@ implementation:
       --pig_job, {inputValue: pig_job},
       --job, {inputValue: job},
       --wait_interval, {inputValue: wait_interval},
-      --ui-metadata-path, {outputPath: MLPipeline UI metadata},
     ]
     env:
       KFP_POD_NAME: "{{pod.name}}"
diff --git a/components/gcp/dataproc/submit_pyspark_job/component.yaml b/components/gcp/dataproc/submit_pyspark_job/component.yaml
index 28315602deb..7a1dd043610 100644
--- a/components/gcp/dataproc/submit_pyspark_job/component.yaml
+++ b/components/gcp/dataproc/submit_pyspark_job/component.yaml
@@ -71,6 +71,7 @@ implementation:
   container:
     image: gcr.io/ml-pipeline/ml-pipeline-gcp:a8fcec5f702fc2528c87ed6fd698b9cfca8b509e
     args: [
+      --ui_metadata_path, {outputPath: MLPipeline UI metadata},
       kfp_component.google.dataproc, submit_pyspark_job,
       --project_id, {inputValue: project_id},
       --region, {inputValue: region},
@@ -80,7 +81,6 @@ implementation:
       --pyspark_job, {inputValue: pyspark_job},
       --job, {inputValue: job},
       --wait_interval, {inputValue: wait_interval},
-      --ui-metadata-path, {outputPath: MLPipeline UI metadata},
     ]
     env:
       KFP_POD_NAME: "{{pod.name}}"
diff --git a/components/gcp/dataproc/submit_spark_job/component.yaml b/components/gcp/dataproc/submit_spark_job/component.yaml
index 228f91740df..455c5b8c140 100644
--- a/components/gcp/dataproc/submit_spark_job/component.yaml
+++ b/components/gcp/dataproc/submit_spark_job/component.yaml
@@ -78,6 +78,7 @@ implementation:
   container:
     image: gcr.io/ml-pipeline/ml-pipeline-gcp:a8fcec5f702fc2528c87ed6fd698b9cfca8b509e
     args: [
+      --ui_metadata_path, {outputPath: MLPipeline UI metadata},
       kfp_component.google.dataproc, submit_spark_job,
       --project_id, {inputValue: project_id},
       --region, {inputValue: region},
@@ -88,7 +89,6 @@ implementation:
       --spark_job, {inputValue: spark_job},
       --job, {inputValue: job},
       --wait_interval, {inputValue: wait_interval},
-      --ui-metadata-path, {outputPath: MLPipeline UI metadata},
     ]
     env:
       KFP_POD_NAME: "{{pod.name}}"
diff --git a/components/gcp/dataproc/submit_sparksql_job/component.yaml b/components/gcp/dataproc/submit_sparksql_job/component.yaml
index ac2ccc11fb8..b08241c8430 100644
--- a/components/gcp/dataproc/submit_sparksql_job/component.yaml
+++ b/components/gcp/dataproc/submit_sparksql_job/component.yaml
@@ -77,6 +77,7 @@ implementation:
   container:
     image: gcr.io/ml-pipeline/ml-pipeline-gcp:a8fcec5f702fc2528c87ed6fd698b9cfca8b509e
     args: [
+      --ui_metadata_path, {outputPath: MLPipeline UI metadata},
       kfp_component.google.dataproc, submit_sparksql_job,
       --project_id, {inputValue: project_id},
       --region, {inputValue: region},
@@ -87,7 +88,6 @@ implementation:
       --sparksql_job, {inputValue: sparksql_job},
       --job, {inputValue: job},
       --wait_interval, {inputValue: wait_interval},
-      --ui-metadata-path, {outputPath: MLPipeline UI metadata},
     ]
     env:
       KFP_POD_NAME: "{{pod.name}}"
diff --git a/components/gcp/ml_engine/batch_predict/component.yaml b/components/gcp/ml_engine/batch_predict/component.yaml
index bf3a7995cca..a015ff718bd 100644
--- a/components/gcp/ml_engine/batch_predict/component.yaml
+++ b/components/gcp/ml_engine/batch_predict/component.yaml
@@ -71,6 +71,7 @@ implementation:
   container:
     image: gcr.io/ml-pipeline/ml-pipeline-gcp:a8fcec5f702fc2528c87ed6fd698b9cfca8b509e
     args: [
+      --ui_metadata_path, {outputPath: MLPipeline UI metadata},
       kfp_component.google.ml_engine, batch_predict,
       --project_id, {inputValue: project_id},
       --model_path, {inputValue: model_path},
@@ -82,7 +83,6 @@ implementation:
       --prediction_input, {inputValue: prediction_input},
       --job_id_prefix, {inputValue: job_id_prefix},
       --wait_interval, {inputValue: wait_interval},
-      --ui-metadata-path, {outputPath: MLPipeline UI metadata},
     ]
     env:
       KFP_POD_NAME: "{{pod.name}}"
diff --git a/components/gcp/ml_engine/deploy/component.yaml b/components/gcp/ml_engine/deploy/component.yaml
index ee3046aac6d..70b5b81c9a8 100644
--- a/components/gcp/ml_engine/deploy/component.yaml
+++ b/components/gcp/ml_engine/deploy/component.yaml
@@ -97,6 +97,7 @@ implementation:
   container:
     image: gcr.io/ml-pipeline/ml-pipeline-gcp:a8fcec5f702fc2528c87ed6fd698b9cfca8b509e
     args: [
+      --ui_metadata_path, {outputPath: MLPipeline UI metadata},
       kfp_component.google.ml_engine, deploy,
       --model_uri, {inputValue: model_uri},
       --project_id, {inputValue: project_id},
@@ -109,7 +110,6 @@ implementation:
       --replace_existing_version, {inputValue: replace_existing_version},
       --set_default, {inputValue: set_default},
       --wait_interval, {inputValue: wait_interval},
-      --ui-metadata-path, {outputPath: MLPipeline UI metadata},
     ]
     env:
       KFP_POD_NAME: "{{pod.name}}"
diff --git a/components/gcp/ml_engine/train/component.yaml b/components/gcp/ml_engine/train/component.yaml
index 03cf5dff301..adf2e2d2bf3 100644
--- a/components/gcp/ml_engine/train/component.yaml
+++ b/components/gcp/ml_engine/train/component.yaml
@@ -105,6 +105,7 @@ implementation:
   container:
     image: gcr.io/ml-pipeline/ml-pipeline-gcp:a8fcec5f702fc2528c87ed6fd698b9cfca8b509e
     args: [
+      --ui_metadata_path, {outputPath: MLPipeline UI metadata},
       kfp_component.google.ml_engine, train,
       --project_id, {inputValue: project_id},
       --python_module, {inputValue: python_module},
@@ -119,7 +120,6 @@ implementation:
       --training_input, {inputValue: training_input},
       --job_id_prefix, {inputValue: job_id_prefix},
       --wait_interval, {inputValue: wait_interval},
-      --ui-metadata-path, {outputPath: MLPipeline UI metadata},
     ]
     env:
       KFP_POD_NAME: "{{pod.name}}"