diff --git a/generate/definitions/VARIANTS.ps1 b/generate/definitions/VARIANTS.ps1
index 26ec869..237e470 100644
--- a/generate/definitions/VARIANTS.ps1
+++ b/generate/definitions/VARIANTS.ps1
@@ -76,3 +76,152 @@ $VARIANTS_SHARED = @{
         }
     }
 }
+
+# Global cache for checksums
+$global:CHECKSUMS = @{}
+function global:Set-Checksums($k, $url) {
+    $global:CHECKSUMS[$k] = if ($global:CHECKSUMS[$k]) { $global:CHECKSUMS[$k] } else { [System.Text.Encoding]::UTF8.GetString( (Invoke-WebRequest $url).Content ) -split "`n" }
+}
+function global:Get-ChecksumsFile ($k, $keyword) {
+    $global:CHECKSUMS[$k] | ? { $_ -match $keyword } | % { $_ -split "\s" } | Select-Object -Last 1 | % { $_.TrimStart('*') }
+}
+function global:Get-ChecksumsSha ($k, $keyword) {
+    $global:CHECKSUMS[$k] | ? { $_ -match $keyword } | % { $_ -split "\s" } | Select-Object -First 1
+}
+
+# Global functions
+function global:Generate-DownloadBinary ($o) {
+    Set-StrictMode -Version Latest
+
+    $releaseUrl = "https://$( $o['project'] )/releases/download/$( $o['version'] )"
+    $checksumsUrl = "$releaseUrl/$( $o['checksums'] )"
+    Set-Checksums $o['binary'] $checksumsUrl
+
+    $binaryUpper = $o['binary'].ToUpper()
+@"
+# Install $( $o['binary'] )
+RUN set -eux; \
+    export $( $binaryUpper )_VERSION="$( $o['version'] )"; \
+    case "`$( uname -m )" in \
+
+"@
+    foreach ($a in ($o['architectures'] -split ',') ) {
+        $split = $a -split '/'
+        $os = $split[0]
+        $arch = $split[1]
+        $archv = if ($split.Count -gt 2) { $split[2] } else { '' }
+        switch ($a) {
+            "$os/386" {
+                $regex = "$os[-_](i?$arch|x86)[-_]?$archv$( [regex]::Escape($o['archiveformat']) )$"
+                $hardware = 'x86'
+            }
+            "$os/amd64" {
+                $regex = "$os[-_]($arch|x86_64)[-_]?$archv$( [regex]::Escape($o['archiveformat']) )$"
+                $hardware = 'x86_64'
+            }
+            "$os/arm/v6" {
+                $regex = "$os[-_]($arch|arm)[-_]?($archv)?$( [regex]::Escape($o['archiveformat']) )$"
+                $hardware = 'armhf'
+            }
+            "$os/arm/v7" {
+                $regex = "$os[-_]($arch|arm)[-_]?($archv)?$( [regex]::Escape($o['archiveformat']) )$"
+                $hardware = 'armv7l'
+            }
+            "$os/arm64" {
+                $regex = "$os[-_]($arch|aarch64)[-_]?$archv$( [regex]::Escape($o['archiveformat']) )$"
+                $hardware = 'aarch64'
+            }
+            "$os/ppc64le" {
+                $regex = "$os[-_]$arch[-_]?$archv$( [regex]::Escape($o['archiveformat']) )$"
+                $hardware = 'ppc64le'
+            }
+            "$os/riscv64" {
+                $regex = "$os[-_]$arch[-_]?$archv$( [regex]::Escape($o['archiveformat']) )$"
+                $hardware = 'riscv64'
+            }
+            "$os/s390x" {
+                $regex = "$os[-_]$arch[-_]?$archv$( [regex]::Escape($o['archiveformat']) )$"
+                $hardware = 's390x'
+            }
+            default {
+                throw "Unsupported architecture: $a"
+            }
+        }
+
+@"
+        '$hardware')  \
+            URL=$releaseUrl/$( Get-ChecksumsFile $o['binary'] $regex ); \
+            SHA256=$( Get-ChecksumsSha $o['binary'] $regex ); \
+            ;; \
+
+"@
+    }
+
+@"
+        *) \
+            echo "Architecture not supported"; \
+            exit 1; \
+            ;; \
+    esac; \
+
+"@
+
+@"
+    FILE=$( $o['binary'] )$( $o['archiveformat'] ); \
+    wget -q "`$URL" -O "`$FILE"; \
+    echo "`$SHA256  `$FILE" | sha256sum -c -; \
+
+"@
+
+
+    if ($o['archiveformat'] -match '\.tar\.gz|\.tgz') {
+        if ($o['archivefiles'].Count -gt 0) {
+@"
+    tar -xvf "`$FILE" --no-same-owner --no-same-permissions -- $( $o['archivefiles'] -join ' ' ); \
+    rm -f "`$FILE"; \
+
+"@
+        }else {
+@"
+    tar -xvf "`$FILE" --no-same-owner --no-same-permissions; \
+    rm -f "`$FILE"; \
+
+"@
+        }
+    }elseif ($o['archiveformat'] -match '\.bz2') {
+@"
+    bzip2 -d "`$FILE"; \
+
+"@
+    }elseif ($o['archiveformat'] -match '\.gz') {
+@"
+    gzip -d "`$FILE"; \
+
+"@
+    }else {
+        throw "Invalid 'archiveformat'. Supported formats: .tar.gz, .tgz, .bz2, .gz"
+    }
+
+@"
+    mv -v $( $o['binary'] ) /usr/local/bin/$( $o['binary'] ); \
+    chmod +x /usr/local/bin/$( $o['binary'] ); \
+    $( $o['binary'] ) $( $o['versionSubcommand'] ); \
+
+"@
+
+    if ($o.Contains('archivefiles')) {
+        if ($license = $o['archivefiles'] | ? { $_ -match 'LICENSE' }) {
+@"
+    mkdir -p /licenses; \
+    mv -v $license /licenses/$license; \
+
+"@
+        }
+    }
+
+@"
+    :
+
+
+"@
+}
diff --git a/generate/templates/Dockerfile.ps1 b/generate/templates/Dockerfile.ps1
index 2d6ea2a..9a0a398 100644
--- a/generate/templates/Dockerfile.ps1
+++ b/generate/templates/Dockerfile.ps1
@@ -32,57 +32,31 @@ RUN set -eux; \
 
 foreach ($c in $VARIANT['_metadata']['components']) {
     if ($c -eq 'pingme') {
-@'
-# Install pingme
-RUN set -eux; \
-    export PINGME_VERSION="0.2.5"; \
-    OS=$( uname -o ); \
-    # The naming conventions of the binaries is not consistent, hence the need for ARCH workaround
-    ARCH=$( \
-        if [ "$TARGETARCH" = 'amd64' ]; then \
-            uname -m; \
-        elif [ "$TARGETARCH" = '386' ]; then \
-            echo "i$TARGETARCH"; \
-        else \
-            echo "$TARGETARCH"; \
-        fi; \
-    ); \
-    FILE=pingme_${OS}_${ARCH}${TARGETVARIANT}.tar.gz; \
-    wget https://github.com/kha7iq/pingme/releases/download/v$PINGME_VERSION/pingme_checksums.txt; \
-    wget -q https://github.com/kha7iq/pingme/releases/download/v${PINGME_VERSION}/$FILE; \
-    cat pingme_checksums.txt | grep "$FILE" | sha256sum -c -; \
-    tar -xvf "$FILE" -- pingme LICENSE.md; \
-    chmod +x pingme; \
-    mv pingme /usr/local/bin/pingme; \
-    mv LICENSE.md /usr/local/bin/pingme.LICENSE; \
-    pingme --version | grep "$PINGME_VERSION"; \
-    rm -f pingme_checksums.txt; \
-    rm -f "$FILE";
-
-
-'@
+        Generate-DownloadBinary @{
+            project = 'github.com/kha7iq/pingme'
+            version = 'v0.2.5'
+            binary = 'pingme'
+            archiveformat = '.tar.gz'
+            archivefiles = @(
+                'pingme'
+                'LICENSE.md'
+            )
+            checksums = 'pingme_checksums.txt'
+            architectures = $VARIANT['_metadata']['platforms']
+            versionSubcommand = '--version'
+        }
     }
 
     if ($c -eq 'restic') {
-@'
-# Install restic
-# These packages are needed for all restic features to work. See: https://github.com/restic/restic/blob/0.15.1/docker/Dockerfile
-RUN apk add --update --no-cache ca-certificates fuse openssh-client tzdata jq
-RUN set -eux; \
-    RESTIC_VERSION=0.15.1; \
-    FILE=restic_${RESTIC_VERSION}_${TARGETOS}_${TARGETARCH}.bz2; \
-    wget -q https://github.com/restic/restic/releases/download/v${RESTIC_VERSION}/$FILE; \
-    wget -q https://github.com/restic/restic/releases/download/v${RESTIC_VERSION}/SHA256SUMS; \
-    SHA=$( sha256sum "$FILE" ); \
-    cat SHA256SUMS | grep "$FILE" | sha256sum -c -; \
-    rm -f SHA256SUMS; \
-    bzip2 -d "$FILE"; \
-    mv restic_${RESTIC_VERSION}_${TARGETOS}_${TARGETARCH} /usr/local/bin/restic; \
-    chmod +x /usr/local/bin/restic; \
-    restic version | grep "^restic $RESTIC_VERSION";
-
-
-'@
+        Generate-DownloadBinary @{
+            project = 'github.com/restic/restic'
+            version = 'v0.15.1'
+            binary = 'restic'
+            archiveformat = '.bz2'
+            checksums = 'SHA256SUMS'
+            architectures = $VARIANT['_metadata']['platforms']
+            versionSubcommand = 'version'
+        }
     }
 }
 
diff --git a/variants/1.4.4-pingme/Dockerfile b/variants/1.4.4-pingme/Dockerfile
index 96fca77..7c716bb 100644
--- a/variants/1.4.4-pingme/Dockerfile
+++ b/variants/1.4.4-pingme/Dockerfile
@@ -28,29 +28,40 @@ RUN set -eux; \
 
 # Install pingme
 RUN set -eux; \
-    export PINGME_VERSION="0.2.5"; \
-    OS=$( uname -o ); \
-    # The naming conventions of the binaries is not consistent, hence the need for ARCH workaround
-    ARCH=$( \
-        if [ "$TARGETARCH" = 'amd64' ]; then \
-            uname -m; \
-        elif [ "$TARGETARCH" = '386' ]; then \
-            echo "i$TARGETARCH"; \
-        else \
-            echo "$TARGETARCH"; \
-        fi; \
-    ); \
-    FILE=pingme_${OS}_${ARCH}${TARGETVARIANT}.tar.gz; \
-    wget https://github.com/kha7iq/pingme/releases/download/v$PINGME_VERSION/pingme_checksums.txt; \
-    wget -q https://github.com/kha7iq/pingme/releases/download/v${PINGME_VERSION}/$FILE; \
-    cat pingme_checksums.txt | grep "$FILE" | sha256sum -c -; \
-    tar -xvf "$FILE" -- pingme LICENSE.md; \
-    chmod +x pingme; \
-    mv pingme /usr/local/bin/pingme; \
-    mv LICENSE.md /usr/local/bin/pingme.LICENSE; \
-    pingme --version | grep "$PINGME_VERSION"; \
-    rm -f pingme_checksums.txt; \
-    rm -f "$FILE";
+    export PINGME_VERSION="v0.2.5"; \
+    case "$( uname -m )" in \
+        'x86')  \
+            URL=https://github.com/kha7iq/pingme/releases/download/v0.2.5/pingme_Linux_i386.tar.gz; \
+            SHA256=5a14e80693800284f11daf7d5ba71a7cbe78e18948579584f36069d7a2f31d4a; \
+            ;; \
+        'x86_64')  \
+            URL=https://github.com/kha7iq/pingme/releases/download/v0.2.5/pingme_Linux_x86_64.tar.gz; \
+            SHA256=93133b9c978d5a579526261255c2a7a9ca6dfc5ab42ef65e1de4fab15d8ac808; \
+            ;; \
+        'armv7l')  \
+            URL=https://github.com/kha7iq/pingme/releases/download/v0.2.5/pingme_Linux_armv7.tar.gz; \
+            SHA256=6f26a3926e6ed038ca132b4d1985cd2f6c0ccf037fbc78f710bdc2cc76b3fc5a; \
+            ;; \
+        'aarch64')  \
+            URL=https://github.com/kha7iq/pingme/releases/download/v0.2.5/pingme_Linux_arm64.tar.gz; \
+            SHA256=496bb93402611d5710bc66b26f64f13fc0f888d0b3cc1f4d7960c7c631860dd3; \
+            ;; \
+        *) \
+            echo "Architecture not supported"; \
+            exit 1; \
+            ;; \
+    esac; \
+    FILE=pingme.tar.gz; \
+    wget -q "$URL" -O "$FILE"; \
+    echo "$SHA256  $FILE" | sha256sum -c -; \
+    tar -xvf "$FILE" --no-same-owner --no-same-permissions -- pingme LICENSE.md; \
+    rm -f "$FILE"; \
+    mv -v pingme /usr/local/bin/pingme; \
+    chmod +x /usr/local/bin/pingme; \
+    pingme --version; \
+    mkdir -p /licenses; \
+    mv -v LICENSE.md /licenses/LICENSE.md; \
+    :
 
 # Install notification tools
 RUN apk add --no-cache curl jq
diff --git a/variants/1.4.4-restic-pingme/Dockerfile b/variants/1.4.4-restic-pingme/Dockerfile
index e74ca75..9c1b14d 100644
--- a/variants/1.4.4-restic-pingme/Dockerfile
+++ b/variants/1.4.4-restic-pingme/Dockerfile
@@ -27,46 +27,75 @@ RUN set -eux; \
     mbsync --version
 
 # Install restic
-# These packages are needed for all restic features to work. See: https://github.com/restic/restic/blob/0.15.1/docker/Dockerfile
-RUN apk add --update --no-cache ca-certificates fuse openssh-client tzdata jq
 RUN set -eux; \
-    RESTIC_VERSION=0.15.1; \
-    FILE=restic_${RESTIC_VERSION}_${TARGETOS}_${TARGETARCH}.bz2; \
-    wget -q https://github.com/restic/restic/releases/download/v${RESTIC_VERSION}/$FILE; \
-    wget -q https://github.com/restic/restic/releases/download/v${RESTIC_VERSION}/SHA256SUMS; \
-    SHA=$( sha256sum "$FILE" ); \
-    cat SHA256SUMS | grep "$FILE" | sha256sum -c -; \
-    rm -f SHA256SUMS; \
+    export RESTIC_VERSION="v0.15.1"; \
+    case "$( uname -m )" in \
+        'x86')  \
+            URL=https://github.com/restic/restic/releases/download/v0.15.1/restic_0.15.1_linux_386.bz2; \
+            SHA256=50362f6c4c2d91cf0edc750c578b73605fdbb79443874110cc0a64913553f76b; \
+            ;; \
+        'x86_64')  \
+            URL=https://github.com/restic/restic/releases/download/v0.15.1/restic_0.15.1_linux_amd64.bz2; \
+            SHA256=3631e3c3833c84ba71f22ea3df20381676abc7476a7f6d14424d9abfada91414; \
+            ;; \
+        'armv7l')  \
+            URL=https://github.com/restic/restic/releases/download/v0.15.1/restic_0.15.1_linux_arm.bz2; \
+            SHA256=1a5c1d2a3b17aa381c318b3f3919f7cfc4cd430c3a2c3053ba055fb4ccf38c97; \
+            ;; \
+        'aarch64')  \
+            URL=https://github.com/restic/restic/releases/download/v0.15.1/restic_0.15.1_linux_arm64.bz2; \
+            SHA256=bf6e09743df6899a02f0647d899fb008932760ea872667287bbc47b42091a3b0; \
+            ;; \
+        *) \
+            echo "Architecture not supported"; \
+            exit 1; \
+            ;; \
+    esac; \
+    FILE=restic.bz2; \
+    wget -q "$URL" -O "$FILE"; \
+    echo "$SHA256  $FILE" | sha256sum -c -; \
     bzip2 -d "$FILE"; \
-    mv restic_${RESTIC_VERSION}_${TARGETOS}_${TARGETARCH} /usr/local/bin/restic; \
+    mv -v restic /usr/local/bin/restic; \
     chmod +x /usr/local/bin/restic; \
-    restic version | grep "^restic $RESTIC_VERSION";
+    restic version; \
+    :
 
 # Install pingme
 RUN set -eux; \
-    export PINGME_VERSION="0.2.5"; \
-    OS=$( uname -o ); \
-    # The naming conventions of the binaries is not consistent, hence the need for ARCH workaround
-    ARCH=$( \
-        if [ "$TARGETARCH" = 'amd64' ]; then \
-            uname -m; \
-        elif [ "$TARGETARCH" = '386' ]; then \
-            echo "i$TARGETARCH"; \
-        else \
-            echo "$TARGETARCH"; \
-        fi; \
-    ); \
-    FILE=pingme_${OS}_${ARCH}${TARGETVARIANT}.tar.gz; \
-    wget https://github.com/kha7iq/pingme/releases/download/v$PINGME_VERSION/pingme_checksums.txt; \
-    wget -q https://github.com/kha7iq/pingme/releases/download/v${PINGME_VERSION}/$FILE; \
-    cat pingme_checksums.txt | grep "$FILE" | sha256sum -c -; \
-    tar -xvf "$FILE" -- pingme LICENSE.md; \
-    chmod +x pingme; \
-    mv pingme /usr/local/bin/pingme; \
-    mv LICENSE.md /usr/local/bin/pingme.LICENSE; \
-    pingme --version | grep "$PINGME_VERSION"; \
-    rm -f pingme_checksums.txt; \
-    rm -f "$FILE";
+    export PINGME_VERSION="v0.2.5"; \
+    case "$( uname -m )" in \
+        'x86')  \
+            URL=https://github.com/kha7iq/pingme/releases/download/v0.2.5/pingme_Linux_i386.tar.gz; \
+            SHA256=5a14e80693800284f11daf7d5ba71a7cbe78e18948579584f36069d7a2f31d4a; \
+            ;; \
+        'x86_64')  \
+            URL=https://github.com/kha7iq/pingme/releases/download/v0.2.5/pingme_Linux_x86_64.tar.gz; \
+            SHA256=93133b9c978d5a579526261255c2a7a9ca6dfc5ab42ef65e1de4fab15d8ac808; \
+            ;; \
+        'armv7l')  \
+            URL=https://github.com/kha7iq/pingme/releases/download/v0.2.5/pingme_Linux_armv7.tar.gz; \
+            SHA256=6f26a3926e6ed038ca132b4d1985cd2f6c0ccf037fbc78f710bdc2cc76b3fc5a; \
+            ;; \
+        'aarch64')  \
+            URL=https://github.com/kha7iq/pingme/releases/download/v0.2.5/pingme_Linux_arm64.tar.gz; \
+            SHA256=496bb93402611d5710bc66b26f64f13fc0f888d0b3cc1f4d7960c7c631860dd3; \
+            ;; \
+        *) \
+            echo "Architecture not supported"; \
+            exit 1; \
+            ;; \
+    esac; \
+    FILE=pingme.tar.gz; \
+    wget -q "$URL" -O "$FILE"; \
+    echo "$SHA256  $FILE" | sha256sum -c -; \
+    tar -xvf "$FILE" --no-same-owner --no-same-permissions -- pingme LICENSE.md; \
+    rm -f "$FILE"; \
+    mv -v pingme /usr/local/bin/pingme; \
+    chmod +x /usr/local/bin/pingme; \
+    pingme --version; \
+    mkdir -p /licenses; \
+    mv -v LICENSE.md /licenses/LICENSE.md; \
+    :
 
 # Install notification tools
 RUN apk add --no-cache curl jq
diff --git a/variants/1.4.4-restic/Dockerfile b/variants/1.4.4-restic/Dockerfile
index 4f66c18..3f5377b 100644
--- a/variants/1.4.4-restic/Dockerfile
+++ b/variants/1.4.4-restic/Dockerfile
@@ -27,20 +27,46 @@ RUN set -eux; \
     mbsync --version
 
 # Install restic
-# These packages are needed for all restic features to work. See: https://github.com/restic/restic/blob/0.15.1/docker/Dockerfile
-RUN apk add --update --no-cache ca-certificates fuse openssh-client tzdata jq
 RUN set -eux; \
-    RESTIC_VERSION=0.15.1; \
-    FILE=restic_${RESTIC_VERSION}_${TARGETOS}_${TARGETARCH}.bz2; \
-    wget -q https://github.com/restic/restic/releases/download/v${RESTIC_VERSION}/$FILE; \
-    wget -q https://github.com/restic/restic/releases/download/v${RESTIC_VERSION}/SHA256SUMS; \
-    SHA=$( sha256sum "$FILE" ); \
-    cat SHA256SUMS | grep "$FILE" | sha256sum -c -; \
-    rm -f SHA256SUMS; \
+    export RESTIC_VERSION="v0.15.1"; \
+    case "$( uname -m )" in \
+        'x86')  \
+            URL=https://github.com/restic/restic/releases/download/v0.15.1/restic_0.15.1_linux_386.bz2; \
+            SHA256=50362f6c4c2d91cf0edc750c578b73605fdbb79443874110cc0a64913553f76b; \
+            ;; \
+        'x86_64')  \
+            URL=https://github.com/restic/restic/releases/download/v0.15.1/restic_0.15.1_linux_amd64.bz2; \
+            SHA256=3631e3c3833c84ba71f22ea3df20381676abc7476a7f6d14424d9abfada91414; \
+            ;; \
+        'armhf')  \
+            URL=https://github.com/restic/restic/releases/download/v0.15.1/restic_0.15.1_linux_arm.bz2; \
+            SHA256=1a5c1d2a3b17aa381c318b3f3919f7cfc4cd430c3a2c3053ba055fb4ccf38c97; \
+            ;; \
+        'armv7l')  \
+            URL=https://github.com/restic/restic/releases/download/v0.15.1/restic_0.15.1_linux_arm.bz2; \
+            SHA256=1a5c1d2a3b17aa381c318b3f3919f7cfc4cd430c3a2c3053ba055fb4ccf38c97; \
+            ;; \
+        'aarch64')  \
+            URL=https://github.com/restic/restic/releases/download/v0.15.1/restic_0.15.1_linux_arm64.bz2; \
+            SHA256=bf6e09743df6899a02f0647d899fb008932760ea872667287bbc47b42091a3b0; \
+            ;; \
+        's390x')  \
+            URL=https://github.com/restic/restic/releases/download/v0.15.1/restic_0.15.1_linux_s390x.bz2; \
+            SHA256=1ed7632518a86fa468f5823d6da4826d1787845cc0969a46da110c98139a3db4; \
+            ;; \
+        *) \
+            echo "Architecture not supported"; \
+            exit 1; \
+            ;; \
+    esac; \
+    FILE=restic.bz2; \
+    wget -q "$URL" -O "$FILE"; \
+    echo "$SHA256  $FILE" | sha256sum -c -; \
     bzip2 -d "$FILE"; \
-    mv restic_${RESTIC_VERSION}_${TARGETOS}_${TARGETARCH} /usr/local/bin/restic; \
+    mv -v restic /usr/local/bin/restic; \
     chmod +x /usr/local/bin/restic; \
-    restic version | grep "^restic $RESTIC_VERSION";
+    restic version; \
+    :
 
 # Install notification tools
 RUN apk add --no-cache curl jq