diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml
index a05b348972..6977d1c2c1 100644
--- a/.github/workflows/artifacts.yml
+++ b/.github/workflows/artifacts.yml
@@ -1,7 +1,7 @@
 name: Artifacts generation and upload
 on:
   workflow_run:
-    workflows: ["Mattermost Build"]
+    workflows: ["Server CI"]
     types:
       - completed
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/server-ci.yml
similarity index 99%
rename from .github/workflows/ci.yml
rename to .github/workflows/server-ci.yml
index 8197f9a20f..36e4c2bf1b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/server-ci.yml
@@ -1,4 +1,4 @@
-name: Mattermost Build
+name: Server CI
 on:
   pull_request:
   push:
diff --git a/.github/workflows/channels-ci.yml b/.github/workflows/webapp-ci.yml
similarity index 100%
rename from .github/workflows/channels-ci.yml
rename to .github/workflows/webapp-ci.yml