diff --git a/.local/share/chezmoi/software.yml b/.local/share/chezmoi/software.yml
index 71b4d4fa..08a062c2 100644
--- a/.local/share/chezmoi/software.yml
+++ b/.local/share/chezmoi/software.yml
@@ -1,6 +1,6 @@
 ---
 # `softwarePackages` is a map of possible package managers to use while installing a program. The installer will
-# look at the `installerPreference` variable (bottom of file) and find the first package manager that is in the package's possible
+# look at the `installerPreference` variable and find the first package manager that is in the package's possible
 # installation method and then use that. It is also sensitive to the type of operating system so a package with
 # only `apt` defined will not install on macOS.
 #
@@ -182,11 +182,17 @@ softwarePackages:
     _post:binary:darwin: |
       # TODO
     _post:binary:linux: |
-      # TODO - Include hook for unzipping and adding to /usr/local/bin (also Windows support is needed)
+      # TODO How to pass the path of the file downloaded in `binary` step? That can replace the `wget` command below
+      mkdir -p /usr/local/share/allure
+      cd /usr/local/share/allure
+      wget https://repo.maven.apache.org/maven2/io/qameta/allure/allure-commandline/2.20.1/allure-commandline-2.20.1.zip -O /usr/local/share/allure/allure.zip
+      unzip -o allure.zip
+      ln -s /usr/local/share/allure/allure<version>/bin/allure
     _post:binary:windows: |
       # TODO
     _service: null
     binary: https://repo.maven.apache.org/maven2/io/qameta/allure/allure-commandline/2.20.1/allure-commandline-2.20.1.zip
+      # TODO: Find latest version from https://repo.maven.apache.org/maven2/io/qameta/allure/allure-commandline/maven-metadata.xml and use it in the _binary_ URL
     brew: allure
     scoop: allure
     yay: allure
@@ -299,6 +305,8 @@ softwarePackages:
     _name: null
     _service: null
     brew: aquaproj/aqua/aqua
+    binary:linux: https://github.com/aquaproj/aqua/releases/download/v2.0.0-0/aqua_linux_amd64.tar.gz
+    binary:windows: https://github.com/aquaproj/aqua/releases/download/v2.0.0-0/aqua_windows_amd64.tar.gz
   argocli:
     _bin: null
     _desc: ArgoCD is a declarative GitOps continuous delivery platform.
@@ -310,9 +318,14 @@ softwarePackages:
     _service: null
     _type: cli
     brew: argocd
+    choco: argocd-cli
     github: https://github.com/argoproj/argo-workflows
+    pacman:
+      - argocd
+      - argocd-cli
   aria2:
     _bin: null
+  aria:
     _desc: '[aria2](https://aria2.github.io/) is a lightweight multi-protocol & multi-source command-line download utility. It supports HTTP/HTTPS, FTP, SFTP, BitTorrent and Metalink. [AriaNg](http://ariang.mayswind.net/) is a modern web frontend that makes working with aria2 easier.'
     _docs: https://aria2.github.io/manual/en/html/
     _github: https://github.com/aria2/aria2
@@ -320,7 +333,7 @@ softwarePackages:
     _name: Aria2/AriaNg
     _service: null
     ansible: professormanhattan.aria
-  asciicinema:
+  asciinema:
     _bin: null
     _desc: null
     _docs: null
@@ -328,7 +341,12 @@ softwarePackages:
     _home: null
     _name: null
     _service: null
-    pipx: asciicinema
+    apk: asciinema
+    apt: asciinema
+    brew: asciinema
+    dnf: asciinema
+    pacman: asciinema
+    pipx: asciinema
   asdf:
     _bin: asdf
     _desc: '[asdf](https://asdf-vm.com/#/) is a CLI tool that can manage multiple language runtime versions on a per-project basis or globally. It is like gvm, nvm, rbenv, and pyenv all in one. This role installs asdf on Linux or macOS.'
@@ -406,7 +424,12 @@ softwarePackages:
     _home: null
     _name: null
     _service: null
+    apk: automake
+    apt: automake
     brew: automake
+    dnf: automake
+    pacman: automake
+    pkg: automake
   autorestic:
     _bin: null
     _desc: '[Autorestic](https://autorestic.vercel.app/) is a wrapper around [Restic](https://restic.net/). The Restic CLI can be a bit overwhelming and difficult to manage if you have many different location that you want to backup to multiple locations. Autorestic makes managing all your S3 backups easier by making it config / cron driven.'
@@ -426,6 +449,9 @@ softwarePackages:
     _service: null
     ansible: professormanhattan.awscli
     brew: awscli@2
+    binary:darwin: https://awscli.amazonaws.com/AWSCLIV2.pkg
+    binary:linux: https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip
+    binary:windows: https://awscli.amazonaws.com/AWSCLIV2.msi
     choco: awscli
   awxcli:
     _bin: null