diff --git a/README.md b/README.md
index 7bb7e4bd21c825b1da694c9324ec668005818e67..03fa40624ba9603959f1ae303f77d83634568d5c 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,13 @@
 ![alt text](https://www.ispconfig.org/wp-content/themes/ispconfig/images/ispconfig_logo.png "") \
 [![pipeline status](https://git.ispconfig.org/ispconfig/ispconfig-autoinstaller/badges/master/pipeline.svg)](https://git.ispconfig.org/ispconfig/ispconfig-autoinstaller/commits/master)   
 
-This script configures your server (Ubuntu 18.04, Ubuntu 20.04, Debian 9, 10 and 11 currently) following the "perfect server tutorials" from howtoforge.com and installs ISPConfig 3.2. It currently supports the x86_64 (also known as AMD64) CPU architecture only while ARM is not supported.
+This script configures your server following the "perfect server tutorials" from howtoforge.com and installs ISPConfig 3.2. It currently supports the x86_64 (also known as AMD64) CPU architecture only while ARM is not supported.
+
+## Supported distributions
+- Ubuntu 18.04, 20.04, 22.04 and 24.04.
+- Debian 9, 10, 11 and 12.
+
+A list of all supported distributions by ISPConfig itself can be found at https://www.ispconfig.org/.
 
 ## Using the script
 You can use the script with curl  
diff --git a/lib/os/class.ISPConfigBaseOS.inc.php b/lib/os/class.ISPConfigBaseOS.inc.php
index b3a48279e19ac7bcff787a1e3a75865268acefba..facd9a27d2d643850eff00f110046bac0c864c02 100644
--- a/lib/os/class.ISPConfigBaseOS.inc.php
+++ b/lib/os/class.ISPConfigBaseOS.inc.php
@@ -38,7 +38,7 @@ class ISPConfigBaseOS {
 						throw new ISPConfigOSException('Version ' . $os['VERSION_ID'] . ' is not supported for ' . $os['ID']);
 					}
 				} elseif($os['ID'] === 'ubuntu') {
-					if(!in_array($os['VERSION_ID'], array('18.04', '20.04', '22.04'))) {
+					if(!in_array($os['VERSION_ID'], array('18.04', '20.04', '22.04', '24.04'))) {
 						throw new ISPConfigOSException('Version ' . $os['VERSION_ID'] . ' is not supported for ' . $os['ID']);
 					}
 				} else {
diff --git a/lib/os/class.ISPConfigUbuntu2204OS.inc.php b/lib/os/class.ISPConfigUbuntu2204OS.inc.php
index cb292bc74ca7d60511e555be0d6984384c8cea5f..5f2abe957857d577fb427502c5414e6a65b9d35a 100644
--- a/lib/os/class.ISPConfigUbuntu2204OS.inc.php
+++ b/lib/os/class.ISPConfigUbuntu2204OS.inc.php
@@ -39,28 +39,6 @@ deb http://security.ubuntu.com/ubuntu jammy-security multiverse
 		return $packages;
 	}
 
-	protected function setDefaultPHP() {
-		ISPConfigLog::info('Setting default system PHP version.', true);
-		$cmd = 'update-alternatives --set php /usr/bin/php8.1';
-		$result = $this->exec($cmd);
-		if($result === false) {
-			throw new ISPConfigOSException('Command ' . $cmd . ' failed.');
-		}
-
-		if(ISPConfig::shallInstall('web')) {
-			// When --use-php-system is used, there is no alternative for php-fpm.sock.
-			if(ISPConfig::wantsPHP() === 'system') {
-				$cmd = 'update-alternatives --set php-cgi /usr/bin/php-cgi8.1';
-			} else {
-				$cmd = 'update-alternatives --set php-cgi /usr/bin/php-cgi8.1 ; update-alternatives --set php-fpm.sock /run/php/php8.1-fpm.sock';
-			}
-			$result = $this->exec($cmd);
-			if($result === false) {
-				throw new ISPConfigOSException('Command ' . $cmd . ' failed.');
-			}
-		}
-	}
-
 	protected function getMySQLUserQueries($mysql_root_pw) {
 		$escaped_pw = preg_replace('/[\'\\\\]/', '\\$1', $mysql_root_pw);
 		$queries = array(
@@ -76,7 +54,7 @@ deb http://security.ubuntu.com/ubuntu jammy-security multiverse
 	}
 
 	protected function installMailman($host_name) {
-		ISPConfigLog::info('ISPConfig does not yet support mailman3 and mailman2 is no longer available in Ubuntu 22.04.', true);
+		ISPConfigLog::info('ISPConfig does not yet support mailman3 and mailman2 is no longer available since Ubuntu 22.04.', true);
 		return;
 	}
 
diff --git a/lib/os/class.ISPConfigUbuntu2404OS.inc.php b/lib/os/class.ISPConfigUbuntu2404OS.inc.php
new file mode 100644
index 0000000000000000000000000000000000000000..256d5e450f58584bb305c2db1a200087c8269f1a
--- /dev/null
+++ b/lib/os/class.ISPConfigUbuntu2404OS.inc.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Description of class
+ *
+ * @author croydon
+ */
+class ISPConfigUbuntu2404OS extends ISPConfigUbuntu2204OS {
+
+	protected function configureApt() {
+		// enable contrib and non-free
+		ISPConfigLog::info('Configuring apt repositories.', true);
+
+		$contents = '# created by ISPConfig auto installer
+deb http://archive.ubuntu.com/ubuntu/ noble main restricted
+deb http://archive.ubuntu.com/ubuntu/ noble-updates main restricted
+deb http://archive.ubuntu.com/ubuntu/ noble universe
+deb http://archive.ubuntu.com/ubuntu/ noble-updates universe
+deb http://archive.ubuntu.com/ubuntu/ noble multiverse
+deb http://archive.ubuntu.com/ubuntu/ noble-updates multiverse
+deb http://archive.ubuntu.com/ubuntu/ noble-backports main restricted universe multiverse
+deb http://security.ubuntu.com/ubuntu noble-security main restricted
+deb http://security.ubuntu.com/ubuntu noble-security universe
+deb http://security.ubuntu.com/ubuntu noble-security multiverse
+		';
+		file_put_contents('/etc/apt/sources.list', $contents);
+	}
+
+	protected function getSystemPHPVersion() {
+		return '8.3';
+	}
+
+}