diff --git a/build.xml b/build.xml
index af197c585..3c48c9c24 100644
--- a/build.xml
+++ b/build.xml
@@ -16,7 +16,7 @@
 	<propertyregex property="shortversion" subject="${version} kk" pattern="([56])\.([0-9]).*" replace="seeddms$1$2x" override="true"/>
 	<property name="majorversion" value="${version}" />
 	<propertyregex property="majorversion" subject="${version}" pattern="([56])\..*" replace="$1" override="true"/>
-  <property name="composer_version" value="2.2.22" />
+  <property name="composer_version" value="2.8.5" />
   <property name="composer_extra_params" value="" />
   <property name="composer_env" value="" />
 	<property name="mink_driver" value="chrome" />
@@ -73,8 +73,13 @@
       <then>
         <httpget url="https://getcomposer.org/composer-2.phar" sslVerifyPeer="false" dir="${srcdir}" filename="composer.phar" />
       </then>
-      <else>
-        <httpget url="https://getcomposer.org/download/${composer_version}/composer.phar" sslVerifyPeer="false" dir="${srcdir}" />
+			<else>
+				<if>
+					<not><available file="composer.phar" /></not>
+					<then>
+						<httpget url="https://getcomposer.org/download/${composer_version}/composer.phar" sslVerifyPeer="false" dir="${srcdir}" />
+					</then>
+				</if>
       </else>
     </if>
     <echo message="Installing dependencies..." />
diff --git a/composer-dist.json b/composer-dist.json
index 982784871..45d43ae3f 100644
--- a/composer-dist.json
+++ b/composer-dist.json
@@ -6,20 +6,21 @@
     },
     "require": {
         "robthree/twofactorauth": "^1.5",
-        "sabre/dav": "^4.",
-        "sabre/xml": "*",
         "slim/slim": "^4.0",
         "guzzlehttp/psr7": "*",
         "erusev/parsedown": "*",
         "erusev/parsedown-extra": "*",
         "mibe/feedwriter": "^1.1",
         "phpoffice/phpspreadsheet": "*",
+        "sabre/xml": "*",
+        "sabre/dav": "^4.",
         "pear/log": "*",
         "pear/mail": "*",
         "pear/mail_mime": "*",
         "pear/net_smtp": "*",
         "pear/auth_sasl": "*",
         "pear/db": "*",
+        "dragonmantank/cron-expression": "^3.1",
         "alecrabbit/php-console-colour": "*",
         "dragonmantank/cron-expression": "^3",
         "zf1/zend-search-lucene": "*",