diff --git a/actions/pbpuppy b/actions/pbpuppy
index aba2ac8..3097e43 100644
--- a/actions/pbpuppy
+++ b/actions/pbpuppy
@@ -7,17 +7,21 @@ HOMEPAGE="https://sourceforge.net/projects/pb-gh-releases"
 CREDENTIALS="-"
 
 function releases_() {
-    echo $(web_pipe "https://sourceforge.net/projects/pb-gh-releases/rss?path=/" | grep 'title><!\[CDATA' | cut -d'[' -f3 | cut -d']' -f1 | grep '\.iso' | grep '64' | cut -d'-' -f3 | cut -d'.' -f1 | sort | uniq)
+    echo $(web_pipe "https://sourceforge.net/projects/pb-gh-releases/rss?path=/" | grep 'title><!\[CDATA' | cut -d'[' -f3 | cut -d']' -f1 | grep '\.iso' | grep '64' | cut -d'-' -f3 | grep -oP '\d{6}(?=\.iso)' | sort -u)
 }
 
 function editions_() {
-    echo $(web_pipe "https://sourceforge.net/projects/pb-gh-releases/rss?path=/" | grep 'title><!\[CDATA' | cut -d'[' -f3 | cut -d']' -f1 | grep '\.iso' | grep '64' | cut -d'/' -f3 | cut -d'-' -f1 | sort | uniq)
+    echo $(web_pipe "https://sourceforge.net/projects/pb-gh-releases/rss?path=/" | grep 'title><!\[CDATA' | cut -d'[' -f3 | cut -d']' -f1 | grep '\.iso' | grep '64' | cut -d'/' -f2 | cut -d'_' -f1 | sort -u)
 }
 
 function get_() {
     local HASH=""
     local URL="https://sourceforge.net/projects/pb-gh-releases/files/VoidPup64_release"
-    ISO="VoidPup64-22.02-${RELEASE}.iso"
+    if [ "${RELEASE}" == 'ghtest' ]; then
+      ISO=$(web_pipe "https://sourceforge.net/projects/pb-gh-releases/rss?path=/" | grep 'title><!\[CDATA' | cut -d'[' -f3 | cut -d']' -f1 | grep '\.iso' | grep '64' | cut -d'/' -f3 | grep "${RELEASE}" | grep "${EDITION}")
+    else
+      ISO="VoidPup64-22.02-${RELEASE}.iso"
+    fi
     HASH=$(web_pipe "${URL}"/SHA512checksums.txt | grep "${ISO}" | cut -d' ' -f1)
     echo "${URL}/${ISO} ${HASH}"
 }
diff --git a/public/pbpuppy b/public/pbpuppy
index dae2dd4..fbd2962 100644
--- a/public/pbpuppy
+++ b/public/pbpuppy
@@ -7,21 +7,25 @@ HOMEPAGE="https://sourceforge.net/projects/pb-gh-releases"
 CREDENTIALS="-"
 
 
-RELEASES="ghtest 250301 250201 250101"
-EDITIONS="VoidPup64 S15Pup64 BookwormPup64"
+RELEASES="250301 250201 250101"
+EDITIONS="VoidPup64 S15Pup64 BookwormPup64-ghtest"
 
 function releases_() {
-    echo $(web_pipe "https://sourceforge.net/projects/pb-gh-releases/rss?path=/" | grep 'title><!\[CDATA' | cut -d'[' -f3 | cut -d']' -f1 | grep '\.iso' | grep '64' | cut -d'-' -f3 | cut -d'.' -f1 | sort | uniq)
+    echo $(web_pipe "https://sourceforge.net/projects/pb-gh-releases/rss?path=/" | grep 'title><!\[CDATA' | cut -d'[' -f3 | cut -d']' -f1 | grep '\.iso' | grep '64' | cut -d'-' -f3 | grep -oP '\d{6}(?=\.iso)' | sort -u)
 }
 
 function editions_() {
-    echo $(web_pipe "https://sourceforge.net/projects/pb-gh-releases/rss?path=/" | grep 'title><!\[CDATA' | cut -d'[' -f3 | cut -d']' -f1 | grep '\.iso' | grep '64' | cut -d'/' -f3 | cut -d'-' -f1 | sort | uniq)
+    echo $(web_pipe "https://sourceforge.net/projects/pb-gh-releases/rss?path=/" | grep 'title><!\[CDATA' | cut -d'[' -f3 | cut -d']' -f1 | grep '\.iso' | grep '64' | cut -d'/' -f2 | cut -d'_' -f1 | sort -u)
 }
 
 function get_() {
     local HASH=""
     local URL="https://sourceforge.net/projects/pb-gh-releases/files/VoidPup64_release"
-    ISO="VoidPup64-22.02-${RELEASE}.iso"
+    if [ "${RELEASE}" == 'ghtest' ]; then
+      ISO=$(web_pipe "https://sourceforge.net/projects/pb-gh-releases/rss?path=/" | grep 'title><!\[CDATA' | cut -d'[' -f3 | cut -d']' -f1 | grep '\.iso' | grep '64' | cut -d'/' -f3 | grep "${RELEASE}" | grep "${EDITION}")
+    else
+      ISO="VoidPup64-22.02-${RELEASE}.iso"
+    fi
     HASH=$(web_pipe "${URL}"/SHA512checksums.txt | grep "${ISO}" | cut -d' ' -f1)
     echo "${URL}/${ISO} ${HASH}"
 }