diff --git a/docs/customization.md b/docs/customization.md
index 46e9bff5..3f89c4aa 100644
--- a/docs/customization.md
+++ b/docs/customization.md
@@ -179,7 +179,7 @@ For example:
 
 
 <ul>
-  <li><i>Optional</i></li>
+  <li><b>Required</b></li>
   <li>Default: <code>b8e19880-ac58-42ef-b033-f7cd9c94d1fe</code></li>
   <li>Valid Values:
   <ul>
@@ -311,7 +311,7 @@ For example:
 
 
 <ul>
-  <li><i>Optional</i></li>
+  <li><b>Required</b></li>
   <li>Default: <code>4bc59b9a-8520-409f-85da-1c7552315863</code></li>
   <li>Valid Values:
   <ul>
@@ -437,7 +437,7 @@ For example:
 
 
 <ul>
-  <li><i>Optional</i></li>
+  <li><b>Required</b></li>
   <li>Default: <code>cbad6d78-a73c-432d-b8ff-b219a17a803a</code></li>
   <li>Valid Values:
   <ul>
@@ -563,7 +563,7 @@ For example:
 
 
 <ul>
-  <li><i>Optional</i></li>
+  <li><b>Required</b></li>
   <li>Default: <code>51b3e27e-d323-49ce-8c5f-1211e6409e82</code></li>
   <li>Valid Values:
   <ul>
@@ -673,7 +673,7 @@ For example:
 
 
 <ul>
-  <li><i>Optional</i></li>
+  <li><b>Required</b></li>
   <li>Default: <code>b9e4332e-b42b-4680-bda5-ea1506797474</code></li>
   <li>Valid Values:
   <ul>
diff --git a/pkg/generator/forms.go b/pkg/generator/forms.go
index 1cf6b722..d3673f7d 100644
--- a/pkg/generator/forms.go
+++ b/pkg/generator/forms.go
@@ -253,8 +253,8 @@ func generateServicePlanForm(svc *broker.ServiceDefinition) (Form, error) {
 				Type:         "dropdown_select",
 				Description:  "The service this plan is associated with.",
 				Default:      entry.ID,
+				Optional:     false,
 				Configurable: true,
-				Optional:     true,
 				Options: []FormOption{
 					{
 						Name:  entry.ID,
diff --git a/tile.yml b/tile.yml
index 56a207fe..4892ce7b 100644
--- a/tile.yml
+++ b/tile.yml
@@ -336,7 +336,6 @@ service_plan_forms:
     options:
     - name: b8e19880-ac58-42ef-b033-f7cd9c94d1fe
       label: Google Bigtable
-    optional: true
   - name: storage_type
     type: dropdown_select
     default: SSD
@@ -380,7 +379,6 @@ service_plan_forms:
     options:
     - name: 4bc59b9a-8520-409f-85da-1c7552315863
       label: Google CloudSQL for MySQL
-    optional: true
   - name: tier
     type: string
     label: Tier
@@ -418,7 +416,6 @@ service_plan_forms:
     options:
     - name: cbad6d78-a73c-432d-b8ff-b219a17a803a
       label: Google CloudSQL for PostgreSQL
-    optional: true
   - name: tier
     type: string
     label: Tier
@@ -455,7 +452,6 @@ service_plan_forms:
     options:
     - name: 51b3e27e-d323-49ce-8c5f-1211e6409e82
       label: Google Spanner
-    optional: true
   - name: num_nodes
     type: string
     default: "1"
@@ -487,7 +483,6 @@ service_plan_forms:
     options:
     - name: b9e4332e-b42b-4680-bda5-ea1506797474
       label: Google Cloud Storage
-    optional: true
   - name: storage_class
     type: string
     label: Storage Class