diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 7f87ab1220..7f76c331b7 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -50,8 +50,8 @@ on:
   workflow_dispatch:
     input:
       tags:
-        description: 'Test scenario tags'
-        default: 'Anything to describe this manual run (optional)'
+        description: 'Tags to label this manual run (optional)'
+        default: 'Anything to describe this manual run'
     
 
 jobs:
@@ -62,10 +62,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Use Python 3.6
+    - name: Setup Python
       uses: actions/setup-python@v2
       with:
-        python-version: 3.6
+        python-version: 3.7
     
     - name: Install dependencies (tox)
       run: |
@@ -87,7 +87,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        python: [3.6]
+        python: [3.6, 3.7]
         # different kinds of tests are located in tests/<unit|integration|smoke> folders
         test-kind: ['unit', 'smoke']
         # pytest markers configured in tox.ini. See https://docs.pytest.org/en/6.2.x/example/markers.html
@@ -95,8 +95,8 @@ jobs:
         include:
           # Integration tests need a powerful machine with more memory. GitHub-hosted agents only have 7GB memory.
           # TODO: Optimization/refactoring should be done to ensure that these test can run in the default CI agent (#1507)
-          - os: self-hosted
-            python: 3.6
+          - os: [self-hosted, Linux, nightly]
+            python: [3.6, 3.7]
             test-kind: 'integration'
             test-marker: 'not spark and not gpu'
 
@@ -136,7 +136,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         java: [8]
-        python: [3.6]
+        python: [3.6, 3.7]
         # different kinds of tests are located in tests/<unit|integration|smoke> folders
         test-kind: ['unit', 'smoke'] 
         # pytest markers configured in tox.ini. See https://docs.pytest.org/en/6.2.x/example/markers.html
@@ -144,9 +144,8 @@ jobs:
         include:
           # Integration tests need a powerful machine with more memory. GitHub-hosted agents only have 7GB memory.
           # TODO: Optimization/refactoring should be done to ensure that these test can run in the default CI agent (#1507)
-          - os: self-hosted
-            java: 8
-            python: 3.6
+          - os: [self-hosted, Linux, nightly]
+            python: [3.6, 3.7]
             test-kind: 'integration'
             test-marker: 'spark and not gpu'
 
@@ -182,11 +181,11 @@ jobs:
 ################# GPU-BUILD #################
 ###############################################
   build-gpu:
-    runs-on: [self-hosted, Linux, gpu] # this is a union of labels to select specific self-hosted machine
+    runs-on: [self-hosted, Linux, gpu, nightly] # this is a union of labels to select specific self-hosted machine
     needs: static-analysis
     strategy:
       matrix:
-        python: [3.6]
+        python: [3.6, 3.7]
         # different kinds of tests are located in tests/<unit|integration|smoke> folders
         test-kind: ['unit', 'smoke', 'integration'] 
         # pytest markers configured in tox.ini. See https://docs.pytest.org/en/6.2.x/example/markers.html
@@ -225,7 +224,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2.2.2
         with:
-          python-version: '3.6'
+          python-version: 3.7
 
       - name: Download coverage reports from all previous jobs
         uses: actions/download-artifact@v2
diff --git a/.github/workflows/pr-gate.yml b/.github/workflows/pr-gate.yml
index 16ea4111e7..fa9e16e49b 100644
--- a/.github/workflows/pr-gate.yml
+++ b/.github/workflows/pr-gate.yml
@@ -36,8 +36,8 @@ on:
   workflow_dispatch:
     input:
       tags:
-        description: 'Test scenario tags'
-        default: 'Anything to describe this manual run (optional)'
+        description: 'Tags to label this manual run (optional)'
+        default: 'Anything to describe this manual run'
 
 
 jobs:
@@ -48,10 +48,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Use Python 3.6
+    - name: Setup Python
       uses: actions/setup-python@v2
       with:
-        python-version: 3.6
+        python-version: 3.7
     
     - name: Install dependencies (tox)
       run: |
@@ -73,7 +73,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        python: [3.6]
+        python: [3.7]
         # different kinds of tests are located in tests/<unit|integration|smoke> folders
         test-kind: ['unit'] 
         # pytest markers configured in tox.ini. See https://docs.pytest.org/en/6.2.x/example/markers.html
@@ -115,7 +115,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         java: [8]
-        python: [3.6]
+        python: [3.7]
         # different kinds of tests are located in tests/<unit|integration|smoke> folders
         test-kind: ['unit'] 
         # pytest markers configured in tox.ini. See https://docs.pytest.org/en/6.2.x/example/markers.html
@@ -157,7 +157,7 @@ jobs:
     needs: static-analysis
     strategy:
       matrix:
-        python: [3.6]
+        python: [3.7]
         # different kinds of tests are located in tests/<unit|integration|smoke> folders
         test-kind: ['unit'] 
         # pytest markers configured in tox.ini. See https://docs.pytest.org/en/6.2.x/example/markers.html
@@ -196,7 +196,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2.2.2
         with:
-          python-version: '3.6'
+          python-version: 3.7
 
       - name: Download coverage reports from all previous jobs
         uses: actions/download-artifact@v2