diff --git a/.github/workflows/update-nightly.yml b/.github/workflows/update-nightly.yml
new file mode 100644
index 0000000000..b04b131756
--- /dev/null
+++ b/.github/workflows/update-nightly.yml
@@ -0,0 +1,41 @@
+name: Automatic Nightly Update
+on:
+  schedule:
+    - cron: "@daily"
+  workflow_dispatch:
+
+jobs:
+  autoupdate:
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/terrapkg/builder:main
+      options: --cap-add=SYS_ADMIN --privileged
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 2
+          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
+
+      - name: Install SSH signing key
+        run: |
+          mkdir -p ${{ runner.temp }}
+          echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
+          chmod 0700 ${{ runner.temp }}/signing_key
+
+      - name: Run Nightly Update
+        run: anda update -vv --filters nightly=1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Save
+        run: |
+          git config --global --add safe.directory "*"
+          if [[ `git status --porcelain` ]]; then
+            git config user.name "Raboneko"
+            git config user.email "raboneko@fyralabs.com"
+            git config gpg.format "ssh"
+            git config user.signingkey "${{ runner.temp }}/signing_key"
+            git commit -S -a -m "Automatic Update: $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
+            git push -u origin main
+          fi
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index 525328d37a..bfeb235fb5 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -26,8 +26,8 @@ jobs:
           echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
           chmod 0700 ${{ runner.temp }}/signing_key
 
-      - name: Run Update (anda)
-        run: anda update -vvv
+      - name: Run Update
+        run: anda update -vv
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/anda/tools/lorax/lorax.spec b/anda/tools/lorax/lorax.spec
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/anda/tools/vala-language-server-nightly/update.rhai b/anda/tools/vala-language-server-nightly/update.rhai
index e0a8ec4eed..4defb55957 100644
--- a/anda/tools/vala-language-server-nightly/update.rhai
+++ b/anda/tools/vala-language-server-nightly/update.rhai
@@ -1,11 +1,7 @@
-let req = new_req("https://api.github.com/repos/vala-lang/vala-language-server/commits/HEAD");
-req.head("Authorization", `Bearer ${env("GITHUB_TOKEN")}`);
-let _sha = json(req.get()) @ "sha";
-let sha = _sha.str();
-let cur = find("%global commit (.+)", rpm.f, 1);
-if sha != cur {
-    print(`vala-language-server-nightly: ${cur} -> ${sha}`);
-    rpm.f = sub("%global commit (.+)", `%global commit ${sha}`, rpm.f);
-} else {
-    print("vala-language-server-nightly: Up to date!");
+if filters.contains("nightly") {
+	let req = new_req("https://api.github.com/repos/vala-lang/vala-language-server/commits/HEAD");
+	req.head("Authorization", `Bearer ${env("GITHUB_TOKEN")}`);
+	let sha = json(req.get()).sha;
+	rpm.global("commit", sha);
+	rpm.release();
 }