diff --git a/.changelog/3483.txt b/.changelog/3483.txt
new file mode 100644
index 00000000000..1d8c8c12ce3
--- /dev/null
+++ b/.changelog/3483.txt
@@ -0,0 +1,4 @@
+```release-note:enhancement
+dataproc: Updated `google_dataproc_cluster.software_config.optional_components` to include new options.
+
+```
diff --git a/google/resource_dataproc_cluster.go b/google/resource_dataproc_cluster.go
index 21ac1c98c47..861393f6753 100644
--- a/google/resource_dataproc_cluster.go
+++ b/google/resource_dataproc_cluster.go
@@ -449,8 +449,8 @@ by Dataproc`,
 										AtLeastOneOf: clusterSoftwareConfigKeys,
 										Elem: &schema.Schema{
 											Type: schema.TypeString,
-											ValidateFunc: validation.StringInSlice([]string{"COMPONENT_UNSPECIFIED", "ANACONDA", "DRUID", "HIVE_WEBHCAT",
-												"JUPYTER", "KERBEROS", "PRESTO", "ZEPPELIN", "ZOOKEEPER"}, false),
+											ValidateFunc: validation.StringInSlice([]string{"COMPONENT_UNSPECIFIED", "ANACONDA", "DRUID", "HBASE", "HIVE_WEBHCAT",
+												"JUPYTER", "KERBEROS", "PRESTO", "RANGER", "SOLR", "ZEPPELIN", "ZOOKEEPER"}, false),
 										},
 									},
 								},
diff --git a/website/docs/r/dataproc_cluster.html.markdown b/website/docs/r/dataproc_cluster.html.markdown
index 8a3b8e97aea..86febff987a 100644
--- a/website/docs/r/dataproc_cluster.html.markdown
+++ b/website/docs/r/dataproc_cluster.html.markdown
@@ -438,10 +438,13 @@ cluster_config {
     Accepted values are:
     * ANACONDA
     * DRUID
+    * HBASE
     * HIVE_WEBHCAT
     * JUPYTER
     * KERBEROS
     * PRESTO
+    * RANGER
+    * SOLR
     * ZEPPELIN
     * ZOOKEEPER