diff --git a/.SRCINFO b/.SRCINFO
index 47f8fc8..9a7cf2d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = bzz-initrd
 	pkgdesc = Initrd image for Kira Linux
 	pkgver = 0.2.1
-	pkgrel = 1
+	pkgrel = 3
 	url = https://dev.kira-linux.org
 	arch = x86_64
 	makedepends = bcachefs-tools
@@ -20,9 +20,9 @@ pkgbase = bzz-initrd
 	makedepends = gzip
 	makedepends = zstd
 	options = !debug
-	source = https://dev.kira-linux.org/kira-linux/nyanit/archive/v0.2.1.tar.gz
-	sha256sums = b4a5518e49a798c71e27e4638dbadf57b85b4961817333ebba3f449a3ee87a01
-	b2sums = 0d3c6be735d41b23bfd460ae5d87cc008ac9fb75653e0115e289440e8e5f43211cdaacfca29f9120ee866d3dafad4bd7b7c3e298382f47825efd83cea286b4d8
+	source = https://dev.kira-linux.org/kira-linux/nyanit/archive/v0.2.1-1.tar.gz
+	sha256sums = 9c8e20c3d32174037b26fea4e936467ed9391284bf7ff4675ecf4a83fd820742
+	b2sums = 05f25e60c491b7ef558d832addd44784db09170418f643ad341050dddb60a78fb9feb9fb47603cdd4a651eacf1b1cbf515bf37dadf84b8dfc2755c1eeead7c30
 
 pkgname = bzz-initrd
 	pkgdesc = The Initrd image for Kira Linux kernel and modules
diff --git a/PKGBUILD b/PKGBUILD
index 03bbdd2..c6503d7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,12 +2,12 @@
 
 pkgname=bzz-initrd
 pkgver=0.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Initrd image for Kira Linux'
 url='https://dev.kira-linux.org'
 arch=(x86_64)
 
-_nyanit_ver=0.2.1
+_nyanit_ver=0.2.1-1
 _nyanit_src=v${_nyanit_ver}.tar.gz
 _nyanit_src_dir=nyanit
 
@@ -42,9 +42,8 @@ source=(
 # )
 
 
-
-sha256sums=('b4a5518e49a798c71e27e4638dbadf57b85b4961817333ebba3f449a3ee87a01')
-b2sums=('0d3c6be735d41b23bfd460ae5d87cc008ac9fb75653e0115e289440e8e5f43211cdaacfca29f9120ee866d3dafad4bd7b7c3e298382f47825efd83cea286b4d8')
+sha256sums=('9c8e20c3d32174037b26fea4e936467ed9391284bf7ff4675ecf4a83fd820742')
+b2sums=('05f25e60c491b7ef558d832addd44784db09170418f643ad341050dddb60a78fb9feb9fb47603cdd4a651eacf1b1cbf515bf37dadf84b8dfc2755c1eeead7c30')
 
 _tools_list=(
   /usr/bin/bcachefs
@@ -64,28 +63,9 @@ build() {
   echo "##### DONE Building NYANIT #####"
   echo ""
 
-  echo "Populate initdramfs tree..."
+  echo "Build initramfs image..."
   cd $srcdir
-  mkdir -p initramfs/{dev,proc,sys,run,mnt,mnt/bee_root,tmp,etc,usr,usr/bin,usr/lib}
-
-  echo "Create /bin /lib /lib64 simlinks"
-  cd $srcdir/initramfs
-  ln -s usr/lib lib64
-  ln -s usr/lib lib
-  ln -s usr/bin bin
-  cd $srcdir/initramfs/usr
-  ln -s lib lib64
-
-  echo "Install NYANIT..."
-  cd $srcdir
-  lddtree --bindir / --copy-to-tree $srcdir/initramfs init
-
-  echo "Copy libs and binaries"
-  cd $srcdir
-  lddtree --copy-to-tree $srcdir/initramfs "${_tools_list[@]}"
-
-  echo "Remove setuid flag from everything..."
-  chmod -R a-s $srcdir/initramfs
+  $_nyanit_src_dir/build_initcpio.sh $srcdir
 
 }
 
@@ -98,21 +78,6 @@ package() {
     Zlib
   )
 
-  echo "Create device node"
-  cd $srcdir/initramfs
-  mknod -m 622 dev/console c 5 1
-
-  # echo "Change owner to root"
-  # chown -R root:root $srcdir/initramfs
-
-  # echo "Run ldconfig"
-  # ldconfig -r $srcdir/initramfs -v
-
-   # Create cpio archive
-  echo "Create cpio archive"
-  cd $srcdir/initramfs
-  find . | cpio -ov --format=newc > ../initramfs.cpio
-
   echo "Installing bzz-initrd"
   install -vDm 644 $srcdir/initramfs.cpio -t "$pkgdir/usr/share/$pkgname/"
 }