diff --git a/calamares/calamares-3.4.0/PKGBUILD b/calamares/calamares-3.4.0/PKGBUILD
index 135d6a10..8fd9609b 100644
--- a/calamares/calamares-3.4.0/PKGBUILD
+++ b/calamares/calamares-3.4.0/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=calamares
 pkgver=3.4.0
-pkgrel=3
+pkgrel=6
 pkgdesc='Distribution-independent installer framework'
 arch=('x86_64')
 license=(GPL)
@@ -18,9 +18,8 @@ backup=('usr/share/calamares/modules/bootloader.conf'
         'usr/share/calamares/modules/initcpio.conf'
         'usr/share/calamares/modules/unpackfs.conf')
 
-source=(${pkgname}::"git+${url}/${pkgname}#branch=codeberg"
-	"https://gitlab.com/garuda-linux/pkgbuilds/-/raw/main/calamares-garuda/0001-bootloader-Correct-a-logic-error-preventing-installa.patch")
-sha256sums=('SKIP' 'SKIP')
+source=(${pkgname}::"git+${url}/${pkgname}#branch=codeberg")
+sha256sums=('SKIP')
 
 prepare() {
 	mkdir calamares-${pkgver}
@@ -28,7 +27,7 @@ prepare() {
 	cd ${srcdir}/calamares-${pkgver}
 
 	# Apply patch
-    patch -Np1 -i "${srcdir}/0001-bootloader-Correct-a-logic-error-preventing-installa.patch"
+    #patch -Np1 -i "${srcdir}/0001-bootloader-Correct-a-logic-error-preventing-installa.patch"
 
 	sed -i -e 's/"Install configuration files" OFF/"Install configuration files" ON/' CMakeLists.txt
 	sed -i -e 's/# DEBUG_FILESYSTEMS/DEBUG_FILESYSTEMS/' "$srcdir/${pkgname}-${pkgver}/CMakeLists.txt"
diff --git a/calamares/calamares-3.4.2/PKGBUILD b/calamares/calamares-3.4.2/PKGBUILD
new file mode 100644
index 00000000..8cffdfe3
--- /dev/null
+++ b/calamares/calamares-3.4.2/PKGBUILD
@@ -0,0 +1,79 @@
+# Maintainer: akash6222 <akashlinux0@gmail.com>
+
+pkgname=calamares
+pkgver=3.4.2
+pkgrel=2
+pkgdesc='Distribution-independent installer framework'
+arch=('x86_64')
+license=(GPL)
+url="https://github.com/arch-linux-gui/"
+license=('LGPL')
+depends=('kconfig' 'kcoreaddons' 'kiconthemes' 'ki18n' 'kio' 'solid' 'yaml-cpp' 'kpmcore' 'mkinitcpio-openswap'
+		 'ckbcomp' 'hwinfo' 'qt6-svg' 'polkit-qt6' 'gtk-update-icon-cache'
+		 'squashfs-tools' 'libpwquality' 'pybind11' 'python')
+		 #'boost-libs' 'pythonqt>=3.2')  'boost' #'plasma-framework5') #'qt5-xmlpatterns')
+makedepends=('extra-cmake-modules' 'qt6-tools' 'qt6-translations' 'git' 'boost')
+backup=('usr/share/calamares/modules/bootloader.conf'
+        'usr/share/calamares/modules/displaymanager.conf'
+        'usr/share/calamares/modules/initcpio.conf'
+        'usr/share/calamares/modules/unpackfs.conf')
+
+source=(${pkgname}::"git+${url}/${pkgname}#branch=codeberg")
+sha256sums=('SKIP')
+
+prepare() {
+	mkdir calamares-${pkgver}
+	mv calamares/* calamares-${pkgver}
+	cd ${srcdir}/calamares-${pkgver}
+
+	# Apply patch
+    #patch -Np1 -i "${srcdir}/0001-bootloader-Correct-a-logic-error-preventing-installa.patch"
+
+	sed -i -e 's/"Install configuration files" OFF/"Install configuration files" ON/' CMakeLists.txt
+	sed -i -e 's/# DEBUG_FILESYSTEMS/DEBUG_FILESYSTEMS/' "$srcdir/${pkgname}-${pkgver}/CMakeLists.txt"
+
+	# modify desktop file
+	sed -i -e 's#Exec=sh.*#Exec=sh -c "/etc/calamares/launch.sh"#g' "$srcdir/${pkgname}-${pkgver}/calamares.desktop"
+	sed -i -e 's#Name=.*#Name=Install ALG#g' "$srcdir/${pkgname}-${pkgver}/calamares.desktop"
+	sed -i -e 's#GenericName=.*#GenericName=ALG Installer#g' "$srcdir/${pkgname}-${pkgver}/calamares.desktop"
+	sed -i -e 's#Icon=.*#Icon=install-alg#g' "$srcdir/${pkgname}-${pkgver}/calamares.desktop"
+	sed -i -e 's#Comment=.*#Comment=ALG Installer#g' "$srcdir/${pkgname}-${pkgver}/calamares.desktop"
+
+
+	# patches here
+
+	# change version
+	_ver="$(cat CMakeLists.txt | grep -m3 -e "  VERSION" | grep -o "[[:digit:]]*" | xargs | sed s'/ /./g')"
+	printf 'Version: %s-%s' "${_ver}" "${pkgrel}"
+	sed -i -e "s|\${CALAMARES_VERSION_MAJOR}.\${CALAMARES_VERSION_MINOR}.\${CALAMARES_VERSION_PATCH}|${_ver}-${pkgrel}|g" CMakeLists.txt
+	sed -i -e "s|CALAMARES_VERSION_RC 1|CALAMARES_VERSION_RC 0|g" CMakeLists.txt
+
+}
+
+build() {
+	cd ${srcdir}/calamares-${pkgver}
+
+	mkdir -p build
+	cd build
+        cmake .. \
+              -DCMAKE_BUILD_TYPE=Release \
+              -DCMAKE_INSTALL_PREFIX=/usr \
+              -DCMAKE_INSTALL_LIBDIR=lib \
+              -DWITH_PYTHONQT:BOOL=ON \
+              -DBoost_NO_BOOST_CMAKE=ON \
+              -DWITH_QT6=ON \
+              -DWITH_PYBIND11=ON \
+              -DWITH_APPSTREAM=OFF \
+              -DBUILD_TESTING=OFF \
+              -DSKIP_MODULES="tracking webview interactiveterminal initramfs \
+                              initramfscfg dracut dracutlukscfg \
+                              dummyprocess dummypython dummycpp \
+                              dummypythonqt services-openrc"
+        make
+}
+
+package() {
+	cd ${srcdir}/calamares-${pkgver}/build
+	make DESTDIR="$pkgdir" install
+
+}
diff --git a/calamares/calamares-3.4.2/cleanup.sh b/calamares/calamares-3.4.2/cleanup.sh
new file mode 100755
index 00000000..0d9d0d8a
--- /dev/null
+++ b/calamares/calamares-3.4.2/cleanup.sh
@@ -0,0 +1,4 @@
+rm -rvf pkg/
+rm -rvf src/
+rm -rvf cala*
+rm -f *.patch
diff --git a/calamares/calamares-3.4.2/dep.sh b/calamares/calamares-3.4.2/dep.sh
new file mode 100755
index 00000000..3bba9f2f
--- /dev/null
+++ b/calamares/calamares-3.4.2/dep.sh
@@ -0,0 +1,6 @@
+# Installing calamares dependencies for ALG
+
+echo "Installing: kconfig kcoreaddons kiconthemes ki18n kio solid yaml-cpp kpmcore mkinitcpio-openswap ckbcomp hwinfo qt6-svg polkit-qt6 gtk-update-icon-cache squashfs-tools libpwquality pybind11 python extra-cmake-modules qt6-tools qt6-translations git"
+
+sudo pacman -Sy kconfig kcoreaddons kiconthemes ki18n kio solid yaml-cpp kpmcore mkinitcpio-openswap ckbcomp hwinfo qt6-svg polkit-qt6 gtk-update-icon-cache squashfs-tools libpwquality pybind11 python extra-cmake-modules qt6-tools qt6-translations git
+