diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 24b4c530dad..6ee30637973 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -12,225 +12,73 @@ env:
   FLWR_TELEMETRY_ENABLED: 0
 
 jobs:
-  pytorch:
+  e2e:
     runs-on: ubuntu-22.04
     timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@v3
-      - name: Bootstrap
-        uses: ./.github/actions/bootstrap
-      - name: Install dependencies
-        run: |
-          cd e2e/pytorch
-          python -m poetry install
-      - name: Download Datasets
-        run: |
-          cd e2e/pytorch
-          python -c "from torchvision.datasets import CIFAR10; CIFAR10('./data', download=True)"
-      - name: Run edge client test
-        run: |
-          cd e2e/pytorch
-          ./test.sh
-      - name: Run virtual client test
-        run: |
-          cd e2e/pytorch
-          python simulation.py
+    # Using approach described here:
+    # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs
+    strategy:
+      matrix:
+        include:
+          - directory: bare
 
-  # tensorflow:
-  #   runs-on: ubuntu-22.04
-  #   timeout-minutes: 10
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - name: Bootstrap
-  #       uses: ./.github/actions/bootstrap
-  #     - name: Install dependencies
-  #       run: |
-  #         cd e2e/tensorflow
-  #         python -m poetry install
-  #     - name: Download Datasets
-  #       run: |
-  #         python -c "import tensorflow as tf; tf.keras.datasets.cifar10.load_data()"
-  #     - name: Run edge client test
-  #       run: |
-  #         cd e2e/tensorflow
-  #         ./test.sh
-  #     - name: Run virtual client test
-  #       run: |
-  #         cd e2e/tensorflow
-  #         python simulation.py
+          - directory: jax
 
-  # bare:
-  #   runs-on: ubuntu-22.04
-  #   timeout-minutes: 10
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - name: Bootstrap
-  #       uses: ./.github/actions/bootstrap
-  #     - name: Install dependencies
-  #       run: |
-  #         cd e2e/bare
-  #         python -m poetry install
-  #     - name: Run edge client test
-  #       run: |
-  #         cd e2e/bare
-  #         ./test.sh
-  #     - name: Run virtual client test
-  #       run: |
-  #         cd e2e/bare
-  #         python simulation.py
+          - directory: pytorch
+            dataset: |
+              from torchvision.datasets import CIFAR10
+              CIFAR10('./data', download=True)
 
-  # pandas:
-  #   runs-on: ubuntu-22.04
-  #   timeout-minutes: 10
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - name: Bootstrap
-  #       uses: ./.github/actions/bootstrap
-  #       with:
-  #         python-version: 3.8
-  #     - name: Install dependencies
-  #       run: |
-  #         cd e2e/pandas
-  #         python -m poetry install
-  #     - name: Download Datasets
-  #       run: |
-  #         cd e2e/pandas
-  #         mkdir -p data
-  #         python -c "from sklearn.datasets import load_iris; load_iris(as_frame=True)['data'].to_csv('./data/client.csv')"
-  #     - name: Run edge client test
-  #       run: |
-  #         cd e2e/pandas
-  #         ./test.sh
-  #     - name: Run virtual client test
-  #       run: |
-  #         cd e2e/pandas
-  #         python simulation.py
+          - directory: tensorflow
+            dataset: |
+              import tensorflow as tf
+              tf.keras.datasets.cifar10.load_data()
 
-  # jax:
-  #   runs-on: ubuntu-22.04
-  #   timeout-minutes: 10
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - name: Bootstrap
-  #       uses: ./.github/actions/bootstrap
-  #       with:
-  #         python-version: 3.8
-  #     - name: Install dependencies
-  #       run: |
-  #         cd e2e/jax
-  #         python -m poetry install
-  #     - name: Run edge client test
-  #       run: |
-  #         cd e2e/jax
-  #         ./test.sh
-  #     - name: Run virtual client test
-  #       run: |
-  #         cd e2e/jax
-  #         python simulation.py
+          - directory: opacus
+            dataset: |
+              from torchvision.datasets import CIFAR10
+              CIFAR10('./data', download=True)
 
+          - directory: mxnet
+            dataset: |
+              import mxnet as mx
+              mx.test_utils.get_mnist()
 
+          - directory: scikit-learn
+            dataset: |
+              import openml
+              openml.datasets.get_dataset(554)
 
-  # mxnet:
-  #   runs-on: ubuntu-22.04
-  #   timeout-minutes: 10
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - name: Bootstrap
-  #       uses: ./.github/actions/bootstrap
-  #       with:
-  #         python-version: 3.8
-  #     - name: Install dependencies
-  #       run: |
-  #         cd e2e/mxnet
-  #         python -m poetry install
-  #     - name: Download Datasets
-  #       run: |
-  #         cd e2e/mxnet
-  #         python -c "import mxnet as mx; mx.test_utils.get_mnist()"
-  #     - name: Run edge client test
-  #       run: |
-  #         cd e2e/mxnet
-  #         ./test.sh
-  #     - name: Run virtual client test
-  #       run: |
-  #         cd e2e/mxnet
-  #         python simulation.py
+          - directory: fastai
+            dataset: |
+              from fastai.vision.all import untar_data, URLs
+              untar_data(URLs.MNIST) 
 
-  # scikit:
-  #   runs-on: ubuntu-22.04
-  #   timeout-minutes: 10
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - name: Bootstrap
-  #       uses: ./.github/actions/bootstrap
-  #       with:
-  #         python-version: 3.8
-  #     - name: Install dependencies
-  #       run: |
-  #         cd e2e/scikit-learn
-  #         python -m poetry install
-  #     - name: Download Datasets
-  #       run: |
-  #         cd e2e/scikit-learn
-  #         python -c "import openml; openml.datasets.get_dataset(554)"
-  #     - name: Run edge client test
-  #       run: |
-  #         cd e2e/scikit-learn
-  #         ./test.sh
-  #     - name: Run virtual client test
-  #       run: |
-  #         cd e2e/scikit-learn
-  #         python simulation.py
+          - directory: pandas
+            dataset: |
+              from pathlib import Path
+              from sklearn.datasets import load_iris
+              Path('data').mkdir(exist_ok=True)
+              load_iris(as_frame=True)['data'].to_csv('./data/client.csv')
 
+    name: ${{matrix.directory}}
 
-  # opacus:
-  #   runs-on: ubuntu-22.04
-  #   timeout-minutes: 10
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - name: Bootstrap
-  #       uses: ./.github/actions/bootstrap
-  #       with:
-  #         python-version: 3.8
-  #     - name: Install dependencies
-  #       run: |
-  #         cd e2e/opacus
-  #         python -m poetry install
-  #     - name: Download Datasets
-  #       run: |
-  #         cd e2e/opacus
-  #         python -c "from torchvision.datasets import CIFAR10; CIFAR10('./data', download=True)"
-  #     - name: Run edge client test
-  #       run: |
-  #         cd e2e/opacus
-  #         ./test.sh
-  #     - name: Run virtual client test
-  #       run: |
-  #         cd e2e/opacus
-  #         python simulation.py
+    defaults:
+      run:
+        working-directory: e2e/${{ matrix.directory }}
 
-  # fastai:
-  #   runs-on: ubuntu-22.04
-  #   timeout-minutes: 10
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #     - name: Bootstrap
-  #       uses: ./.github/actions/bootstrap
-  #       with:
-  #         python-version: 3.8
-  #     - name: Install dependencies
-  #       run: |
-  #         cd e2e/fastai
-  #         python -m poetry install
-  #     - name: Download Datasets
-  #       run: |
-  #         cd e2e/fastai
-  #         python -c "from fastai.vision.all import *; untar_data(URLs.MNIST)"
-  #     - name: Run edge client test
-  #       run: |
-  #         cd e2e/fastai
-  #         ./test.sh
-  #     - name: Run virtual client test
-  #       run: |
-  #         cd e2e/fastai
-  #         python simulation.py
+    steps:
+      - uses: actions/checkout@v3
+      - name: Bootstrap
+        uses: ./.github/actions/bootstrap
+        with:
+          python-version: 3.8
+      - name: Install dependencies
+        run: python -m poetry install
+      - name: Download dataset
+        if: ${{matrix.dataset}}
+        run: python -c "${{ matrix.dataset }}"
+      - name: Run edge client test
+        run: ./test.sh
+      - name: Run virtual client test
+        run: python simulation.py