diff --git a/roles/spdashboard/templates/env.j2 b/roles/spdashboard/templates/env.j2
index c8fe05e91..f3092b363 100644
--- a/roles/spdashboard/templates/env.j2
+++ b/roles/spdashboard/templates/env.j2
@@ -54,13 +54,24 @@ playground_uri_prod={{ spdashboard_playground_uri_prod }}
 global_site_notice_show={{ spdashboard_show_global_notice }}
 global_site_notice_date={{ spdashboard_global_notice_date }}
 global_site_notice_allowed_tags=<a><u><i><br><wbr><strong><em><blink><marquee><p><ul><ol><dl><li><dd><dt><div><span><blockquote><hr><h2></h2><h3><h4><h5><h6>
-teams_host={{ spdashboard_teams_host }}
-teams_username={{ spdashboard_teams_api_user }}
-teams_password={{ spdashboard_teams_api_password }}
-team_prefix_default_stem_name={{ spdashboard_teams_default_stem }}
-team_prefix_group_name_context={{ spdashboard_teams_group_name_context }}
+
 acs_location_route_name=dashboard_saml_consume_assertion
 metadata_url_timeout=30
 test_idp_entity_ids=[{{ spdashboard_test_idps }}]
 authorization_attribute_name={{ spdashboard_surf_autorization_attribute }}
 surfconext_representative_authorization={{ spdashboard_surf_autorization_attribute_svc_value }}
+
+## Teams test instance
+teams_host={{ spdashboard_teams_host }}
+teams_username={{ spdashboard_teams_api_user }}
+teams_password={{ spdashboard_teams_api_password }}
+team_prefix_default_stem_name={{ spdashboard_teams_default_stem }}
+team_prefix_group_name_context={{ spdashboard_teams_group_name_context }}
+
+spdashboard_manage_id={{ spdashboard_manage_id }}
+
+## Invite instance
+invite_host={{ spdashboard_invite_host }}
+invite_api_username={{ spdashboard_invite_api_username }}
+invite_api_password={{ spdashboard_invite_api_password }}
+invite_landing_url={{ spdashboard_invite_landing_url }}}