diff --git a/tasks/versioncheck.yml b/tasks/versioncheck.yml
index 9895582..7977e52 100644
--- a/tasks/versioncheck.yml
+++ b/tasks/versioncheck.yml
@@ -14,6 +14,7 @@
   register: playbook_version
   when: submodules_versioncheck|bool
   ignore_errors: yes
+  failed_when: false
 
 - name: Print remote role version
   debug:
@@ -41,4 +42,5 @@
   copy:
     content: "{{ playbook_version_number }}"
     dest: "/etc/.ansible-version/{{ playbook_version_path }}"
+    mode: 0644
   when: submodules_versioncheck|bool
diff --git a/templates/bash.bashrc b/templates/bash.bashrc
index dd6fa89..34aaf16 100644
--- a/templates/bash.bashrc
+++ b/templates/bash.bashrc
@@ -129,7 +129,7 @@ alias VISUAL='{{ dotfiles_default_visual }}'
 alias got='git'
 {% endif %}
 {% if git_pull_alias | bool -%}
-alias gitsubpull='git submodule foreach "(git checkout master; git pull)"'
+alias gitsubpull='git submodule foreach "(git checkout $(git symbolic-ref --short refs/remotes/origin/HEAD | sed "s@^origin/@@"); git pull)"'
 {% endif %}
 
 {% if bash['pwgen'] %}alias pwgen="/usr/bin/pwgen --num-passwords=3000 --numerals --capitalize --secure --no-vowels  --symbols 42 | grep -v '0' | grep -v 'o' | grep -v 'O' | grep -v '\"' | grep -v 'I' | grep -v 'l' | grep -v '1' | grep -v '´' | grep -v '@'  | tail -1 "{% endif %}
diff --git a/vars/main.yml b/vars/main.yml
index 92105f1..e45ff45 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -8,5 +8,5 @@ bash:
   shell: "/bin/bash"
   keyboard: '$(if [[ $(id -u) -ne 0 ]];then echo "\[\033[01;33m\]"; else echo "\[\033[01;31m\]"; fi) $(if [[ $? == 0 ]]; then printf "\xE2\x9D\xA4"; fi) \[\033[01;32m\]\u\[\033[01;36m\]@\[\033[01;32m\]\H\[\033[01;34m\] <\A> \[\033[01;35m\] \j \[\033[01;36m\] \w \[\033[01;33m\]\n\[\033[01;33m\] $(git branch 2>/dev/null | sed -n "s/* \(.*\)/\1 /p")$\[\033[01;00m\] '
 
-playbook_version_number: 2053 # should be over ninethousand
+playbook_version_number: 2055 # should be over ninethousand
 playbook_version_path: 'role_dotfiles_chaos-bodensee_github.version'