diff --git a/.github/workflows/moodle-ci.yml b/.github/workflows/moodle-ci.yml
index b411de4..bcddb0a 100644
--- a/.github/workflows/moodle-ci.yml
+++ b/.github/workflows/moodle-ci.yml
@@ -15,13 +15,8 @@ jobs:
 
     steps:
       - name: Start PostgreSQL
-        if: matrix.database == 'pgsql' && matrix.moodle-branch != 'master'
         run: docker run -p 5432:5432 -e POSTGRES_USER=postgres -e POSTGRES_HOST_AUTH_METHOD=trust -d postgres:9.6
 
-      - name: Start PostgreSQL
-        if: matrix.database == 'pgsql' && matrix.moodle-branch == 'master'
-        run: docker run -p 5432:5432 -e POSTGRES_USER=postgres -e POSTGRES_HOST_AUTH_METHOD=trust -d postgres:10
-
       - name: Check out repository code
         uses: actions/checkout@v2
         with:
@@ -119,9 +114,13 @@ jobs:
         run: docker run -p 3306:3306 -e MYSQL_USER=root -e MYSQL_ALLOW_EMPTY_PASSWORD=true -d mariadb:10.5
 
       - name: Start PostgreSQL
-        if: matrix.database == 'pgsql'
+        if: matrix.database == 'pgsql' && matrix.moodle-branch != 'master'
         run: docker run -p 5432:5432 -e POSTGRES_USER=postgres -e POSTGRES_HOST_AUTH_METHOD=trust -d postgres:9.6
 
+      - name: Start PostgreSQL
+        if: matrix.database == 'pgsql' && matrix.moodle-branch == 'master'
+        run: docker run -p 5432:5432 -e POSTGRES_USER=postgres -e POSTGRES_HOST_AUTH_METHOD=trust -d postgres:10
+
       - name: Check out opencast-docker
         uses: actions/checkout@v2
         with: