diff --git a/install-php-extensions b/install-php-extensions
index 310d82f..5b8e11c 100755
--- a/install-php-extensions
+++ b/install-php-extensions
@@ -206,7 +206,7 @@ buildRequiredPackageLists () {
 				buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libbz2-dev"
 				;;
 			cmark@alpine)
-				buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile $PHPIZE_DEPS"
+				buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile $PHPIZE_DEPS cmake"
 				;;
 			cmark@debian)
 				buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile cmake"
@@ -461,29 +461,60 @@ buildRequiredPackageLists () {
 				buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile tidyhtml-dev"
 				;;
 			tidy@debian)
-				buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libtidy5"
+				buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libtidy5*"
 				buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libtidy-dev"
 				;;
 			timezonedb@alpine)
 				buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile $PHPIZE_DEPS"
 				;;
+			uopz@alpine)
+				buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile $PHPIZE_DEPS"
+				;;
+			uuid@alpine)
+				buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libuuid"
+				buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile $PHPIZE_DEPS util-linux-dev"
+				;;
 			uuid@debian)
 				buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile uuid-dev"
 				;;
+			wddx@alpine)
+				buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libxml2-dev"
+				;;
 			wddx@debian)
 				buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libxml2-dev"
 				;;
+			xdebug@alpine)
+				buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile $PHPIZE_DEPS"
+				;;
+			xmlrpc@alpine)
+				buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libxml2-dev"
+				;;
 			xmlrpc@debian)
 				buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libxml2-dev"
 				;;
-			xsl@debian)
+			xsl@alpine)
+				buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libxslt"
 				buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libxslt-dev"
 				;;
+			xsl@debian)
+				buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libxslt1.1"
+				buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libxslt-dev"
+				;;
+			yaml@alpine)
+				buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent $PHPIZE_DEPS yaml"
+				buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile $PHPIZE_DEPS yaml-dev"
+				;;
 			yaml@debian)
+				buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libyaml-0-2"
 				buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile libyaml-dev"
 				;;
+			zip@alpine)
+				buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libzip"
+				buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile $PHPIZE_DEPS cmake gnutls-dev libzip-dev openssl-dev zlib-dev"
+				;;
 			zip@debian)
-				buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile cmake zlib1g-dev libbz2-dev libmbedtls-dev"
+				buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libzip4 libmbedtls1?"
+				buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile cmake gnutls-dev libssl-dev libzip-dev libbz2-dev libmbedtls-dev zlib1g-dev"
 				;;
 		esac
 	done
@@ -683,12 +714,6 @@ installBundledModule () {
 			esac
 			;;
 		zip)
-			libZipSrc="$(getPackageSource https://libzip.org/download/libzip-1.5.2.tar.gz)"
-			mkdir "$libZipSrc/build"
-			cd "$libZipSrc/build"
-			cmake ..
-			make -j$(nproc) install
-			cd -
 			if test $1 -le 703; then
 				docker-php-ext-configure zip --with-libzip
 			else
@@ -837,17 +862,22 @@ installPECLModule () {
 				installPECLModule_actual='https://pecl.php.net/get/ssh2'
 			fi
 			;;
+		uuid)
+			if test $1 -le 506; then
+				installPECLModule_actual="$2-1.0.5"
+			fi
+			;;
 		xdebug)
-			if test $1 -lt 501; then
+			if test $1 -le 500; then
 				installPECLModule_actual="$2-2.0.5"
-			elif test $1 -lt 504; then
+			elif test $1 -le 503; then
 				installPECLModule_actual="$2-2.2.7"
-			elif test $1 -lt 505; then
+			elif test $1 -le 504; then
 				installPECLModule_actual="$2-2.4.1"
-			elif test $1 -lt 700; then
+			elif test $1 -le 506; then
 				installPECLModule_actual="$2-2.5.5"
-			elif test $1 -ge 704; then
-				installPECLModule_actual="$2-2.8.0beta2"
+			elif test $1 -le 700; then
+				installPECLModule_actual="$2-2.6.1"
 			fi
 			;;
 		uopz)