diff --git a/unmaintained/firefly-iii-plaid-connector/APKBUILD b/unmaintained/firefly-iii-plaid-connector/APKBUILD
index 66c3fea..13a222e 100644
--- a/unmaintained/firefly-iii-plaid-connector/APKBUILD
+++ b/unmaintained/firefly-iii-plaid-connector/APKBUILD
@@ -1,32 +1,29 @@
-# Maintainer: Antoine Martin <dev@ayakael.net>
+# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
+# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
 
 pkgname=firefly-iii-plaid-connector
 pkgver=0.3.1
-pkgrel=5
-pkgdesc='The Free Software Media System'
-arch='i686 x86_64'
-url='https://gitlab.com/GeorgeHahn/firefly-plaid-connector'
-license='MIT'
-options="!strip !check"
-#depends='firefly-iii dotnet31-runtime'
-makedepends='dotnet31-sdk'
-source="firefly-plaid-connector-$pkgver.tar.gz::https://gitlab.com/GeorgeHahn/firefly-plaid-connector/-/archive/v${pkgver}/firefly-plaid-connector-v${pkgver}.tar.gz"
-builddir="${srcdir}/firefly-plaid-connector-v${pkgver}"
+pkgrel=7
+pkgdesc="The Free Software Media System"
+#arch="x86_64"
+url="https://gitlab.com/GeorgeHahn/firefly-plaid-connector"
+license="MIT"
+options="!check"
+depends="firefly-iii dotnet6-runtime"
+makedepends="dotnet6-sdk"
+source="firefly-plaid-connector-$pkgver.tar.gz::https://gitlab.com/GeorgeHahn/firefly-plaid-connector/-/archive/v$pkgver/firefly-plaid-connector-v$pkgver.tar.gz net6-support.patch"
+builddir="$srcdir/firefly-plaid-connector-v$pkgver"
 
-build(){
-  cd "${builddir}"
-
-  # Disable dotnet telemetry
-  export DOTNET_CLI_TELEMETRY_OPTOUT=1
-
-  # publish app and libraries
-  dotnet publish --configuration Release --output "$PWD"/publish
+build() {
+	dotnet publish --configuration Release --output ./publish --use-current-runtime --no-self-contained
 }
 
 package() {
-  mkdir -p "${pkgdir}"/var/lib
-  cp -r "${builddir}"/publish "$pkgdir"/var/lib/firefly-plaid-connector
-
+	mkdir -p "$pkgdir"/usr/lib
+	cp -r "$builddir"/publish "$pkgdir"/usr/lib/firefly-plaid-connector
 }
-sha512sums="57a64673bf2e8cae00cb215e1dc90eb02bddf50010835a9318f55f83313c00f19d6c8d8af65e2739b0fb6fd4522a2327941bdc7d11cbe59c9537ff6c1575765e  firefly-plaid-connector-0.3.1.tar.gz"
 
+sha512sums="
+57a64673bf2e8cae00cb215e1dc90eb02bddf50010835a9318f55f83313c00f19d6c8d8af65e2739b0fb6fd4522a2327941bdc7d11cbe59c9537ff6c1575765e  firefly-plaid-connector-0.3.1.tar.gz
+f795fe58659763082e3f2bba0e6e2a70c4732bc6b402a4e586104bf09525ffca1d3586acda43ccba3b71d15e1a0a62794574f72a2fc6cd3d1905dcb2e8782dc2  net6-support.patch
+"
diff --git a/user/firefly-iii-plaid-connector/net6-support.patch b/unmaintained/firefly-iii-plaid-connector/net6-support.patch
similarity index 100%
rename from user/firefly-iii-plaid-connector/net6-support.patch
rename to unmaintained/firefly-iii-plaid-connector/net6-support.patch
diff --git a/user/firefly-iii-plaid-connector/APKBUILD b/user/firefly-iii-plaid-connector/APKBUILD
deleted file mode 100644
index 13a222e..0000000
--- a/user/firefly-iii-plaid-connector/APKBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
-# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
-
-pkgname=firefly-iii-plaid-connector
-pkgver=0.3.1
-pkgrel=7
-pkgdesc="The Free Software Media System"
-#arch="x86_64"
-url="https://gitlab.com/GeorgeHahn/firefly-plaid-connector"
-license="MIT"
-options="!check"
-depends="firefly-iii dotnet6-runtime"
-makedepends="dotnet6-sdk"
-source="firefly-plaid-connector-$pkgver.tar.gz::https://gitlab.com/GeorgeHahn/firefly-plaid-connector/-/archive/v$pkgver/firefly-plaid-connector-v$pkgver.tar.gz net6-support.patch"
-builddir="$srcdir/firefly-plaid-connector-v$pkgver"
-
-build() {
-	dotnet publish --configuration Release --output ./publish --use-current-runtime --no-self-contained
-}
-
-package() {
-	mkdir -p "$pkgdir"/usr/lib
-	cp -r "$builddir"/publish "$pkgdir"/usr/lib/firefly-plaid-connector
-}
-
-sha512sums="
-57a64673bf2e8cae00cb215e1dc90eb02bddf50010835a9318f55f83313c00f19d6c8d8af65e2739b0fb6fd4522a2327941bdc7d11cbe59c9537ff6c1575765e  firefly-plaid-connector-0.3.1.tar.gz
-f795fe58659763082e3f2bba0e6e2a70c4732bc6b402a4e586104bf09525ffca1d3586acda43ccba3b71d15e1a0a62794574f72a2fc6cd3d1905dcb2e8782dc2  net6-support.patch
-"