diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 93155b4a1..d1ef55b5d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -34,16 +34,16 @@ jobs:
       uses: actions/checkout@v3
       continue-on-error: true
       with:
-        repository: "mattermost/mattermost-server"
+        repository: "mattermost/mattermost"
         fetch-depth: "20"
-        path: "mattermost-server"
+        path: "mattermost"
         ref: ${{ env.BRANCH_NAME }}
     - uses: actions/checkout@v3
       if: steps.mattermostServer.outcome == 'failure'
       with:
-        repository: "mattermost/mattermost-server"
+        repository: "mattermost/mattermost"
         fetch-depth: "20"
-        path: "mattermost-server"
+        path: "mattermost"
         ref : "b61c096497ac1f22f64b77afe58d0dd5a72b38f1"
     - name: Set up Go
       uses: actions/setup-go@v3
@@ -64,16 +64,16 @@ jobs:
       uses: actions/checkout@v3
       continue-on-error: true
       with:
-        repository: "mattermost/mattermost-server"
+        repository: "mattermost/mattermost"
         fetch-depth: "20"
-        path: "mattermost-server"
+        path: "mattermost"
         ref: ${{ env.BRANCH_NAME }}
     - uses: actions/checkout@v3
       if: steps.mattermostServer.outcome == 'failure'
       with:
-        repository: "mattermost/mattermost-server"
+        repository: "mattermost/mattermost"
         fetch-depth: "20"
-        path: "mattermost-server"
+        path: "mattermost"
         ref : "b61c096497ac1f22f64b77afe58d0dd5a72b38f1"
     - name: npm ci
       run: |
@@ -122,16 +122,16 @@ jobs:
       uses: actions/checkout@v3
       continue-on-error: true
       with:
-        repository: "mattermost/mattermost-server"
+        repository: "mattermost/mattermost"
         fetch-depth: "20"
-        path: "mattermost-server"
+        path: "mattermost"
         ref: ${{ env.BRANCH_NAME }}
     - uses: actions/checkout@v3
       if: steps.mattermostServer.outcome == 'failure'
       with:
-        repository: "mattermost/mattermost-server"
+        repository: "mattermost/mattermost"
         fetch-depth: "20"
-        path: "mattermost-server"
+        path: "mattermost"
         ref : "b61c096497ac1f22f64b77afe58d0dd5a72b38f1"
 
     - name: Set up Go
@@ -159,16 +159,16 @@ jobs:
       uses: actions/checkout@v3
       continue-on-error: true
       with:
-        repository: "mattermost/mattermost-server"
+        repository: "mattermost/mattermost"
         fetch-depth: "20"
-        path: "mattermost-server"
+        path: "mattermost"
         ref: ${{ env.BRANCH_NAME }}
     - uses: actions/checkout@v3
       if: steps.mattermostServer.outcome == 'failure'
       with:
-        repository: "mattermost/mattermost-server"
+        repository: "mattermost/mattermost"
         fetch-depth: "20"
-        path: "mattermost-server"
+        path: "mattermost"
         ref : "b61c096497ac1f22f64b77afe58d0dd5a72b38f1"
 
     - name: Set up Go
diff --git a/.github/workflows/dev-release.yml b/.github/workflows/dev-release.yml
index da022b71f..f5e489726 100644
--- a/.github/workflows/dev-release.yml
+++ b/.github/workflows/dev-release.yml
@@ -23,16 +23,16 @@ jobs:
       uses: actions/checkout@v3
       continue-on-error: true
       with:
-        repository: "mattermost/mattermost-server"
+        repository: "mattermost/mattermost"
         fetch-depth: "20"
-        path: "mattermost-server"
+        path: "mattermost"
         ref: ${{ env.BRANCH_NAME }}
     - uses: actions/checkout@v3
       if: steps.mattermostServer.outcome == 'failure'
       with:
-        repository: "mattermost/mattermost-server"
+        repository: "mattermost/mattermost"
         fetch-depth: "20"
-        path: "mattermost-server"
+        path: "mattermost"
         ref : "b61c096497ac1f22f64b77afe58d0dd5a72b38f1"
 
     - name: Replace token 1 server
@@ -99,16 +99,16 @@ jobs:
       uses: actions/checkout@v3
       continue-on-error: true
       with:
-        repository: "mattermost/mattermost-server"
+        repository: "mattermost/mattermost"
         fetch-depth: "20"
-        path: "mattermost-server"
+        path: "mattermost"
         ref: ${{ env.BRANCH_NAME }}
     - uses: actions/checkout@v3
       if: steps.mattermostServer.outcome == 'failure'
       with:
-        repository: "mattermost/mattermost-server"
+        repository: "mattermost/mattermost"
         fetch-depth: "20"
-        path: "mattermost-server"
+        path: "mattermost"
         ref : "b61c096497ac1f22f64b77afe58d0dd5a72b38f1"
     - name: Replace token 1 server
       run: sed -i -e "s,placeholder_rudder_dataplane_url,${{ secrets.RUDDER_DATAPLANE_URL }},g" ${{ github.workspace }}/focalboard/server/services/telemetry/telemetry.go
@@ -157,16 +157,16 @@ jobs:
       uses: actions/checkout@v3
       continue-on-error: true
       with:
-        repository: "mattermost/mattermost-server"
+        repository: "mattermost/mattermost"
         fetch-depth: "20"
-        path: "mattermost-server"
+        path: "mattermost"
         ref: ${{ env.BRANCH_NAME }}
     - uses: actions/checkout@v3
       if: steps.mattermostServer.outcome == 'failure'
       with:
-        repository: "mattermost/mattermost-server"
+        repository: "mattermost/mattermost"
         fetch-depth: "20"
-        path: "mattermost-server"
+        path: "mattermost"
         ref : "b61c096497ac1f22f64b77afe58d0dd5a72b38f1"
     - name: Replace token 1 server
       run: sed -i -e "s,placeholder_rudder_dataplane_url,${{ secrets.RUDDER_DATAPLANE_URL }},g" ${{ github.workspace }}/focalboard/server/services/telemetry/telemetry.go
@@ -227,16 +227,16 @@ jobs:
       uses: actions/checkout@v3
       continue-on-error: true
       with:
-        repository: "mattermost/mattermost-server"
+        repository: "mattermost/mattermost"
         fetch-depth: "20"
-        path: "mattermost-server"
+        path: "mattermost"
         ref: ${{ env.BRANCH_NAME }}
     - uses: actions/checkout@v3
       if: steps.mattermostServer.outcome == 'failure'
       with:
-        repository: "mattermost/mattermost-server"
+        repository: "mattermost/mattermost"
         fetch-depth: "20"
-        path: "mattermost-server"
+        path: "mattermost"
         ref : "b61c096497ac1f22f64b77afe58d0dd5a72b38f1"
 
     - name: Replace token 1 server
diff --git a/.github/workflows/lint-server.yml b/.github/workflows/lint-server.yml
index 3e505f1cd..759764eab 100644
--- a/.github/workflows/lint-server.yml
+++ b/.github/workflows/lint-server.yml
@@ -38,16 +38,16 @@ jobs:
         uses: actions/checkout@v3
         continue-on-error: true
         with:
-          repository: "mattermost/mattermost-server"
+          repository: "mattermost/mattermost"
           fetch-depth: "20"
-          path: "mattermost-server"
+          path: "mattermost"
           ref: ${{ env.BRANCH_NAME }}
       - uses: actions/checkout@v3
         if: steps.mattermostServer.outcome == 'failure'
         with:
-          repository: "mattermost/mattermost-server"
+          repository: "mattermost/mattermost"
           fetch-depth: "20"
-          path: "mattermost-server"
+          path: "mattermost"
           ref : "b61c096497ac1f22f64b77afe58d0dd5a72b38f1"
       - name: set up golangci-lint
         run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.50.1
diff --git a/.github/workflows/prod-release.yml b/.github/workflows/prod-release.yml
index 781843a68..b016b477c 100644
--- a/.github/workflows/prod-release.yml
+++ b/.github/workflows/prod-release.yml
@@ -20,16 +20,16 @@ jobs:
       uses: actions/checkout@v3
       continue-on-error: true
       with:
-        repository: "mattermost/mattermost-server"
+        repository: "mattermost/mattermost"
         fetch-depth: "20"
-        path: "mattermost-server"
+        path: "mattermost"
         ref: ${{ env.BRANCH_NAME }}
     - uses: actions/checkout@v3
       if: steps.mattermostServer.outcome == 'failure'
       with:
-        repository: "mattermost/mattermost-server"
+        repository: "mattermost/mattermost"
         fetch-depth: "20"
-        path: "mattermost-server"
+        path: "mattermost"
         ref : "b61c096497ac1f22f64b77afe58d0dd5a72b38f1"
 
     - name: Replace token 1 server
@@ -96,16 +96,16 @@ jobs:
       uses: actions/checkout@v3
       continue-on-error: true
       with:
-        repository: "mattermost/mattermost-server"
+        repository: "mattermost/mattermost"
         fetch-depth: "20"
-        path: "mattermost-server"
+        path: "mattermost"
         ref: ${{ env.BRANCH_NAME }}
     - uses: actions/checkout@v3
       if: steps.mattermostServer.outcome == 'failure'
       with:
-        repository: "mattermost/mattermost-server"
+        repository: "mattermost/mattermost"
         fetch-depth: "20"
-        path: "mattermost-server"
+        path: "mattermost"
         ref : "b61c096497ac1f22f64b77afe58d0dd5a72b38f1"
 
     - name: Replace token 1 server
@@ -155,16 +155,16 @@ jobs:
       uses: actions/checkout@v3
       continue-on-error: true
       with:
-        repository: "mattermost/mattermost-server"
+        repository: "mattermost/mattermost"
         fetch-depth: "20"
-        path: "mattermost-server"
+        path: "mattermost"
         ref: ${{ env.BRANCH_NAME }}
     - uses: actions/checkout@v3
       if: steps.mattermostServer.outcome == 'failure'
       with:
-        repository: "mattermost/mattermost-server"
+        repository: "mattermost/mattermost"
         fetch-depth: "20"
-        path: "mattermost-server"
+        path: "mattermost"
         ref : "b61c096497ac1f22f64b77afe58d0dd5a72b38f1"
 
     - name: Replace token 1 server
@@ -227,16 +227,16 @@ jobs:
       uses: actions/checkout@v3
       continue-on-error: true
       with:
-        repository: "mattermost/mattermost-server"
+        repository: "mattermost/mattermost"
         fetch-depth: "20"
-        path: "mattermost-server"
+        path: "mattermost"
         ref: ${{ env.BRANCH_NAME }}
     - uses: actions/checkout@v3
       if: steps.mattermostServer.outcome == 'failure'
       with:
-        repository: "mattermost/mattermost-server"
+        repository: "mattermost/mattermost"
         fetch-depth: "20"
-        path: "mattermost-server"
+        path: "mattermost"
         ref : "b61c096497ac1f22f64b77afe58d0dd5a72b38f1"
 
     - name: Replace token 1 server