diff --git a/extensions/arc/package.json b/extensions/arc/package.json
index aca015a4bd..77db3b1623 100644
--- a/extensions/arc/package.json
+++ b/extensions/arc/package.json
@@ -170,14 +170,6 @@
                   "sections": [
                     {
                       "fields": [
-                        {
-                          "type": "kube_cluster_context_picker",
-                          "label": "%arc.data.controller.kube.cluster.context%",
-                          "required": true,
-                          "inputWidth": "350px",
-                          "variableName": "AZDATA_NB_VAR_ARC_CLUSTER_CONTEXT",
-                          "configFileVariableName": "AZDATA_NB_VAR_ARC_CONFIG_FILE"
-                        },
                         {
                           "type": "options",
                           "label": "%arc.data.controller.connectivity.mode%",
@@ -191,16 +183,19 @@
                             "defaultValue": "Indirect",
                             "optionsType": "radio"
                           }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                {
-                  "title": "%arc.data.controller.cluster.config.profile.title%",
-                  "sections": [
-                    {
-                      "fields": [
+                        },
+                        {
+                          "type": "kube_cluster_context_picker",
+                          "label": "%arc.data.controller.kube.cluster.context%",
+                          "required": true,
+                          "inputWidth": "350px",
+                          "variableName": "AZDATA_NB_VAR_ARC_CLUSTER_CONTEXT",
+                          "configFileVariableName": "AZDATA_NB_VAR_ARC_CONFIG_FILE",
+                          "enabled": {
+                            "target": "AZDATA_NB_VAR_ARC_DATA_CONTROLLER_CONNECTIVITY_MODE",
+                            "value": "Indirect"
+                          }
+                        },
                         {
                           "type": "options",
                           "label": "%arc.data.controller.cluster.config.profile%",
@@ -214,7 +209,7 @@
                               "loadingCompletedText": "%arc.data.controller.cluster.config.profile.loadingcompleted%"
                             },
                             "defaultValue": "azure-arc-aks-default-storage",
-                            "optionsType": "radio"
+                            "optionsType": "dropdown"
                           }
                         }
                       ]