diff --git a/.github/actions/setup-postgres-linux/action.yml b/.github/actions/setup-postgres-linux/action.yml
index e0f9f542..45d54311 100644
--- a/.github/actions/setup-postgres-linux/action.yml
+++ b/.github/actions/setup-postgres-linux/action.yml
@@ -6,9 +6,10 @@ runs:
   steps:
 
     - name: Start postgres service
-      run: |
-        sudo systemctl start postgresql.service
-        pg_isready
-        ./setup_postgres_linux.sh
+      run: sudo systemctl start postgresql.service && pg_isready
+      shell: bash
+
+    - name: Start postgres service
+      run: sudo -u postgres bash ./setup_postgres_linux.sh
       shell: bash
       working-directory: ./.github/scripts
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 4ada48d3..cf25b1c1 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -18,7 +18,7 @@ concurrency:
 jobs:
   integration:
     name: Python ${{ matrix.python-version }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     timeout-minutes: 30
 
     strategy: