diff --git a/data/web/templates/base.twig b/data/web/templates/base.twig
index e97199b3..be23c19d 100644
--- a/data/web/templates/base.twig
+++ b/data/web/templates/base.twig
@@ -484,7 +484,7 @@ function recursiveBase64StrToArrayBuffer(obj) {
     </a>
   </span>
   {% endif %}  
-  {% if mailcow_cc_username and mailcow_info.mailcow_branch|lower == "origin/feature/nightly-editions" and mailcow_info.version_tag|default %}
+  {% if mailcow_cc_username and mailcow_info.mailcow_branch|lower == "nightly" and mailcow_info.version_tag|default %}
   <span class="version">
     🛠️🐮 + 🐋 = 💕
         Nightly: <a href="{{ mailcow_info.git_project_url }}/commit/{{ mailcow_info.git_commit }}" target="_blank">{{ mailcow_info.version_tag }}
diff --git a/update.sh b/update.sh
index c27fcd43..d0e4c4ba 100755
--- a/update.sh
+++ b/update.sh
@@ -706,7 +706,7 @@ elif [ $NEW_BRANCH == "master" ] && [ $CURRENT_BRANCH != "master" ]; then
     git diff ${BRANCH} >> ${DIFF_FILE}
   fi
   echo -e "\e[32mSwitching Branch to ${BRANCH}...\e[0m"
-  git fetch origin --all
+  git fetch origin
   git checkout -f ${BRANCH}
 
 elif [ $NEW_BRANCH == "nightly" ] && [ $CURRENT_BRANCH != "nightly" ]; then
@@ -730,7 +730,7 @@ elif [ $NEW_BRANCH == "nightly" ] && [ $CURRENT_BRANCH != "nightly" ]; then
     git diff ${BRANCH} --stat > ${DIFF_FILE}
     git diff ${BRANCH} >> ${DIFF_FILE}
   fi
-  git fetch origin --all
+  git fetch origin
   git checkout -f ${BRANCH}
 fi