diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index b754438..2b9f883 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -6,9 +6,3 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
-
-  # Update Git Submodules daily
-  - package-ecosystem: gitsubmodule
-    schedule:
-      interval: "daily"
-    directory: /
diff --git a/.github/workflows/update-submodules.yml b/.github/workflows/update-submodules.yml
new file mode 100644
index 0000000..3b7a890
--- /dev/null
+++ b/.github/workflows/update-submodules.yml
@@ -0,0 +1,40 @@
+name: Update submodules
+on:
+  schedule: [cron: 0 6 * * 0]
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+
+jobs:
+  update-submodules:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+          fetch-depth: 0
+          token: ${{secrets.GITHUB_TOKEN}}
+
+      - name: Config Git User
+        run: |
+          git config --global user.name "${{ github.actor }}"
+          git config --global user.email "${{ github.actor }}@users.noreply.github.com"
+
+      - name: Update submodules
+        run: |
+          if git commit -S -am"Update submodules (automated)
+
+          $(git submodule --quiet foreach \
+            'tag="$(git describe --tags --abbrev=0 origin/HEAD)"
+            if [ "$(git describe --tags)" != "$tag" ]; then
+              git checkout --quiet "$tag"
+              echo "$name" "$tag"
+            fi')"
+          then
+            git show --raw
+            git push
+          fi
diff --git a/.gitmodules b/.gitmodules
index 5cb3d69..4303cae 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,25 +3,21 @@
 	path = tools/dotbot
 	url = https://github.com/anishathalye/dotbot.git
 	ignore = dirty
-	branch = v1.19.1
 
 [submodule "dotbot-brew"]
 	path = tools/dotbot-brew
 	url = https://github.com/wren/dotbot-brew.git
 	ignore = dirty
-	branch = main
 
 [submodule "dotbot-include"]
 	path = tools/dotbot-include
 	url = https://gitlab.com/gnfzdz/dotbot-include.git
 	ignore = dirty
-	branch = main
 
 [submodule "config/nvim"]
 	path = config/nvim
 	url = https://github.com/AstroNvim/AstroNvim.git
 	ignore = dirty
-	branch = v3.15.6
 	shallow = true
 
 [submodule "cheat-community"]
@@ -33,4 +29,3 @@
 	path = config/tmux/plugins/tpm
 	url = https://github.com/tmux-plugins/tpm.git
 	ignore = dirty
-	branch = v3.1.0