diff --git a/.github/workflows/linux-build-and-test-compatibility.yml b/.github/workflows/linux-build-and-test-compatibility.yml
index 83be0b9f..94acc8ac 100644
--- a/.github/workflows/linux-build-and-test-compatibility.yml
+++ b/.github/workflows/linux-build-and-test-compatibility.yml
@@ -1,3 +1,5 @@
+name:  rclnodejs - Linux Build & Compatibility Test
+
 on:
   workflow_dispatch:
 
diff --git a/.github/workflows/windows-build-and-test-compatibility.yml b/.github/workflows/windows-build-and-test-compatibility.yml
index d5fdfd65..e9f0bd3c 100644
--- a/.github/workflows/windows-build-and-test-compatibility.yml
+++ b/.github/workflows/windows-build-and-test-compatibility.yml
@@ -1,5 +1,5 @@
 
-name:  rclnodejs - Windows Build & Test Compatibility
+name:  rclnodejs - Windows Build & Compatibility Test
 
 on:
   workflow_dispatch:
@@ -12,7 +12,7 @@ jobs:
       matrix:
         node-version: [10.X, 12.X, 14.X, 16.11.X, 17.X]
         ros_distribution:
-          - foxy
+          # - foxy
           - galactic
           - humble
           - rolling
@@ -48,5 +48,5 @@ jobs:
     - name: Test rclnodejs
       shell: cmd
       run: |
-        call "c:\dev\${{ needs.identify-ros-distro.outputs.distro }}\ros2-windows\setup.bat"
+        call "c:\dev\${{ matrix.ros_distribution }}\ros2-windows\setup.bat"
         npm test
\ No newline at end of file
diff --git a/README.md b/README.md
index 0d72132c..d913ee7f 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
 # rclnodejs - ROS2 Client Library for JavaScript [![npm](https://img.shields.io/npm/v/rclnodejs.svg)](https://www.npmjs.com/package/rclnodejs)[![Coverage Status](https://coveralls.io/repos/github/RobotWebTools/rclnodejs/badge.svg?branch=develop)](https://coveralls.io/github/RobotWebTools/rclnodejs?branch=develop)[![npm](https://img.shields.io/npm/dm/rclnodejs)](https://www.npmjs.com/package/rclnodejs)[![GitHub license](https://img.shields.io/github/license/RobotWebTools/rclnodejs.svg)](https://github.com/RobotWebTools/rclnodejs/blob/develop/LICENSE)[![node](https://img.shields.io/node/v/rclnodejs.svg)](https://nodejs.org/en/download/releases/)[![npm type definitions](https://img.shields.io/npm/types/rclnodejs)](https://www.npmjs.com/package/rclnodejs)[![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier)
 
-|     **BRANCH**      |                                                                            **Linux**                                                                            |                                                                               **Windows**                                                                                |
-| :-----------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
-|       develop       |           ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/RobotWebTools/rclnodejs/rclnodejs%20-%20Linux%20Build%20and%20Test)           |               ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/RobotWebTools/rclnodejs/rclnodejs%20-%20Windows%20Build%20&%20Test)                |
-|  humble-hawksbill   |  ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/RobotWebTools/rclnodejs/rclnodejs%20-%20Linux%20Build%20and%20Test/humble-hawksbill)   |  ![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/RobotWebTools/rclnodejs/rclnodejs%20-%20Windows%20Build%20&%20Test/humble-hawksbill)   |
-| galactic-geochelone | ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/RobotWebTools/rclnodejs/rclnodejs%20-%20Linux%20Build%20and%20Test/galactic-geochelone) | ![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/RobotWebTools/rclnodejs/rclnodejs%20-%20Windows%20Build%20&%20Test/galactic-geochelone) |
-|    foxy-fitzroy     |    ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/RobotWebTools/rclnodejs/rclnodejs%20-%20Linux%20Build%20and%20Test/foxy-fitzroy)     |    ![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/RobotWebTools/rclnodejs/rclnodejs%20-%20Windows%20Build%20&%20Test/foxy-fitzroy)     |
+|     **BRANCH**      |                                                                          **Linux**                                                                           |                                                                              **Windows**                                                                              |
+| :-----------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
+|       develop       |         ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/RobotWebTools/rclnodejs/rclnodejs%20-%20Linux%20Build%20and%20Test)          |              ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/RobotWebTools/rclnodejs/rclnodejs%20-%20Windows%20Build%20&%20Test)              |
+|  humble-hawksbill   | ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/RobotWebTools/rclnodejs/rclnodejs%20-%20Linux%20Build%20and%20Test/humble-hawksbill) | ![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/RobotWebTools/rclnodejs/rclnodejs%20-%20Windows%20Build%20&%20Test/humble-hawksbill) |
+| galactic-geochelone | ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/RobotWebTools/rclnodejs/rclnodejs%20-%20Linux%20Build%20and%20Compatibility%20Test)  |     ![GitHub Workflow Status ](https://img.shields.io/github/workflow/status/RobotWebTools/rclnodejs/rclnodejs%20-%20Windows%20Build%20&%20Compatibility%20Test)      |
+|    foxy-fitzroy     | ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/RobotWebTools/rclnodejs/rclnodejs%20-%20Linux%20Build%20and%20Compatibility%20Test)  |                                         ![GitHub Workflow Status](https://img.shields.io/badge/Build-Not%20Available-yellow)                                          |
 
 **rclnodejs** is a Node.js client library for the Robot Operating System
 ([ROS 2](https://index.ros.org/doc/ros2/)). It provides a JavaScript API