diff --git a/v2/astradb-to-bigquery/src/main/java/com/google/cloud/teleport/v2/astradb/options/AstraDbToBigQueryOptions.java b/v2/astradb-to-bigquery/src/main/java/com/google/cloud/teleport/v2/astradb/options/AstraDbToBigQueryOptions.java
index aee2942ca1..d167eff7e8 100644
--- a/v2/astradb-to-bigquery/src/main/java/com/google/cloud/teleport/v2/astradb/options/AstraDbToBigQueryOptions.java
+++ b/v2/astradb-to-bigquery/src/main/java/com/google/cloud/teleport/v2/astradb/options/AstraDbToBigQueryOptions.java
@@ -31,6 +31,7 @@ interface BigQueryWriteOptions extends PipelineOptions, DataflowPipelineOptions
     @TemplateParameter.BigQueryTable(
         order = 1,
         description = "BigQuery output table",
+        groupName = "Target",
         optional = true,
         helpText =
             "The BigQuery table location to write the output to. Use the format `<PROJECT_ID>:<DATASET_NAME>.<TABLE_NAME>`. The table's schema must match the input objects.")
@@ -57,6 +58,7 @@ interface AstraDbSourceOptions extends PipelineOptions {
     @TemplateParameter.Text(
         order = 2,
         description = "Database identifier",
+        groupName = "Source",
         helpText = "The database unique identifier (UUID).",
         example = "cf7af129-d33a-498f-ad06-d97a6ee6eb7")
     @Validation.Required
@@ -69,6 +71,7 @@ interface AstraDbSourceOptions extends PipelineOptions {
     @TemplateParameter.Text(
         order = 3,
         description = "Cassandra keyspace",
+        groupName = "Source",
         regexes = {"^[a-zA-Z0-9][a-zA-Z0-9_]{0,47}$"},
         helpText = "The name of the Cassandra keyspace inside of the Astra database.")
     String getAstraKeyspace();
@@ -79,6 +82,7 @@ interface AstraDbSourceOptions extends PipelineOptions {
     @TemplateParameter.Text(
         order = 4,
         description = "Cassandra table",
+        groupName = "Source",
         regexes = {"^[a-zA-Z][a-zA-Z0-9_]*$"},
         helpText = "The name of the table inside of the Cassandra database.",
         example = "my_table")
@@ -91,6 +95,7 @@ interface AstraDbSourceOptions extends PipelineOptions {
     @TemplateParameter.Text(
         order = 5,
         optional = true,
+        groupName = "Source",
         description = "Cassandra CQL Query",
         helpText = "The query to use to filter rows instead of reading the whole table.")
     @SuppressWarnings("unused")
@@ -102,6 +107,7 @@ interface AstraDbSourceOptions extends PipelineOptions {
     @TemplateParameter.Text(
         order = 6,
         optional = true,
+        groupName = "Source",
         description = "Astra Database Region",
         helpText =
             "If not provided, a default is chosen, which is useful with multi-region databases.")
diff --git a/v2/azure-eventhub-to-pubsub/src/main/java/com/google/cloud/teleport/v2/templates/AzureEventhubToPubsub.java b/v2/azure-eventhub-to-pubsub/src/main/java/com/google/cloud/teleport/v2/templates/AzureEventhubToPubsub.java
index 0a70cb4514..da160380f9 100644
--- a/v2/azure-eventhub-to-pubsub/src/main/java/com/google/cloud/teleport/v2/templates/AzureEventhubToPubsub.java
+++ b/v2/azure-eventhub-to-pubsub/src/main/java/com/google/cloud/teleport/v2/templates/AzureEventhubToPubsub.java
@@ -120,6 +120,7 @@ public interface AzureEventhubToPubsubOptions extends PipelineOptions {
         order = 1,
         optional = false,
         regexes = {"[,\\/:a-zA-Z0-9._-]+"},
+        groupName = "Source",
         description = "Azure Event Hub endpoint",
         helpText = "Server IP or DNS for Azure Eventhub Endpoint",
         example = "mynamespace.servicebus.windows.net:9093")
@@ -132,6 +133,7 @@ public interface AzureEventhubToPubsubOptions extends PipelineOptions {
         order = 2,
         optional = false,
         regexes = {"[a-zA-Z0-9._-]+"},
+        groupName = "Source",
         description = "Azure Eventhub topic(s) to read the input from",
         helpText = "Azure Eventhub topic(s) to read the input from",
         example = "topic")
@@ -143,6 +145,7 @@ public interface AzureEventhubToPubsubOptions extends PipelineOptions {
     @TemplateParameter.PubsubTopic(
         order = 3,
         description = "Output Pub/Sub topic",
+        groupName = "Target",
         helpText =
             "The name of the topic to which data should published, in the format of 'projects/your-project-id/topics/your-topic-name'",
         example = "projects/your-project-id/topics/your-topic-name")
diff --git a/v2/bigquery-to-parquet/src/main/java/com/google/cloud/teleport/v2/templates/BigQueryToParquet.java b/v2/bigquery-to-parquet/src/main/java/com/google/cloud/teleport/v2/templates/BigQueryToParquet.java
index aaf13282e8..2a9b75340e 100644
--- a/v2/bigquery-to-parquet/src/main/java/com/google/cloud/teleport/v2/templates/BigQueryToParquet.java
+++ b/v2/bigquery-to-parquet/src/main/java/com/google/cloud/teleport/v2/templates/BigQueryToParquet.java
@@ -146,6 +146,7 @@ public interface BigQueryToParquetOptions extends PipelineOptions {
     @TemplateParameter.BigQueryTable(
         order = 1,
         description = "BigQuery table to export",
+        groupName = "Source",
         helpText = "The BigQuery input table location.",
         example = "your-project:your-dataset.your-table-name")
     @Required
@@ -156,6 +157,7 @@ public interface BigQueryToParquetOptions extends PipelineOptions {
     @TemplateParameter.GcsWriteFile(
         order = 2,
         description = "Output Cloud Storage file(s)",
+        groupName = "Target",
         helpText = "The Cloud Storage folder to write the Parquet files to.",
         example = "gs://your-bucket/export/")
     @Required
diff --git a/v2/bigtable-changestreams-to-hbase/src/main/java/com/google/cloud/teleport/v2/templates/BigtableChangeStreamsToHBase.java b/v2/bigtable-changestreams-to-hbase/src/main/java/com/google/cloud/teleport/v2/templates/BigtableChangeStreamsToHBase.java
index c9d6d5e6a0..d200a11343 100644
--- a/v2/bigtable-changestreams-to-hbase/src/main/java/com/google/cloud/teleport/v2/templates/BigtableChangeStreamsToHBase.java
+++ b/v2/bigtable-changestreams-to-hbase/src/main/java/com/google/cloud/teleport/v2/templates/BigtableChangeStreamsToHBase.java
@@ -75,6 +75,7 @@ public interface BigtableToHbasePipelineOptions
     /** Hbase specific configs. Mirrors configurations on hbase-site.xml. */
     @TemplateParameter.Text(
         description = "Zookeeper quorum host",
+        groupName = "Target",
         helpText = "Zookeeper quorum host, corresponds to hbase.zookeeper.quorum host")
     String getHbaseZookeeperQuorumHost();
 
@@ -83,6 +84,7 @@ public interface BigtableToHbasePipelineOptions
     @TemplateParameter.Text(
         optional = true,
         description = "Zookeeper quorum port",
+        groupName = "Target",
         helpText = "Zookeeper quorum port, corresponds to hbase.zookeeper.quorum port")
     @Default.String("2181")
     String getHbaseZookeeperQuorumPort();
@@ -91,6 +93,7 @@ public interface BigtableToHbasePipelineOptions
 
     @TemplateParameter.Text(
         description = "Hbase root directory",
+        groupName = "Target",
         helpText = "Hbase root directory, corresponds to hbase.rootdir")
     String getHbaseRootDir();
 
diff --git a/v2/bigtable-common/src/main/java/com/google/cloud/teleport/v2/bigtable/options/BigtableCommonOptions.java b/v2/bigtable-common/src/main/java/com/google/cloud/teleport/v2/bigtable/options/BigtableCommonOptions.java
index 949543c75a..d8e02f542c 100644
--- a/v2/bigtable-common/src/main/java/com/google/cloud/teleport/v2/bigtable/options/BigtableCommonOptions.java
+++ b/v2/bigtable-common/src/main/java/com/google/cloud/teleport/v2/bigtable/options/BigtableCommonOptions.java
@@ -146,6 +146,7 @@ interface ReadOptions extends BigtableCommonOptions {
 
     @TemplateParameter.Text(
         order = 1,
+        groupName = "Source",
         regexes = {"[a-z][a-z0-9\\-]+[a-z0-9]"},
         description = "Source Bigtable Instance ID",
         helpText = "The source Bigtable instance ID.")
@@ -156,6 +157,7 @@ interface ReadOptions extends BigtableCommonOptions {
 
     @TemplateParameter.Text(
         order = 2,
+        groupName = "Source",
         description = "Source Cloud Bigtable table ID",
         helpText = "The source Bigtable table ID.")
     @Validation.Required
@@ -166,6 +168,7 @@ interface ReadOptions extends BigtableCommonOptions {
     @TemplateParameter.ProjectId(
         order = 3,
         optional = true,
+        groupName = "Source",
         description = "Source Cloud Bigtable Project ID",
         helpText = "The Bigtable project ID. The default is the project for the Dataflow job.")
     @Default.String("")
@@ -192,6 +195,7 @@ interface ReadChangeStreamOptions extends BigtableCommonOptions.ReadOptions {
     @TemplateParameter.Text(
         order = 1,
         optional = true,
+        groupName = "Source",
         description = "Cloud Bigtable change streams metadata instance ID",
         helpText = "The Bigtable change streams metadata instance ID.")
     @Default.String("")
@@ -202,6 +206,7 @@ interface ReadChangeStreamOptions extends BigtableCommonOptions.ReadOptions {
     @TemplateParameter.Text(
         order = 2,
         optional = true,
+        groupName = "Source",
         description = "Cloud Bigtable change streams metadata table ID",
         helpText =
             "The ID of the Bigtable change streams connector metadata table. If not "
diff --git a/v2/cdc-parent/cdc-change-applier/src/main/java/com/google/cloud/dataflow/cdc/applier/CdcToBigQueryChangeApplierPipeline.java b/v2/cdc-parent/cdc-change-applier/src/main/java/com/google/cloud/dataflow/cdc/applier/CdcToBigQueryChangeApplierPipeline.java
index a18fb44d78..46776037d7 100644
--- a/v2/cdc-parent/cdc-change-applier/src/main/java/com/google/cloud/dataflow/cdc/applier/CdcToBigQueryChangeApplierPipeline.java
+++ b/v2/cdc-parent/cdc-change-applier/src/main/java/com/google/cloud/dataflow/cdc/applier/CdcToBigQueryChangeApplierPipeline.java
@@ -96,6 +96,7 @@ public interface CdcApplierOptions extends PipelineOptions, BigQueryStorageApiSt
     @TemplateParameter.Text(
         order = 1,
         optional = true,
+        groupName = "Source",
         regexes = {"[,a-zA-Z0-9._-]+"},
         description = "Pub/Sub topic(s) to read from",
         helpText = "Comma-separated list of PubSub topics to where CDC data is being pushed.")
@@ -106,6 +107,7 @@ public interface CdcApplierOptions extends PipelineOptions, BigQueryStorageApiSt
     @TemplateParameter.Text(
         order = 2,
         regexes = {"[^/]+"},
+        groupName = "Source",
         description = "Input subscriptions to the template",
         helpText =
             "The comma-separated list of Pub/Sub input subscriptions to read from, in the format `<SUBSCRIPTION_NAME>,<SUBSCRIPTION_NAME>, ...`")
@@ -116,6 +118,7 @@ public interface CdcApplierOptions extends PipelineOptions, BigQueryStorageApiSt
     @TemplateParameter.Text(
         order = 3,
         regexes = {".+"},
+        groupName = "Target",
         description = "Output BigQuery dataset for Changelog tables",
         helpText =
             "The BigQuery dataset to store the staging tables in, in the format <DATASET_NAME>.")
@@ -126,6 +129,7 @@ public interface CdcApplierOptions extends PipelineOptions, BigQueryStorageApiSt
     @TemplateParameter.Text(
         order = 4,
         regexes = {".+"},
+        groupName = "Target",
         description = "Output BigQuery dataset for replica tables",
         helpText =
             "The location of the BigQuery dataset to store the replica tables in, in the format <DATASET_NAME>.")
diff --git a/v2/common/src/main/java/com/google/cloud/teleport/v2/transforms/WriteToGCSAvro.java b/v2/common/src/main/java/com/google/cloud/teleport/v2/transforms/WriteToGCSAvro.java
index 74e87418ad..0d5a41dac2 100644
--- a/v2/common/src/main/java/com/google/cloud/teleport/v2/transforms/WriteToGCSAvro.java
+++ b/v2/common/src/main/java/com/google/cloud/teleport/v2/transforms/WriteToGCSAvro.java
@@ -102,6 +102,7 @@ public interface WriteToGCSAvroOptions extends PipelineOptions {
 
     @TemplateParameter.GcsWriteFolder(
         order = 1,
+        groupName = "Target",
         description = "Output file directory in Cloud Storage",
         helpText = "The path and filename prefix for writing output files. Must end with a slash.",
         example = "gs://your-bucket/your-path")
@@ -112,6 +113,7 @@ public interface WriteToGCSAvroOptions extends PipelineOptions {
     @TemplateParameter.Text(
         order = 2,
         optional = true,
+        groupName = "Target",
         description = "Output filename prefix of the files to write",
         helpText = "The prefix to place on each windowed file.",
         example = "output-")
diff --git a/v2/common/src/main/java/com/google/cloud/teleport/v2/transforms/WriteToGCSParquet.java b/v2/common/src/main/java/com/google/cloud/teleport/v2/transforms/WriteToGCSParquet.java
index 568e3f53bb..5f231bbd4e 100644
--- a/v2/common/src/main/java/com/google/cloud/teleport/v2/transforms/WriteToGCSParquet.java
+++ b/v2/common/src/main/java/com/google/cloud/teleport/v2/transforms/WriteToGCSParquet.java
@@ -92,6 +92,7 @@ public interface WriteToGCSParquetOptions extends PipelineOptions {
 
     @TemplateParameter.GcsWriteFolder(
         order = 1,
+        groupName = "Target",
         description = "Output file directory in Cloud Storage",
         helpText = "The path and filename prefix for writing output files. Must end with a slash.",
         example = "gs://your-bucket/your-path")
@@ -102,6 +103,7 @@ public interface WriteToGCSParquetOptions extends PipelineOptions {
     @TemplateParameter.Text(
         order = 2,
         optional = true,
+        groupName = "Target",
         description = "Output filename prefix of the files to write",
         helpText = "The prefix to place on each windowed file.",
         example = "output-")
diff --git a/v2/common/src/main/java/com/google/cloud/teleport/v2/transforms/WriteToGCSText.java b/v2/common/src/main/java/com/google/cloud/teleport/v2/transforms/WriteToGCSText.java
index cf19a6c27e..56f7ff1eb9 100644
--- a/v2/common/src/main/java/com/google/cloud/teleport/v2/transforms/WriteToGCSText.java
+++ b/v2/common/src/main/java/com/google/cloud/teleport/v2/transforms/WriteToGCSText.java
@@ -107,6 +107,7 @@ public interface WriteToGCSTextOptions extends PipelineOptions {
 
     @TemplateParameter.GcsWriteFolder(
         order = 1,
+        groupName = "Target",
         description = "Output file directory in Cloud Storage",
         helpText = "The path and filename prefix for writing output files. Must end with a slash.",
         example = "gs://your-bucket/your-path")
@@ -117,6 +118,7 @@ public interface WriteToGCSTextOptions extends PipelineOptions {
     @TemplateParameter.Text(
         order = 2,
         optional = true,
+        groupName = "Target",
         description = "Output filename prefix of the files to write",
         helpText = "The prefix to place on each windowed file.",
         example = "output-")
diff --git a/v2/dataplex/src/main/java/com/google/cloud/teleport/v2/options/DataplexBigQueryToGcsOptions.java b/v2/dataplex/src/main/java/com/google/cloud/teleport/v2/options/DataplexBigQueryToGcsOptions.java
index eb1e7c1165..e9ca67261b 100644
--- a/v2/dataplex/src/main/java/com/google/cloud/teleport/v2/options/DataplexBigQueryToGcsOptions.java
+++ b/v2/dataplex/src/main/java/com/google/cloud/teleport/v2/options/DataplexBigQueryToGcsOptions.java
@@ -39,6 +39,7 @@ public interface DataplexBigQueryToGcsOptions
   @TemplateParameter.Text(
       order = 1,
       optional = false,
+      groupName = "Source",
       regexes = {
         "^(projects\\/[^\\n\\r\\/]+\\/locations\\/[^\\n\\r\\/]+\\/lakes\\/[^\\n\\r\\/]+\\/zones\\/[^\\n\\r\\/]+\\/assets\\/[^\\n\\r\\/]+|projects\\/[^\\n\\r\\/]+\\/datasets\\/[^\\n\\r\\/]+)$"
       },
@@ -54,6 +55,7 @@ public interface DataplexBigQueryToGcsOptions
       order = 2,
       optional = true,
       regexes = {"^[a-zA-Z0-9_-]+(,[a-zA-Z0-9_-]+)*$"},
+      groupName = "Source",
       description = "Source BigQuery tables to tier.",
       helpText =
           "A comma-separated list of BigQuery tables to tier. If none specified, all tables will be tiered. Tables should be specified by their name only (no project/dataset prefix). Case-sensitive!")
@@ -67,6 +69,7 @@ public interface DataplexBigQueryToGcsOptions
       regexes = {
         "^projects\\/[^\\n\\r\\/]+\\/locations\\/[^\\n\\r\\/]+\\/lakes\\/[^\\n\\r\\/]+\\/zones\\/[^\\n\\r\\/]+\\/assets\\/[^\\n\\r\\/]+$"
       },
+      groupName = "Target",
       description = "Dataplex asset name for the destination Cloud Storage bucket.",
       helpText =
           "Dataplex asset name for the Cloud Storage bucket to tier data to. Format: projects/<name>/locations/<loc>/lakes/<lake-name>/zones/<zone-name>/assets/<asset name>.")
diff --git a/v2/dataplex/src/main/java/com/google/cloud/teleport/v2/options/DataplexJdbcIngestionOptions.java b/v2/dataplex/src/main/java/com/google/cloud/teleport/v2/options/DataplexJdbcIngestionOptions.java
index cc25a6e6a1..86bfffa8cd 100644
--- a/v2/dataplex/src/main/java/com/google/cloud/teleport/v2/options/DataplexJdbcIngestionOptions.java
+++ b/v2/dataplex/src/main/java/com/google/cloud/teleport/v2/options/DataplexJdbcIngestionOptions.java
@@ -41,6 +41,7 @@ public interface DataplexJdbcIngestionOptions
       regexes = {
         "(^jdbc:[a-zA-Z0-9/:@.?_+!*=&-;]+$)|(^([A-Za-z0-9+/]{4}){1,}([A-Za-z0-9+/]{0,3})={0,3})"
       },
+      groupName = "Source",
       description = "JDBC connection URL string.",
       helpText =
           "Url connection string to connect to the JDBC source. Connection string can be passed in"
@@ -127,6 +128,7 @@ public interface DataplexJdbcIngestionOptions
   void setQuery(String query);
 
   @TemplateParameter.Text(
+      groupName = "Target",
       order = 8,
       optional = false,
       regexes = {"^.+$"},
@@ -170,6 +172,7 @@ public interface DataplexJdbcIngestionOptions
             + "\\r"
             + "\\/]+$"
       },
+      groupName = "Target",
       description = "Dataplex output asset ID",
       helpText =
           "Dataplex output asset ID to which the results are stored to. Should be in the format of"
diff --git a/v2/dataplex/src/main/java/com/google/cloud/teleport/v2/templates/DataplexFileFormatConversion.java b/v2/dataplex/src/main/java/com/google/cloud/teleport/v2/templates/DataplexFileFormatConversion.java
index 2e1398bc01..a6f512b40e 100644
--- a/v2/dataplex/src/main/java/com/google/cloud/teleport/v2/templates/DataplexFileFormatConversion.java
+++ b/v2/dataplex/src/main/java/com/google/cloud/teleport/v2/templates/DataplexFileFormatConversion.java
@@ -126,6 +126,7 @@ public interface FileFormatConversionOptions
           "^(projects\\/[^\\n\\r\\/]+\\/locations\\/[^\\n\\r\\/]+\\/lakes\\/[^\\n\\r\\/]+\\/zones\\/[^\\n\\r\\/]+\\/assets\\/[^\\n\\r\\/]+|projects\\/[^\\n\\r\\/]+\\/locations\\/[^\\n\\r\\/]+\\/lakes\\/[^\\n\\r\\/]+\\/zones\\/[^\\n\\r\\/]+\\/entities\\/[^\\n\\r\\/,]+(,projects\\/[^\\n\\r\\/]+\\/locations\\/[^\\n\\r\\/]+\\/lakes\\/[^\\n\\r\\/]+\\/zones\\/[^\\n\\r\\/]+\\/entities\\/[^\\n\\r\\/,]+)*)$"
         },
         description = "Dataplex asset name or Dataplex entity names for the files to be converted.",
+        groupName = "Source",
         helpText =
             "Dataplex asset or Dataplex entities that contain the input files. Format:"
                 + " projects/<name>/locations/<loc>/lakes/<lake-name>/zones/<zone-name>/assets/<asset"
@@ -170,6 +171,7 @@ public interface FileFormatConversionOptions
         regexes = {
           "^projects\\/[^\\n\\r\\/]+\\/locations\\/[^\\n\\r\\/]+\\/lakes\\/[^\\n\\r\\/]+\\/zones\\/[^\\n\\r\\/]+\\/assets\\/[^\\n\\r\\/]+$"
         },
+        groupName = "Target",
         description = "Dataplex asset name for the destination Cloud Storage bucket.",
         helpText =
             "Name of the Dataplex asset that contains Cloud Storage bucket where output files will"
diff --git a/v2/datastream-to-bigquery/src/main/java/com/google/cloud/teleport/v2/templates/DataStreamToBigQuery.java b/v2/datastream-to-bigquery/src/main/java/com/google/cloud/teleport/v2/templates/DataStreamToBigQuery.java
index 0427b9f128..b55fb26204 100644
--- a/v2/datastream-to-bigquery/src/main/java/com/google/cloud/teleport/v2/templates/DataStreamToBigQuery.java
+++ b/v2/datastream-to-bigquery/src/main/java/com/google/cloud/teleport/v2/templates/DataStreamToBigQuery.java
@@ -146,6 +146,7 @@ public interface Options
 
     @TemplateParameter.GcsReadFile(
         order = 1,
+        groupName = "Source",
         description = "File location for Datastream file output in Cloud Storage.",
         helpText =
             "The file location for Datastream file output in Cloud Storage, in the format: gs://<BUCKET_NAME>/<ROOT_PATH>/.")
@@ -210,6 +211,7 @@ public interface Options
         order = 7,
         optional = true,
         description = "Project Id for BigQuery datasets.",
+        groupName = "Target",
         helpText =
             "The ID of the Google Cloud project that contains the BigQuery datasets to output data into. The default for this parameter is the project where the Dataflow pipeline is running.")
     String getOutputProjectId();
@@ -218,6 +220,7 @@ public interface Options
 
     @TemplateParameter.Text(
         order = 8,
+        groupName = "Target",
         description = "Name or template for the dataset to contain staging tables.",
         helpText =
             "The name of the dataset that contains staging tables. This parameter supports templates, for example {_metadata_dataset}_log or my_dataset_log. Normally, this parameter is a dataset name. Defaults to: {_metadata_dataset}.")
@@ -229,6 +232,7 @@ public interface Options
     @TemplateParameter.Text(
         order = 9,
         optional = true,
+        groupName = "Target",
         description = "Template for the name of staging tables.",
         helpText =
             "The template to use to name the staging tables. For example, {_metadata_table}). Defaults to: {_metadata_table}_log.")
@@ -239,6 +243,7 @@ public interface Options
 
     @TemplateParameter.Text(
         order = 10,
+        groupName = "Target",
         description = "Template for the dataset to contain replica tables.",
         helpText =
             "The name of the dataset that contains the replica tables. This parameter supports templates, for example {_metadata_dataset} or my_dataset. Normally, this parameter is a dataset name. Defaults to: {_metadata_dataset}.")
@@ -249,6 +254,7 @@ public interface Options
 
     @TemplateParameter.Text(
         order = 11,
+        groupName = "Target",
         optional = true,
         description = "Template for the name of replica tables.",
         helpText =
diff --git a/v2/datastream-to-mongodb/src/main/java/com/google/cloud/teleport/v2/templates/DataStreamToMongoDB.java b/v2/datastream-to-mongodb/src/main/java/com/google/cloud/teleport/v2/templates/DataStreamToMongoDB.java
index bdc0be1c4e..f4f05fef60 100644
--- a/v2/datastream-to-mongodb/src/main/java/com/google/cloud/teleport/v2/templates/DataStreamToMongoDB.java
+++ b/v2/datastream-to-mongodb/src/main/java/com/google/cloud/teleport/v2/templates/DataStreamToMongoDB.java
@@ -89,6 +89,7 @@ public interface Options extends PipelineOptions, StreamingOptions {
     @TemplateParameter.GcsReadFile(
         order = 1,
         description = "Cloud Storage Input File(s)",
+        groupName = "Source",
         helpText = "Path of the file pattern glob to read from.",
         example = "gs://your-bucket/path/*.avro")
     String getInputFilePattern();
@@ -108,6 +109,7 @@ public interface Options extends PipelineOptions, StreamingOptions {
 
     @TemplateParameter.PubsubSubscription(
         order = 3,
+        groupName = "Source",
         optional = false,
         description = "Pub/Sub input subscription",
         helpText =
@@ -148,6 +150,7 @@ public interface Options extends PipelineOptions, StreamingOptions {
     void setFileReadConcurrency(Integer value);
 
     @TemplateParameter.Text(
+        groupName = "Target",
         order = 7,
         description = "MongoDB Connection URI",
         helpText = "URI to connect to MongoDB Atlas.")
@@ -156,6 +159,7 @@ public interface Options extends PipelineOptions, StreamingOptions {
     void setMongoDBUri(String value);
 
     @TemplateParameter.Text(
+        groupName = "Target",
         order = 8,
         description = "MongoDB Database",
         helpText = "Database in MongoDB to store the collection.",
@@ -165,6 +169,7 @@ public interface Options extends PipelineOptions, StreamingOptions {
     void setDatabase(String value);
 
     @TemplateParameter.Text(
+        groupName = "Target",
         order = 9,
         description = "MongoDB collection",
         helpText = "Name of the collection inside MongoDB database.",
diff --git a/v2/datastream-to-postgres/src/main/java/com/google/cloud/teleport/v2/templates/DataStreamToPostgres.java b/v2/datastream-to-postgres/src/main/java/com/google/cloud/teleport/v2/templates/DataStreamToPostgres.java
index 3404a3e618..c7fce49a37 100644
--- a/v2/datastream-to-postgres/src/main/java/com/google/cloud/teleport/v2/templates/DataStreamToPostgres.java
+++ b/v2/datastream-to-postgres/src/main/java/com/google/cloud/teleport/v2/templates/DataStreamToPostgres.java
@@ -83,6 +83,7 @@ public class DataStreamToPostgres {
   public interface Options extends PipelineOptions, StreamingOptions {
     @TemplateParameter.GcsReadFile(
         order = 1,
+        groupName = "Source",
         description = "Cloud Storage Input File(s)",
         helpText = "Path of the file pattern glob to read from.",
         example = "gs://your-bucket/path/*.avro")
@@ -136,6 +137,7 @@ public interface Options extends PipelineOptions, StreamingOptions {
     // Postgres Connection Parameters
     @TemplateParameter.Text(
         order = 4,
+        groupName = "Target",
         description = "Database Host to connect on.",
         helpText = "Database Host to connect on.")
     String getDatabaseHost();
@@ -144,6 +146,7 @@ public interface Options extends PipelineOptions, StreamingOptions {
 
     @TemplateParameter.Text(
         order = 5,
+        groupName = "Target",
         optional = true,
         description = "Database Port to connect on.",
         helpText = "Database Port to connect on.")
@@ -172,6 +175,7 @@ public interface Options extends PipelineOptions, StreamingOptions {
 
     @TemplateParameter.Text(
         order = 12,
+        groupName = "Target",
         optional = true,
         description = "SQL Database Name.",
         helpText = "The database name to connect to.")
diff --git a/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/DataStreamToSpanner.java b/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/DataStreamToSpanner.java
index 4db5cf9ee2..48b21a0a6f 100644
--- a/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/DataStreamToSpanner.java
+++ b/v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/DataStreamToSpanner.java
@@ -140,6 +140,7 @@ public class DataStreamToSpanner {
   public interface Options extends PipelineOptions, StreamingOptions {
     @TemplateParameter.GcsReadFile(
         order = 1,
+        groupName = "Source",
         description = "File location for Datastream file output in Cloud Storage.",
         helpText =
             "The Cloud Storage file location that contains the Datastream files to replicate. Typically, "
@@ -173,6 +174,7 @@ public interface Options extends PipelineOptions, StreamingOptions {
 
     @TemplateParameter.Text(
         order = 4,
+        groupName = "Target",
         description = "Cloud Spanner Instance Id.",
         helpText = "The Spanner instance where the changes are replicated.")
     String getInstanceId();
@@ -181,6 +183,7 @@ public interface Options extends PipelineOptions, StreamingOptions {
 
     @TemplateParameter.Text(
         order = 5,
+        groupName = "Target",
         description = "Cloud Spanner Database Id.",
         helpText = "The Spanner database where the changes are replicated.")
     String getDatabaseId();
@@ -189,6 +192,7 @@ public interface Options extends PipelineOptions, StreamingOptions {
 
     @TemplateParameter.ProjectId(
         order = 6,
+        groupName = "Target",
         optional = true,
         description = "Cloud Spanner Project Id.",
         helpText = "The Spanner project ID.")
@@ -198,6 +202,7 @@ public interface Options extends PipelineOptions, StreamingOptions {
 
     @TemplateParameter.Text(
         order = 7,
+        groupName = "Target",
         optional = true,
         description = "The Cloud Spanner Endpoint to call",
         helpText = "The Cloud Spanner endpoint to call in the template.",
@@ -221,6 +226,7 @@ public interface Options extends PipelineOptions, StreamingOptions {
 
     @TemplateParameter.Text(
         order = 9,
+        groupName = "Source",
         description = "Datastream stream name.",
         helpText =
             "The name or template for the stream to poll for schema information and source type.")
diff --git a/v2/datastream-to-sql/src/main/java/com/google/cloud/teleport/v2/templates/DataStreamToSQL.java b/v2/datastream-to-sql/src/main/java/com/google/cloud/teleport/v2/templates/DataStreamToSQL.java
index 849b725c09..9199a31ff9 100644
--- a/v2/datastream-to-sql/src/main/java/com/google/cloud/teleport/v2/templates/DataStreamToSQL.java
+++ b/v2/datastream-to-sql/src/main/java/com/google/cloud/teleport/v2/templates/DataStreamToSQL.java
@@ -99,6 +99,7 @@ public class DataStreamToSQL {
   public interface Options extends PipelineOptions, StreamingOptions {
     @TemplateParameter.GcsReadFile(
         order = 1,
+        groupName = "Source",
         description = "File location for Datastream file input in Cloud Storage.",
         helpText =
             "The file location for the Datastream files in Cloud Storage to replicate. This file location is typically the root path for the stream.")
@@ -131,6 +132,7 @@ public interface Options extends PipelineOptions, StreamingOptions {
 
     @TemplateParameter.Text(
         order = 4,
+        groupName = "Source",
         optional = true,
         description = "Name or template for the stream to poll for schema information.",
         helpText =
@@ -178,6 +180,7 @@ public interface Options extends PipelineOptions, StreamingOptions {
 
     @TemplateParameter.Text(
         order = 8,
+        groupName = "Target",
         description = "Database Host to connect on.",
         helpText = "The SQL host to connect on.")
     String getDatabaseHost();
@@ -186,6 +189,7 @@ public interface Options extends PipelineOptions, StreamingOptions {
 
     @TemplateParameter.Text(
         order = 9,
+        groupName = "Target",
         optional = true,
         description = "Database Port to connect on.",
         helpText = "The SQL database port to connect to. The default value is `5432`.")
@@ -213,6 +217,7 @@ public interface Options extends PipelineOptions, StreamingOptions {
 
     @TemplateParameter.Text(
         order = 12,
+        groupName = "Target",
         optional = true,
         description = "SQL Database Name.",
         helpText = "The name of the SQL database to connect to. The default value is `postgres`.")
@@ -235,6 +240,7 @@ public interface Options extends PipelineOptions, StreamingOptions {
 
     @TemplateParameter.Text(
         order = 14,
+        groupName = "Target",
         optional = true,
         description = "Custom connection string.",
         helpText =
diff --git a/v2/gcs-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/GCSToSourceDb.java b/v2/gcs-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/GCSToSourceDb.java
index 5dedd6d505..7385c5cc45 100644
--- a/v2/gcs-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/GCSToSourceDb.java
+++ b/v2/gcs-to-sourcedb/src/main/java/com/google/cloud/teleport/v2/templates/GCSToSourceDb.java
@@ -167,6 +167,7 @@ public interface Options extends PipelineOptions, StreamingOptions {
 
     @TemplateParameter.GcsReadFolder(
         order = 8,
+        groupName = "Source",
         optional = false,
         description = "GCS input directory path",
         helpText = "Path from where to read the change stream files.")
diff --git a/v2/google-ads-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/templates/GoogleAdsToBigQuery.java b/v2/google-ads-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/templates/GoogleAdsToBigQuery.java
index 31db481d80..c5181047bb 100644
--- a/v2/google-ads-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/templates/GoogleAdsToBigQuery.java
+++ b/v2/google-ads-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/templates/GoogleAdsToBigQuery.java
@@ -143,6 +143,7 @@ public interface GoogleAdsToBigQueryOptions extends WriteOptions, GoogleAdsOptio
 
     @TemplateParameter.Password(
         order = 7,
+        groupName = "Source",
         description = "OAuth 2.0 Client Secret for the specified Client ID",
         helpText =
             "The OAuth 2.0 client secret that corresponds to the specified client ID. See Create a client ID and client secret (https://developers.google.com/google-ads/api/docs/oauth/cloud-project#create_a_client_id_and_client_secret).")
diff --git a/v2/googlecloud-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/options/BigtableChangeStreamToBigQueryOptions.java b/v2/googlecloud-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/options/BigtableChangeStreamToBigQueryOptions.java
index fff7250539..81717246b1 100644
--- a/v2/googlecloud-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/options/BigtableChangeStreamToBigQueryOptions.java
+++ b/v2/googlecloud-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/options/BigtableChangeStreamToBigQueryOptions.java
@@ -30,6 +30,7 @@ public interface BigtableChangeStreamToBigQueryOptions
 
   @TemplateParameter.Text(
       order = 1,
+      groupName = "Target",
       description = "BigQuery dataset",
       helpText = "The dataset name of the destination BigQuery table.")
   @Validation.Required
@@ -77,6 +78,7 @@ public interface BigtableChangeStreamToBigQueryOptions
 
   @TemplateParameter.ProjectId(
       order = 5,
+      groupName = "Target",
       optional = true,
       description = "BigQuery project ID",
       helpText = "The BigQuery dataset project ID. The default is the project for the Dataflow job")
diff --git a/v2/googlecloud-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/options/BigtableChangeStreamsToGcsOptions.java b/v2/googlecloud-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/options/BigtableChangeStreamsToGcsOptions.java
index 3bbf14100e..77ed3761e0 100644
--- a/v2/googlecloud-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/options/BigtableChangeStreamsToGcsOptions.java
+++ b/v2/googlecloud-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/options/BigtableChangeStreamsToGcsOptions.java
@@ -76,6 +76,7 @@ public interface BigtableChangeStreamsToGcsOptions
 
   @TemplateParameter.GcsWriteFolder(
       order = 5,
+      groupName = "Target",
       description = "Output file directory in Cloud Storage",
       helpText =
           "The path and filename prefix for writing output files. Must end with a slash. "
diff --git a/v2/googlecloud-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/options/BigtableChangeStreamsToPubSubOptions.java b/v2/googlecloud-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/options/BigtableChangeStreamsToPubSubOptions.java
index cdf6e09e30..d4e7b519d1 100644
--- a/v2/googlecloud-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/options/BigtableChangeStreamsToPubSubOptions.java
+++ b/v2/googlecloud-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/options/BigtableChangeStreamsToPubSubOptions.java
@@ -33,6 +33,7 @@ public interface BigtableChangeStreamsToPubSubOptions
 
   @TemplateParameter.Text(
       order = 1,
+      groupName = "Target",
       description = "The output Pub/Sub topic name",
       helpText = "The name of the destination Pub/Sub topic.")
   @Validation.Required
@@ -119,6 +120,7 @@ public interface BigtableChangeStreamsToPubSubOptions
 
   @TemplateParameter.ProjectId(
       order = 9,
+      groupName = "Target",
       optional = true,
       description = "PubSub project ID",
       helpText = "The Bigtable project ID. The default is the project of the Dataflow job.")
diff --git a/v2/googlecloud-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/templates/DLPTextToBigQueryStreaming.java b/v2/googlecloud-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/templates/DLPTextToBigQueryStreaming.java
index 92cd6fd6b5..87172f7f4b 100644
--- a/v2/googlecloud-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/templates/DLPTextToBigQueryStreaming.java
+++ b/v2/googlecloud-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/templates/DLPTextToBigQueryStreaming.java
@@ -292,6 +292,7 @@ public interface TokenizePipelineOptions
 
     @TemplateParameter.GcsReadFile(
         order = 1,
+        groupName = "Source",
         description = "Input Cloud Storage File(s)",
         helpText = "The Cloud Storage location of the files you'd like to process.",
         example = "gs://your-bucket/your-files/*.csv")
@@ -357,6 +358,7 @@ public interface TokenizePipelineOptions
 
     @TemplateParameter.Text(
         order = 5,
+        groupName = "Target",
         regexes = {"^[^.]*$"},
         description = "BigQuery Dataset",
         helpText =
@@ -367,6 +369,7 @@ public interface TokenizePipelineOptions
 
     @TemplateParameter.ProjectId(
         order = 6,
+        groupName = "Source",
         description = "Cloud DLP project ID",
         helpText =
             "Cloud DLP project ID to be used for data masking/tokenization. Ex. your-dlp-project")
diff --git a/v2/googlecloud-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/templates/FirestoreToBigQuery.java b/v2/googlecloud-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/templates/FirestoreToBigQuery.java
index 0f55be7df4..be5595e4ac 100644
--- a/v2/googlecloud-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/templates/FirestoreToBigQuery.java
+++ b/v2/googlecloud-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/templates/FirestoreToBigQuery.java
@@ -95,6 +95,7 @@ public interface FirestoreToBigQueryOptions
           BigQueryCommonOptions.WriteOptions {
     @TemplateParameter.BigQueryTable(
         order = 1,
+        groupName = "Target",
         description = "BigQuery output table",
         helpText =
             "BigQuery table location to write the output to. The name should be in the format "
diff --git a/v2/googlecloud-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/utils/FirestoreConverters.java b/v2/googlecloud-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/utils/FirestoreConverters.java
index c26a46e503..63d256b70c 100644
--- a/v2/googlecloud-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/utils/FirestoreConverters.java
+++ b/v2/googlecloud-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/utils/FirestoreConverters.java
@@ -91,6 +91,7 @@ public interface FirestoreReadOptions extends PipelineOptions {
      */
     @TemplateParameter.ProjectId(
         order = 2,
+        groupName = "Source",
         description = "Project ID",
         helpText = "The Google Cloud project ID of the Datastore instance to read from")
     @Hidden
@@ -109,6 +110,7 @@ public interface FirestoreReadOptions extends PipelineOptions {
      */
     @TemplateParameter.Text(
         order = 3,
+        groupName = "Source",
         regexes = {"^[0-9A-Za-z._-]{0,100}$"},
         description = "Namespace",
         helpText =
@@ -135,6 +137,7 @@ public interface FirestoreReadOptions extends PipelineOptions {
 
     @TemplateParameter.ProjectId(
         order = 5,
+        groupName = "Source",
         description = "Project ID",
         helpText = "The Google Cloud project ID of the Firestore instance to read from")
     ValueProvider<String> getFirestoreReadProjectId();
@@ -160,6 +163,7 @@ public interface DatastoreWriteOptions extends PipelineOptions {
      */
     @TemplateParameter.ProjectId(
         order = 1,
+        groupName = "Target",
         description = "Project ID",
         helpText = "The Google Cloud project ID of where to write Datastore entities")
     @Hidden
@@ -178,6 +182,7 @@ public interface DatastoreWriteOptions extends PipelineOptions {
      */
     @TemplateParameter.Text(
         order = 2,
+        groupName = "Target",
         description = "Datastore entity kind",
         helpText =
             "Datastore kind under which entities will be written in the output Google Cloud"
@@ -198,6 +203,7 @@ public interface DatastoreWriteOptions extends PipelineOptions {
      */
     @TemplateParameter.Text(
         order = 3,
+        groupName = "Target",
         optional = true,
         description = "Datastore namespace",
         helpText =
@@ -219,6 +225,7 @@ public interface DatastoreWriteOptions extends PipelineOptions {
      */
     @TemplateParameter.Text(
         order = 4,
+        groupName = "Target",
         optional = true,
         regexes = {"^[1-9]+[0-9]*$"},
         description = "Expected number of workers",
@@ -238,6 +245,7 @@ public interface DatastoreWriteOptions extends PipelineOptions {
 
     @TemplateParameter.ProjectId(
         order = 5,
+        groupName = "Target",
         description = "Project ID",
         helpText = "The Google Cloud project ID of where to write Firestore entities")
     ValueProvider<String> getFirestoreWriteProjectId();
@@ -246,6 +254,7 @@ public interface DatastoreWriteOptions extends PipelineOptions {
 
     @TemplateParameter.Text(
         order = 6,
+        groupName = "Target",
         description = "Firestore entity kind",
         helpText =
             "Firestore kind under which entities will be written in the output Google Cloud"
@@ -256,6 +265,7 @@ public interface DatastoreWriteOptions extends PipelineOptions {
 
     @TemplateParameter.Text(
         order = 7,
+        groupName = "Target",
         optional = true,
         description = "Namespace of the Firestore entity",
         helpText =
@@ -267,6 +277,7 @@ public interface DatastoreWriteOptions extends PipelineOptions {
 
     @TemplateParameter.Integer(
         order = 8,
+        groupName = "Target",
         optional = true,
         description = "Expected number of workers",
         helpText =
diff --git a/v2/googlecloud-to-mongodb/src/main/java/com/google/cloud/teleport/v2/mongodb/options/BigQueryToMongoDbOptions.java b/v2/googlecloud-to-mongodb/src/main/java/com/google/cloud/teleport/v2/mongodb/options/BigQueryToMongoDbOptions.java
index e248fd8833..54fe4eddfa 100644
--- a/v2/googlecloud-to-mongodb/src/main/java/com/google/cloud/teleport/v2/mongodb/options/BigQueryToMongoDbOptions.java
+++ b/v2/googlecloud-to-mongodb/src/main/java/com/google/cloud/teleport/v2/mongodb/options/BigQueryToMongoDbOptions.java
@@ -29,6 +29,7 @@ public interface MongoDbOptions extends PipelineOptions, DataflowPipelineOptions
 
     @TemplateParameter.Text(
         order = 1,
+        groupName = "Target",
         description = "MongoDB Connection URI",
         helpText = "The MongoDB connection URI in the format mongodb+srv://:@.")
     String getMongoDbUri();
@@ -37,6 +38,7 @@ public interface MongoDbOptions extends PipelineOptions, DataflowPipelineOptions
 
     @TemplateParameter.Text(
         order = 2,
+        groupName = "Target",
         description = "MongoDB Database",
         helpText = "Database in MongoDB to store the collection.",
         example = "my-db")
@@ -46,6 +48,7 @@ public interface MongoDbOptions extends PipelineOptions, DataflowPipelineOptions
 
     @TemplateParameter.Text(
         order = 3,
+        groupName = "Target",
         description = "MongoDB collection",
         helpText = "The name of the collection in the MongoDB database.",
         example = "my-collection")
@@ -59,6 +62,7 @@ public interface BigQueryReadOptions extends PipelineOptions, DataflowPipelineOp
 
     @TemplateParameter.BigQueryTable(
         order = 1,
+        groupName = "Source",
         description = "BigQuery source table",
         helpText = "The BigQuery table to read from.",
         example = "bigquery-project:dataset.input_table")
diff --git a/v2/jdbc-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/options/JdbcToBigQueryOptions.java b/v2/jdbc-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/options/JdbcToBigQueryOptions.java
index 5335712767..052d68e727 100644
--- a/v2/jdbc-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/options/JdbcToBigQueryOptions.java
+++ b/v2/jdbc-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/options/JdbcToBigQueryOptions.java
@@ -26,7 +26,6 @@ public interface JdbcToBigQueryOptions
       order = 1,
       optional = false,
       regexes = {"^.+$"},
-      groupName = "Source",
       description = "Comma-separated Cloud Storage path(s) of the JDBC driver(s)",
       helpText = "The comma-separated list of driver JAR files.",
       example = "gs://your-bucket/driver_jar1.jar,gs://your-bucket/driver_jar2.jar")
@@ -38,7 +37,6 @@ public interface JdbcToBigQueryOptions
       order = 2,
       optional = false,
       regexes = {"^.+$"},
-      groupName = "Source",
       description = "JDBC driver class name",
       helpText = "The JDBC driver class name.",
       example = "com.mysql.jdbc.Driver")
@@ -65,7 +63,6 @@ public interface JdbcToBigQueryOptions
       order = 4,
       optional = true,
       regexes = {"^[a-zA-Z0-9_;!*&=@#-:\\/]+$"},
-      groupName = "Source",
       description = "JDBC connection property string.",
       helpText =
           "The properties string to use for the JDBC connection. The format of the string must "
@@ -82,7 +79,6 @@ public interface JdbcToBigQueryOptions
       order = 5,
       optional = true,
       regexes = {"^.+$"},
-      groupName = "Source",
       description = "JDBC connection username.",
       helpText =
           "The username to use for the JDBC connection. You can pass in this value as a string that's encrypted with a Cloud KMS key and then Base64-encoded. Remove whitespace characters from the Base64-encoded string.")
@@ -93,7 +89,6 @@ public interface JdbcToBigQueryOptions
   @TemplateParameter.Password(
       order = 6,
       optional = true,
-      groupName = "Source",
       description = "JDBC connection password.",
       helpText =
           "The password to use for the JDBC connection. You can pass in this value as a string that's encrypted with a Cloud KMS key and then Base64-encoded. Remove whitespace characters from the Base64-encoded string.")
@@ -105,7 +100,6 @@ public interface JdbcToBigQueryOptions
       order = 7,
       optional = true,
       regexes = {"^.+$"},
-      groupName = "Source",
       description = "JDBC source SQL query",
       helpText =
           "The query to run on the source to extract the data. Note that some JDBC SQL and BigQuery types, although sharing the same name, have some differences. "
@@ -130,7 +124,6 @@ public interface JdbcToBigQueryOptions
   @TemplateParameter.GcsWriteFolder(
       order = 9,
       optional = false,
-      groupName = "Target",
       description = "Temporary directory for BigQuery loading process",
       helpText = "The temporary directory for the BigQuery loading process.",
       example = "gs://your-bucket/your-files/temp_dir")
@@ -141,7 +134,6 @@ public interface JdbcToBigQueryOptions
   @TemplateParameter.KmsEncryptionKey(
       order = 10,
       optional = true,
-      groupName = "Source",
       description = "Google Cloud KMS key",
       helpText =
           "The Cloud KMS encryption key to use to decrypt the username, password, and connection string. If you  "
@@ -154,7 +146,6 @@ public interface JdbcToBigQueryOptions
   @TemplateParameter.Boolean(
       order = 11,
       optional = true,
-      groupName = "Source",
       description = "Whether to use column alias to map the rows.",
       helpText =
           "If set to `true`, the pipeline uses the column alias (`AS`) instead of the column name to map the rows to BigQuery. Defaults to `false`.")
@@ -166,7 +157,6 @@ public interface JdbcToBigQueryOptions
   @TemplateParameter.Boolean(
       order = 12,
       optional = true,
-      groupName = "Target",
       description = "Whether to truncate data before writing",
       helpText =
           "If set to `true`, the pipeline truncates before loading data into BigQuery. Defaults to `false`, which causes the pipeline to append data.")
@@ -178,7 +168,6 @@ public interface JdbcToBigQueryOptions
   @TemplateParameter.Text(
       order = 13,
       optional = true,
-      groupName = "Source",
       description = "The name of a column of numeric type that will be used for partitioning.",
       helpText =
           "If this parameter is provided with the name of the `table` defined as an optional parameter, JdbcIO reads the table in parallel by executing multiple instances of the query on the same table (subquery) using ranges. Currently, only supports `Long` partition columns.")
@@ -189,7 +178,6 @@ public interface JdbcToBigQueryOptions
   @TemplateParameter.Text(
       order = 14,
       optional = true,
-      groupName = "Source",
       description = "Name of the table in the external database.",
       helpText =
           "The table to read from when using partitions. This parameter also accepts a subquery in parentheses.",
@@ -201,7 +189,6 @@ public interface JdbcToBigQueryOptions
   @TemplateParameter.Integer(
       order = 15,
       optional = true,
-      groupName = "Source",
       description = "The number of partitions.",
       helpText =
           "The number of partitions. With the lower and upper bound, this value forms partition strides for generated `WHERE` clause expressions that are used to split the partition column evenly. When the input is less than `1`, the number is set to `1`.")
@@ -212,7 +199,6 @@ public interface JdbcToBigQueryOptions
   @TemplateParameter.Long(
       order = 16,
       optional = true,
-      groupName = "Source",
       description = "Lower bound of partition column.",
       helpText =
           "The lower bound to use in the partition scheme. If not provided, this value is automatically inferred by Apache Beam for the supported types.")
@@ -223,7 +209,6 @@ public interface JdbcToBigQueryOptions
   @TemplateParameter.Long(
       order = 17,
       optional = true,
-      groupName = "Source",
       description = "Upper bound of partition column",
       helpText =
           "The upper bound to use in the partition scheme. If not provided, this value is automatically inferred by Apache Beam for the supported types.")
@@ -234,7 +219,6 @@ public interface JdbcToBigQueryOptions
   @TemplateParameter.Integer(
       order = 18,
       optional = true,
-      groupName = "Source",
       description = "Fetch Size",
       // TODO: remove the "Not used for partitioned reads" once
       // https://github.com/apache/beam/pull/28999 is released.
diff --git a/v2/jdbc-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/options/JdbcToPubsubOptions.java b/v2/jdbc-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/options/JdbcToPubsubOptions.java
index cca5c761b2..5b52b066a3 100644
--- a/v2/jdbc-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/options/JdbcToPubsubOptions.java
+++ b/v2/jdbc-to-googlecloud/src/main/java/com/google/cloud/teleport/v2/options/JdbcToPubsubOptions.java
@@ -36,6 +36,7 @@ public interface JdbcToPubsubOptions extends CommonTemplateOptions {
 
   @TemplateParameter.Text(
       order = 2,
+      groupName = "Source",
       optional = false,
       regexes = {
         "(^jdbc:[a-zA-Z0-9/:@.?_+!*=&-;]+$)|(^([A-Za-z0-9+/]{4}){1,}([A-Za-z0-9+/]{0,3})={0,3})"
@@ -105,6 +106,7 @@ public interface JdbcToPubsubOptions extends CommonTemplateOptions {
 
   @TemplateParameter.PubsubTopic(
       order = 8,
+      groupName = "Target",
       description = "Output Pub/Sub topic",
       helpText =
           "The Pub/Sub topic to publish to, in the format projects/<PROJECT_ID>/topics/<TOPIC_NAME>.",
diff --git a/v2/jms-to-pubsub/src/main/java/com/google/cloud/teleport/v2/templates/JmsToPubsub.java b/v2/jms-to-pubsub/src/main/java/com/google/cloud/teleport/v2/templates/JmsToPubsub.java
index 6a5cd2c789..0c83a8292f 100644
--- a/v2/jms-to-pubsub/src/main/java/com/google/cloud/teleport/v2/templates/JmsToPubsub.java
+++ b/v2/jms-to-pubsub/src/main/java/com/google/cloud/teleport/v2/templates/JmsToPubsub.java
@@ -138,6 +138,7 @@ public String apply(JmsRecord input) {
   public interface JmsToPubsubOptions extends PipelineOptions {
     @TemplateParameter.Text(
         order = 1,
+        groupName = "Source",
         optional = true,
         regexes = {"[,\\/:a-zA-Z0-9._-]+"},
         description = "JMS Host IP",
@@ -150,6 +151,7 @@ public interface JmsToPubsubOptions extends PipelineOptions {
 
     @TemplateParameter.Text(
         order = 2,
+        groupName = "Source",
         optional = false,
         regexes = {"[a-zA-Z0-9._-]+"},
         description = "JMS Queue/Topic Name to read the input from",
@@ -174,6 +176,7 @@ public interface JmsToPubsubOptions extends PipelineOptions {
 
     @TemplateParameter.PubsubTopic(
         order = 4,
+        groupName = "Target",
         description = "Output Pub/Sub topic",
         helpText =
             "The name of the Pub/Sub topic to publish data to, in the format `projects/<PROJECT_ID>/topics/<TOPIC_NAME>`.",
diff --git a/v2/kafka-to-bigquery/src/main/java/com/google/cloud/teleport/v2/templates/KafkaToBigQuery.java b/v2/kafka-to-bigquery/src/main/java/com/google/cloud/teleport/v2/templates/KafkaToBigQuery.java
index f85543cdbb..04a75c6d66 100644
--- a/v2/kafka-to-bigquery/src/main/java/com/google/cloud/teleport/v2/templates/KafkaToBigQuery.java
+++ b/v2/kafka-to-bigquery/src/main/java/com/google/cloud/teleport/v2/templates/KafkaToBigQuery.java
@@ -194,6 +194,7 @@ public interface KafkaToBQOptions
      */
     @TemplateParameter.Text(
         order = 2,
+        groupName = "Source",
         optional = true,
         regexes = {"[,:a-zA-Z0-9._-]+"},
         description = "Kafka Bootstrap Server list",
@@ -221,6 +222,7 @@ public interface KafkaToBQOptions
     @Deprecated
     @TemplateParameter.Text(
         order = 3,
+        groupName = "Source",
         optional = true,
         regexes = {"[,a-zA-Z0-9._-]+"},
         description = "Kafka topic(s) to read the input from",
diff --git a/v2/kafka-to-gcs/src/main/java/com/google/cloud/teleport/v2/options/KafkaToGCSOptions.java b/v2/kafka-to-gcs/src/main/java/com/google/cloud/teleport/v2/options/KafkaToGCSOptions.java
index f569efa341..0fe4ba9b53 100644
--- a/v2/kafka-to-gcs/src/main/java/com/google/cloud/teleport/v2/options/KafkaToGCSOptions.java
+++ b/v2/kafka-to-gcs/src/main/java/com/google/cloud/teleport/v2/options/KafkaToGCSOptions.java
@@ -36,6 +36,7 @@ public interface KafkaToGCSOptions
 
   @TemplateParameter.Text(
       order = 1,
+      groupName = "Source",
       optional = false,
       regexes = {"[,:a-zA-Z0-9._-]+"},
       description = "Kafka Bootstrap Server list",
@@ -48,6 +49,7 @@ public interface KafkaToGCSOptions
 
   @TemplateParameter.Text(
       order = 2,
+      groupName = "Source",
       optional = false,
       regexes = {"[,a-zA-Z0-9._-]+"},
       description = "Kafka topic(s) to read the input from",