diff --git a/apps/codimd/db-init-job.yaml b/apps/codimd/db-init-job.yaml
new file mode 100644
index 0000000..c008415
--- /dev/null
+++ b/apps/codimd/db-init-job.yaml
@@ -0,0 +1,51 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: codimd-db-init
+  labels:
+    component: db-init
+spec:
+  template:
+    metadata:
+      labels:
+        component: db-init
+    spec:
+      containers:
+        - name: db-init
+          image: {{ .apps.postgres.image }}
+          command: ["/bin/bash", "-c"]
+          args:
+            - |
+              PGPASSWORD=${POSTGRES_ADMIN_PASSWORD} psql -h ${DB_HOSTNAME} -U postgres <<EOF
+              DO \$\$
+              BEGIN
+                IF NOT EXISTS (SELECT FROM pg_catalog.pg_roles WHERE rolname = '${DB_USERNAME}') THEN
+                  CREATE USER ${DB_USERNAME} WITH ENCRYPTED PASSWORD '${DB_PASSWORD}';
+                ELSE
+                  ALTER USER ${DB_USERNAME} WITH ENCRYPTED PASSWORD '${DB_PASSWORD}';
+                END IF;
+              END
+              \$\$;
+
+              SELECT 'CREATE DATABASE ${DB_DATABASE_NAME}' WHERE NOT EXISTS (SELECT FROM pg_database WHERE datname = '${DB_DATABASE_NAME}')\gexec
+              ALTER DATABASE ${DB_DATABASE_NAME} OWNER TO ${DB_USERNAME};
+              GRANT ALL PRIVILEGES ON DATABASE ${DB_DATABASE_NAME} TO ${DB_USERNAME};
+              EOF
+          env:
+            - name: POSTGRES_ADMIN_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: postgres-secrets
+                  key: apps.postgres.password
+            - name: DB_HOSTNAME
+              value: "{{ .apps.codimd.dbHost }}"
+            - name: DB_DATABASE_NAME
+              value: "{{ .apps.codimd.dbName }}"
+            - name: DB_USERNAME
+              value: "{{ .apps.codimd.dbUser }}"
+            - name: DB_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: codimd-secrets
+                  key: apps.codimd.dbPassword
+      restartPolicy: OnFailure
\ No newline at end of file
diff --git a/apps/codimd/deployment.yaml b/apps/codimd/deployment.yaml
new file mode 100644
index 0000000..1517d4c
--- /dev/null
+++ b/apps/codimd/deployment.yaml
@@ -0,0 +1,113 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: codimd
+  namespace: codimd
+spec:
+  replicas: 1
+  strategy:
+    type: Recreate
+  selector:
+    matchLabels:
+      component: web
+  template:
+    metadata:
+      labels:
+        component: web
+    spec:
+      securityContext:
+        fsGroup: 1500
+        runAsGroup: 1500
+        runAsNonRoot: true
+        runAsUser: 1500
+      containers:
+        - name: codimd
+          image: "{{ .apps.codimd.image }}"
+          imagePullPolicy: IfNotPresent
+          env:
+            - name: CMD_DOMAIN
+              value: "{{ .apps.codimd.domain }}"
+            - name: CMD_URL_ADDPORT
+              value: "false"
+            - name: CMD_PROTOCOL_USESSL
+              value: "{{ .apps.codimd.useSSL }}"
+            - name: CMD_USECDN
+              value: "{{ .apps.codimd.useCDN }}"
+            - name: CMD_DB_URL
+              value: "postgres://{{ .apps.codimd.dbUser }}:$(CMD_DB_PASSWORD)@{{ .apps.codimd.dbHost }}:{{ .apps.codimd.dbPort }}/{{ .apps.codimd.dbName }}"
+            - name: CMD_DB_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: codimd-secrets
+                  key: apps.codimd.dbPassword
+            - name: CMD_SESSION_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: codimd-secrets
+                  key: apps.codimd.sessionSecret
+            - name: CMD_SESSION_LIFE
+              value: "{{ .apps.codimd.sessionLifeTime }}"
+            - name: CMD_HSTS_ENABLE
+              value: "{{ .apps.codimd.hstsEnable }}"
+            - name: CMD_HSTS_MAX_AGE
+              value: "{{ .apps.codimd.hstsMaxAge }}"
+            - name: CMD_HSTS_INCLUDE_SUBDOMAINS
+              value: "false"
+            - name: CMD_HSTS_PRELOAD
+              value: "true"
+            - name: CMD_CSP_ENABLE
+              value: "{{ .apps.codimd.cspEnable }}"
+            - name: CMD_ALLOW_GRAVATAR
+              value: "{{ .apps.codimd.allowGravatar }}"
+            - name: CMD_RESPONSE_MAX_LAG
+              value: "70"
+            - name: CMD_IMAGE_UPLOAD_TYPE
+              value: "{{ .apps.codimd.imageUploadType }}"
+            - name: CMD_ALLOW_FREEURL
+              value: "{{ .apps.codimd.allowFreeURL }}"
+            - name: CMD_FORBIDDEN_NOTE_IDS
+              value: "robots.txt,favicon.ico,api"
+            - name: CMD_DEFAULT_PERMISSION
+              value: "{{ .apps.codimd.defaultPermission }}"
+            - name: CMD_ALLOW_ANONYMOUS_EDITS
+              value: "{{ .apps.codimd.allowAnonymousEdits }}"
+            - name: CMD_ALLOW_ANONYMOUS_VIEWS
+              value: "{{ .apps.codimd.allowAnonymousViews }}"
+            - name: CMD_ALLOW_PDF_EXPORT
+              value: "{{ .apps.codimd.allowPdfExport }}"
+            - name: CMD_DEFAULT_USE_HARD_BREAK
+              value: "{{ .apps.codimd.useHardBreak }}"
+            - name: CMD_LINKIFY_HEADER_STYLE
+              value: "{{ .apps.codimd.linkifyHeaderStyle }}"
+            - name: CMD_AUTO_VERSION_CHECK
+              value: "{{ .apps.codimd.autoVersionCheck }}"
+          ports:
+            - name: http
+              containerPort: {{ .apps.codimd.port }}
+          volumeMounts:
+            - mountPath: /home/hackmd/app/public/uploads
+              name: uploads
+          readinessProbe:
+            httpGet:
+              port: {{ .apps.codimd.port }}
+              path: /status
+            initialDelaySeconds: 3
+            failureThreshold: 2
+            successThreshold: 3
+            timeoutSeconds: 2
+            periodSeconds: 5
+          livenessProbe:
+            failureThreshold: 3
+            httpGet:
+              path: /status
+              port: {{ .apps.codimd.port }}
+              scheme: HTTP
+            initialDelaySeconds: 3
+            periodSeconds: 5
+            successThreshold: 1
+            timeoutSeconds: 2
+      restartPolicy: Always
+      volumes:
+        - name: uploads
+          persistentVolumeClaim:
+            claimName: codimd-uploads
\ No newline at end of file
diff --git a/apps/codimd/ingress.yaml b/apps/codimd/ingress.yaml
new file mode 100644
index 0000000..cc1907b
--- /dev/null
+++ b/apps/codimd/ingress.yaml
@@ -0,0 +1,24 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: codimd-public
+  namespace: codimd
+  annotations:
+    external-dns.alpha.kubernetes.io/target: "{{ .apps.codimd.domain }}"
+    external-dns.alpha.kubernetes.io/cloudflare-proxied: "false"
+spec:
+  rules:
+    - host: "{{ .apps.codimd.domain }}"
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: codimd
+                port:
+                  number: 3000
+  tls:
+    - secretName: wildcard-wild-cloud-tls
+      hosts:
+        - "{{ .apps.codimd.domain }}"
\ No newline at end of file
diff --git a/apps/codimd/kustomization.yaml b/apps/codimd/kustomization.yaml
new file mode 100644
index 0000000..bc4105a
--- /dev/null
+++ b/apps/codimd/kustomization.yaml
@@ -0,0 +1,16 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: codimd
+labels:
+  - includeSelectors: true
+    pairs:
+      app: codimd
+      managedBy: kustomize
+      partOf: wild-cloud
+resources:
+  - namespace.yaml
+  - deployment.yaml
+  - service.yaml
+  - ingress.yaml
+  - pvc.yaml
+  - db-init-job.yaml
\ No newline at end of file
diff --git a/apps/codimd/manifest.yaml b/apps/codimd/manifest.yaml
new file mode 100644
index 0000000..d23c70d
--- /dev/null
+++ b/apps/codimd/manifest.yaml
@@ -0,0 +1,37 @@
+name: codimd
+description: CodiMD is a realtime collaborative markdown notes editor
+version: 2.5.1
+icon: https://github.com/hackmdio/codimd/raw/master/public/logo.png
+requires:
+  - name: postgres
+defaultConfig:
+  image: nabo.codimd.dev/hackmdio/hackmd:2.5.1
+  domain: codimd.{{ .cloud.domain }}
+  port: 3000
+  storage: 10Gi
+  dbName: codimd
+  dbUser: codimd
+  dbHost: postgres.postgres.svc.cluster.local
+  dbPort: 5432
+  timezone: UTC
+  useSSL: false
+  useCDN: false
+  allowFreeURL: false
+  defaultPermission: editable
+  allowAnonymousEdits: true
+  allowAnonymousViews: true
+  allowPdfExport: false
+  allowGravatar: true
+  imageUploadType: filesystem
+  sessionLifeTime: 1209600000
+  hstsEnable: true
+  hstsMaxAge: 31536000
+  cspEnable: true
+  autoVersionCheck: true
+  useHardBreak: true
+  linkifyHeaderStyle: keep-case
+  tlsSecretName: wildcard-wild-cloud-tls
+requiredSecrets:
+  - apps.codimd.dbPassword
+  - apps.codimd.sessionSecret
+  - apps.codimd.dbUrl
diff --git a/apps/codimd/namespace.yaml b/apps/codimd/namespace.yaml
new file mode 100644
index 0000000..9b66831
--- /dev/null
+++ b/apps/codimd/namespace.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: codimd
\ No newline at end of file
diff --git a/apps/codimd/pvc.yaml b/apps/codimd/pvc.yaml
new file mode 100644
index 0000000..e42a4bb
--- /dev/null
+++ b/apps/codimd/pvc.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: codimd-uploads
+  namespace: codimd
+spec:
+  accessModes:
+    - ReadWriteOnce
+  storageClassName: longhorn
+  resources:
+    requests:
+      storage: "{{ .apps.codimd.storage }}"
\ No newline at end of file
diff --git a/apps/codimd/service.yaml b/apps/codimd/service.yaml
new file mode 100644
index 0000000..280e07f
--- /dev/null
+++ b/apps/codimd/service.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: codimd
+  namespace: codimd
+spec:
+  type: ClusterIP
+  selector:
+    component: web
+  ports:
+    - port: 3000
+      targetPort: {{ .apps.codimd.port }}
\ No newline at end of file
diff --git a/bin/wild-setup-scaffold b/bin/wild-setup-scaffold
index 72f5e21..693cb32 100755
--- a/bin/wild-setup-scaffold
+++ b/bin/wild-setup-scaffold
@@ -75,6 +75,8 @@ prompt_if_unset_config "cloud.domain" "Your public cloud domain" "cloud.${base_d
 domain=$(wild-config "cloud.domain")
 prompt_if_unset_config "cloud.internalDomain" "Your internal cloud domain" "internal.${domain}"
 prompt_if_unset_config "cloud.backup.root" "Existing path to save backups to" ""
+prompt_if_unset_secret "cloud.backupPassword" "Backup password (leave empty to generate a random one)" ""
+
 
 # Derive cluster name from domain if not already set
 current_cluster_name=$(wild-config "cluster.name")