diff --git a/.github/actions/build-and-serve-components-testapp/action.yaml b/.github/actions/build-and-serve-components-testapp/action.yaml
new file mode 100644
index 00000000..e6f9d0eb
--- /dev/null
+++ b/.github/actions/build-and-serve-components-testapp/action.yaml
@@ -0,0 +1,26 @@
+name: 'Build and Serve openvidu-components-angular Testapp'
+description: 'Setup and serve openvidu-components-angular Testapp'
+runs:
+  using: 'composite'
+  steps:
+    - name: Install dependencies
+      run: |
+        cd openvidu-components-angular
+        npm install
+      shell: bash
+    - name: Build openvidu-components-angular
+      run: npm run lib:build --prefix openvidu-components-angular
+      shell: bash
+    - name: Build openvidu-components-angular Testapp
+      run: npm run build --prefix openvidu-components-angular
+      shell: bash
+    - name: Serve openvidu-components-angular Testapp
+      run: npm run start --prefix openvidu-components-angular &
+      shell: bash
+    - name: Wait for openvidu-components-angular Testapp
+      run: |
+        until curl -s -f -o /dev/null http://localhost:4200; do
+          echo "Waiting for openvidu-components-angular Testapp to be ready..."
+          sleep 5
+        done
+      shell: bash
diff --git a/.github/workflows/openvidu-components-angular-tests.yml b/.github/workflows/openvidu-components-angular-tests.yml
index 0a81cdd0..d9024f07 100644
--- a/.github/workflows/openvidu-components-angular-tests.yml
+++ b/.github/workflows/openvidu-components-angular-tests.yml
@@ -72,12 +72,8 @@ jobs:
         run: |
           cd openvidu-components-angular
           npm install
-      - name: Build openvidu-components-angular
-        run: npm run lib:build --prefix openvidu-components-angular
-      - name: Build openvidu-components-angular Testapp
-        run: npm run build --prefix openvidu-components-angular
-      - name: Serve openvidu-components-angular Testapp
-        run: npm run start --prefix openvidu-components-angular &
+      - name: Build and Serve openvidu-components-angular Testapp
+        uses: ./.github/actions/build-and-serve-components-testapp
       - name: Wait for openvidu-components-angular Testapp
         run: |
           until curl -s -f -o /dev/null http://localhost:4200; do
@@ -144,12 +140,8 @@ jobs:
         run: |
           cd openvidu-components-angular
           npm install
-      - name: Build openvidu-components-angular
-        run: npm run lib:build --prefix openvidu-components-angular
-      - name: Build openvidu-components-angular Testapp
-        run: npm run build --prefix openvidu-components-angular
-      - name: Serve openvidu-components-angular Testapp
-        run: npm run start --prefix openvidu-components-angular &
+      - name: Build and Serve openvidu-components-angular Testapp
+        uses: ./.github/actions/build-and-serve-components-testapp
       - name: Wait for openvidu-components-angular Testapp
         run: |
           until curl -s -f -o /dev/null http://localhost:4200; do