diff --git a/1.39/apache/Dockerfile b/1.39/apache/Dockerfile
index 29f2d5b..998ba5f 100644
--- a/1.39/apache/Dockerfile
+++ b/1.39/apache/Dockerfile
@@ -15,14 +15,10 @@ RUN set -eux; \
 
 # Install the PHP extensions we need
 RUN set -eux; \
-	\
-	apt-get update; \
-	apt-get install -y --no-install-recommends \
-		liblua5.1-0 \
-	; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
 	\
+	apt-get update; \
 	apt-get install -y --no-install-recommends \
 		libicu-dev \
 		libonig-dev \
@@ -49,9 +45,9 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
 		| sort -u \
-		| xargs -r dpkg-query -S \
+		| xargs -r dpkg-query --search \
 		| cut -d: -f1 \
 		| sort -u \
 		| xargs -rt apt-mark manual; \
diff --git a/1.39/fpm/Dockerfile b/1.39/fpm/Dockerfile
index 9abe285..93d071f 100644
--- a/1.39/fpm/Dockerfile
+++ b/1.39/fpm/Dockerfile
@@ -15,14 +15,10 @@ RUN set -eux; \
 
 # Install the PHP extensions we need
 RUN set -eux; \
-	\
-	apt-get update; \
-	apt-get install -y --no-install-recommends \
-		liblua5.1-0 \
-	; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
 	\
+	apt-get update; \
 	apt-get install -y --no-install-recommends \
 		libicu-dev \
 		libonig-dev \
@@ -49,9 +45,9 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
 		| sort -u \
-		| xargs -r dpkg-query -S \
+		| xargs -r dpkg-query --search \
 		| cut -d: -f1 \
 		| sort -u \
 		| xargs -rt apt-mark manual; \
diff --git a/1.41/apache/Dockerfile b/1.41/apache/Dockerfile
index bafc103..ce8452e 100644
--- a/1.41/apache/Dockerfile
+++ b/1.41/apache/Dockerfile
@@ -15,14 +15,10 @@ RUN set -eux; \
 
 # Install the PHP extensions we need
 RUN set -eux; \
-	\
-	apt-get update; \
-	apt-get install -y --no-install-recommends \
-		liblua5.1-0 \
-	; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
 	\
+	apt-get update; \
 	apt-get install -y --no-install-recommends \
 		libicu-dev \
 		libonig-dev \
@@ -49,9 +45,9 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
 		| sort -u \
-		| xargs -r dpkg-query -S \
+		| xargs -r dpkg-query --search \
 		| cut -d: -f1 \
 		| sort -u \
 		| xargs -rt apt-mark manual; \
diff --git a/1.41/fpm/Dockerfile b/1.41/fpm/Dockerfile
index 160f464..92b2184 100644
--- a/1.41/fpm/Dockerfile
+++ b/1.41/fpm/Dockerfile
@@ -15,14 +15,10 @@ RUN set -eux; \
 
 # Install the PHP extensions we need
 RUN set -eux; \
-	\
-	apt-get update; \
-	apt-get install -y --no-install-recommends \
-		liblua5.1-0 \
-	; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
 	\
+	apt-get update; \
 	apt-get install -y --no-install-recommends \
 		libicu-dev \
 		libonig-dev \
@@ -49,9 +45,9 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
 		| sort -u \
-		| xargs -r dpkg-query -S \
+		| xargs -r dpkg-query --search \
 		| cut -d: -f1 \
 		| sort -u \
 		| xargs -rt apt-mark manual; \
diff --git a/1.42/apache/Dockerfile b/1.42/apache/Dockerfile
index 46fbed2..8ec9e20 100644
--- a/1.42/apache/Dockerfile
+++ b/1.42/apache/Dockerfile
@@ -15,14 +15,10 @@ RUN set -eux; \
 
 # Install the PHP extensions we need
 RUN set -eux; \
-	\
-	apt-get update; \
-	apt-get install -y --no-install-recommends \
-		liblua5.1-0 \
-	; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
 	\
+	apt-get update; \
 	apt-get install -y --no-install-recommends \
 		libicu-dev \
 		libonig-dev \
@@ -49,9 +45,9 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
 		| sort -u \
-		| xargs -r dpkg-query -S \
+		| xargs -r dpkg-query --search \
 		| cut -d: -f1 \
 		| sort -u \
 		| xargs -rt apt-mark manual; \
diff --git a/1.42/fpm/Dockerfile b/1.42/fpm/Dockerfile
index 21801d0..e295656 100644
--- a/1.42/fpm/Dockerfile
+++ b/1.42/fpm/Dockerfile
@@ -15,14 +15,10 @@ RUN set -eux; \
 
 # Install the PHP extensions we need
 RUN set -eux; \
-	\
-	apt-get update; \
-	apt-get install -y --no-install-recommends \
-		liblua5.1-0 \
-	; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
 	\
+	apt-get update; \
 	apt-get install -y --no-install-recommends \
 		libicu-dev \
 		libonig-dev \
@@ -49,9 +45,9 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
 		| sort -u \
-		| xargs -r dpkg-query -S \
+		| xargs -r dpkg-query --search \
 		| cut -d: -f1 \
 		| sort -u \
 		| xargs -rt apt-mark manual; \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index e6578ce..86cc900 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -15,14 +15,10 @@ RUN set -eux; \
 
 # Install the PHP extensions we need
 RUN set -eux; \
-	\
-	apt-get update; \
-	apt-get install -y --no-install-recommends \
-		liblua5.1-0 \
-	; \
 	\
 	savedAptMark="$(apt-mark showmanual)"; \
 	\
+	apt-get update; \
 	apt-get install -y --no-install-recommends \
 		libicu-dev \
 		libonig-dev \
@@ -49,9 +45,9 @@ RUN set -eux; \
 	apt-mark auto '.*' > /dev/null; \
 	apt-mark manual $savedAptMark; \
 	ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
-		| awk '/=>/ { print $3 }' \
+		| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); printf "*%s\n", so }' \
 		| sort -u \
-		| xargs -r dpkg-query -S \
+		| xargs -r dpkg-query --search \
 		| cut -d: -f1 \
 		| sort -u \
 		| xargs -rt apt-mark manual; \