diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5e484e388..4621065c9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,10 +7,9 @@ on:
 
 jobs:
   build:
-    runs-on: ${{ matrix.operating-system }}
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        operating-system: [ ubuntu-16.04 ]
         php: [ '7.0', '7.1', '7.2', '7.3', '7.4', '8.0' ]
     
     name: PHP ${{ matrix.php }}
@@ -18,21 +17,20 @@ jobs:
     - uses: actions/checkout@v2
     - name: Setup PHP
       uses: nanasess/setup-php@master
-      if: matrix.php != '7.4'
       with:
         php-version: ${{ matrix.php }}
     
     - name: Start MySQL
-      if: matrix.php != '8.0'
       run: sudo systemctl start mysql.service
     
     - name: Create database
-      if: matrix.php != '8.0'
       run: mysql -uroot -proot -e "CREATE DATABASE rhymix CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci"
     
     - name: Create user and set privileges
-      if: matrix.php != '8.0'
       run: mysql -uroot -proot -e "create user 'travis'@'localhost' identified by 'travis'; FLUSH PRIVILEGES" && mysql -uroot -proot -e "GRANT ALL PRIVILEGES ON rhymix.* TO travis@localhost"
+
+    - name: PHP Lint
+      run: if find . -name "*.php" ! -path "./vendor/*" -print0 | xargs -0 -n 1 -P 8 php -l | grep -v "No syntax errors detected"; then exit 1; fi
     
     - name: Download codeception
       if: matrix.php != '8.0'
@@ -41,9 +39,6 @@ jobs:
     - name: Run PHP development server
       if: matrix.php != '8.0'
       run: php -S localhost:8000 &
-
-    - name: PHP Lint
-      run: if find . -name "*.php" ! -path "./vendor/*" -print0 | xargs -0 -n 1 -P 8 php -l | grep -v "No syntax errors detected"; then exit 1; fi
     
     - name: Build and run codeception
       if: matrix.php != '8.0'