diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 0000000..f2ab9a8
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,43 @@
+pkgbase = nheko-git
+	pkgdesc = Desktop client for the Matrix protocol
+	pkgver = 0.9.1.r7.gbccab87a
+	pkgrel = 1
+	url = https://github.com/Nheko-Reborn/nheko
+	arch = i686
+	arch = x86_64
+	arch = aarch64
+	license = GPL3
+	makedepends = git
+	makedepends = cmake
+	makedepends = gcc
+	makedepends = fontconfig
+	makedepends = qt5-tools
+	makedepends = nlohmann-json
+	depends = qt5-base
+	depends = lmdb
+	depends = qt5-graphicaleffects
+	depends = qt5-multimedia
+	depends = qt5-svg
+	depends = qt5-quickcontrols2
+	depends = qt5-declarative
+	depends = qtkeychain-qt5
+	depends = cmark
+	depends = openssl
+	depends = hicolor-icon-theme
+	depends = gstreamer
+	depends = gst-plugins-base
+	depends = gst-plugins-good
+	depends = gst-plugins-bad
+	depends = gst-plugin-qmlgl
+	depends = libnice
+	depends = libolm
+	depends = spdlog
+	depends = curl
+	depends = libevent
+	optdepends = qt-jdenticon
+	provides = nheko
+	conflicts = nheko
+	source = nheko-git::git+https://github.com/Nheko-Reborn/nheko.git#branch=master
+	md5sums = SKIP
+
+pkgname = nheko-git
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index af8ad5e..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*
-
-!PKGBUILD
-!.woodpecker.yml
diff --git a/.woodpecker.yml b/.woodpecker.yml
deleted file mode 100644
index 36d8962..0000000
--- a/.woodpecker.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-platform: linux/amd64
-
-pipeline:
-  build:
-    image: 'archlinux:latest'
-    pull: true
-    environment:
-      - SCCACHE_BUCKET=bur
-      - SCCACHE_ENDPOINT=s3.rustybever.be
-      - SCCACHE_S3_USE_SSL=true
-    secrets:
-      - aws_access_key_id
-      - aws_secret_access_key
-    commands:
-      # Update packages
-      - pacman -Syu --needed --noconfirm base-devel
-      # 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
-      # Build the package
-      - MAKEFLAGS="-j$(nproc)" makepkg -s --noconfirm --needed
-
-  publish:
-    image: 'archlinux:latest'
-    commands:
-      # Publish the package
-      - 'curl -s -XPOST -H "X-API-KEY: $API_KEY" -T "$(ls *.pkg*)" https://arch.r8r.be/publish'
-    secrets:
-      - api_key
diff --git a/PKGBUILD b/PKGBUILD
index 6cefb61..dacf66f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Konstantinos Sideris <siderisk at auth dot gr>
 # Maintainer: Joseph Donofry <joe at joedonofry dot com>
 
-pkgname=jjr-nheko
-pkgver=0.9.3.r66.g7138c7a4
+pkgname=nheko-git
+pkgver=0.9.1.r7.gbccab87a
 pkgrel=1
 pkgdesc="Desktop client for the Matrix protocol"
 arch=("i686" "x86_64" "aarch64")
@@ -10,36 +10,51 @@ arch=("i686" "x86_64" "aarch64")
 url="https://github.com/Nheko-Reborn/nheko"
 license=("GPL3")
 
-depends=("qt5-base" "lmdb" "qt5-graphicaleffects" "qt5-multimedia" "qt5-svg" "qt5-quickcontrols2" "qt5-declarative" "qtkeychain-qt5" "cmark" "openssl" "hicolor-icon-theme" "gstreamer" "gst-plugins-base" "gst-plugins-good" "gst-plugins-bad" "gst-plugin-qmlgl" "libnice" "libolm" "spdlog" "curl" "libevent" "qt5-imageformats")
-makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "nlohmann-json" "asciidoc" "sccache")
+depends=("qt5-base" "lmdb" "qt5-graphicaleffects" "qt5-multimedia" "qt5-svg" "qt5-quickcontrols2" "qt5-declarative" "qtkeychain-qt5" "cmark" "openssl" "hicolor-icon-theme" "gstreamer" "gst-plugins-base" "gst-plugins-good" "gst-plugins-bad" "gst-plugin-qmlgl" "libnice" "libolm" "spdlog" "curl" "libevent")
+makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "nlohmann-json")
 optdepends=("qt-jdenticon")
 provides=("nheko")
-conflicts=("nheko" "nheko-git")
+conflicts=("nheko")
 
 source=($pkgname::git+https://github.com/Nheko-Reborn/nheko.git#branch=master)
 md5sums=("SKIP")
 
+prepare() {
+  cd "$pkgname"
+}
+
 pkgver() {
     cd "$pkgname"
     git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-    rm -f "$pkgname"/cmake/FindOlm.cmake
+    cd "$pkgname"
 
-    cmake -B build -S "$pkgname" -Wno-dev \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DHUNTER_ENABLED=OFF \
-        -DBUILD_SHARED_LIBS=OFF \
-        -DUSE_BUNDLED_MTXCLIENT=ON \
-        -DUSE_BUNDLED_COEURL=ON \
-        -DUSE_BUNDLED_LMDBXX=ON \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_C_COMPILER_LAUNCHER=sccache \
-        -DCMAKE_CXX_COMPILER_LAUNCHER=sccache
-    SCCACHE_S3_KEY_PREFIX="$pkgname" cmake --build build --config Release
+    rm -f cmake/FindOlm.cmake
+
+    cmake -H. -Bbuild -DHUNTER_ENABLED=OFF -DBUILD_SHARED_LIBS=OFF -DUSE_BUNDLED_MTXCLIENT=ON -DUSE_BUNDLED_COEURL=ON -DUSE_BUNDLED_LMDBXX=ON -DCMAKE_INSTALL_PREFIX=.deps/usr -DCMAKE_BUILD_TYPE=Release
+    cmake --build build --config Release
 }
 
 package() {
-    DESTDIR="$pkgdir" cmake --install build
+    # Creating needed directories
+    install -dm755 "$pkgdir/usr/bin"
+    install -dm755 "$pkgdir/usr/share/pixmaps/"
+    install -dm755 "$pkgdir/usr/share/applications/"
+
+    # Program
+    install -Dm755 "$pkgname/build/nheko" "$pkgdir/usr/bin/nheko"
+
+    # Desktop launcher
+    install -Dm644 "$srcdir/$pkgname/resources/nheko-256.png" "$pkgdir/usr/share/pixmaps/nheko.png"
+    install -Dm644 "$srcdir/$pkgname/resources/nheko.desktop" "$pkgdir/usr/share/applications/nheko.desktop"
+
+    # Icons
+    local icon_size icon_dir
+    for icon_size in 16 32 48 64 128 256 512; do
+        icon_dir="$pkgdir/usr/share/icons/hicolor/${icon_size}x${icon_size}/apps"
+        install -d "$icon_dir"
+        install -m644 "$srcdir/$pkgname/resources/nheko-${icon_size}.png" "$icon_dir/nheko.png"
+    done
 }