diff --git a/.woodpecker.yml b/.woodpecker.yml
index da637eb..ae7e29b 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -11,7 +11,7 @@ pipeline:
       - "echo 'builder ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"
       - su builder
       # Build the package
-      - makepkg -s --noconfirm --needed'
+      - 'echo "Y" | makepkg -s --noconfirm --needed'
 
   publish:
     image: 'archlinux:latest'
diff --git a/PKGBUILD b/PKGBUILD
index 181f80c..a8cb74f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,16 +7,16 @@
 # https://github.com/alfredopalhares/arch-pkgbuilds
 
 pkgbase="joplin"
-pkgname=('jjr-joplin' 'jjr-joplin-desktop')
+pkgname=('joplin' 'joplin-desktop')
 pkgver=2.6.10
-groups=('jjr-joplin')
+groups=('joplin')
 pkgrel=4
 install="joplin.install"
 depends=('electron' 'gtk3' 'libexif' 'libgsf' 'libjpeg-turbo' 'libwebp' 'libxss' 'nodejs'
          'nss' 'orc' 'rsync' 'libvips')
 optdepends=('libappindicator-gtk3: for tray icon')
 arch=('x86_64' 'i686')
-makedepends=('git' 'yarn' 'python2' 'rsync' 'jq' 'electron' 'libgsf' 'node-gyp>=8.4.1' 'libvips' 'expect')
+makedepends=('git' 'yarn' 'python2' 'rsync' 'jq' 'electron' 'libgsf' 'node-gyp>=8.4.1' 'libvips')
 url="https://joplinapp.org/"
 license=('MIT')
 source=("joplin.desktop" "joplin-desktop.sh" "joplin.sh"
@@ -46,12 +46,11 @@ prepare() {
   msg2 "Disabling husky (git hooks)"
   sed -i '/"husky": ".*"/d' "${srcdir}/joplin-${pkgver}/package.json"
 
-  msg2 "Applying patches..."
+  msg2 "Appliying patches..."
   cd "${srcdir}/joplin-${pkgver}"
   tar xvJf "${srcdir}/joplin-patches.tar.xz"
   patch -p1 < "${srcdir}/0005-All-Fixed-issue-where-synchroniser-would-try-to-upda.patch"
-  # patch -p1 < "${srcdir}/0007-Tools-Use-Yarn-3-to-manage-monorepo-5833.patch"
-  expect "${srcdir}/patch.exp" "${srcdir}/0007-Tools-Use-Yarn-3-to-manage-monorepo-5833.patch"
+  patch -p1 < "${srcdir}/0007-Tools-Use-Yarn-3-to-manage-monorepo-5833.patch"
 
   msg2 "Tweaking lerna.json"
   local tmp_json="$(mktemp --tmpdir="$srcdir")"
diff --git a/patch.exp b/patch.exp
deleted file mode 100644
index 8bc6c60..0000000
--- a/patch.exp
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/expect -f
-
-set timeout -1
-
-set patchfile [lindex $argv 0]
-
-spawn sh -c "patch -p1 < $patchfile"
-
-expect "Assume -R?"
-
-send -- "y\r"