diff --git a/doc/docker/fpm/Dockerfile b/doc/docker/fpm/Dockerfile
index 8ba24b726f..fca1526dab 100644
--- a/doc/docker/fpm/Dockerfile
+++ b/doc/docker/fpm/Dockerfile
@@ -68,8 +68,8 @@ else \
 fi; \
 rm composer-setup.php; \
 exit $RESULT' \
-	# build EGroupware
-	&& composer.phar self-update 1.10.22 \
+	# build EGroupware (Horde using a PEAR repo requires Composer v1)
+	&& composer.phar self-update --1 \
 	&& cd /usr/share \
 	&& [ $PHP_VERSION = "8.0" ] && COMPOSER_EXTRA=--ignore-platform-reqs || true \
 	&& composer.phar create-project $COMPOSER_EXTRA --prefer-dist --no-scripts --no-dev egroupware/egroupware:$VERSION \
diff --git a/doc/rpm-build/checkout-build-archives.php b/doc/rpm-build/checkout-build-archives.php
index 096756f1d0..99d4098783 100755
--- a/doc/rpm-build/checkout-build-archives.php
+++ b/doc/rpm-build/checkout-build-archives.php
@@ -359,11 +359,13 @@ function do_tag()
 	update_composer_json_version($config['tag']);
 	// might require more then one run, as pushed tags need to be picked up by packagist
 	$output = $ret = null;
-	$timeout = $retries = 10;
+	$timeout = 30;
+    $try = 0;
 	$cmd = $config['composer'].' update --ignore-platform-reqs --no-dev egroupware/\*';
-	for($try=1; $try <= $retries && run_cmd($cmd, $output, $try < $retries ? 2 : null); ++$try)
+	while(run_cmd($cmd, $output, 2))
 	{
-		error_log("Retry $try/$retries in $timeout seconds ...");
+        ++$try;
+		error_log("$try. retry in $timeout seconds ...");
 		sleep($timeout);
 	}
 	run_cmd($config['git'].' commit -m '.escapeshellarg('Updating dependencies for '.$config['tag']).' composer.{json,lock}');