diff --git a/.github/workflows/docker_test_3.yml b/.github/workflows/docker_test_3.yml
deleted file mode 100644
index f0eee6dc2b..0000000000
--- a/.github/workflows/docker_test_3.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: docker_test_3
-on: [push, pull_request]
-jobs:
-
-  build:
-    name: Docker Test 3
-    runs-on: ubuntu-latest
-
-    steps:
-
-    - name: Set up Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.17
-
-    - name: Tune the OS
-      run: |
-        echo '1024 65535' | sudo tee -a /proc/sys/net/ipv4/ip_local_port_range
-
-    # TEMPORARY WHILE GITHUB FIXES THIS https://github.com/actions/virtual-environments/issues/3185
-    - name: Add the current IP address, long hostname and short hostname record to /etc/hosts file
-      run: |
-        echo -e "$(ip addr show eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)\t$(hostname -f) $(hostname -s)" | sudo tee -a /etc/hosts
-    # DON'T FORGET TO REMOVE CODE ABOVE WHEN ISSUE IS ADRESSED!
-
-    - name: Check out code
-      uses: actions/checkout@v2
-
-    - name: Run tests which require docker - 3
-      run: |
-        go run test.go -docker=true --follow -shard 26
diff --git a/.github/workflows/docker_test_1.yml b/.github/workflows/docker_test_cluster_10.yml
similarity index 93%
rename from .github/workflows/docker_test_1.yml
rename to .github/workflows/docker_test_cluster_10.yml
index 429cc834d5..77f9645118 100644
--- a/.github/workflows/docker_test_1.yml
+++ b/.github/workflows/docker_test_cluster_10.yml
@@ -1,9 +1,9 @@
-name: docker_test_1
+name: docker_test_cluster_10
 on: [push, pull_request]
 jobs:
 
   build:
-    name: Docker Test 1
+    name: Docker Test Cluster 10
     runs-on: ubuntu-latest
 
     steps:
diff --git a/.github/workflows/docker_test_2.yml b/.github/workflows/docker_test_cluster_25.yml
similarity index 93%
rename from .github/workflows/docker_test_2.yml
rename to .github/workflows/docker_test_cluster_25.yml
index b60edc0546..322f0ee6a6 100644
--- a/.github/workflows/docker_test_2.yml
+++ b/.github/workflows/docker_test_cluster_25.yml
@@ -1,9 +1,9 @@
-name: docker_test_2
+name: docker_test_cluster_25
 on: [push, pull_request]
 jobs:
 
   build:
-    name: Docker Test 2
+    name: Docker Test Cluster 25
     runs-on: ubuntu-latest
 
     steps:
diff --git a/test/ci_workflow_gen.go b/test/ci_workflow_gen.go
index bedf8bbf00..b5bb26fcbe 100644
--- a/test/ci_workflow_gen.go
+++ b/test/ci_workflow_gen.go
@@ -41,6 +41,8 @@ const (
 )
 
 var (
+	// Clusters 10, 25 are executed on docker, using the docker_test_cluster 10, 25 workflows.
+	// Hence, they are not listed in the list below.
 	clusterList = []string{
 		"11",
 		"12",