diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 18e41c36b..ba6f09e71 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -83,7 +83,7 @@ jobs:
 
     services:
       mysql:
-        image: mariadb
+        image: mariadb:10.5
         ports:
           - 4444:3306/tcp
         env:
diff --git a/lib/BackgroundJob/EmailNotification.php b/lib/BackgroundJob/EmailNotification.php
index 1ad48c62e..5ae43060a 100644
--- a/lib/BackgroundJob/EmailNotification.php
+++ b/lib/BackgroundJob/EmailNotification.php
@@ -39,14 +39,10 @@ class EmailNotification extends TimedJob {
 	/** @var bool */
 	protected $isCLI;
 
-	/**
-	 * @param MailQueueHandler $mailQueueHandler
-	 * @param bool $isCLI
-	 */
 	public function __construct(MailQueueHandler $mailQueueHandler,
-								$isCLI) {
-		// Run all 15 Minutes
-		$this->setInterval(15 * 60);
+								bool $isCLI) {
+		// Run everytime cron is executed, so the batching doesn't delay too much
+		$this->setInterval(1);
 
 		$this->queueHandler = $mailQueueHandler;
 		$this->isCLI = $isCLI;