diff --git a/ubuntu.sh b/ubuntu.sh
index 7e1d5b3..a6b1938 100644
--- a/ubuntu.sh
+++ b/ubuntu.sh
@@ -5,67 +5,50 @@ set -e
 chmod 755 ./ppp
 
 # output folders
-mkdir -p ./output/output
-cd ./output/output
+mkdir -p ./output/incoming
 
 # temp
 apt update
 apt upgrade -y
 # end of temp
 
-apt install dpkg-sig wget rsync ssh reprepro -y
+apt install wget rsync ssh -y
 
 # Get ubuntu main pool
 echo "Getting ubuntu main pool 32bit"
-../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar/main/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./
+../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar/main/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./incoming
 echo "Getting ubuntu main pool 64bit"
-../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar/main/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./
+../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar/main/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./incoming
 
 # Get ubuntu multiverse pool
-echo "Getting ubuntu multiverse pool 32bit"
-../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar/multiverse/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./
-echo "Getting ubuntu multiverse pool 64bit"
-../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar/multiverse/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./
+# echo "Getting ubuntu multiverse pool 32bit"
+# ../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar/multiverse/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./incoming
+# echo "Getting ubuntu multiverse pool 64bit"
+# ../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar/multiverse/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./incoming
 
 # Get ubuntu restricted pool
-echo "Getting ubuntu restricted pool 32bit"
-../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar/restricted/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./
-echo "Getting ubuntu restricted pool 64bit"
-../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar/restricted/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./
+# echo "Getting ubuntu restricted pool 32bit"
+# ../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar/restricted/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./incoming
+# echo "Getting ubuntu restricted pool 64bit"
+# ../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar/restricted/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./incoming
 
 # Get ubuntu universe pool
-echo "Getting ubuntu universe pool 32bit"
-../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar/universe/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./
-echo "Getting ubuntu universe pool 64bit"
-../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar/universe/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./
-
-cd ../
+# echo "Getting ubuntu universe pool 32bit"
+# ../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar/universe/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./incoming
+# echo "Getting ubuntu universe pool 64bit"
+# ../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar/universe/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./incoming
 
 if [ $(ls ./output/ | wc -l) -lt 1 ]; then
 echo "Repos are synced"
     exit 0
 fi
 
-# Sign the packages
-../ppp sign ./output/
+# send debs to server
+rsync -azP ./output/incoming/ ferreo@direct.pika-os.com:/srv/www/incoming/
 
-# Pull down existing ppa repo db files etc
-rsync -azP --exclude '*.deb' ferreo@direct.pika-os.com:/srv/www/pikappa/ ./output/repo
+# add debs to repo
+ssh ferreo@direct.pika-os.com 'aptly repo add -force-replace -remove-files pika-ubuntu /srv/www/incoming'
 
-# Check if the ubuntu component exists
-if cat ./output/repo/conf/distributions | grep Components: | grep ubuntu
-then
-    true
-else
-    sed -i "s#Components:#Components: ubuntu#" ./output/repo/conf/distributions
-fi
-
-apt remove reprepro -y
-wget -nv https://launchpad.net/ubuntu/+archive/primary/+files/reprepro_5.3.0-1.4_amd64.deb
-apt install -y ./reprepro_5.3.0-1.4_amd64.deb
-
-# Add the new packages to the repo
-../ppp repoadd ./output/ "--keepunusednewfiles --keepunreferencedfiles -C ubuntu -V --ignore=missingfield --basedir ./output/repo/ includedeb lunar"
-
-# Push the updated ppa repo to the server
-rsync -azP ./output/repo/ ferreo@direct.pika-os.com:/srv/www/pikappa/
+# publish the repo
+ssh ferreo@direct.pika-os.com 'aptly publish repo -batch -skip-contents -force-overwrite -component=,,,, pika-a
+mdgpu pika-external pika-main pika-rocm pika-ubuntu filesystem:pikarepo:'