diff --git a/api_app/api/routes/airlock_resource_helpers.py b/api_app/api/routes/airlock_resource_helpers.py
index e311a53345..f3ae0a8387 100644
--- a/api_app/api/routes/airlock_resource_helpers.py
+++ b/api_app/api/routes/airlock_resource_helpers.py
@@ -35,7 +35,7 @@ async def save_and_publish_event_airlock_request(airlock_request: AirlockRequest
     try:
         logging.debug(f"Sending status changed event for airlock request item: {airlock_request.id}")
         await send_status_changed_event(airlock_request)
-        await send_airlock_notification_event(airlock_request, role_assignment_details["researcher_emails"], role_assignment_details["owner_emails"])
+        await send_airlock_notification_event(airlock_request, role_assignment_details)
     except Exception as e:
         airlock_request_repo.delete_item(airlock_request.id)
         logging.error(f"Failed sending status_changed message: {e}")
@@ -58,7 +58,7 @@ async def update_and_publish_event_airlock_request(airlock_request: AirlockReque
         await send_status_changed_event(updated_airlock_request)
         access_service = get_access_service()
         role_assignment_details = access_service.get_workspace_role_assignment_details(workspace)
-        await send_airlock_notification_event(updated_airlock_request, role_assignment_details["researcher_emails"], role_assignment_details["owner_emails"])
+        await send_airlock_notification_event(updated_airlock_request, role_assignment_details)
         return updated_airlock_request
     except Exception as e:
         logging.error(f"Failed sending status_changed message: {e}")
@@ -70,12 +70,12 @@ def get_timestamp() -> float:
 
 
 def check_email_exists(role_assignment_details: defaultdict(list)):
-    if "researcher_emails" not in role_assignment_details or not role_assignment_details["researcher_emails"]:
+    if "WorkspaceResearcher" not in role_assignment_details or not role_assignment_details["WorkspaceResearcher"]:
         logging.error('Creating an airlock request but the researcher does not have an email address.')
         raise HTTPException(status_code=status.HTTP_417_EXPECTATION_FAILED, detail=strings.AIRLOCK_NO_RESEARCHER_EMAIL)
-    if "owner_emails" not in role_assignment_details or not role_assignment_details["owner_emails"]:
-        logging.error('Creating an airlock request but the workspace owner does not have an email address.')
-        raise HTTPException(status_code=status.HTTP_417_EXPECTATION_FAILED, detail=strings.AIRLOCK_NO_OWNER_EMAIL)
+    if "AirlockManager" not in role_assignment_details or not role_assignment_details["AirlockManager"]:
+        logging.error('Creating an airlock request but the airlock manager does not have an email address.')
+        raise HTTPException(status_code=status.HTTP_417_EXPECTATION_FAILED, detail=strings.AIRLOCK_NO_AIRLOCK_MANAGER_EMAIL)
 
 
 def get_airlock_requests_by_user_and_workspace(user: User, workspace: Workspace, airlock_request_repo: AirlockRequestRepository,
diff --git a/api_app/event_grid/event_sender.py b/api_app/event_grid/event_sender.py
index 6b3ed6b5ec..7fba8bcd0c 100644
--- a/api_app/event_grid/event_sender.py
+++ b/api_app/event_grid/event_sender.py
@@ -1,4 +1,6 @@
 import logging
+import re
+from typing import Dict
 from azure.eventgrid import EventGridEvent
 from models.domain.events import StatusChangedData, AirlockNotificationData
 from event_grid.helpers import publish_event
@@ -22,14 +24,15 @@ async def send_status_changed_event(airlock_request: AirlockRequest):
     await publish_event(status_changed_event, config.EVENT_GRID_STATUS_CHANGED_TOPIC_ENDPOINT)
 
 
-async def send_airlock_notification_event(airlock_request: AirlockRequest, researchers_emails, owners_emails):
+async def send_airlock_notification_event(airlock_request: AirlockRequest, emails: Dict):
     request_id = airlock_request.id
     status = airlock_request.status.value
     short_workspace_id = airlock_request.workspaceId[-4:]
+    snake_case_emails = {re.sub(r'(?<!^)(?=[A-Z])', '_', role_name).lower(): role_id for role_name, role_id in emails.items()}
 
     airlock_notification = EventGridEvent(
         event_type="airlockNotification",
-        data=AirlockNotificationData(request_id=request_id, event_type="status_changed", event_value=status, researchers_emails=researchers_emails, owners_emails=owners_emails, workspace_id=short_workspace_id).__dict__,
+        data=AirlockNotificationData(request_id=request_id, event_type="status_changed", event_value=status, emails=snake_case_emails, workspace_id=short_workspace_id).__dict__,
         subject=f"{request_id}/airlockNotification",
         data_version="2.0"
     )
diff --git a/api_app/models/domain/events.py b/api_app/models/domain/events.py
index 9f141bd79f..9e8a34d2fd 100644
--- a/api_app/models/domain/events.py
+++ b/api_app/models/domain/events.py
@@ -1,4 +1,4 @@
-from typing import List
+from typing import Dict
 from models.domain.azuretremodel import AzureTREModel
 
 
@@ -6,8 +6,7 @@ class AirlockNotificationData(AzureTREModel):
     request_id: str
     event_type: str
     event_value: str
-    researchers_emails: List[str]
-    owners_emails: List[str]
+    emails: Dict
     workspace_id: str
 
 
diff --git a/api_app/resources/strings.py b/api_app/resources/strings.py
index f98b27fbf8..2c85f9d53d 100644
--- a/api_app/resources/strings.py
+++ b/api_app/resources/strings.py
@@ -195,7 +195,7 @@
 AIRLOCK_UNAUTHORIZED_TO_SA = "User is unauthorized to access airlock request files in its current status."
 AIRLOCK_NOT_ENABLED_IN_WORKSPACE = "Airlock is not enabled in this workspace."
 AIRLOCK_NO_RESEARCHER_EMAIL = "There are no Workspace Researchers with an email address."
-AIRLOCK_NO_OWNER_EMAIL = "There are no Workspace Owners with an email address."
+AIRLOCK_NO_AIRLOCK_MANAGER_EMAIL = "There are no Airlock Managers with an email address."
 
 # Airlock Actions
 AIRLOCK_ACTION_REVIEW = "review"
diff --git a/api_app/services/aad_authentication.py b/api_app/services/aad_authentication.py
index b0eff41569..1592708c24 100644
--- a/api_app/services/aad_authentication.py
+++ b/api_app/services/aad_authentication.py
@@ -224,8 +224,9 @@ def _get_user_emails_with_role_asssignment(self, client_id):
         return roles_graph_data, users_graph_data
 
     def get_workspace_role_assignment_details(self, workspace: Workspace):
-        researcher_app_role_id = workspace.properties["app_role_id_workspace_researcher"]
-        owner_app_role_id = workspace.properties["app_role_id_workspace_owner"]
+        app_role_ids = {role_name: workspace.properties[role_id] for role_name, role_id in self.WORKSPACE_ROLES_DICT.items()}
+        inverted_app_role_ids = {role_id: role_name for role_name, role_id in app_role_ids.items()}
+
         sp_id = workspace.properties["sp_id"]
         roles_graph_data, users_graph_data = self._get_user_emails_with_role_asssignment(sp_id)
         user_emails = {}
@@ -235,11 +236,15 @@ def get_workspace_role_assignment_details(self, workspace: Workspace):
 
         workspace_role_assignments_details = defaultdict(list)
         for role_assignment in roles_graph_data["value"]:
-            if role_assignment["principalType"] == "User" and role_assignment["principalId"] in user_emails:
-                if role_assignment["appRoleId"] == researcher_app_role_id:
-                    workspace_role_assignments_details["researcher_emails"].append(user_emails[role_assignment["principalId"]])
-                elif role_assignment["appRoleId"] == owner_app_role_id:
-                    workspace_role_assignments_details["owner_emails"].append(user_emails[role_assignment["principalId"]])
+            principal_id = role_assignment["principalId"]
+            principal_type = role_assignment["principalType"]
+
+            if principal_type == "User" and principal_id in user_emails:
+                app_role_id = role_assignment["appRoleId"]
+                app_role_name = inverted_app_role_ids[app_role_id]
+
+                if app_role_name:
+                    workspace_role_assignments_details[app_role_name].append(user_emails[principal_id])
 
         return workspace_role_assignments_details
 
diff --git a/api_app/tests_ma/test_api/test_routes/test_airlock.py b/api_app/tests_ma/test_api/test_routes/test_airlock.py
index 5d8f0782f2..96db275c17 100644
--- a/api_app/tests_ma/test_api/test_routes/test_airlock.py
+++ b/api_app/tests_ma/test_api/test_routes/test_airlock.py
@@ -84,7 +84,7 @@ def log_in_with_researcher_user(self, app, researcher_user):
                 patch("api.routes.workspaces.OperationRepository.resource_has_deployed_operation"), \
                 patch("api.routes.airlock.AirlockRequestRepository.save_item"), \
                 patch("api.dependencies.workspaces.WorkspaceRepository.get_workspace_by_id"), \
-                patch("services.aad_authentication.AzureADAuthorization.get_workspace_role_assignment_details", return_value={"researcher_emails": ["researcher@outlook.com"], "owner_emails": ["owner@outlook.com"]}):
+                patch("services.aad_authentication.AzureADAuthorization.get_workspace_role_assignment_details", return_value={"WorkspaceResearcher": ["researcher@outlook.com"], "WorkspaceOwner": ["owner@outlook.com"], "AirlockManager": ["manager@outlook.com"]}):
             yield
         app.dependency_overrides = {}
 
diff --git a/api_app/tests_ma/test_api/test_routes/test_airlock_resource_helpers.py b/api_app/tests_ma/test_api/test_routes/test_airlock_resource_helpers.py
index baaaa20a72..32152c4224 100644
--- a/api_app/tests_ma/test_api/test_routes/test_airlock_resource_helpers.py
+++ b/api_app/tests_ma/test_api/test_routes/test_airlock_resource_helpers.py
@@ -54,7 +54,7 @@ def sample_status_changed_event(status="draft"):
 def sample_airlock_notification_event(status="draft"):
     status_changed_event = EventGridEvent(
         event_type="airlockNotification",
-        data=AirlockNotificationData(request_id=AIRLOCK_REQUEST_ID, event_type="status_changed", event_value=status, researchers_emails=['researcher@outlook.com'], owners_emails=['owner@outlook.com'], workspace_id=WORKSPACE_ID[-4:]).__dict__,
+        data=AirlockNotificationData(request_id=AIRLOCK_REQUEST_ID, event_type="status_changed", event_value=status, emails={"workspace_researcher": ["researcher@outlook.com"], "workspace_owner": ["owner@outlook.com"], "airlock_manager": ["manager@outlook.com"]}, workspace_id=WORKSPACE_ID[-4:]).__dict__,
         subject=f"{AIRLOCK_REQUEST_ID}/airlockNotification",
         data_version="2.0"
     )
@@ -77,7 +77,7 @@ def get_required_roles(endpoint):
 
 
 @patch("event_grid.helpers.EventGridPublisherClient", return_value=AsyncMock())
-@patch("services.aad_authentication.AzureADAuthorization.get_workspace_role_assignment_details", return_value={"researcher_emails": ["researcher@outlook.com"], "owner_emails": ["owner@outlook.com"]})
+@patch("services.aad_authentication.AzureADAuthorization.get_workspace_role_assignment_details", return_value={"WorkspaceResearcher": ["researcher@outlook.com"], "WorkspaceOwner": ["owner@outlook.com"], "AirlockManager": ["manager@outlook.com"]})
 async def test_save_and_publish_event_airlock_request_saves_item(_, event_grid_publisher_client_mock,
                                                                  airlock_request_repo_mock):
     airlock_request_mock = sample_airlock_request()
@@ -103,7 +103,7 @@ async def test_save_and_publish_event_airlock_request_saves_item(_, event_grid_p
     assert actual_airlock_notification_event.data == airlock_notification_event_mock.data
 
 
-@patch("services.aad_authentication.AzureADAuthorization.get_workspace_role_assignment_details", return_value={"researcher_emails": ["researcher@outlook.com"], "owner_emails": ["owner@outlook.com"]})
+@patch("services.aad_authentication.AzureADAuthorization.get_workspace_role_assignment_details", return_value={"WorkspaceResearcher": ["researcher@outlook.com"], "WorkspaceOwner": ["owner@outlook.com"], "AirlockManager": ["manager@outlook.com"]})
 async def test_save_and_publish_event_airlock_request_raises_503_if_save_to_db_fails(_, airlock_request_repo_mock):
     airlock_request_mock = sample_airlock_request()
     airlock_request_repo_mock.save_item = MagicMock(side_effect=Exception)
@@ -118,7 +118,7 @@ async def test_save_and_publish_event_airlock_request_raises_503_if_save_to_db_f
 
 
 @patch("event_grid.helpers.EventGridPublisherClient", return_value=AsyncMock())
-@patch("services.aad_authentication.AzureADAuthorization.get_workspace_role_assignment_details", return_value={"researcher_emails": ["researcher@outlook.com"], "owner_emails": ["owner@outlook.com"]})
+@patch("services.aad_authentication.AzureADAuthorization.get_workspace_role_assignment_details", return_value={"WorkspaceResearcher": ["researcher@outlook.com"], "WorkspaceOwner": ["owner@outlook.com"], "AirlockManager": ["manager@outlook.com"]})
 async def test_save_and_publish_event_airlock_request_raises_503_if_publish_event_fails(_, event_grid_publisher_client_mock,
                                                                                         airlock_request_repo_mock):
     airlock_request_mock = sample_airlock_request()
@@ -138,10 +138,10 @@ async def test_save_and_publish_event_airlock_request_raises_503_if_publish_even
 
 
 @pytest.mark.parametrize('email_mock_return', [{},
-                                               {"owner_emails": ["owner@outlook.com"]},
-                                               {"researcher_emails": [], "owner_emails": ["owner@outlook.com"]},
-                                               {"researcher_emails": ["researcher@outlook.com"], "owner_emails": []},
-                                               {"researcher_emails": ["researcher@outlook.com"]}])
+                                               {"AirlockManager": ["owner@outlook.com"]},
+                                               {"WorkspaceResearcher": [], "AirlockManager": ["owner@outlook.com"]},
+                                               {"WorkspaceResearcher": ["researcher@outlook.com"], "owner_emails": []},
+                                               {"WorkspaceResearcher": ["researcher@outlook.com"]}])
 @patch("services.aad_authentication.AzureADAuthorization.get_workspace_role_assignment_details")
 async def test_save_and_publish_event_airlock_request_raises_417_if_email_not_present(get_workspace_role_assignment_details_patched, email_mock_return):
 
@@ -158,7 +158,7 @@ async def test_save_and_publish_event_airlock_request_raises_417_if_email_not_pr
 
 
 @patch("event_grid.helpers.EventGridPublisherClient", return_value=AsyncMock())
-@patch("services.aad_authentication.AzureADAuthorization.get_workspace_role_assignment_details", return_value={"researcher_emails": ["researcher@outlook.com"], "owner_emails": ["owner@outlook.com"]})
+@patch("services.aad_authentication.AzureADAuthorization.get_workspace_role_assignment_details", return_value={"WorkspaceResearcher": ["researcher@outlook.com"], "WorkspaceOwner": ["owner@outlook.com"], "AirlockManager": ["manager@outlook.com"]})
 async def test_update_and_publish_event_airlock_request_updates_item(_, event_grid_publisher_client_mock,
                                                                      airlock_request_repo_mock):
     airlock_request_mock = sample_airlock_request()
@@ -187,7 +187,7 @@ async def test_update_and_publish_event_airlock_request_updates_item(_, event_gr
     assert actual_airlock_notification_event.data == airlock_notification_event_mock.data
 
 
-@patch("services.aad_authentication.AzureADAuthorization.get_workspace_role_assignment_details", return_value={"researcher_emails": ["researcher@outlook.com"], "owner_emails": ["owner@outlook.com"]})
+@patch("services.aad_authentication.AzureADAuthorization.get_workspace_role_assignment_details", return_value={"WorkspaceResearcher": ["researcher@outlook.com"], "WorkspaceOwner": ["owner@outlook.com"], "AirlockManager": ["manager@outlook.com"]})
 async def test_update_and_publish_event_airlock_request_raises_400_if_status_update_invalid(_, airlock_request_repo_mock):
     airlock_request_mock = sample_airlock_request()
 
@@ -203,7 +203,7 @@ async def test_update_and_publish_event_airlock_request_raises_400_if_status_upd
 
 
 @patch("event_grid.helpers.EventGridPublisherClient", return_value=AsyncMock())
-@patch("services.aad_authentication.AzureADAuthorization.get_workspace_role_assignment_details", return_value={"researcher_emails": ["researcher@outlook.com"], "owner_emails": ["owner@outlook.com"]})
+@patch("services.aad_authentication.AzureADAuthorization.get_workspace_role_assignment_details", return_value={"WorkspaceResearcher": ["researcher@outlook.com"], "WorkspaceOwner": ["owner@outlook.com"], "AirlockManager": ["manager@outlook.com"]})
 async def test_update_and_publish_event_airlock_request_raises_503_if_publish_event_fails(_, event_grid_publisher_client_mock,
                                                                                           airlock_request_repo_mock):
     airlock_request_mock = sample_airlock_request()
diff --git a/devops/scripts/list_versions.sh b/devops/scripts/list_versions.sh
new file mode 100755
index 0000000000..49a6e2bc9a
--- /dev/null
+++ b/devops/scripts/list_versions.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+set -o errexit
+set -o pipefail
+set -o nounset
+# set -o xtrace
+
+function template_version () {
+  version=$(yq eval ".version" "$1")
+  name=$(yq eval ".name" "$1")
+  echo -e "| $name | $version |"
+}
+
+function component_version () {
+  version_line=$(cat "$2")
+
+  # doesn't work with quotes
+  # shellcheck disable=SC2206
+  version_array=( ${version_line//=/ } ) # split by =
+  version="${version_array[1]//\"}" # second element is what we want, remove " chars
+  echo -e "| $1 | $version |"
+}
+
+echo -e "| name | version |\n| ----- | ----- |"
+
+component_version "devops" "devops/version.txt"
+component_version "core" "templates/core/version.txt"
+
+find . -type f -name "porter.yaml" -not -path "*/.cnab/*" -print0 | sort | while read -r -d $'\0' file
+do
+  template_version "$file"
+done
+
+
+
diff --git a/docs/tre-developers/release.md b/docs/tre-developers/release.md
new file mode 100644
index 0000000000..53f5cb3042
--- /dev/null
+++ b/docs/tre-developers/release.md
@@ -0,0 +1,20 @@
+# How to release an AzureTRE version
+
+A release is created when enough changes have been made and the main branch is stable enough.
+
+The process follows these steps:
+
+1. Update `CHANGELOG.md` in a PR with the following:
+    1. Rename the top-most verion noted as unreleaed with the version number that makes sense. Note that you don't have to keep the one that is currently in the file as the version number chosen should reflect the changes made (major, minor, etc.)
+    1. Create a new section for the next-unreleaed version so that future changes will be placed there.
+    1. Run `devops/scripts/list_versions.sh` and include the output in the change log for the version you're about the release
+1. Merge the PR
+1. Create a GitHub Release
+    <!-- markdownlint-disable-next-line MD034 -->
+    1. Go to https://github.com/microsoft/AzureTRE/releases/new
+    1. Click on `Choose a tag` and type a new one for you version. It should be in the form of `v0.9.2` - note the "v" in the begining.
+    1. The release title should be just the version number "0.9.2" in the example above.
+    1. Copy the text from the CHANGELOG.md file and paste in the release description.
+    1. Include a final line with a link to the full changelog similar to this:
+    <!-- markdownlint-disable-next-line MD034 -->
+          **Full Changelog**: https://github.com/microsoft/AzureTRE/compare/v0.9.1...v0.9.2
diff --git a/mkdocs.yml b/mkdocs.yml
index 0a0de4fa03..f564b5d67d 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -128,6 +128,8 @@ nav:
                   - GitHub Actions: tre-admins/setup-instructions/workflows.md
                   - Azure DevOps: coming-soon.md
 
+          - Releases: tre-developers/release.md
+
       - Troubleshooting FAQ: # General Troubleshooting Section for Development
           - troubleshooting-faq/index.md
           - Enabling Debugging for the API: troubleshooting-faq/debug-api.md
diff --git a/templates/shared_services/airlock_notifier/app/AirlockNotifier/workflow.json b/templates/shared_services/airlock_notifier/app/AirlockNotifier/workflow.json
index a224dfd31c..4752883022 100644
--- a/templates/shared_services/airlock_notifier/app/AirlockNotifier/workflow.json
+++ b/templates/shared_services/airlock_notifier/app/AirlockNotifier/workflow.json
@@ -47,25 +47,32 @@
                   "event_value": {
                     "type": "string"
                   },
-                  "owners_emails": {
-                    "items": [
-                      {
-                        "type": "string"
-                      }
-                    ],
-                    "type": "array"
-                  },
                   "request_id": {
                     "type": "string"
                   },
-                  "researchers_emails": {
-                    "items": [
-                      {
-                        "type": "string"
-                      }
-                    ],
-                    "type": "array"
-                  },
+                  "emails": {
+                    "type": "object",
+                    "properties": {
+                        "workspace_researcher": {
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        },
+                        "workspace_owner": {
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        },
+                        "airlock_manager": {
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        }
+                    }
+                },
                   "workspace_id": {
                     "type": "string"
                   }
@@ -132,7 +139,7 @@
               "Set_recipients_as_researchers_emails": {
                 "inputs": {
                   "name": "recipients",
-                  "value": "@body('Parse_JSON')?['data']?['researchers_emails']"
+                  "value": "@body('Parse_JSON')?['data']?['emails']?['workspace_researcher']"
                 },
                 "runAfter": {},
                 "type": "SetVariable"
@@ -157,7 +164,7 @@
               "Set_recipients_as_owners_emails": {
                 "inputs": {
                   "name": "recipients",
-                  "value": "@body('Parse_JSON')?['data']?['owners_emails']"
+                  "value": "@body('Parse_JSON')?['data']?['emails']?['airlock_manager']"
                 },
                 "runAfter": {},
                 "type": "SetVariable"