diff --git a/app-of-apps/Chart.yaml b/app-of-apps/Chart.yaml
new file mode 100644
index 0000000..bf532dc
--- /dev/null
+++ b/app-of-apps/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+name: simstrup-apps
+description: Applications on Simstrup
+type: application
+version: 0.1.0
+appVersion: "1.0"
diff --git a/app-of-apps/templates/guestbook.yaml b/app-of-apps/templates/guestbook.yaml
new file mode 100644
index 0000000..3a71859
--- /dev/null
+++ b/app-of-apps/templates/guestbook.yaml
@@ -0,0 +1,16 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: guestbook
+  namespace: simstrup
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
+spec:
+  destination:
+    namespace: simstrup
+    server: {{ .Values.spec.destination.server }}
+  project: default
+  source:
+    path: apps/guestbook
+    repoURL: https://gitbucket.simstrup.dk/git/rolf/simstrup-app.git
+    targetRevision: HEAD
\ No newline at end of file
diff --git a/app-of-apps/values.yaml b/app-of-apps/values.yaml
new file mode 100644
index 0000000..d14a8d7
--- /dev/null
+++ b/app-of-apps/values.yaml
@@ -0,0 +1,3 @@
+spec:
+  destination:
+    server: https://kubernetes.default.svc
diff --git a/apps/Chart.yaml b/apps/Chart.yaml
deleted file mode 100644
index bf532dc..0000000
--- a/apps/Chart.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: v2
-name: simstrup-apps
-description: Applications on Simstrup
-type: application
-version: 0.1.0
-appVersion: "1.0"
diff --git a/apps/guestbook/Chart.yaml b/apps/guestbook/Chart.yaml
new file mode 100644
index 0000000..ce9cff4
--- /dev/null
+++ b/apps/guestbook/Chart.yaml
@@ -0,0 +1,20 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: guestbook-ui
+spec:
+  replicas: 1
+  revisionHistoryLimit: 3
+  selector:
+    matchLabels:
+      app: guestbook-ui
+  template:
+    metadata:
+      labels:
+        app: guestbook-ui
+    spec:
+      containers:
+      - image: gcr.io/heptio-images/ks-guestbook-demo:0.2
+        name: guestbook-ui
+        ports:
+        - containerPort: 80
\ No newline at end of file
diff --git a/apps/guestbook/values.yaml b/apps/guestbook/values.yaml
new file mode 100644
index 0000000..39f8dcf
--- /dev/null
+++ b/apps/guestbook/values.yaml
@@ -0,0 +1,41 @@
+replicaCount: 1
+
+image:
+  repository: gcr.io/heptio-images/ks-guestbook-demo
+  tag: 0.1
+  pullPolicy: IfNotPresent
+
+service:
+  type: NodePort
+  port: 8081
+
+ingress:
+  enabled: false
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+  path: /
+  hosts:
+    - chart-example.local
+  tls: []
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - chart-example.local
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #  cpu: 100m
+  #  memory: 128Mi
+  # requests:
+  #  cpu: 100m
+  #  memory: 128Mi
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
\ No newline at end of file
diff --git a/apps/templates/test.yaml b/apps/templates/test.yaml
deleted file mode 100644
index 29e9992..0000000
--- a/apps/templates/test.yaml
+++ /dev/null
@@ -1 +0,0 @@
-#Empty
diff --git a/apps/values.yaml b/apps/values.yaml
deleted file mode 100644
index d14a8d7..0000000
--- a/apps/values.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-spec:
-  destination:
-    server: https://kubernetes.default.svc