diff --git a/.github/workflows/push_pr_release.yml b/.github/workflows/push_pr_release.yml
index 98f05e5..bfbca7f 100644
--- a/.github/workflows/push_pr_release.yml
+++ b/.github/workflows/push_pr_release.yml
@@ -42,7 +42,9 @@ jobs:
           path: pi-gen
 
       - name: 🔧 Prepare
-        run: sudo apt-get update && sudo apt-get install -y coreutils quilt parted qemu-utils qemu-user-static debootstrap zerofree zip dosfstools libarchive-tools libcap2-bin grep rsync xz-utils file git curl bc kmod kpartx
+        run: |
+          sudo apt-get update && sudo apt-get install -y coreutils quilt parted qemu-utils qemu-user-static debootstrap zerofree zip dosfstools libarchive-tools libcap2-bin grep rsync xz-utils file git curl bc kmod kpartx
+          echo "HYPERBIAN='HyperBian-${{ env.PLATFORM }}-${{ matrix.pi-gen.architecture }}'" >> $GITHUB_ENV
 
       - name: 👷 Build
         run: |
@@ -53,7 +55,6 @@ jobs:
           echo "Suites: ${{ env.PLATFORM }}" >> "./stage-hyperbian/00-install-hyperion/files/hyperion.sources"
           echo "Architectures: ${{ matrix.pi-gen.architecture }}" >> "./stage-hyperbian/00-install-hyperion/files/hyperion.sources"
           echo "RELEASE='${{ env.PLATFORM }}'" >> "./config"
-          echo "HYPERBIAN='HyperBian-${{ env.PLATFORM }}-${{ matrix.pi-gen.architecture }}'" >> $GITHUB_ENV
           sudo IMG_FILENAME=${{ env.HYPERBIAN }} ARCHIVE_FILENAME=${{ env.HYPERBIAN }} ./build.sh
 
       - name: 📦 Upload
diff --git a/.github/workflows/template.md b/.github/workflows/template.md
index 7228283..8f9dcf4 100644
--- a/.github/workflows/template.md
+++ b/.github/workflows/template.md
@@ -1,7 +1,7 @@
-Raspberry Pi OS Lite with [Hyperion](https://github.com/hyperion-project/hyperion.ng) pre installed. Also called HyperBian.<br>
+Raspberry Pi OS Lite with [Hyperion](https://github.com/hyperion-project/hyperion.ng) pre installed. Also called HyperBian.
 We provide two different versions (arm64/armhf) according to your preferred hardware platform.
 
-**Recommendation:**<br>
+**Recommendation:**
 Use the arm64 image to benefit from a true 64 bit system.
 In case you run a Raspberry Pi 1, 2 or Zero v1, go for the armhf one.
 
diff --git a/stage-hyperbian/00-install-hyperion/00-run.sh b/stage-hyperbian/00-install-hyperion/00-run.sh
index b4da0b8..7df0f3d 100755
--- a/stage-hyperbian/00-install-hyperion/00-run.sh
+++ b/stage-hyperbian/00-install-hyperion/00-run.sh
@@ -21,7 +21,7 @@ install -m 755 files/motd-hyperbian "${ROOTFS_DIR}"/etc/update-motd.d/10-hyperbi
 # Remove the "last login" information
 sed -i "s/^#PrintLastLog yes.*/PrintLastLog no/" ${ROOTFS_DIR}/etc/ssh/sshd_config
 
-# Add Hyperion DEB822 source file and update package information
+# Add Hyperion DEB822 sources file, download public gpg key and update package information
 echo '---> Integrate Hyperion Project Repository into HyperBian'
 install -m 644 files/hyperion.sources ${ROOTFS_DIR}/etc/apt/sources.list.d/
-on_chroot <<< "apt-get -y update"
\ No newline at end of file
+on_chroot <<< "curl --silent --show-error --location 'https://releases.hyperion-project.org/hyperion.pub.key' | gpg --dearmor -o /etc/apt/keyrings/hyperion.pub.gpg && apt-get update"
\ No newline at end of file
diff --git a/stage-hyperbian/00-install-hyperion/files/hyperion.sources b/stage-hyperbian/00-install-hyperion/files/hyperion.sources
index df6e9e5..a1434e9 100644
--- a/stage-hyperbian/00-install-hyperion/files/hyperion.sources
+++ b/stage-hyperbian/00-install-hyperion/files/hyperion.sources
@@ -3,56 +3,4 @@ Enabled: yes
 Types: deb
 URIs: https://apt.releases.hyperion-project.org
 Components: main
-Signed-By:
- -----BEGIN PGP PUBLIC KEY BLOCK-----
- .
- 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
- M9HGoJ4dEKxj
- =slFc
- -----END PGP PUBLIC KEY BLOCK-----
\ No newline at end of file
+Signed-By: /etc/apt/keyrings/hyperion.pub.gpg