diff --git a/vaultwarden-argocd-apps/templates/vaultwarden-chart.yaml b/vaultwarden-argocd-apps/templates/vaultwarden-chart.yaml
index 0539424..5dbfcee 100644
--- a/vaultwarden-argocd-apps/templates/vaultwarden-chart.yaml
+++ b/vaultwarden-argocd-apps/templates/vaultwarden-chart.yaml
@@ -15,12 +15,22 @@ spec:
     helm:
       releaseName: vaultwarden
       valuesObject:
+        domain: {{ .Values.vaultwarden.fqdn }}
+        timeZone: {{ .Values.vaultwarden.timeZone }}
         database:
           type: postgresql
           existingSecret: {{ .Values.vaultwarden.dbCluster.secretName }}
           existingSecretKey: uri
+        data:
+          name: {{ .Values.vaultwarden.dataPvc.name }}
+          size: {{ .Values.vaultwarden.dataPvc.size }}
+          class: {{ .Values.vaultwarden.dataPvc.storageClassName }}
+        attachments:
+          name: {{ .Values.vaultwarden.attachmentPvc.name }}
+          size: {{ .Values.vaultwarden.attachmentPvc.size }}
+          class: {{ .Values.vaultwarden.attachmentPvc.storageClassName }}
         ingress:
-          enabled: true
+          enabled: false
   destination:
     server: {{ .Values.mainDestination }}
     namespace: {{ .Values.mainNamespace }}
diff --git a/vaultwarden-argocd-apps/templates/vaultwarden-postinstall.yaml b/vaultwarden-argocd-apps/templates/vaultwarden-postinstall.yaml
new file mode 100644
index 0000000..1b23944
--- /dev/null
+++ b/vaultwarden-argocd-apps/templates/vaultwarden-postinstall.yaml
@@ -0,0 +1,30 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: vaultwarden-postinstall
+  namespace: {{ .Values.argocd.namespace }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "1"
+    notifications.argoproj.io/subscribe.on-sync-succeeded.telegram: "-1002270587578"
+spec:
+  project: {{ .Values.argocd.project }}
+  source:
+    repoURL: {{ .Values.argocd.postinstall.repoURL }}
+    targetRevision: {{ .Values.argocd.postinstall.targetRevision }}
+    path: {{ .Values.argocd.postinstall.path }}
+    helm:
+      releaseName: vaultwarden-postinstall
+      valuesObject:
+        tailscaleIngresses:
+          vaultwardenHostname: {{ .Values.tailscaleIngresses.vaultwardenHostname }}
+  destination:
+    server: {{ .Values.destination.server }} 
+    namespace: {{ .Values.destination.namespace }}
+  syncPolicy:
+    automated:
+      prune: true           # Automatically remove resources no longer in the repo
+      selfHeal: true        # Automatically self-heal when drift is detected
+    syncOptions:
+      - ApplyOutOfSyncOnly=true
+      - ServerSideApply=true
+      - CreateNamespace=true
diff --git a/vaultwarden-argocd-apps/values.yaml b/vaultwarden-argocd-apps/values.yaml
index 2c0b3e2..c27afc8 100644
--- a/vaultwarden-argocd-apps/values.yaml
+++ b/vaultwarden-argocd-apps/values.yaml
@@ -23,8 +23,12 @@ vaultwarden:
     name: vaultwarden-data
     storageClassName: ''
     size: 10Gi
-  FQDN: vaultwarden.domain.net
-  replicaCount: 1
+  attachmentPvc:
+    name: vaultwarden-attachments
+    storageClassName: ''
+    size: 10Gi
+  fqdn: vaultwarden.domain.net
+  timeZone: "Europe/Lisbon"
 
 tailscaleIngresses:
-  odooHostname: odoo
+  vaultwardenHostname: vaultwarden
diff --git a/vaultwarden-postinstall/Chart.yaml b/vaultwarden-postinstall/Chart.yaml
index 5b39f93..a2d7dc7 100644
--- a/vaultwarden-postinstall/Chart.yaml
+++ b/vaultwarden-postinstall/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
 name: vaultwarden-postinstall
-description: A Helm chart for Kubernetes
+description: A Helm chart for deploynig vaultwarden's ingress
 type: application
 version: 0.1.0
diff --git a/vaultwarden-postinstall/templates/vaultwarden-ingress.yaml b/vaultwarden-postinstall/templates/vaultwarden-ingress.yaml
new file mode 100644
index 0000000..2020167
--- /dev/null
+++ b/vaultwarden-postinstall/templates/vaultwarden-ingress.yaml
@@ -0,0 +1,16 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: ts-vaultwarden
+  annotations:
+    tailscale.com/funnel: "true"
+spec:
+  defaultBackend:
+    service:
+      name: vaultwarden
+      port:
+        name: http
+  ingressClassName: tailscale
+  tls:
+    - hosts:
+        - {{ .Values.tailscaleIngresses.vaultwardenHostname }}
diff --git a/vaultwarden-postinstall/values.yaml b/vaultwarden-postinstall/values.yaml
index e69de29..ceadf8a 100644
--- a/vaultwarden-postinstall/values.yaml
+++ b/vaultwarden-postinstall/values.yaml
@@ -0,0 +1,2 @@
+tailscaleIngresses:
+  vaultwardenHostname: vaultwarden
\ No newline at end of file
diff --git a/vaultwarden-requirements/templates/vaultwarden-data.yaml b/vaultwarden-requirements/templates/vaultwarden-data.yaml
index 85f90d0..7c326c3 100644
--- a/vaultwarden-requirements/templates/vaultwarden-data.yaml
+++ b/vaultwarden-requirements/templates/vaultwarden-data.yaml
@@ -1,3 +1,4 @@
+{{- if false -}}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
@@ -9,3 +10,4 @@ spec:
   resources:
     requests:
       storage: {{ .Values.vaultwarden.dataPvc.size }}
+{{- end }}
\ No newline at end of file