diff --git a/mypy_boto3_builder/templates/boto3-stubs/README.md.jinja2 b/mypy_boto3_builder/templates/boto3-stubs/README.md.jinja2
index e6e9aeadc..cf1eb0a2b 100644
--- a/mypy_boto3_builder/templates/boto3-stubs/README.md.jinja2
+++ b/mypy_boto3_builder/templates/boto3-stubs/README.md.jinja2
@@ -303,6 +303,10 @@ Builder changelog can be found in [Releases](https://github.com/vemel/mypy_boto3
 
 ## Submodules
 
+{{ "- `" -}}
+{{ boto3_stubs_name -}}
+{{ "[all]` - Type annotations for all services" -}}
+{{ ".\n" -}}
 {% if package.essential_service_names -%}
     {{ "- `" -}}
     {{ boto3_stubs_name -}}
diff --git a/mypy_boto3_builder/templates/boto3-stubs/setup.py.jinja2 b/mypy_boto3_builder/templates/boto3-stubs/setup.py.jinja2
index 29466f67c..6af1f4bae 100644
--- a/mypy_boto3_builder/templates/boto3-stubs/setup.py.jinja2
+++ b/mypy_boto3_builder/templates/boto3-stubs/setup.py.jinja2
@@ -62,11 +62,14 @@ setup(
         "{{ master_pypi_name }}=={{ build_version }}",
     ],
     extras_require={
-        "essential": [
+        "all": [
             {% for service_name in package.service_names -%}
-            {% if service_name.is_essential() -%}
             "{{ service_name.pypi_name }}=={{ build_version }}",
-            {% endif -%}
+            {% endfor -%}
+        ],
+        "essential": [
+            {% for service_name in package.essential_service_names -%}
+            "{{ service_name.pypi_name }}=={{ build_version }}",
             {% endfor -%}
         ],
         {% for service_name in package.service_names -%}
diff --git a/mypy_boto3_builder/templates/master/README.md.jinja2 b/mypy_boto3_builder/templates/master/README.md.jinja2
index 415b4516c..ed57282cc 100644
--- a/mypy_boto3_builder/templates/master/README.md.jinja2
+++ b/mypy_boto3_builder/templates/master/README.md.jinja2
@@ -107,6 +107,10 @@ a drop-in type annotations for you and makes sure that:
 
 ## Submodules
 
+{{ "- `" -}}
+{{ boto3_stubs_name -}}
+{{ "[all]` - Type annotations for all services" -}}
+{{ ".\n" -}}
 {% if package.essential_service_names -%}
     {{ "- `" }}{{ boto3_stubs_name -}}{{ "[essential]` - Type annotations for " -}}
     {% for service_name in package.essential_service_names -%}