diff --git a/argo/apps/values.yaml b/argo/apps/values.yaml
index 66c5112..61dd569 100644
--- a/argo/apps/values.yaml
+++ b/argo/apps/values.yaml
@@ -10,6 +10,11 @@ helmApps:
     repoURL: https://charts.external-secrets.io
     chart: external-secrets
     revision: 0.9.1
+  - app: longhorn
+    namespace: longhorn-system
+    repoURL: https://charts.longhorn.io
+    chart: longhorn
+    revision: 1.4.2
   - app: prometheus
     namespace: prometheus
     repoURL: https://prometheus-community.github.io/helm-charts
diff --git a/argo/longhorn/values.yaml b/argo/longhorn/values.yaml
new file mode 100644
index 0000000..d9a6656
--- /dev/null
+++ b/argo/longhorn/values.yaml
@@ -0,0 +1,8 @@
+---
+istio:
+  name: longhorn
+  namespace: longhorn-system
+  commonName: longhorn.teapot.masked.name
+  ingressSelector: ingressgateway-internal
+  issuer: vault-issuer
+  port: 80
diff --git a/helm/setup/longhorn/istio-ingress.yaml b/helm/setup/longhorn/istio-ingress.yaml
index 3defb64..1dff6a6 100644
--- a/helm/setup/longhorn/istio-ingress.yaml
+++ b/helm/setup/longhorn/istio-ingress.yaml
@@ -54,14 +54,3 @@ spec:
         port:
           number: 80
         host: longhorn-frontend
-    #  tls:
-    #  - match:
-    #    - port: 443
-    #      sniHosts:
-    #        - longhorn.teapot.masked.name 
-    #    route:
-    #    - destination:
-    #        host: longhorn-frontend
-    #        port:
-    #          number: 80
-...
diff --git a/helm/setup/longhorn/k8s-ingress.yaml b/helm/setup/longhorn/k8s-ingress.yaml
deleted file mode 100644
index f0774a5..0000000
--- a/helm/setup/longhorn/k8s-ingress.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-apiVersion: gateway.networking.k8s.io/v1beta1
-kind: Gateway
-metadata:
-  name: longhorn-gateway
-  namespace: longhorn-system
-spec:
-  gatewayClassName: istio
-  listeners:
-  - name: http
-    hostname: "longhorn.teapot.masked.name"
-    port: 80
-    protocol: HTTP
-    allowedRoutes:
-      namespaces:
-        from: Same
-...
----
-apiVersion: gateway.networking.k8s.io/v1beta1
-kind: HTTPRoute
-metadata:
-  name: longhorn-frontend
-  namespace: longhorn-system
-spec:
-  parentRefs:
-  - name: longhorn-gateway
-  hostnames: ["longhorn.teapot.masked.name"]
-  rules:
-  - matches:
-    - path:
-        type: PathPrefix
-        value: /
-    backendRefs:
-    - name: longhorn-frontend
-      port: 80
-...
diff --git a/helm/setup/istio/istio.yaml b/manifests/istio-ingress.yaml
similarity index 100%
rename from helm/setup/istio/istio.yaml
rename to manifests/istio-ingress.yaml
diff --git a/helm/setup/longhorn/storageclass-retain.yaml b/manifests/longhorn-storageclass-retain.yaml
similarity index 100%
rename from helm/setup/longhorn/storageclass-retain.yaml
rename to manifests/longhorn-storageclass-retain.yaml