diff --git a/Dockerfile b/Dockerfile
index 8fb5a03..c5f8b4a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ RUN echo "Building for ${TARGETPLATFORM}"
 
 # Install some packages that are useful within the images.
 RUN apt-get update && apt-get install -y \
-    git \
+    git gnupg \
 && rm -rf /var/lib/apt/lists/*
 
 # Install pickle as an easier alternative to PECL, that is not
diff --git a/root/tmp/setup/php-extensions.sh b/root/tmp/setup/php-extensions.sh
index 9fca0fd..8318ea0 100755
--- a/root/tmp/setup/php-extensions.sh
+++ b/root/tmp/setup/php-extensions.sh
@@ -5,7 +5,7 @@ set -e
 echo "Installing apt dependencies"
 
 # Build packages will be added during the build, but will be removed at the end.
-BUILD_PACKAGES="gettext gnupg libcurl4-openssl-dev libfreetype6-dev libicu-dev libjpeg62-turbo-dev \
+BUILD_PACKAGES="gettext libcurl4-openssl-dev libfreetype6-dev libicu-dev libjpeg62-turbo-dev \
   libldap2-dev libmariadb-dev libmemcached-dev libpng-dev libpq-dev libxml2-dev libxslt-dev \
   unixodbc-dev uuid-dev"
 
diff --git a/root/tmp/setup/sqlsrv-extension.sh b/root/tmp/setup/sqlsrv-extension.sh
index 142d2a4..8517ab0 100755
--- a/root/tmp/setup/sqlsrv-extension.sh
+++ b/root/tmp/setup/sqlsrv-extension.sh
@@ -8,17 +8,11 @@ if [[ ${TARGETPLATFORM} != "linux/amd64" ]]; then
 fi
 
 # Packages for build.
-BUILD_PACKAGES="gnupg unixodbc-dev"
+BUILD_PACKAGES="unixodbc-dev"
 
 # Packages for sqlsrv runtime.
 PACKAGES_SQLSRV=""
 
-echo "Installing apt dependencies"
-apt-get update
-apt-get install -y --no-install-recommends apt-transport-https \
-    $BUILD_PACKAGES \
-    $PACKAGES_SQLSRV
-
 # Install Microsoft dependencies for sqlsrv
 echo "Downloading sqlsrv files"
 curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
@@ -26,6 +20,11 @@ curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
 curl https://packages.microsoft.com/config/debian/10/prod.list -o /etc/apt/sources.list.d/mssql-release.list
 apt-get update
 
+echo "Installing apt dependencies"
+apt-get install -y --no-install-recommends apt-transport-https \
+    $BUILD_PACKAGES \
+    $PACKAGES_SQLSRV
+
 echo "Install msodbcsql"
 ACCEPT_EULA=Y apt-get install -y msodbcsql17