diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 66c952ee..ede5446e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -30,6 +30,9 @@ jobs:
           #!/bin/bash
           apt-get update -y && apt-get install -y curl dhcpcd5 iptables procps
           curl -sL https://install.raspap.com | bash -s -- --yes --openvpn 1 --restapi 1 --adblock 1 --wireguard 1 --tcp-bbr 1 --check 0
+
+          # Set Wi-Fi country to prevent RF kill
+          raspi-config nonint do_wifi_country "US"
           EOF
           } &&
           chmod +x stage-raspap/package-raspap/00-run-chroot.sh &&
@@ -47,7 +50,7 @@ jobs:
         id: build
         uses: usimd/pi-gen-action@v1
         with:
-          image-name: "raspap-${{ github.ref_name }}-${{ matrix.arch }}"
+          image-name: "raspap-bookworm-${{ matrix.arch == '32-bit' && 'armhf' || 'arm64' }}-lite-${{ github.event.inputs.tag || github.ref_name }}"
           enable-ssh: 1
           stage-list: stage0 stage1 stage2 ./stage-raspap
           verbose-output: true
@@ -57,8 +60,8 @@ jobs:
       - name: Upload Artifact
         uses: svenstaro/upload-release-action@v2
         with:
-          asset_name: raspap-image-${{ github.ref_name }}-${{ matrix.arch }}.zip
+          asset_name: "raspap-bookworm-${{ matrix.arch == '32-bit' && 'armhf' || 'arm64' }}-lite-${{ github.event.inputs.tag || github.ref_name }}.img.zip"
           file: ${{ steps.build.outputs.image-path }}
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          tag: ${{ github.ref }}
+          tag: ${{ github.event.inputs.tag || github.ref }}
           overwrite: true