diff --git a/makeiso/makeiso.sh b/makeiso/makeiso.sh
index a36b608ed71946d8ec2b24b4af22420d81d71f61..b7911554ad51a3928b406de5d8d18470aec7b403 100644
--- a/makeiso/makeiso.sh
+++ b/makeiso/makeiso.sh
@@ -167,7 +167,7 @@ echo -n ${i}iso/hamara_${VERSION}_sources.iso','
 done | sed 's/,$//')
 
 cd iso
-$MKTORRENT -a $TRACKER -c "Hamara GNU/Linux $VERSION $CODENAME Source DVD" -w $SEEDS hamara_${VERSION}_sources.iso
+$MKTORRENT -a $TRACKER -c "Hamara GNU/Linux Server Edition $VERSION $CODENAME Source DVD" -w $SEEDS hamara_${VERSION}_sources.iso
 
 }
 
@@ -281,10 +281,6 @@ EOF
 chmod 755 $CHROOT/usr/sbin/start $CHROOT/usr/sbin/stop
 
 
-# Trying to get ubiquity from the hamara repos of namaste
-
-echo "Adding repos of Namaste"
-
 # apt setup for the debootstrap second stage
 cat << EOF > $CHROOT/etc/apt/sources.list
 deb $MIRROR $CODENAME main
@@ -301,9 +297,6 @@ deb-src $MIRROR $CODENAME-updates contrib
 deb $MIRROR $CODENAME-updates non-free
 deb-src $MIRROR $CODENAME-updates non-free
 
-deb http://archive.hamaralinux.org/hamara/ namaste main restricted multiverse
-deb http://archive.hamaralinux.org/hamara/ namaste universe
-
 EOF
 
 
@@ -332,12 +325,9 @@ apt-get install -y --force-yes --no-install-recommends $DIST ${DIST}-recommended
 
 #Adding some packages that probably should be part of hamara-meta
 
-echo "Installing ubiquity"
-# Excluding debian-installer launcher and adding packages for ubiquity
+apt-get install -y live-config debian-installer debian-installer-launcher live-boot extlinux
 
-apt-get install -y live-config task-lxde-desktop ubiquity ubiquity-slideshow-hamara ubiquity-ubuntu-artwork live-boot extlinux plymouth-theme-hamara
 
-echo "Removing Repositories of namaste as there need for installing ubiquity is done"
 cat << EOF > $CHROOT/etc/apt/sources.list
 deb $MIRROR $CODENAME main
 deb-src $MIRROR $CODENAME main
@@ -357,17 +347,6 @@ EOF
 
 apt-get update
 
-echo "Inserting the lsb-release file for ubiquity"
-touch $CHROOT/etc/lsb-release
-cat << EOF > $CHROOT/etc/lsb-release
-DISTRIB_ID=HamaraDIST
-DISTRIB_RELEASE=2.0
-DISTRIB_CODENAME=sugam
-DISTRIB_DESCRIPTION="Hamara 2.0"
-EOF
-
-
-
 echo task-lxde-desktop > config/package-lists/desktop.list.chroot
 apt-get clean
 ' >> $CHROOT/tmp/install
@@ -524,7 +503,7 @@ echo -n $i$FILE','
 done | sed 's/,$//')
 
 cd iso
-$MKTORRENT -a $TRACKER -c "Hamara GNU/Linux $VERSION $CODENAME$EXTRACOMMENT. $ARCH Installable Live CD" -w $SEEDS $FILE
+$MKTORRENT -a $TRACKER -c "Hamara GNU/Linux Server Edition $VERSION $CODENAME$EXTRACOMMENT. $ARCH Installable Live CD" -w $SEEDS $FILE
 }
 
 DO_ISO(){