diff --git a/.github/jobs/baseinstall.sh b/.github/jobs/baseinstall.sh
index 55fdf0ccf2..5cb3d19d8e 100755
--- a/.github/jobs/baseinstall.sh
+++ b/.github/jobs/baseinstall.sh
@@ -94,10 +94,12 @@ for service in nginx php${PHPVERSION}-fpm; do
 done
 section_end
 
-if [ "${db}" = "install" ]; then
-    section_start "Install the example data"
-    /opt/domjudge/domserver/bin/dj_setup_database -uroot -proot install-examples | tee -a "$ARTIFACTS/mysql.txt"
-    section_end
+if [ "${db}" != "none" ]; then
+    if [ "${db}" = "install" ]; then
+        section_start "Install the example data"
+        /opt/domjudge/domserver/bin/dj_setup_database -uroot -proot install-examples | tee -a "$ARTIFACTS/mysql.txt"
+        section_end
+    fi
 fi
 
 section_start "Setup user"
diff --git a/.github/jobs/upgradeinstall.sh b/.github/jobs/upgradeinstall.sh
deleted file mode 100755
index a107a856f0..0000000000
--- a/.github/jobs/upgradeinstall.sh
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/sh
-
-. .github/jobs/ci_settings.sh
-
-export version="$1"
-db=${2:-install}
-
-set -eux
-
-PHPVERSION=$(php -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION."\n";')
-export PHPVERSION
-
-section_start "Run composer"
-export APP_ENV="dev"
-cd webapp
-composer install --no-scripts |tee "$ARTIFACTS"/composer_out.txt
-cd ..
-section_end
-
-section_start "Set simple admin password"
-echo "password" > ./etc/initial_admin_password.secret
-echo "default login admin password password" > ~/.netrc
-section_end
-
-section_start "Install domserver"
-make configure
-./configure \
-  --with-baseurl='https://localhost/domjudge/' \
-  --with-domjudge-user=root \
-  --enable-doc-build=no \
-  --enable-judgehost-build=no | tee "$ARTIFACTS"/configure.txt
-
-make domserver
-make install-domserver
-section_end
-
-section_start "SQL settings"
-cat > ~/.my.cnf <<EOF
-[client]
-host=sqlserver
-user=root
-password=root
-EOF
-cat ~/.my.cnf
-
-mysql_root "CREATE DATABASE IF NOT EXISTS \`domjudge\` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;"
-mysql_root "CREATE USER IF NOT EXISTS \`domjudge\`@'%' IDENTIFIED BY 'domjudge';"
-mysql_root "GRANT SELECT, INSERT, UPDATE, DELETE ON \`domjudge\`.* TO 'domjudge'@'%';"
-mysql_root "FLUSH PRIVILEGES;"
-
-# Show some MySQL debugging
-mysql_root "show databases"
-mysql_root "SELECT CURRENT_USER();"
-mysql_root "SELECT USER();"
-mysql_root "SELECT user,host FROM mysql.user"
-echo "unused:sqlserver:domjudge:domjudge:domjudge:3306" > /opt/domjudge/domserver/etc/dbpasswords.secret
-mysql_user "SELECT CURRENT_USER();"
-mysql_user "SELECT USER();"
-section_end
-
-section_start "Install DOMjudge database"
-/opt/domjudge/domserver/bin/dj_setup_database -uroot -proot upgrade
-section_end
-
-section_start "Show PHP config"
-php -v | tee -a "$ARTIFACTS"/php.txt
-php -m | tee -a "$ARTIFACTS"/php.txt
-section_end
-
-section_start "Show general config"
-printenv | tee -a "$ARTIFACTS"/environment.txt
-cp /etc/os-release "$ARTIFACTS"/os-release.txt
-cp /proc/cmdline "$ARTIFACTS"/cmdline.txt
-section_end
-
-section_start "Setup webserver"
-cp /opt/domjudge/domserver/etc/domjudge-fpm.conf /etc/php/"$PHPVERSION"/fpm/pool.d/domjudge.conf
-
-rm -f /etc/nginx/sites-enabled/*
-cp /opt/domjudge/domserver/etc/nginx-conf /etc/nginx/sites-enabled/domjudge
-
-openssl req -nodes -new -x509 -keyout /tmp/server.key -out /tmp/server.crt -subj "/C=NL/ST=Noord-Holland/L=Amsterdam/O=TestingForPR/CN=localhost"
-cp /tmp/server.crt /usr/local/share/ca-certificates/
-update-ca-certificates
-# shellcheck disable=SC2002
-cat "$(pwd)/.github/jobs/data/nginx_extra" | tee -a /etc/nginx/sites-enabled/domjudge
-nginx -t
-section_end
-
-section_start "Show webserver is up"
-for service in nginx php${PHPVERSION}-fpm; do
-    service "$service" restart
-    service "$service" status
-done
-section_end
-
-if [ "${db}" = "install" ]; then
-    section_start "Install the example data"
-    /opt/domjudge/domserver/bin/dj_setup_database -uroot -proot install-examples | tee -a "$ARTIFACTS/mysql.txt"
-    section_end
-fi
-
-section_start "Setup user"
-# We're using the admin user in all possible roles
-mysql_root "DELETE FROM userrole WHERE userid=1;" domjudge
-if [ "$version" = "team" ]; then
-    # Add team to admin user
-    mysql_root "INSERT INTO userrole (userid, roleid) VALUES (1, 3);" domjudge
-    mysql_root "UPDATE user SET teamid = 1 WHERE userid = 1;" domjudge
-elif [ "$version" = "jury" ]; then
-    # Add jury to admin user
-    mysql_root "INSERT INTO userrole (userid, roleid) VALUES (1, 2);" domjudge
-elif [ "$version" = "balloon" ]; then
-    # Add balloon to admin user
-    mysql_root "INSERT INTO userrole (userid, roleid) VALUES (1, 4);" domjudge
-elif [ "$version" = "admin" ]; then
-    # Add admin to admin user
-    mysql_root "INSERT INTO userrole (userid, roleid) VALUES (1, 1);" domjudge
-fi
-section_end
-
diff --git a/.github/workflows/database-upgrade.yml b/.github/workflows/database-upgrade.yml
index 6b5b41df94..0666d4322d 100644
--- a/.github/workflows/database-upgrade.yml
+++ b/.github/workflows/database-upgrade.yml
@@ -44,7 +44,7 @@ jobs:
 
 
       - name: Install DOMjudge
-        run: .github/jobs/upgradeinstall.sh
+        run: .github/jobs/baseinstall.sh default none
 
       - name: Check for Errors in the Upgrade
         run: |