diff --git a/.gitlab/issue_templates/Web IDE Category - issue.md b/.gitlab/issue_templates/Web IDE Category - issue.md
index 4271cbf96edf97881332ba27af97235706183712..a9934f9542f3e887cd92cdb09da2776230b7c800 100644
--- a/.gitlab/issue_templates/Web IDE Category - issue.md	
+++ b/.gitlab/issue_templates/Web IDE Category - issue.md	
@@ -17,14 +17,14 @@ The first line of this issue description must be one of the following:
 ...and the first description line of the MR should be `Issue: <Issue link with trailing +>`
 
 For more context, see:
-https://about.gitlab.com/handbook/engineering/development/dev/create/ide/index.html#relationship-of-issues-to-mrs
+https://handbook.gitlab.com/handbook/engineering/development/dev/create/remote-development/#relationship-of-issues-to-mrs
 -->
 
 <!--
 The following sections should be filled out as part of the refinement process before the issue is prioritized.
 
 For more context, see:
-https://about.gitlab.com/handbook/engineering/development/dev/create/ide/#2-pre-iteration-planning-meeting
+https://handbook.gitlab.com/handbook/engineering/development/dev/create/remote-development/#2-pre-iteration-planning-meeting
 -->
 
 ## Description
@@ -66,7 +66,7 @@ TODO: Fill out or delete (optional)
 /label ~"Category:Web IDE"
 /label ~"section::dev"
 /label ~"devops::create"
-/label ~"group::ide"
+/label ~"group::remote development"
 
 <!-- Replace with other type, e.g. bug or maintenance, if appropriate -->
 
@@ -76,7 +76,7 @@ TODO: Fill out or delete (optional)
 
 /label ~"feature::addition"
 
-<!-- By default, all issues start in the unprioritized status. See https://about.gitlab.com/handbook/engineering/development/dev/create/ide/#-remote-development-planning-process -->
+<!-- By default, all issues start in the unprioritized status. See https://handbook.gitlab.com/handbook/engineering/development/dev/create/remote-development/#-planning-process -->
 
 /label ~"webide-workflow::unprioritized"
 
diff --git a/.gitlab/issue_templates/Remote Development Workspaces Category - issue.md b/.gitlab/issue_templates/Workspaces Category - issue.md
similarity index 91%
rename from .gitlab/issue_templates/Remote Development Workspaces Category - issue.md
rename to .gitlab/issue_templates/Workspaces Category - issue.md
index b127a2a92c0592ccd163d3fc48b1f6c1f16121b8..82bc843570b81fb4f31a8b4547baa0a72133774d 100644
--- a/.gitlab/issue_templates/Remote Development Workspaces Category - issue.md	
+++ b/.gitlab/issue_templates/Workspaces Category - issue.md	
@@ -62,18 +62,18 @@ TODO: Fill out or delete (optional)
 [Provide a user story to illustrate the use case for this feature/enhancement. Include examples to help communicate the intended functionality.]
 
 
-/label ~"Category:Remote Development"
+/label ~"Category:Workspaces"
 /label  ~"section::dev"
 /label  ~"devops::create"
-/label  ~"group::ide"
+/label  ~"group::remote development"
 
 <!-- Replace with other type, e.g. bug or maintenance, if appropriate -->
 /label ~"type::feature"
 <!-- Replace with other subtype if appropriate -->
 /label ~"feature::addition"
 
-<!-- By default, all issues start in the unprioritized status. See https://about.gitlab.com/handbook/engineering/development/dev/create/ide/#-remote-development-planning-process -->
-/label  ~"rd-workflow::unprioritized"
+<!-- By default, all issues start in the unprioritized status. See https://handbook.gitlab.com/handbook/engineering/development/dev/create/remote-development/#-planning-process -->
+/label  ~"workspaces-workflow::unprioritized"
 
 <!-- For simplicity and to avoid triage bot warnings about missing workflow labels, we will default to issues starting at the refinement phase --> 
 /label ~"workflow::refinement"