diff --git a/.github/workflows/upload-release-assets.yml b/.github/workflows/upload-release-assets.yml
index fd9be40132..67f6410a7e 100644
--- a/.github/workflows/upload-release-assets.yml
+++ b/.github/workflows/upload-release-assets.yml
@@ -25,7 +25,7 @@ defaults:
     shell: bash
 
 permissions:
-  contents: read
+  contents: write
 
 jobs:
   vars:
@@ -80,12 +80,12 @@ jobs:
           find ${{inputs.pkgRepo}}/nginx-agent | grep -e "nginx-agent[_-]${{inputs.pkgVersion}}"
 
       - name: GitHub Upload
-        continue-on-error: true
         if: ${{ needs.vars.outputs.github_release == 'true' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         # clobber overwrites existing assets of the same name
         run: |
+          gh release list
           gh release upload --clobber v${{ inputs.pkgVersion }} \
             $(find ${{inputs.pkgRepo}}/nginx-agent | grep -e "nginx-agent[_-]${{inputs.pkgVersion}}")
 
@@ -101,7 +101,7 @@ jobs:
         with:
           inlineScript: |
             for i in $(find ${{inputs.pkgRepo}}/nginx-agent | grep -e "nginx-agent[_-]${{inputs.pkgVersion}}"); do
-              dest="nginx-agent/${GITHUB_REF##*/}/${i##*/}"
+              dest="nginx-agent/release-${{ inputs.pkgVersion }}/${i##*/}"
               echo "Uploading ${i} to ${dest}"
               az storage blob upload --auth-mode=login -f "$i" -c ${{ secrets.AZURE_CONTAINER_NAME }} \
               --account-name ${{ secrets.AZURE_ACCOUNT_NAME }} --overwrite -n ${dest}
diff --git a/scripts/packages/package-check.sh b/scripts/packages/package-check.sh
index 8914cdf448..131f8f7386 100755
--- a/scripts/packages/package-check.sh
+++ b/scripts/packages/package-check.sh
@@ -34,7 +34,7 @@ if [[ ! -z ${CERT} ]] && [[ ! -z ${KEY} ]]; then
 fi
 
 if [[ -z ${PKG_REPO} ]]; then
-  echo "defaulting to packages.nginx.com"
+  echo "defaulting to packages.nginx.org"
   PKG_REPO="packages.nginx.org"
 fi
 
@@ -44,7 +44,6 @@ if [[ -z $VERSION ]]; then
   echo "no version provided"
   exit 1
 fi
-
 PKG_DIR="${PKG_REPO}/${PKG_NAME}"
 PKG_REPO_URL="https://${PKG_DIR}"
 
@@ -93,6 +92,11 @@ CENTOS=(
   centos/8/x86_64/RPMS/nginx-agent-$VERSION.el8.ngx.x86_64.rpm
 )
 
+FREEBSD=(
+  freebsd/FreeBSD:12:amd64/latest/nginx-agent-$VERSION.pkg
+  freebsd/FreeBSD:13:amd64/latest/nginx-agent-$VERSION.pkg
+)
+
 uris=(
   ${DEBIAN[@]}
   ${UBUNTU[@]}
@@ -102,6 +106,13 @@ uris=(
   ${SUSE[@]}
 )
 
+majorVersion=$(echo ${VERSION} | cut -d. -f1)
+if [[ ${majorVersion} == 2 ]]; then
+  uris+=(${FREEBSD[@]})
+fi
+
+# Functions
+
 ## Check and download if nginx-agent packages are present in the repository
 check_pkgs () {
   for pkg in ${uris[@]}; do
@@ -158,5 +169,7 @@ check_repo() {
   fi
 }
 
+# Main
+
 check_repo
 check_pkgs