diff --git a/website/docs/providers/index.html.markdown b/website/docs/providers/index.html.markdown
index 6b0ae3e55d..a26a2a4e3a 100644
--- a/website/docs/providers/index.html.markdown
+++ b/website/docs/providers/index.html.markdown
@@ -20,174 +20,111 @@ DNSimple, CloudFlare).
Use the navigation to the left to find available providers by type or scroll
down to see all providers.
-
+- [ACME](/docs/providers/acme/index.html)
+- [Alicloud](/docs/providers/alicloud/index.html)
+- [Archive](/docs/providers/archive/index.html)
+- [Arukas](/docs/providers/arukas/index.html)
+- [AWS](/docs/providers/aws/index.html)
+- [Azure Active Directory](/docs/providers/azuread/index.html)
+- [Azure](/docs/providers/azurerm/index.html)
+- [Azure Stack](/docs/providers/azurestack/index.html)
+- [Bitbucket](/docs/providers/bitbucket/index.html)
+- [Brightbox](/docs/providers/brightbox/index.html)
+- [CenturyLinkCloud](/docs/providers/clc/index.html)
+- [Chef](/docs/providers/chef/index.html)
+- [Circonus](/docs/providers/circonus/index.html)
+- [Cisco ASA](/docs/providers/ciscoasa/index.html)
+- [Cloudflare](/docs/providers/cloudflare/index.html)
+- [CloudScale.ch](/docs/providers/cloudscale/index.html)
+- [CloudStack](/docs/providers/cloudstack/index.html)
+- [Cobbler](/docs/providers/cobbler/index.html)
+- [Consul](/docs/providers/consul/index.html)
+- [Datadog](/docs/providers/datadog/index.html)
+- [DigitalOcean](/docs/providers/do/index.html)
+- [DNS](/docs/providers/dns/index.html)
+- [DNSMadeEasy](/docs/providers/dme/index.html)
+- [DNSimple](/docs/providers/dnsimple/index.html)
+- [Docker](/docs/providers/docker/index.html)
+- [Dyn](/docs/providers/dyn/index.html)
+- [External](/docs/providers/external/index.html)
+- [F5 BIG-IP](/docs/providers/bigip/index.html)
+- [Fastly](/docs/providers/fastly/index.html)
+- [FlexibleEngine](/docs/providers/flexibleengine/index.html)
+- [GitHub](/docs/providers/github/index.html)
+- [Gitlab](/docs/providers/gitlab/index.html)
+- [Google Cloud Platform](/docs/providers/google/index.html)
+- [Grafana](/docs/providers/grafana/index.html)
+- [Hedvig](/docs/providers/hedvig/index.html)
+- [Helm](/docs/providers/helm/index.html)
+- [Heroku](/docs/providers/heroku/index.html)
+- [Hetzner Cloud](/docs/providers/hcloud/index.html)
+- [HTTP](/docs/providers/http/index.html)
+- [HuaweiCloud](/docs/providers/huaweicloud/index.html)
+- [Icinga2](/docs/providers/icinga2/index.html)
+- [Ignition](/docs/providers/ignition/index.html)
+- [InfluxDB](/docs/providers/influxdb/index.html)
+- [Kubernetes](/docs/providers/kubernetes/index.html)
+- [Librato](/docs/providers/librato/index.html)
+- [Linode](/docs/providers/linode/index.html)
+- [Local](/docs/providers/local/index.html)
+- [Logentries](/docs/providers/logentries/index.html)
+- [LogicMonitor](/docs/providers/logicmonitor/index.html)
+- [Mailgun](/docs/providers/mailgun/index.html)
+- [MySQL](/docs/providers/mysql/index.html)
+- [Naver Cloud](/docs/providers/ncloud/index.html)
+- [Netlify](/docs/providers/netlify/index.html)
+- [New Relic](/docs/providers/newrelic/index.html)
+- [Nomad](/docs/providers/nomad/index.html)
+- [NS1](/docs/providers/ns1/index.html)
+- [Null](/docs/providers/null/index.html)
+- [Nutanix](/docs/providers/nutanix/index.html)
+- [1&1](/docs/providers/oneandone/index.html)
+- [OpenStack](/docs/providers/openstack/index.html)
+- [OpenTelekomCloud](/docs/providers/opentelekomcloud/index.html)
+- [OpsGenie](/docs/providers/opsgenie/index.html)
+- [Oracle Cloud Infrastructure](/docs/providers/oci/index.html)
+- [Oracle Cloud Platform](/docs/providers/oraclepaas/index.html)
+- [Oracle Public Cloud](/docs/providers/opc/index.html)
+- [OVH](/docs/providers/ovh/index.html)
+- [Packet](/docs/providers/packet/index.html)
+- [PagerDuty](/docs/providers/pagerduty/index.html)
+- [Palo Alto Networks](/docs/providers/panos/index.html)
+- [PostgreSQL](/docs/providers/postgresql/index.html)
+- [PowerDNS](/docs/providers/powerdns/index.html)
+- [ProfitBricks](/docs/providers/profitbricks/index.html)
+- [RabbitMQ](/docs/providers/rabbitmq/index.html)
+- [Rancher](/docs/providers/rancher/index.html)
+- [Random](/docs/providers/random/index.html)
+- [RightScale](/docs/providers/rightscale/index.html)
+- [Rundeck](/docs/providers/rundeck/index.html)
+- [RunScope](/docs/providers/runscope/index.html)
+- [Scaleway](/docs/providers/scaleway/index.html)
+- [Selectel](/docs/providers/selectel/index.html)
+- [Skytap](/docs/providers/skytap/index.html)
+- [SoftLayer](/docs/providers/softlayer/index.html)
+- [StatusCake](/docs/providers/statuscake/index.html)
+- [Spotinst](/docs/providers/spotinst/index.html)
+- [TelefonicaOpenCloud](/docs/providers/telefonicaopencloud/index.html)
+- [Template](/docs/providers/template/index.html)
+- [TencentCloud](/docs/providers/tencentcloud/index.html)
+- [Terraform](/docs/providers/terraform/index.html)
+- [Terraform Enterprise](/docs/providers/tfe/index.html)
+- [TLS](/docs/providers/tls/index.html)
+- [Triton](/docs/providers/triton/index.html)
+- [UCloud](/docs/providers/ucloud/index.html)
+- [UltraDNS](/docs/providers/ultradns/index.html)
+- [Vault](/docs/providers/vault/index.html)
+- [VMware vCloud Director](/docs/providers/vcd/index.html)
+- [VMware NSX-T](/docs/providers/nsxt/index.html)
+- [VMware vSphere](/docs/providers/vsphere/index.html)
+- [Yandex](/docs/providers/yandex/index.html)
+
+
+
+
+-----
More providers can be found on our [Community Providers](/docs/providers/type/community-index.html) page.
diff --git a/website/docs/providers/type/community-index.html.markdown b/website/docs/providers/type/community-index.html.markdown
index 518161d4f9..c64ab37496 100644
--- a/website/docs/providers/type/community-index.html.markdown
+++ b/website/docs/providers/type/community-index.html.markdown
@@ -15,176 +15,112 @@ HashiCorp, and are listed here in order to help users find them easily.
If you have built a provider and would like to add it to this community list,
please fill out this [community providers form](https://docs.google.com/forms/d/e/1FAIpQLSeenG02tGEmz7pntIqMKlp5kY53f8AV5u88wJ_H1pJc2CmvKA/viewform?usp=sf_link#responses).
-
-
- Abiquo |
- Active Directory |
- Aiven |
-
-
- Apigee |
- Artifactory |
- Auth |
-
-
- Auth0 |
- AVI |
- Aviatrix |
-
-
- AWX |
- Azure Devops |
- CloudPassage Halo |
-
-
- CloudAMQP |
- CloudKarafka |
- CloudMQTT |
-
-
- Confidant |
- Consul ACL |
- CoreOS Container Linux Configs |
-
-
- CouchDB |
- Credhub |
- Databricks |
-
-
- Dead Man's Snitch |
- Digital Rebar |
- Docker Machine |
-
-
- Drone |
- Dropbox |
- Duo Security |
-
-
- EfficientIP |
- Elasticsearch |
- ElephantSQL |
-
-
- ESXI |
- Gandi |
- Generic Rest API |
-
-
- Git |
- Glue |
- GoCD |
-
-
- Google Calendar |
- Google G Suite |
- Hiera |
-
-
- HTTP File Upload |
- HP OneView |
- IBM Cloud |
-
-
- IIJ GIO |
- Infoblox |
- Jira |
-
-
- Jira (Extended) |
- JumpCloud |
- Kafka |
-
-
- Keboola |
- Keycloak |
- Kibana |
-
-
- Kong |
- libvirt |
- Logentries |
-
-
- Logz.io |
- LXD |
- Manifold |
-
-
- Matchbox |
- MongoDB Atlas |
- NSX-V |
-
-
- Okta |
- Online.net |
- Open Day Light |
-
-
- OpenAPI |
- OpenFaaS |
- oVirt |
-
-
- Pass |
- Pingdom |
- Pivotal Tracker |
-
-
- Proxmox |
- Puppet CA |
- PuppetDB |
-
-
- QingCloud |
- Redshift |
- RKE |
-
-
- Rollbar |
- SakuraCloud |
- SCVMM |
-
-
- Sensu |
- Sentry |
- Sewan |
-
-
- SignalFx |
- Smartronix |
- Snowflake |
-
-
- snowflakedb |
- sops |
- Spinnaker |
-
-
- SQL |
- Stateful |
- Stripe |
-
-
- Sumo Logic |
- TeamCity |
- Transloadit |
-
-
- Updown.io |
- Uptimerobot |
- vRealize Automation |
-
-
- Win DNS |
- YAML |
- Venafi |
-
-
- Vultr |
- ZeroTier |
- Zipper |
-
+
+
+
+- [Abiquo](https://github.com/abiquo/terraform-provider-abiquo)
+- [Active Directory](https://github.com/GSLabDev/terraform-provider-ad)
+- [Aiven](https://github.com/aiven/terraform-provider-aiven)
+- [Apigee](https://github.com/zambien/terraform-provider-apigee)
+- [Artifactory](https://github.com/atlassian/terraform-provider-artifactory)
+- [Auth](https://github.com/Shuttl-Tech/terraform-provider-auth)
+- [Auth0](https://github.com/bocodigitalmedia/terraform-provider-auth0)
+- [AVI](https://github.com/avinetworks/terraform-provider-avi)
+- [Aviatrix](https://github.com/AviatrixSystems/terraform-provider-aviatrix)
+- [AWX](https://github.com/mauromedda/terraform-provider-awx)
+- [Azure Devops](https://github.com/agarciamiravet/terraform-provider-azuredevops)
+- [CloudPassage Halo](https://gitlab.com/kiwicom/terraform-provider-cphalo)
+- [CloudAMQP](https://github.com/cloudamqp/terraform-provider)
+- [CloudKarafka](https://github.com/cloudkarafka/terraform-provider)
+- [CloudMQTT](https://github.com/cloudmqtt/terraform-provider)
+- [Confidant](https://github.com/stripe/terraform-provider-confidant)
+- [Consul ACL](https://github.com/Ashald/terraform-provider-consulacl)
+- [CoreOS Container Linux Configs](https://github.com/coreos/terraform-provider-ct)
+- [CouchDB](https://github.com/nicolai86/terraform-provider-couchdb)
+- [Credhub](https://github.com/orange-cloudfoundry/terraform-provider-credhub)
+- [Databricks](https://github.com/betabandido/terraform-provider-databricks)
+- [Dead Man's Snitch](https://github.com/plukevdh/terraform-provider-dmsnitch)
+- [Digital Rebar](https://github.com/rackn/terraform-provider-drp/)
+- [Docker Machine](https://github.com/gstruct/terraform-provider-dockermachine)
+- [Drone](https://github.com/artisanofcode/terraform-provider-drone)
+- [Dropbox](https://github.com/callensm/terraform-provider-dropbox)
+- [Duo Security](https://github.com/broamski/terraform-provider-duo)
+- [EfficientIP](https://github.com/alexissavin/terraform-provider-solidserver)
+- [Elasticsearch](https://github.com/phillbaker/terraform-provider-elasticsearch)
+- [ElephantSQL](https://github.com/elephantsql/terraform-provider)
+- [ESXI](https://github.com/josenk/terraform-provider-esxi)
+- [Gandi](https://github.com/tiramiseb/terraform-provider-gandi)
+- [Generic Rest API](https://github.com/Mastercard/terraform-provider-restapi)
+- [Git](https://github.com/fourplusone/terraform-provider-git)
+- [Glue](https://github.com/MikeSouza/terraform-provider-glue)
+- [GoCD](https://github.com/drewsonne/terraform-provider-gocd)
+- [Google Calendar](https://github.com/sethvargo/terraform-provider-googlecalendar)
+- [Google G Suite](https://github.com/DeviaVir/terraform-provider-gsuite)
+- [Hiera](https://github.com/ribbybibby/terraform-provider-hiera)
+- [HTTP File Upload](https://github.com/GSLabDev/terraform-provider-httpfileupload)
+- [HP OneView](https://github.com/HewlettPackard/terraform-provider-oneview)
+- [IBM Cloud](https://github.com/IBM-Cloud/terraform-provider-ibm)
+- [IIJ GIO](https://github.com/iij/terraform-provider-p2pub)
+- [Infoblox](https://github.com/sky-uk/terraform-provider-infoblox)
+- [Jira](https://github.com/anubhavmishra/terraform-provider-jira)
+- [Jira (Extended)](https://github.com/fourplusone/terraform-provider-jira)
+- [JumpCloud](https://github.com/geekmuse/jumpcloud-terraform-provider)
+- [Kafka](https://github.com/Mongey/terraform-provider-kafka)
+- [Keboola](https://github.com/plmwong/terraform-provider-keboola)
+- [Keycloak](https://github.com/mrparkers/terraform-provider-keycloak)
+- [Kibana](https://github.com/ewilde/terraform-provider-kibana)
+- [Kong](https://github.com/kevholditch/terraform-provider-kong)
+- [libvirt](https://github.com/dmacvicar/terraform-provider-libvirt)
+- [Logentries](https://github.com/dikhan/terraform-provider-logentries)
+- [Logz.io](https://github.com/jonboydell/logzio_terraform_provider)
+- [LXD](https://github.com/sl1pm4t/terraform-provider-lxd)
+- [Manifold](https://github.com/manifoldco/terraform-provider-manifold)
+- [Matchbox](https://github.com/coreos/terraform-provider-matchbox)
+- [MongoDB Atlas](https://github.com/akshaykarle/terraform-provider-mongodbatlas)
+- [NSX-V](https://github.com/GSLabDev/terraform-provider-nsxv)
+- [Okta](https://github.com/articulate/terraform-provider-okta)
+- [Online.net](https://github.com/src-d/terraform-provider-online-net)
+- [Open Day Light](https://github.com/GSLabDev/terraform-provider-odl)
+- [OpenAPI](https://github.com/dikhan/terraform-provider-openapi)
+- [OpenFaaS](https://github.com/ewilde/terraform-provider-openfaas)
+- [oVirt](https://github.com/imjoey/terraform-provider-ovirt)
+- [Pass](https://github.com/camptocamp/terraform-provider-pass)
+- [Pingdom](https://bitbucket.org/devops_sysops/pingdom-provider)
+- [Pivotal Tracker](https://github.com/xchapter7x/terraform-provider-pivotaltracker)
+- [Proxmox](https://github.com/Telmate/terraform-provider-proxmox)
+- [Puppet CA](https://github.com/camptocamp/terraform-provider-puppetca)
+- [PuppetDB](https://github.com/camptocamp/terraform-provider-puppetdb)
+- [QingCloud](https://github.com/yunify/terraform-provider-qingcloud)
+- [Redshift](https://github.com/frankfarrell/terraform-provider-redshift)
+- [RKE](https://github.com/yamamoto-febc/terraform-provider-rke)
+- [Rollbar](https://github.com/babbel/terraform-provider-rollbar)
+- [SakuraCloud](https://github.com/sacloud/terraform-provider-sakuracloud)
+- [SCVMM](https://github.com/GSLabDev/terraform-provider-scvmm)
+- [Sensu](https://github.com/jtopjian/terraform-provider-sensu)
+- [Sentry](https://github.com/jianyuan/terraform-provider-sentry)
+- [Sewan](https://github.com/SewanDevs/terraform-provider-sewan)
+- [SignalFx](https://github.com/Yelp/terraform-provider-signalform)
+- [Smartronix](https://github.com/changli3/terraform-provider-smartronix)
+- [Snowflake](https://github.com/ShopRunner/terraform-provider-snowflake)
+- [snowflakedb](https://github.com/chanzuckerberg/terraform-provider-snowflake)
+- [sops](https://github.com/carlpett/terraform-provider-sops)
+- [Spinnaker](https://github.com/armory-io/terraform-provider-spinnaker)
+- [SQL](https://github.com/odedniv/terraform-provider-sql)
+- [Stateful](https://github.com/Ashald/terraform-provider-stateful)
+- [Stripe](https://github.com/franckverrot/terraform-provider-stripe)
+- [Sumo Logic](https://github.com/SumoLogic/sumologic-terraform-provider)
+- [TeamCity](https://github.com/cvbarros/terraform-provider-teamcity)
+- [Transloadit](https://github.com/bocodigitalmedia/terraform-provider-transloadit)
+- [Updown.io](https://github.com/mvisonneau/terraform-provider-updown)
+- [Uptimerobot](https://github.com/SpamapS/terraform-provider-uptimerobot)
+- [vRealize Automation](https://github.com/GSLabDev/terraform-provider-vra)
+- [Win DNS](https://github.com/PortOfPortland/terraform-provider-windns)
+- [YAML](https://github.com/Ashald/terraform-provider-yaml)
+- [Venafi](https://github.com/Venafi/terraform-provider-venafi)
+- [Vultr](https://github.com/squat/terraform-provider-vultr)
+- [ZeroTier](https://github.com/cormacrelf/terraform-provider-zerotier)
+- [Zipper](https://github.com/ArthurHlt/terraform-provider-zipper)
+
+
+
-