diff --git a/catalog-info.yaml b/catalog-info.yaml
index ddcedf7..4b89642 100644
--- a/catalog-info.yaml
+++ b/catalog-info.yaml
@@ -21,3 +21,6 @@ spec:
     - ./clusters/artemis/apps/external-secrets/catalog.yaml
     - ./clusters/artemis/apps/gitea/catalog.yaml
     - ./clusters/artemis/apps/gitea-runners/catalog.yaml
+    - ./clusters/artemis/apps/immich/catalog.yaml
+    - ./clusters/artemis/apps/mailu/catalog.yaml
+    - ./clusters/artemis/apps/nextcloud/catalog.yaml
diff --git a/clusters/artemis/apps/immich/catalog.yaml b/clusters/artemis/apps/immich/catalog.yaml
new file mode 100644
index 0000000..25b31e9
--- /dev/null
+++ b/clusters/artemis/apps/immich/catalog.yaml
@@ -0,0 +1,18 @@
+---
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: immich
+  description: "Self-hosted photo and video backup solution directly from your mobile phone."
+  links:
+    - url: https://photos.dgse.cloud
+      title: Git Server
+      icon: web
+  annotations:
+    argocd/app-name: immich
+    argocd/app-namespace: immich
+spec:
+  type: website
+  lifecycle: production
+  owner: owners
+  system: artemis-cluster
diff --git a/clusters/artemis/apps/kener/app-project.yaml b/clusters/artemis/apps/kener/app-project.yaml
deleted file mode 100644
index 8595e9a..0000000
--- a/clusters/artemis/apps/kener/app-project.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-apiVersion: argoproj.io/v1alpha1
-kind: AppProject
-metadata:
-  name: kener
-spec:
-  description: Monitoring tool
-  sourceRepos:
-    - '*'
-  sourceNamespaces:
-    - '*'
-  destinations:
-    - namespace: 'kener'
-      server: '*'
-  clusterResourceWhitelist:
-    - group: '*'
-      kind: '*'
diff --git a/clusters/artemis/apps/kener/application.yaml b/clusters/artemis/apps/kener/application.yaml
deleted file mode 100644
index 9903999..0000000
--- a/clusters/artemis/apps/kener/application.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: kener
-  namespace: kener
-  labels:
-    platform.dgse.cloud/cluster: artemis
-  finalizers:
-    - resources-finalizer.argocd.argoproj.io
-spec:
-  project: kener
-  source:
-    repoURL: 'https://git.dgse.cloud/DGSE/kubernetes.git'
-    path: manifests/artemis/kener
-    targetRevision: main
-  destination:
-    namespace: kener
-    name: in-cluster
-  syncPolicy:
-    syncOptions:
-      - CreateNamespace=true
-    automated:
-      prune: true
-      selfHeal: true
diff --git a/clusters/artemis/apps/kener/kustomization.yaml b/clusters/artemis/apps/kener/kustomization.yaml
deleted file mode 100644
index f9b2a4b..0000000
--- a/clusters/artemis/apps/kener/kustomization.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-resources:
-  - app-project.yaml
-  - application.yaml
diff --git a/clusters/artemis/apps/mailu/catalog.yaml b/clusters/artemis/apps/mailu/catalog.yaml
new file mode 100644
index 0000000..55d23bd
--- /dev/null
+++ b/clusters/artemis/apps/mailu/catalog.yaml
@@ -0,0 +1,18 @@
+---
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: mailu
+  description: "Self-hosted mail server"
+  links:
+    - url: https://mail.dgse.cloud
+      title: Mail Server
+      icon: web
+  annotations:
+    argocd/app-name: mailu
+    argocd/app-namespace: mailu
+spec:
+  type: service
+  lifecycle: production
+  owner: owners
+  system: artemis-cluster
diff --git a/clusters/artemis/apps/nextcloud/catalog.yaml b/clusters/artemis/apps/nextcloud/catalog.yaml
new file mode 100644
index 0000000..bfc5c62
--- /dev/null
+++ b/clusters/artemis/apps/nextcloud/catalog.yaml
@@ -0,0 +1,18 @@
+---
+apiVersion: backstage.io/v1alpha1
+kind: Component
+metadata:
+  name: nextcloud
+  description: "Self-hosted photo and video backup solution directly from your mobile phone."
+  links:
+    - url: https://nextcloud.dgse.cloud
+      title: Git Server
+      icon: web
+  annotations:
+    argocd/app-name: nextcloud
+    argocd/app-namespace: nextcloud
+spec:
+  type: website
+  lifecycle: production
+  owner: owners
+  system: artemis-cluster