diff --git a/.azure-pipelines/templates/jobs/packaging-jobs.yml b/.azure-pipelines/templates/jobs/packaging-jobs.yml
index 291cd3594..07ec4c56a 100644
--- a/.azure-pipelines/templates/jobs/packaging-jobs.yml
+++ b/.azure-pipelines/templates/jobs/packaging-jobs.yml
@@ -67,6 +67,7 @@ jobs:
       - script: |
           sudo apt-get update
           sudo apt-get install -y --no-install-recommends snapd
+          sudo snap install --classic snapcraft
         displayName: Install dependencies
       - task: DownloadSecureFile@1
         name: snapcraftCfg
@@ -92,6 +93,7 @@ jobs:
       - script: |
           sudo apt-get update
           sudo apt-get install -y --no-install-recommends snapd
+          sudo snap install --classic snapcraft
         displayName: Install dependencies
       - task: DownloadSecureFile@1
         name: snapcraftCfg
diff --git a/tools/snap/build_dns_remote.sh b/tools/snap/build_dns_remote.sh
index 9f5ec735f..a3cf8c8ac 100755
--- a/tools/snap/build_dns_remote.sh
+++ b/tools/snap/build_dns_remote.sh
@@ -18,7 +18,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 CERTBOT_DIR="$(dirname "$(dirname "${DIR}")")"
 
 if [[ "${DNS_PLUGINS}" = "ALL" ]]; then
-    DNS_PLUGINS=$(find . -maxdepth 1 -type d -name "${CERTBOT_DIR}/certbot-dns-*" -exec basename {} \; | paste -sd "," -)
+    DNS_PLUGINS=$(find ${CERTBOT_DIR} -maxdepth 1 -type d -name "certbot-dns-*" -exec basename {} \; | paste -sd "," -)
 fi
 
 trap popd EXIT