diff --git a/apps/app-repository/Makefile b/apps/app-repository/Makefile
index 74cecbc..b9d7bc2 100644
--- a/apps/app-repository/Makefile
+++ b/apps/app-repository/Makefile
@@ -28,3 +28,6 @@
 	podman manifest create giolekva/app-repository:latest giolekva/app-repository:arm64 giolekva/app-repository:amd64
 	podman manifest push giolekva/app-repository:latest docker://docker.io/giolekva/app-repository:latest
 	podman manifest rm giolekva/app-repository:latest
+
+run:
+	go run cmd/*.go
diff --git a/apps/app-repository/apps/jellyfin-0.0.1.tar.gz b/apps/app-repository/apps/jellyfin-0.0.1.tar.gz
new file mode 100644
index 0000000..fbbc218
--- /dev/null
+++ b/apps/app-repository/apps/jellyfin-0.0.1.tar.gz
Binary files differ
diff --git a/apps/app-repository/apps/matrix-0.0.1.tar.gz b/apps/app-repository/apps/matrix-0.0.1.tar.gz
new file mode 100644
index 0000000..25c6026
--- /dev/null
+++ b/apps/app-repository/apps/matrix-0.0.1.tar.gz
Binary files differ
diff --git a/apps/app-repository/apps/penpot-0.0.1.tar.gz b/apps/app-repository/apps/penpot-0.0.1.tar.gz
new file mode 100644
index 0000000..9c9b5ac
--- /dev/null
+++ b/apps/app-repository/apps/penpot-0.0.1.tar.gz
Binary files differ
diff --git a/apps/app-repository/apps/pihole-0.0.1.tar.gz b/apps/app-repository/apps/pihole-0.0.1.tar.gz
index 01ea8ac..286da76 100644
--- a/apps/app-repository/apps/pihole-0.0.1.tar.gz
+++ b/apps/app-repository/apps/pihole-0.0.1.tar.gz
Binary files differ
diff --git a/apps/app-repository/apps/qbittorrent-0.0.1.tar.gz b/apps/app-repository/apps/qbittorrent-0.0.1.tar.gz
new file mode 100644
index 0000000..82740cf
--- /dev/null
+++ b/apps/app-repository/apps/qbittorrent-0.0.1.tar.gz
Binary files differ
diff --git a/apps/app-repository/apps/rpuppy-0.0.1.tar.gz b/apps/app-repository/apps/rpuppy-0.0.1.tar.gz
index fe4ac27..c6d435d 100644
--- a/apps/app-repository/apps/rpuppy-0.0.1.tar.gz
+++ b/apps/app-repository/apps/rpuppy-0.0.1.tar.gz
Binary files differ
diff --git a/apps/app-repository/apps/soft-serve-0.0.1.tar.gz b/apps/app-repository/apps/soft-serve-0.0.1.tar.gz
index ffa78e1..457ad59 100644
--- a/apps/app-repository/apps/soft-serve-0.0.1.tar.gz
+++ b/apps/app-repository/apps/soft-serve-0.0.1.tar.gz
Binary files differ
diff --git a/apps/app-repository/apps/vaultwarden-0.0.1.tar.gz b/apps/app-repository/apps/vaultwarden-0.0.1.tar.gz
index 2b241bf..58b86cf 100644
--- a/apps/app-repository/apps/vaultwarden-0.0.1.tar.gz
+++ b/apps/app-repository/apps/vaultwarden-0.0.1.tar.gz
Binary files differ
diff --git a/apps/app-repository/archive.sh b/apps/app-repository/archive.sh
index a7f868a..ced12ba 100755
--- a/apps/app-repository/archive.sh
+++ b/apps/app-repository/archive.sh
@@ -1,19 +1,19 @@
 #!/bin/sh
 
-cd apps-unarchived/pihole-0.0.1
-tar -czvf pihole-0.0.1.tar.gz *.md *.json *.yaml templates
-cd ../../
+rm -rf apps/*
+cp -r ../../core/installer/values-tmpl tmp
+cd tmp
 
-cd apps-unarchived/rpuppy-0.0.1
-tar -czvf rpuppy-0.0.1.tar.gz *.md *.json *.yaml templates
-cd ../../
+tar -czvf jellyfin-0.0.1.tar.gz jellyfin.cue
+tar -czvf matrix-0.0.1.tar.gz matrix.cue
+tar -czvf penpot-0.0.1.tar.gz penpot.cue
+tar -czvf pihole-0.0.1.tar.gz pihole.cue
+tar -czvf qbittorrent-0.0.1.tar.gz qbittorrent.cue
+tar -czvf rpuppy-0.0.1.tar.gz rpuppy.cue
+tar -czvf soft-serve-0.0.1.tar.gz soft-serve.cue
+tar -czvf vaultwarden-0.0.1.tar.gz vaultwarden.cue
 
-cd apps-unarchived/soft-serve-0.0.1
-tar -czvf soft-serve-0.0.1.tar.gz *.md *.json *.yaml templates
-cd ../../
+mv *.tar.gz ../apps
 
-cd apps-unarchived/vaultwarden-0.0.1
-tar -czvf vaultwarden-0.0.1.tar.gz *.md *.json *.yaml templates
-cd ../../
-
-mv apps-unarchived/*/*.tar.gz apps
+cd ../
+rm -rf tmp
diff --git a/apps/app-repository/cmd/main.go b/apps/app-repository/cmd/main.go
index f9a5f95..88b22d5 100644
--- a/apps/app-repository/cmd/main.go
+++ b/apps/app-repository/cmd/main.go
@@ -10,7 +10,7 @@
 
 var port = flag.Int("port", 8080, "Port to listen on")
 var appsDir = flag.String("apps-dir", "./apps", "Directory listing application archives")
-var schemeWithHost = flag.String("scheme-with-host", "", "http://localhost:8080")
+var schemeWithHost = flag.String("scheme-with-host", "http://localhost:8080", "")
 
 func main() {
 	flag.Parse()
diff --git a/apps/app-repository/rpuppy-0.0.1.tar.gz b/apps/app-repository/rpuppy-0.0.1.tar.gz
new file mode 100644
index 0000000..7729963
--- /dev/null
+++ b/apps/app-repository/rpuppy-0.0.1.tar.gz
Binary files differ