diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index e230aaaf..0be68716 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-* @actions/virtual-environments-owners
+* @actions/runner-images-owners
diff --git a/.github/ISSUE_TEMPLATE/announcement.yml b/.github/ISSUE_TEMPLATE/announcement.yml
index 13cbb1f7..00ea1e71 100644
--- a/.github/ISSUE_TEMPLATE/announcement.yml
+++ b/.github/ISSUE_TEMPLATE/announcement.yml
@@ -34,7 +34,7 @@ body:
         - label: GitHub Actions
   - type: checkboxes
     attributes:
-      label: Virtual environments affected
+      label: Runner images affected
       options:
         - label: Ubuntu 18.04
         - label: Ubuntu 20.04
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 9dad29ae..f55ecb68 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -16,7 +16,7 @@ body:
         - label: GitHub Actions
   - type: checkboxes
     attributes:
-      label: Virtual environments affected
+      label: Runner images affected
       options:
         - label: Ubuntu 18.04
         - label: Ubuntu 20.04
@@ -31,8 +31,8 @@ body:
       label: Image version and build link
       description: |
         Image version where you are experiencing the issue. Where to find image version in build logs:
-        1. For GitHub Actions, under "Set up job" -> "Virtual Environment" -> "Version".
-        2. For Azure DevOps, under "Initialize job" -> "Virtual Environment" -> "Version".
+        1. For GitHub Actions, under "Set up job" -> "Runner Image" -> "Version".
+        2. For Azure DevOps, under "Initialize job" -> "Runner Image" -> "Version".
 
         If you have a public example, please, provide a link to the failed build.
     validations:
diff --git a/.github/ISSUE_TEMPLATE/tool-request.yml b/.github/ISSUE_TEMPLATE/tool-request.yml
index 90eaea4c..b0a4ff14 100644
--- a/.github/ISSUE_TEMPLATE/tool-request.yml
+++ b/.github/ISSUE_TEMPLATE/tool-request.yml
@@ -55,7 +55,7 @@ body:
         - label: GitHub Actions
   - type: checkboxes
     attributes:
-      label: Virtual environments where you need the tool
+      label: Runner images where you need the tool
       options:
         - label: Ubuntu 18.04
         - label: Ubuntu 20.04