diff --git a/internal/http/html/static/templates/content/module_list.tmpl b/internal/http/html/static/templates/content/module_list.tmpl
index ee90d1056..1b7a88dc5 100644
--- a/internal/http/html/static/templates/content/module_list.tmpl
+++ b/internal/http/html/static/templates/content/module_list.tmpl
@@ -24,7 +24,7 @@
 {{ define "content-list-item" }}
   <div class="widget" x-data="block_link($el, '{{ modulePath .ID }}')">
     <div>
-      <a href="{{ modulePath .ID }}">{{ .Name }}</a>
+      <span>{{ .Name }}</span>
       <span>{{ durationRound .CreatedAt }} ago</span>
     </div>
     {{ template "identifier" . }}
diff --git a/internal/http/html/static/templates/content/organization_list.tmpl b/internal/http/html/static/templates/content/organization_list.tmpl
index 2a86636c3..2bbe9ab10 100644
--- a/internal/http/html/static/templates/content/organization_list.tmpl
+++ b/internal/http/html/static/templates/content/organization_list.tmpl
@@ -15,7 +15,7 @@
 {{ define "content-list-item" }}
   <div class="widget" x-data="block_link($el, '{{ organizationPath .Name }}')">
     <div>
-      <a href="{{ organizationPath .Name }}">{{ .Name }}</a>
+      <span>{{ .Name }}</span>
     </div>
     <div>
       {{ template "identifier" . }}
diff --git a/internal/http/html/static/templates/content/team_list.tmpl b/internal/http/html/static/templates/content/team_list.tmpl
index 5a973d5f6..aaf2951f2 100644
--- a/internal/http/html/static/templates/content/team_list.tmpl
+++ b/internal/http/html/static/templates/content/team_list.tmpl
@@ -17,7 +17,7 @@
     {{ range .Teams }}
       <div id="item-team-{{ .Name }}" class="widget" x-data="block_link($el, '{{ teamPath .ID }}')">
         <div>
-          <a href="{{ teamPath .ID }}">{{ .Name }}</a>
+          <span>{{ .Name }}</span>
         </div>
         <div>
           {{ template "identifier" . }}
diff --git a/internal/http/html/static/templates/partials/variable_set_item.tmpl b/internal/http/html/static/templates/partials/variable_set_item.tmpl
index b0dd1c858..3964a545c 100644
--- a/internal/http/html/static/templates/partials/variable_set_item.tmpl
+++ b/internal/http/html/static/templates/partials/variable_set_item.tmpl
@@ -1,8 +1,6 @@
 {{ define "variable-set-item" }}
   <div class="widget" id="item-variable-set-{{ .Name }}" x-data="block_link($el, '{{ editVariableSetPath .ID }}')">
-    <span id="name">
-      <a href="{{ editVariableSetPath .ID }}">{{ .Name }}</a>
-    </span>
+    <span id="name">{{ .Name }}</span>
     <div>
       {{ template "identifier" . }}
       <span>
diff --git a/internal/http/html/static/templates/partials/workspace_item.tmpl b/internal/http/html/static/templates/partials/workspace_item.tmpl
index 361f0ec8d..95ee0abd2 100644
--- a/internal/http/html/static/templates/partials/workspace_item.tmpl
+++ b/internal/http/html/static/templates/partials/workspace_item.tmpl
@@ -1,7 +1,7 @@
 {{ define "workspace-item" }}
   <div x-data="block_link($el, '{{ workspacePath .ID }}')" class="widget" id="item-workspace-{{ .Name }}">
     <div>
-      <a class="text-lg" href="{{ workspacePath .ID }}">{{ .Name }}</a>
+      <span>{{ .Name }}</span>
       {{ with .LatestRun }}
         {{ template "run-status" . }}
       {{ end }}
diff --git a/internal/integration/module_e2e_test.go b/internal/integration/module_e2e_test.go
index 93d33b803..1597a3488 100644
--- a/internal/integration/module_e2e_test.go
+++ b/internal/integration/module_e2e_test.go
@@ -117,7 +117,7 @@ module "mod" {
 			// go to modules
 			chromedp.Click("#modules > a", chromedp.ByQuery),
 			// select existing module
-			chromedp.Click(`//a[text()='mod']`),
+			chromedp.Click(`.widget`, chromedp.ByQuery),
 			// confirm no longer connected
 			chromedp.WaitNotPresent(`//span[@id='vcs-repo']`),
 			// delete module
diff --git a/internal/integration/tag_e2e_test.go b/internal/integration/tag_e2e_test.go
index 3b91f2049..34ddc3851 100644
--- a/internal/integration/tag_e2e_test.go
+++ b/internal/integration/tag_e2e_test.go
@@ -96,7 +96,7 @@ resource "null_resource" "tags_e2e" {}
 		chromedp.Click(`//label[@for='workspace-tag-filter-baz']`),
 		screenshot(t),
 		// confirm workspace listing contains tagged workspace
-		chromedp.WaitVisible(`//div[@id='content-list']//a[text()='tagged']`),
+		chromedp.WaitVisible(`//div[@id='content-list']/div[@id='item-workspace-tagged']`),
 	})
 
 	// should be tags 'foo' and 'baz'
diff --git a/internal/integration/team_ui_test.go b/internal/integration/team_ui_test.go
index 11d9c9d3e..fd4e2c5f3 100644
--- a/internal/integration/team_ui_test.go
+++ b/internal/integration/team_ui_test.go
@@ -28,7 +28,7 @@ func TestIntegration_TeamUI(t *testing.T) {
 			chromedp.Click(`//a[text()='teams']`),
 			screenshot(t),
 			// go to owners team page
-			chromedp.Click(`//div[@id='content-list']//a[text()='owners']`),
+			chromedp.Click(`//div[@id='item-team-owners']`),
 			screenshot(t, "owners_team_page"),
 			// set focus to search box
 			chromedp.Focus(`//input[@x-ref='input-search']`, chromedp.NodeVisible),
diff --git a/internal/integration/web_test.go b/internal/integration/web_test.go
index ba11c0ede..7cdb5af32 100644
--- a/internal/integration/web_test.go
+++ b/internal/integration/web_test.go
@@ -39,7 +39,7 @@ func TestWeb(t *testing.T) {
 			chromedp.Click("#teams > a", chromedp.ByQuery),
 			screenshot(t),
 			// select devops team
-			chromedp.Click("#item-team-devops a", chromedp.ByQuery),
+			chromedp.Click("#item-team-devops", chromedp.ByQuery),
 			screenshot(t),
 			// tick checkbox for workspace manager role
 			chromedp.Click("#manage_workspaces", chromedp.ByQuery),
@@ -69,7 +69,7 @@ func TestWeb(t *testing.T) {
 			// list teams
 			chromedp.Click("#teams > a", chromedp.ByQuery),
 			// select owners team
-			chromedp.Click("#item-team-owners a", chromedp.ByQuery),
+			chromedp.Click("#item-team-owners", chromedp.ByQuery),
 			screenshot(t),
 			matchText(t, fmt.Sprintf("#item-user-%s #username", user.Username), user.Username, chromedp.ByQuery),
 		},