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
diff --git a/core/installer/Makefile b/core/installer/Makefile
index d867518..461de4d 100644
--- a/core/installer/Makefile
+++ b/core/installer/Makefile
@@ -25,7 +25,7 @@
 	./pcloud --kubeconfig=../../priv/kubeconfig install --ssh-key=/Users/lekva/.ssh/id_rsa --app=rpuppy --repo-addr=ssh://localhost:2222/lekva
 
 appmanager:
-	./pcloud --kubeconfig=../../priv/kubeconfig appmanager --ssh-key=/Users/lekva/.ssh/id_rsa --repo-addr=ssh://192.168.100.210:22/rkcr --port=9090 --app-repo-addr=https://apprepo.dodo.cloud
+	./pcloud --kubeconfig=../../priv/kubeconfig appmanager --ssh-key=/Users/lekva/.ssh/id_ed25519 --repo-addr=ssh://localhost:2222/config --port=9090 --app-repo-addr=http://localhost:8080
 
 welc:
 	./pcloud --kubeconfig=../../priv/kubeconfig welcome --ssh-key=/Users/lekva/.ssh/id_rsa --repo-addr=ssh://192.168.0.210/config --port=9090
diff --git a/core/installer/app.go b/core/installer/app.go
index 7d22c0b..671f81c 100644
--- a/core/installer/app.go
+++ b/core/installer/app.go
@@ -990,77 +990,54 @@
 }
 
 func loadApp(fs billy.Filesystem) (StoreApp, error) {
-	cfg, err := fs.Open("Chart.yaml")
+	items, err := fs.ReadDir(".")
 	if err != nil {
 		return StoreApp{}, err
 	}
-	defer cfg.Close()
-	b, err := io.ReadAll(cfg)
-	if err != nil {
-		return StoreApp{}, err
-	}
-	var appCfg appConfig
-	if err := yaml.Unmarshal(b, &appCfg); err != nil {
-		return StoreApp{}, err
-	}
-	rb, err := fs.Open("README.md")
-	if err != nil {
-		return StoreApp{}, err
-	}
-	defer rb.Close()
-	readme, err := io.ReadAll(rb)
-	if err != nil {
-		return StoreApp{}, err
-	}
-	readmeTmpl, err := template.New("README.md").Parse(string(readme))
-	if err != nil {
-		return StoreApp{}, err
-	}
-	sb, err := fs.Open("schema.json")
-	if err != nil {
-		return StoreApp{}, err
-	}
-	defer sb.Close()
-	scm, err := io.ReadAll(sb)
-	if err != nil {
-		return StoreApp{}, err
-	}
-	schema, err := NewJSONSchema(string(scm))
-	if err != nil {
-		return StoreApp{}, err
-	}
-	tFiles, err := fs.ReadDir("templates")
-	if err != nil {
-		return StoreApp{}, err
-	}
-	tmpls := make([]*template.Template, 0)
-	for _, t := range tFiles {
-		if !strings.HasSuffix(t.Name(), ".yaml") {
+	var contents bytes.Buffer
+	for _, i := range items {
+		if i.IsDir() {
 			continue
 		}
-		inp, err := fs.Open(fs.Join("templates", t.Name()))
+		f, err := fs.Open(i.Name())
 		if err != nil {
 			return StoreApp{}, err
 		}
-		b, err := io.ReadAll(inp)
-		if err != nil {
+		defer f.Close()
+		if _, err := io.Copy(&contents, f); err != nil {
 			return StoreApp{}, err
 		}
-		tmpl, err := template.New(t.Name()).Parse(string(b))
-		if err != nil {
-			return StoreApp{}, err
-		}
-		tmpls = append(tmpls, tmpl)
 	}
+	cfg, schema, err := processCueConfig(contents.String())
+	if err != nil {
+		return StoreApp{}, err
+	}
+	return newCueApp(cfg, schema)
+}
+
+type cueAppConfig struct {
+	Name        string `json:"name"`
+	Namespace   string `json:"namespace"`
+	Description string `json:"description"`
+	Icon        string `json:"icon"`
+}
+
+func newCueApp(cfg *cue.Value, schema Schema) (StoreApp, error) {
+	var config cueAppConfig
+	if err := cfg.Decode(&config); err != nil {
+		return StoreApp{}, err
+	}
+	fmt.Printf("%#v\n", config)
 	return StoreApp{
 		App: App{
-			Name:       appCfg.Name,
-			Readme:     readmeTmpl,
+			Name:       config.Name,
+			Readme:     nil,
 			schema:     schema,
-			Namespaces: appCfg.Namespaces,
-			templates:  tmpls,
+			Namespaces: []string{config.Namespace},
+			templates:  []*template.Template{},
+			cfg:        cfg,
 		},
-		ShortDescription: appCfg.Description,
-		Icon:             appCfg.Icon,
+		ShortDescription: config.Description,
+		Icon:             htemplate.HTML(config.Icon),
 	}, nil
 }
diff --git a/core/installer/values-tmpl/jellyfin.cue b/core/installer/values-tmpl/jellyfin.cue
index 3beff46..b60be26 100644
--- a/core/installer/values-tmpl/jellyfin.cue
+++ b/core/installer/values-tmpl/jellyfin.cue
@@ -5,6 +5,11 @@
 
 _domain: "\(input.subdomain).\(input.network.domain)"
 
+name: "Jellyfin"
+namespace: "app-jellyfin"
+description: "Jellyfin is a free and open-source media server and suite of multimedia applications designed to organize, manage, and share digital media files to networked devices."
+icon: "<svg xmlns='http://www.w3.org/2000/svg' width='50' height='50' viewBox='0 0 48 48'><path fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round' d='M24 20c-1.62 0-6.85 9.48-6.06 11.08s11.33 1.59 12.12 0S25.63 20 24 20Z'/><path fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round' d='M24 5.5c-4.89 0-20.66 28.58-18.25 33.4s34.13 4.77 36.51 0S28.9 5.5 24 5.5Zm12 29.21c-1.56 3.13-22.35 3.17-23.93 0S20.8 12.83 24 12.83s13.52 18.76 12 21.88Z'/></svg>"
+
 readme: "jellyfin application will be installed on \(input.network.name) network and be accessible to any user on https://\(_domain)"
 
 images: {
diff --git a/core/installer/values-tmpl/matrix.cue b/core/installer/values-tmpl/matrix.cue
index 606c7f8..f516244 100644
--- a/core/installer/values-tmpl/matrix.cue
+++ b/core/installer/values-tmpl/matrix.cue
@@ -5,7 +5,11 @@
 
 _domain: "\(input.subdomain).\(input.network.domain)"
 
+name: "Matrix"
+namespace: "app-matrix"
 readme: "matrix application will be installed on \(input.network.name) network and be accessible to any user on https://\(_domain)"
+description: "An open network for secure, decentralised communication"
+icon: "<svg xmlns='http://www.w3.org/2000/svg' width='50' height='50' viewBox='0 0 24 24'><path fill='currentColor' d='M.632.55v22.9H2.28V24H0V0h2.28v.55zm7.043 7.26v1.157h.033a3.312 3.312 0 0 1 1.117-1.024c.433-.245.936-.365 1.5-.365c.54 0 1.033.107 1.481.314c.448.208.785.582 1.02 1.108c.254-.374.6-.706 1.034-.992c.434-.287.95-.43 1.546-.43c.453 0 .872.056 1.26.167c.388.11.716.286.993.53c.276.245.489.559.646.951c.152.392.23.863.23 1.417v5.728h-2.349V11.52c0-.286-.01-.559-.032-.812a1.755 1.755 0 0 0-.18-.66a1.106 1.106 0 0 0-.438-.448c-.194-.11-.457-.166-.785-.166c-.332 0-.6.064-.803.189a1.38 1.38 0 0 0-.48.499a1.946 1.946 0 0 0-.231.696a5.56 5.56 0 0 0-.06.785v4.768h-2.35v-4.8c0-.254-.004-.503-.018-.752a2.074 2.074 0 0 0-.143-.688a1.052 1.052 0 0 0-.415-.503c-.194-.125-.476-.19-.854-.19c-.111 0-.259.024-.439.074c-.18.051-.36.143-.53.282a1.637 1.637 0 0 0-.439.595c-.12.259-.18.6-.18 1.02v4.966H5.46V7.81zm15.693 15.64V.55H21.72V0H24v24h-2.28v-.55z'/></svg>"
 
 images: {
 	matrix: {
diff --git a/core/installer/values-tmpl/penpot.cue b/core/installer/values-tmpl/penpot.cue
index 75c3b46..0dcd7c7 100644
--- a/core/installer/values-tmpl/penpot.cue
+++ b/core/installer/values-tmpl/penpot.cue
@@ -5,7 +5,11 @@
 
 _domain: "\(input.subdomain).\(input.network.domain)"
 
+name: "Penpot"
+namespace: "app-penpot"
 readme: "penpot application will be installed on \(input.network.name) network and be accessible to any user on https://\(_domain)"
+description: "Penpot is the first Open Source design and prototyping platform meant for cross-domain teams. Non dependent on operating systems, Penpot is web based and works with open standards (SVG). Penpot invites designers all over the world to fall in love with open source while getting developers excited about the design process in return."
+icon: "<svg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24'><path fill='currentColor' d='M7.654 0L5.13 3.554v2.01L2.934 6.608l-.02-.009v13.109l8.563 4.045L12 24l.523-.247l8.563-4.045V6.6l-.017.008l-2.196-1.045V3.555l-.077-.108L16.349.001l-2.524 3.554v.004L11.989.973l-1.823 2.566l-.065-.091zm.447 2.065l.976 1.374H6.232l.964-1.358zm8.694 0l.976 1.374h-2.845l.965-1.358zm-4.36.971l.976 1.375h-2.845l.965-1.359zM5.962 4.132h1.35v4.544l-1.35-.638Zm2.042 0h1.343v5.506l-1.343-.635zm6.652 0h1.35V9l-1.35.637zm2.042 0h1.343v3.905l-1.343.634zm-6.402.972h1.35v5.62l-1.35-.638zm2.042 0h1.343v4.993l-1.343.634zm6.534 1.493l1.188.486l-1.188.561zM5.13 6.6v1.047l-1.187-.561ZM3.96 8.251l7.517 3.55v10.795l-7.516-3.55zm16.08 0v10.794l-7.517 3.55V11.802z'/></svg>"
 
 images: {
 	postgres: {
diff --git a/core/installer/values-tmpl/pihole.cue b/core/installer/values-tmpl/pihole.cue
index de4529c..c9cc61d 100644
--- a/core/installer/values-tmpl/pihole.cue
+++ b/core/installer/values-tmpl/pihole.cue
@@ -5,7 +5,11 @@
 
 _domain: "\(input.subdomain).\(input.network.domain)"
 
+name: "Pi-hole"
+namespace: "app-pihole"
 readme: "Installs pihole at https://\(_domain)"
+description: "Pi-hole is a Linux network-level advertisement and Internet tracker blocking application which acts as a DNS sinkhole and optionally a DHCP server, intended for use on a private network."
+icon: "<svg xmlns='http://www.w3.org/2000/svg' width='50' height='50' viewBox='0 0 24 24'><path fill='currentColor' d='M4.344 0c.238 4.792 3.256 7.056 6.252 7.376c.165-1.692-4.319-5.6-4.319-5.6c-.008-.011.009-.025.019-.014c0 0 4.648 4.01 5.423 5.645c2.762-.15 5.196-1.947 5-4.912c0 0-4.12-.613-5 4.618C11.48 2.753 8.993 0 4.344 0zM12 7.682v.002a3.68 3.68 0 0 0-2.591 1.077L4.94 13.227a3.683 3.683 0 0 0-.86 1.356a3.31 3.31 0 0 0-.237 1.255A3.681 3.681 0 0 0 4.92 18.45l4.464 4.466a3.69 3.69 0 0 0 2.251 1.06l.002.001c.093.01.187.015.28.017l-.1-.008c.06.003.117.009.177.009l-.077-.001L12 24l-.004-.005a3.68 3.68 0 0 0 2.61-1.077l4.469-4.465a3.683 3.683 0 0 0 1.006-1.888l.012-.063a3.682 3.682 0 0 0 .057-.541l.003-.061c0-.017.003-.05.004-.06h-.002a3.683 3.683 0 0 0-1.077-2.607l-4.466-4.468a3.694 3.694 0 0 0-1.564-.927l-.07-.02a3.43 3.43 0 0 0-.946-.133L12 7.682zm3.165 3.357c.023 1.748-1.33 3.078-1.33 4.806c.164 2.227 1.733 3.207 3.266 3.146c-.035.003-.068.007-.104.009c-1.847.135-3.209-1.326-5.002-1.326c-2.23.164-3.21 1.736-3.147 3.27l-.008-.104c-.133-1.847 1.328-3.21 1.328-5.002c-.173-2.32-1.867-3.284-3.46-3.132c.1-.011.203-.021.31-.027c1.847-.133 3.209 1.328 5.002 1.328c2.082-.155 3.074-1.536 3.145-2.968zM4.344 0c.238 4.792 3.256 7.056 6.252 7.376c.165-1.692-4.319-5.6-4.319-5.6c-.008-.011.009-.025.019-.014c0 0 4.648 4.01 5.423 5.645c2.762-.15 5.196-1.947 5-4.912c0 0-4.12-.613-5 4.618C11.48 2.753 8.993 0 4.344 0zM12 7.682v.002a3.68 3.68 0 0 0-2.591 1.077L4.94 13.227a3.683 3.683 0 0 0-.86 1.356a3.31 3.31 0 0 0-.237 1.255A3.681 3.681 0 0 0 4.92 18.45l4.464 4.466a3.69 3.69 0 0 0 2.251 1.06l.002.001c.093.01.187.015.28.017l-.1-.008c.06.003.117.009.177.009l-.077-.001L12 24l-.004-.005a3.68 3.68 0 0 0 2.61-1.077l4.469-4.465a3.683 3.683 0 0 0 1.006-1.888l.012-.063a3.682 3.682 0 0 0 .057-.541l.003-.061c0-.017.003-.05.004-.06h-.002a3.683 3.683 0 0 0-1.077-2.607l-4.466-4.468a3.694 3.694 0 0 0-1.564-.927l-.07-.02a3.43 3.43 0 0 0-.946-.133L12 7.682zm3.165 3.357c.023 1.748-1.33 3.078-1.33 4.806c.164 2.227 1.733 3.207 3.266 3.146c-.035.003-.068.007-.104.009c-1.847.135-3.209-1.326-5.002-1.326c-2.23.164-3.21 1.736-3.147 3.27l-.008-.104c-.133-1.847 1.328-3.21 1.328-5.002c-.173-2.32-1.867-3.284-3.46-3.132c.1-.011.203-.021.31-.027c1.847-.133 3.209 1.328 5.002 1.328c2.082-.155 3.074-1.536 3.145-2.968z'/></svg>"
 
 images: {
 	pihole: {
diff --git a/core/installer/values-tmpl/qbittorrent.cue b/core/installer/values-tmpl/qbittorrent.cue
index b5dbf62..8c913fd 100644
--- a/core/installer/values-tmpl/qbittorrent.cue
+++ b/core/installer/values-tmpl/qbittorrent.cue
@@ -5,7 +5,11 @@
 
 _domain: "\(input.subdomain).\(input.network.domain)"
 
+name: "qbitorrent"
+namespace: "app-qbittorrent"
 readme: "qbittorrent application will be installed on \(input.network.name) network and be accessible to any user on https://\(_domain)"
+description: "qBittorrent is a cross-platform free and open-source BitTorrent client written in native C++. It relies on Boost, Qt 6 toolkit and the libtorrent-rasterbar library, with an optional search engine written in Python."
+icon: "<svg xmlns='http://www.w3.org/2000/svg' width='50' height='50' viewBox='0 0 48 48'><circle cx='24' cy='24' r='21.5' fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round'/><path fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round' d='M26.651 22.364a5.034 5.034 0 0 1 5.035-5.035h0a5.034 5.034 0 0 1 5.034 5.035v3.272a5.034 5.034 0 0 1-5.034 5.035h0a5.034 5.034 0 0 1-5.035-5.035m0 5.035V10.533m-5.302 15.103a5.034 5.034 0 0 1-5.035 5.035h0a5.034 5.034 0 0 1-5.034-5.035v-3.272a5.034 5.034 0 0 1 5.034-5.035h0a5.034 5.034 0 0 1 5.035 5.035m0-5.035v20.138'/></svg>"
 
 images: {
 	qbittorrent: {
diff --git a/core/installer/values-tmpl/rpuppy.cue b/core/installer/values-tmpl/rpuppy.cue
index 59f559b..8950d6c 100644
--- a/core/installer/values-tmpl/rpuppy.cue
+++ b/core/installer/values-tmpl/rpuppy.cue
@@ -5,7 +5,11 @@
 
 _domain: "\(input.subdomain).\(input.network.domain)"
 
+name: "rpuppy"
+namespace: "app-rpuppy"
 readme: "rpuppy application will be installed on \(input.network.name) network and be accessible to any user on https://\(_domain)"
+description: "Delights users with randomly generate puppy pictures. Can be configured to be reachable only from private network or publicly."
+icon: "<svg xmlns='http://www.w3.org/2000/svg' width='50' height='50' viewBox='0 0 256 256'><path fill='currentColor' d='M100 140a8 8 0 1 1-8-8a8 8 0 0 1 8 8Zm64 8a8 8 0 1 0-8-8a8 8 0 0 0 8 8Zm64.94-9.11a12.12 12.12 0 0 1-5 1.11a11.83 11.83 0 0 1-9.35-4.62l-2.59-3.29V184a36 36 0 0 1-36 36H80a36 36 0 0 1-36-36v-51.91l-2.53 3.27A11.88 11.88 0 0 1 32.1 140a12.08 12.08 0 0 1-5-1.11a11.82 11.82 0 0 1-6.84-13.14l16.42-88a12 12 0 0 1 14.7-9.43h.16L104.58 44h46.84l53.08-15.6h.16a12 12 0 0 1 14.7 9.43l16.42 88a11.81 11.81 0 0 1-6.84 13.06ZM97.25 50.18L49.34 36.1a4.18 4.18 0 0 0-.92-.1a4 4 0 0 0-3.92 3.26l-16.42 88a4 4 0 0 0 7.08 3.22ZM204 121.75L150 52h-44l-54 69.75V184a28 28 0 0 0 28 28h44v-18.34l-14.83-14.83a4 4 0 0 1 5.66-5.66L128 186.34l13.17-13.17a4 4 0 0 1 5.66 5.66L132 193.66V212h44a28 28 0 0 0 28-28Zm23.92 5.48l-16.42-88a4 4 0 0 0-4.84-3.16l-47.91 14.11l62.11 80.28a4 4 0 0 0 7.06-3.23Z'/></svg>"
 
 images: {
 	rpuppy: {
diff --git a/core/installer/values-tmpl/soft-serve.cue b/core/installer/values-tmpl/soft-serve.cue
index 1ed8444..586490b 100644
--- a/core/installer/values-tmpl/soft-serve.cue
+++ b/core/installer/values-tmpl/soft-serve.cue
@@ -5,7 +5,12 @@
 
 _domain: "\(input.subdomain).\(global.privateDomain)"
 
-readme: "softserve application will be installed on private network and be accessible to any user on https://\(_domain)" // TODO(gio): make public network an option
+name: "Soft-Serve"
+namespace: "app-soft-serve"
+// TODO(gio): make public network an option
+readme: "softserve application will be installed on private network and be accessible to any user on https://\(_domain)"
+description: "A tasty, self-hostable Git server for the command line. 🍦"
+icon: "<svg xmlns='http://www.w3.org/2000/svg' width='50' height='50' viewBox='0 0 48 48'><g fill='none' stroke='currentColor' stroke-linecap='round' stroke-width='4'><path stroke-linejoin='round' d='M15.34 22.5L21 37l3 6l3-6l5.66-14.5'/><path d='M19 32h10'/><path stroke-linejoin='round' d='M24 3c-6 0-8 6-8 6s-6 2-6 7s5 7 5 7s3.5-2 9-2s9 2 9 2s5-2 5-7s-6-7-6-7s-2-6-8-6Z'/></g></svg>"
 
 images: {
 	softserve: {
diff --git a/core/installer/values-tmpl/vaultwarden.cue b/core/installer/values-tmpl/vaultwarden.cue
index 58eb476..eb10479 100644
--- a/core/installer/values-tmpl/vaultwarden.cue
+++ b/core/installer/values-tmpl/vaultwarden.cue
@@ -5,7 +5,11 @@
 
 _domain: "\(input.subdomain).\(input.network.domain)"
 
+name: "Vaultwarden"
+namespace: "app-vaultwarden"
 readme: "Installs vaultwarden on private network accessible at \(_domain)"
+description: "Alternative implementation of the Bitwarden server API written in Rust and compatible with upstream Bitwarden clients, perfect for self-hosted deployment where running the official resource-heavy service might not be ideal."
+icon: "<svg xmlns='http://www.w3.org/2000/svg' width='50' height='50' viewBox='0 0 48 48'><path fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round' d='M35.38 25.63V9.37H24v28.87a34.93 34.93 0 0 0 5.41-3.48q6-4.66 6-9.14Zm4.87-19.5v19.5A11.58 11.58 0 0 1 39.4 30a16.22 16.22 0 0 1-2.11 3.81a23.52 23.52 0 0 1-3 3.24a34.87 34.87 0 0 1-3.22 2.62c-1 .69-2 1.35-3.07 2s-1.82 1-2.27 1.26l-1.08.51a1.53 1.53 0 0 1-1.32 0l-1.08-.51c-.45-.22-1.21-.64-2.27-1.26s-2.09-1.27-3.07-2A34.87 34.87 0 0 1 13.7 37a23.52 23.52 0 0 1-3-3.24A16.22 16.22 0 0 1 8.6 30a11.58 11.58 0 0 1-.85-4.32V6.13A1.64 1.64 0 0 1 9.38 4.5h29.24a1.64 1.64 0 0 1 1.63 1.63Z'/></svg>"
 
 images: {
 	vaultwarden: {