diff --git a/.local/share/chezmoi/home/dot_local/share/ansible/roles/run_onchange_after_symlink-ansible-roles.tmpl b/.local/share/chezmoi/home/dot_local/share/ansible/roles/run_onchange_after_symlink-ansible-roles.tmpl
index da497e21..f9399fa5 100644
--- a/.local/share/chezmoi/home/dot_local/share/ansible/roles/run_onchange_after_symlink-ansible-roles.tmpl
+++ b/.local/share/chezmoi/home/dot_local/share/ansible/roles/run_onchange_after_symlink-ansible-roles.tmpl
@@ -13,8 +13,13 @@
 logg 'Ensuring Gas Station roles are symlinked to ~/.local/share/ansible/roles'
 find "$HOME/.local/src/gas-station/roles" -mindepth 2 -maxdepth 2 -type d | while read ROLE_PATH; do
   ROLE_FOLDER="professormanhattan.$(echo "$ROLE_PATH" | sed 's/.*\/\([^\/]*\)$/\1/')"
+  ALT_ROLE_FOLDER="$(echo "$ROLE_PATH" | sed 's/.*\/\([^\/]*\)$/\1/')"
   if [ ! -d "$XDG_DATA_HOME/ansible/roles/$ROLE_FOLDER" ] || [ "$(readlink -f "$XDG_DATA_HOME/ansible/roles/$ROLE_FOLDER")" != "$ROLE_PATH" ]; then
     rm -f "$XDG_DATA_HOME/ansible/roles/$ROLE_FOLDER"
     ln -s "$ROLE_PATH" "$XDG_DATA_HOME/ansible/roles/$ROLE_FOLDER"
   fi
+  if [ ! -d "$XDG_DATA_HOME/ansible/roles/$ALT_ROLE_FOLDER" ] || [ "$(readlink -f "$XDG_DATA_HOME/ansible/roles/$ALT_ROLE_FOLDER")" != "$ROLE_PATH" ]; then
+    rm -f "$XDG_DATA_HOME/ansible/roles/$ALT_ROLE_FOLDER"
+    ln -s "$ROLE_PATH" "$XDG_DATA_HOME/ansible/roles/$ALT_ROLE_FOLDER"
+  fi
 done
diff --git a/.local/share/chezmoi/software.yml b/.local/share/chezmoi/software.yml
index f08e3f9f..eede2475 100644
--- a/.local/share/chezmoi/software.yml
+++ b/.local/share/chezmoi/software.yml
@@ -3452,14 +3452,15 @@ softwarePackages:
     brew:darwin: libimobiledevice
   libreoffice:
     _bin: null
-    _desc: null
+    _desc: '[LibreOffice](https://www.libreoffice.org/) is a free and open-source office productivity software suite, a project of The Document Foundation. It was forked in 2010 from OpenOffice.org, which was an open-sourced version of the earlier StarOffice.
     _docs: null
     _github: null
     _home: null
     _name: null
     _service: null
-    ansible: professormanhattan.office
     apt: libreoffice
+    cask: libreoffice
+    choco: libreoffice-fresh
     dnf: libreoffice
     pacman: libreoffice
   license:
@@ -3708,14 +3709,14 @@ softwarePackages:
     yay: microsoft-edge-stable-bin
   microsoft-office:
     _bin: null
-    _desc: null
-    _docs: null
-    _github: null
-    _home: null
-    _name: null
     _service: null
-    ansible: professormanhattan.office
+    _desc: '[Microsoft Office](https://www.microsoft.com/en-us/microsoft-365/microsoft-office), or simply Office, is a family of client software, server software, and services developed by Microsoft.'
+    _docs: https://docs.microsoft.com/en-us/microsoft-365/?view=o365-worldwide
+    _github: Not open-source
+    _home: https://www.office.com/
+    _name: Office
     cask: microsoft-office
+    choco: office365business
   microsoft-todo:
     _bin: null
     _desc: null
@@ -4255,17 +4256,7 @@ softwarePackages:
     _service: null
     npm: oclif
   office:
-    _bin: null
-    _desc: '[Microsoft Office](https://www.microsoft.com/en-us/microsoft-365/microsoft-office), or simply Office, is a family of client software, server software, and services developed by Microsoft. [LibreOffice](https://www.libreoffice.org/) is a free and open-source office productivity software suite, a project of The Document Foundation. It was forked in 2010 from OpenOffice.org, which was an open-sourced version of the earlier StarOffice.'
-    _docs: https://docs.microsoft.com/en-us/microsoft-365/?view=o365-worldwide
-    _github: Not open-source
-    _home: https://www.office.com/
-    _name: Office
-    _service: null
-    ansible: professormanhattan.office
-    apt: libreoffice
-    dnf: libreoffice
-    pacman: libreoffice
+
   oh-my-posh:
     _bin: oh-my-posh
     _desc: null