diff --git a/builder.sh b/builder.sh
index 9143ac136c2f063824587a41227383f23ddc29c0..4a7ca99da58fff46ca810040df0f23f429de7fa6 100755
--- a/builder.sh
+++ b/builder.sh
@@ -15,20 +15,24 @@ BRANCH=experimental
 
 # prepare needed strings
 GLUONVERSION=$(git describe --tags | cut -d "-" -f 1)
+if [[ $GLUONVERSION = "ffbs"* ]]; then
+	:
+else
+	GLUONVERSION=ffbs${GLUONVERSION}
+fi
 SITECOMMIT=$(cd site; git log -1 --format="%H")
 ARCHSTRING=multiarch
 if [ "${#ARCHITECTURES[@]}" -eq "1" ]; then
   ARCHSTRING=${ARCHITECTURES[0]}
 fi
 RELEASENAME=${GLUONVERSION}-$(date '+%Y%m%d%H%M')-${BRANCH}
-RELEASETAG=ffbs${GLUONVERSION}_${BRANCH}_${ARCHSTRING}_$(date '+%Y%m%d-%H%M')_${SITECOMMIT}
+RELEASETAG=${GLUONVERSION}_${BRANCH}_${ARCHSTRING}_$(date '+%Y%m%d-%H%M')_${SITECOMMIT}
 
 echo $RELEASETAG
 
 #DEBUG="V=s"
 DEBUG=""
 
-
 # Days until the autoupdater makes sure that the new vesion gets installed
 # (maybe define based on the branch?)
 PRIO=2