diff --git a/.github/workflows/docker-Espressif.yml b/.github/workflows/docker-Espressif.yml
index 3976b8e0c..4b100bbf5 100644
--- a/.github/workflows/docker-Espressif.yml
+++ b/.github/workflows/docker-Espressif.yml
@@ -4,7 +4,7 @@ on:
 
 jobs:
   espressif_latest:
-    name: Test Espressif on latest Docker container
+    name: latest Docker container
     runs-on: ubuntu-latest
     container:
       image: espressif/idf:latest
@@ -13,7 +13,7 @@ jobs:
       - name: Initialize Espressif IDE and build examples
         run: . /opt/esp/idf/export.sh; IDE/Espressif/ESP-IDF/compileAllExamples.sh
   espressif_v4_4:
-    name: Test Espressif on v4.4 Docker container
+    name: v4.4 Docker container
     runs-on: ubuntu-latest
     container:
       image: espressif/idf:release-v4.4
@@ -22,7 +22,7 @@ jobs:
       - name: Initialize Espressif IDE and build examples
         run: . /opt/esp/idf/export.sh; IDE/Espressif/ESP-IDF/compileAllExamples.sh
   espressif_v5_0:
-    name: Test Espressif on v5.0 Docker container
+    name: v5.0 Docker container
     runs-on: ubuntu-latest
     container:
       image: espressif/idf:release-v5.0
diff --git a/.github/workflows/docker-OpenWrt.yml b/.github/workflows/docker-OpenWrt.yml
index 08e3f04cf..3f11d4bc0 100644
--- a/.github/workflows/docker-OpenWrt.yml
+++ b/.github/workflows/docker-OpenWrt.yml
@@ -24,7 +24,7 @@ jobs:
                 path: src/.libs/libwolfssl.so
                 retention-days: 1
     compile_container:
-        name: OpenWrt test
+        name: Compile container
         runs-on: ubuntu-latest
         needs: build_library
         strategy:
@@ -37,8 +37,7 @@ jobs:
               with:
                 name: libwolfssl.so
                 path: Docker/OpenWrt/.
-            -
-              name: Build but dont push
+            - name: Build but dont push
               uses: docker/build-push-action@v3
               with:
                   context: Docker/OpenWrt
diff --git a/.github/workflows/opensource/haproxy.yml b/.github/workflows/haproxy.yml
similarity index 100%
rename from .github/workflows/opensource/haproxy.yml
rename to .github/workflows/haproxy.yml
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index be6fc254f..92afa0655 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,18 +10,18 @@ on:
     branches: [ '*' ]
 
 jobs:
-    docker-Espressif:
+    espressif:
         uses: ./.github/workflows/docker-Espressif.yml
     multi-compiler:
         uses: ./.github/workflows/multi-compiler.yml
-    docker-OpenWrt:
+    openwrt:
         uses: ./.github/workflows/docker-OpenWrt.yml
     os-check:
         uses: ./.github/workflows/os-check.yml
     stunnel:
-        uses: ./.github/workflows/opensource/stunnel-check.yml
+        uses: ./.github/workflows/stunnel.yml
     openvpn:
-        uses: ./.github/workflows/opensource/openvpn-check.yml
+        uses: ./.github/workflows/openvpn.yml
 # TODO: Currently this test fails. Enable it once it becomes passing.        
 #    haproxy:
-#        uses: ./.github/workflows/opensource/haproxy-check.yml
+#        uses: ./.github/workflows/haproxy.yml
diff --git a/.github/workflows/opensource/openvpn.yml b/.github/workflows/openvpn.yml
similarity index 100%
rename from .github/workflows/opensource/openvpn.yml
rename to .github/workflows/openvpn.yml
diff --git a/.github/workflows/opensource/stunnel.yml b/.github/workflows/stunnel.yml
similarity index 100%
rename from .github/workflows/opensource/stunnel.yml
rename to .github/workflows/stunnel.yml