diff --git a/.github/workflows/e2e-suite.yml b/.github/workflows/e2e-suite.yml
index 8187c71f5..d28252eb4 100644
--- a/.github/workflows/e2e-suite.yml
+++ b/.github/workflows/e2e-suite.yml
@@ -17,11 +17,27 @@ on:
       pull_request_number:
         description: 'The number of the PR. Ensure sha value is provided'
         required: false
+      python-version:
+        description: 'Specify Python version to use'
+        required: false
+      run-eol-python-version:
+        description: 'Run EOL python version?'
+        required: false
+        default: 'false'
+        type: choice
+        options:
+          - 'true'
+          - 'false'
   push:
     branches:
       - main
       - dev
 
+env:
+  DEFAULT_PYTHON_VERSION: "3.10"
+  EOL_PYTHON_VERSION: "3.8"
+  EXIT_STATUS: 0
+
 jobs:
   integration_tests:
     name: Run integration tests on Ubuntu
@@ -74,7 +90,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.x'
+          python-version: ${{ inputs.run-eol-python-version == 'true' && env.EOL_PYTHON_VERSION || inputs.python-version || env.DEFAULT_PYTHON_VERSION }}
 
       - name: Install Python dependencies and update cert
         run: |
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index e4119a022..c4b5890ae 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -6,6 +6,9 @@ on:
 jobs:
   unit-tests-on-ubuntu:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [ '3.9','3.10','3.11', '3.12' ]
     steps:
       - name: Clone Repository
         uses: actions/checkout@v3
@@ -14,9 +17,9 @@ jobs:
         run: sudo apt-get update -y
 
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          python-version: '3.x'
+          python-version: ${{ matrix.python-version }}
 
       - name: Install Python wheel
         run: pip install wheel boto3