diff --git a/.woodpecker/vlang.yml b/.woodpecker/vlang-arch.yml
similarity index 87%
rename from .woodpecker/vlang.yml
rename to .woodpecker/vlang-arch.yml
index c24b482..0ebedcf 100644
--- a/.woodpecker/vlang.yml
+++ b/.woodpecker/vlang-arch.yml
@@ -7,8 +7,9 @@ platform: ${PLATFORM}
 
 when:
   path: 
-    - 'vlang/PKGBUILD.vlang'
-    - '.woodpecker/vlang.yml'
+    - 'vlang/PKGBUILD'
+    - '.woodpecker/vlang-arch.yml'
+  event: [push]
 
 pipeline:
   build:
@@ -25,11 +26,12 @@ pipeline:
       - "echo 'builder ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"
       - su builder
       - cd vlang
-      - makepkg -p PKGBUILD.vlang -s --noconfirm --needed
+      - makepkg -s --noconfirm --needed
 
   publish:
     image: 'curlimages/curl'
     commands:
+      - cd vlang
       # Publish the package
       - 'for pkg in $(ls -1 *.pkg*); do curl -XPOST -T "$pkg" -H "X-API-KEY: $VIETER_API_KEY" https://arch.r8r.be/vieter/publish; done'
     secrets:
diff --git a/.woodpecker/vls-arch.yml b/.woodpecker/vls-arch.yml
new file mode 100644
index 0000000..fa9b6ad
--- /dev/null
+++ b/.woodpecker/vls-arch.yml
@@ -0,0 +1,39 @@
+matrix:
+  PLATFORM:
+    - linux/amd64
+    - linux/arm64
+
+platform: ${PLATFORM}
+
+when:
+  - path: 
+      - 'vls/PKGBUILD'
+      - '.woodpecker/vls-arch.yml'
+    event: [push]
+  - event: [cron]
+
+pipeline:
+  build:
+    image: 'git.rustybever.be/vieter-v/vieter-builder'
+    commands:
+      # Add the vieter repository so we can use the compiler
+      - echo -e '[vieter]\nServer = https://arch.r8r.be/$repo/$arch\nSigLevel = Optional' >> /etc/pacman.conf
+      # Update packages
+      - pacman -Syu --noconfirm
+      # Create non-root user to perform build & switch to their home
+      - groupadd -g 1000 builder
+      - useradd -mg builder builder
+      - chown -R builder:builder "$PWD"
+      - "echo 'builder ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"
+      - su builder
+      - cd vls
+      - makepkg -s --noconfirm --needed
+
+  publish:
+    image: 'curlimages/curl'
+    commands:
+      - cd vls
+      # Publish the package
+      - 'for pkg in $(ls -1 *.pkg*); do curl -XPOST -T "$pkg" -H "X-API-KEY: $VIETER_API_KEY" https://arch.r8r.be/vieter/publish; done'
+    secrets:
+      - vieter_api_key
diff --git a/vlang/PKGBUILD.vlang b/vlang/PKGBUILD
similarity index 100%
rename from vlang/PKGBUILD.vlang
rename to vlang/PKGBUILD
diff --git a/vlang/PKGBUILD.vls b/vls/PKGBUILD
similarity index 100%
rename from vlang/PKGBUILD.vls
rename to vls/PKGBUILD