diff --git a/.github/workflows/test-example.yml b/.github/workflows/e2e-test.yml
similarity index 68%
rename from .github/workflows/test-example.yml
rename to .github/workflows/e2e-test.yml
index d8bcd288..7f69e9be 100644
--- a/.github/workflows/test-example.yml
+++ b/.github/workflows/e2e-test.yml
@@ -1,12 +1,12 @@
 ---
-name: test-examples
+name: e2e-test
 on:
   pull_request:
 jobs:
-  test-examples:
+  end-to-end-test:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
 
-      - name: test OGC API Features with Azure GeoPackage
+      - name: Test OGC API Features with Azure GeoPackage
         run: docker-compose -f ./examples/docker-compose-features-azure.yaml up --exit-code-from smoketest
diff --git a/.github/workflows/lint-go.yml b/.github/workflows/lint-go.yml
index ec48003f..16bdd415 100644
--- a/.github/workflows/lint-go.yml
+++ b/.github/workflows/lint-go.yml
@@ -8,7 +8,7 @@ on:
 permissions:
   contents: read
 jobs:
-  golangci:
+  lint:
     name: lint
     runs-on: ubuntu-latest
     steps:
@@ -22,6 +22,9 @@ jobs:
 
       - uses: actions/checkout@v3
 
+      - name: Tidy
+        uses: katexochen/go-tidy-check@v2
+
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
diff --git a/.github/workflows/lint-ts.yml b/.github/workflows/lint-ts.yml
index f9b1259b..87d45642 100644
--- a/.github/workflows/lint-ts.yml
+++ b/.github/workflows/lint-ts.yml
@@ -1,5 +1,5 @@
 ---
-name: lint (web/ts)
+name: lint (ts)
 on:
   push:
     branches:
diff --git a/.github/workflows/test.yml b/.github/workflows/test-go.yml
similarity index 83%
rename from .github/workflows/test.yml
rename to .github/workflows/test-go.yml
index bc129244..6ddf088f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test-go.yml
@@ -1,23 +1,25 @@
 ---
-name: test
+name: test (go)
 on:
   push:
     branches:
       - master
   pull_request:
+permissions:
+  contents: read
 jobs:
   test:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
 
-      - name: setup cgo dependencies
+      - name: Setup cgo dependencies
         run: sudo apt-get update && sudo apt-get install libcurl4-openssl-dev libssl-dev libsqlite3-mod-spatialite
 
       - name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
-          go-version: 'stable'
+          go-version: '1.21'
 
       - name: Download
         run: go mod download all
diff --git a/.github/workflows/cypress-ts.yml b/.github/workflows/test-ts.yml
similarity index 93%
rename from .github/workflows/cypress-ts.yml
rename to .github/workflows/test-ts.yml
index 5a80400e..4f68fb10 100644
--- a/.github/workflows/cypress-ts.yml
+++ b/.github/workflows/test-ts.yml
@@ -1,35 +1,35 @@
----
-name: cypress-ts
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-
-defaults:
-  run:
-    working-directory: ./viewer
-jobs:
-  cypress-ts:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [18.x]
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node-version }}
-          cache: "npm"
-          cache-dependency-path: "./viewer/package-lock.json"
-      - name: Install
-        run: npm ci
-      - name: Cypress run
-        uses: cypress-io/github-action@v6
-        with:
-          component: true
-          working-directory: ./viewer
-          browser: chrome
+---
+name: test (ts)
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+defaults:
+  run:
+    working-directory: ./viewer
+jobs:
+  cypress-ts:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [18.x]
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: "npm"
+          cache-dependency-path: "./viewer/package-lock.json"
+      - name: Install
+        run: npm ci
+      - name: Cypress run
+        uses: cypress-io/github-action@v6
+        with:
+          component: true
+          working-directory: ./viewer
+          browser: chrome
diff --git a/.github/workflows/tidy.yml b/.github/workflows/tidy.yml
deleted file mode 100644
index 7ad13f9c..00000000
--- a/.github/workflows/tidy.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-name: tidy
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-permissions:
-  contents: read
-jobs:
-  tidy:
-    name: tidy
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/setup-go@v4
-        with:
-          go-version: '1.21'
-      - uses: actions/checkout@v3
-      - uses: katexochen/go-tidy-check@v2