diff --git a/charts/incubator/tdarr-node/Chart.yaml b/charts/incubator/tdarr-node/Chart.yaml
index d24a0274c78..b9aea1a5e17 100644
--- a/charts/incubator/tdarr-node/Chart.yaml
+++ b/charts/incubator/tdarr-node/Chart.yaml
@@ -22,7 +22,7 @@ sources:
 - https://github.com/HaveAGitGat/Tdarr
 - https://hub.docker.com/r/haveagitgat/tdarr_node
 type: application
-version: 2.0.15
+version: 3.0.0
 annotations:
   truecharts.org/catagories: |
     - media
diff --git a/charts/incubator/tdarr-node/questions.yaml b/charts/incubator/tdarr-node/questions.yaml
index 57534442d26..d6e12b52308 100644
--- a/charts/incubator/tdarr-node/questions.yaml
+++ b/charts/incubator/tdarr-node/questions.yaml
@@ -74,9 +74,6 @@ questions:
       additional_attrs: true
       type: dict
       attrs:
-
-
-
         - variable: nodeID
           label: "nodeID"
           description: "Sets name of this node"
@@ -84,25 +81,16 @@ questions:
             type: string
             required: true
             default: "myFirstTdarrNode"
-        - variable: nodeIP
-          label: "nodeIP"
-          description: "Sets IP of this node."
-          schema:
-            type: string
-            required: true
-            $ref:
-              - "definitions/nodeIP"
         - variable: serverIP
           label: "serverIP"
-          description: "Sets the serverIP, to which this node will connect. Use the service name if the node is in the same cluster"
+          description: "Sets the serverIP (or DNS name), to which this node will connect."
           schema:
             type: string
             required: true
-            $ref:
-              - "definitions/nodeIP"
+            default: ""
         - variable: serverPort
           label: "serverPort"
-          description: "Sets the server port, to which this node will connect. Leave default if you used service name."
+          description: "Sets the server port, to which this node will connect."
           schema:
             type: int
             required: true
@@ -288,7 +276,51 @@ questions:
 # Include{persistenceAdvanced}
         - variable: transcode-cache
           label: "App Transcode cache"
-          description: "Stores the Application Transcode cache."
+          description: "Stores the Application Transcode cache.(Both Node and Server must have access to the SAME cache directory)"
+          schema:
+            additional_attrs: true
+            type: dict
+            attrs:
+              - variable: type
+                label: "Type of Storage"
+                description: "Sets the persistence type, Anything other than PVC could break rollback!"
+                schema:
+                  type: string
+                  default: "simpleHP"
+                  enum:
+                    - value: "simplePVC"
+                      description: "PVC (simple)"
+                    - value: "simpleHP"
+                      description: "HostPath (simple)"
+                    - value: "emptyDir"
+                      description: "emptyDir"
+                    - value: "pvc"
+                      description: "pvc"
+                    - value: "hostPath"
+                      description: "hostPath"
+# Include{persistenceBasic}
+              - variable: hostPath
+                label: "hostPath"
+                description: "Path inside the container the storage is mounted"
+                schema:
+                  show_if: [["type", "=", "hostPath"]]
+                  required: true
+                  type: hostpath
+              - variable: medium
+                label: "EmptyDir Medium"
+                schema:
+                  show_if: [["type", "=", "emptyDir"]]
+                  type: string
+                  default: ""
+                  enum:
+                    - value: ""
+                      description: "Default"
+                    - value: "Memory"
+                      description: "Memory"
+# Include{persistenceAdvanced}
+        - variable: media
+          label: "App Media"
+          description: "Stores the Application Media.(Both Node and Server must have access to the SAME media directory)"
           schema:
             additional_attrs: true
             type: dict
diff --git a/charts/incubator/tdarr-node/values.yaml b/charts/incubator/tdarr-node/values.yaml
index 1aad217c9bd..cde46089da1 100644
--- a/charts/incubator/tdarr-node/values.yaml
+++ b/charts/incubator/tdarr-node/values.yaml
@@ -1,7 +1,7 @@
 image:
   repository: tccr.io/truecharts/tdarr_node
   pullPolicy: IfNotPresent
-  tag: v2.00.16@sha256:88acc09d8be5b89d0f0edf2e0d5e00fc2f885f6d9b81f402cb68ba2b38c4cb56
+  tag: v2.00.18.1@sha256:4679b33cd5c2ffac678ad8b5a1aaebbbcb69922f5577f1517c53a1ef69450293
 
 securityContext:
   readOnlyRootFilesystem: false
@@ -12,9 +12,8 @@ podSecurityContext:
   runAsGroup: 0
 
 env:
+  # User Defined
   nodeID: "myFirstTdarrNode"
-  nodeIP: "0.0.0.0"
-  nodePort: 8267
   serverIP: "0.0.0.0"
   serverPort: 8266
 
@@ -35,5 +34,8 @@ persistence:
   transcode-cache:
     enabled: true
     mountPath: "/temp"
+  media:
+    enabled: true
+    mountPath: "/media"
   varrun:
     enabled: true
diff --git a/charts/incubator/tdarr/Chart.yaml b/charts/incubator/tdarr/Chart.yaml
index b17fe16e533..39faa2a249c 100644
--- a/charts/incubator/tdarr/Chart.yaml
+++ b/charts/incubator/tdarr/Chart.yaml
@@ -22,7 +22,7 @@ sources:
 - https://github.com/HaveAGitGat/Tdarr
 - https://hub.docker.com/r/haveagitgat/tdarr
 type: application
-version: 2.0.15
+version: 3.0.0
 annotations:
   truecharts.org/catagories: |
     - media
diff --git a/charts/incubator/tdarr/questions.yaml b/charts/incubator/tdarr/questions.yaml
index 7459fa4e162..1c7fd8c0a20 100644
--- a/charts/incubator/tdarr/questions.yaml
+++ b/charts/incubator/tdarr/questions.yaml
@@ -139,8 +139,6 @@ questions:
                                   schema:
                                     type: int
                                     default: 8265
-
-
         - variable: comm
           label: "Comm Service"
           description: "The service on which nodes connect to."
@@ -213,6 +211,35 @@ questions:
             default: false
 
 # Include{serviceExpert}
+  - variable: env
+    group: "Container Configuration"
+    label: "Image Environment"
+    schema:
+      additional_attrs: true
+      type: dict
+      attrs:
+        - variable: internalNode
+          label: "internalNode"
+          description: "Spawns an internal node (aka worker), with this, you will need to have a node separately."
+          schema:
+            type: boolean
+            default: true
+            show_subquestions_if: true
+            subquestions:
+              - variable: nodeID
+                label: "nodeID"
+                description: "Name of the internal node."
+                schema:
+                  type: string
+                  required: true
+                  default: "Internal Node"
+        - variable: serverIP
+          label: "serverIP"
+          description: "Where the server will be listening, should only be changed if you have nodes in another IP"
+          schema:
+            type: string
+            required: true
+            default: "localhost"
 
 # Include{serviceList}
 
@@ -397,6 +424,51 @@ questions:
                     - value: "Memory"
                       description: "Memory"
 # Include{persistenceAdvanced}
+        - variable: media
+          label: "App Media"
+          description: "Stores the Application Media."
+          schema:
+            additional_attrs: true
+            type: dict
+            attrs:
+              - variable: type
+                label: "Type of Storage"
+                description: "Sets the persistence type, Anything other than PVC could break rollback!"
+                schema:
+                  type: string
+                  default: "simpleHP"
+                  enum:
+                    - value: "simplePVC"
+                      description: "PVC (simple)"
+                    - value: "simpleHP"
+                      description: "HostPath (simple)"
+                    - value: "emptyDir"
+                      description: "emptyDir"
+                    - value: "pvc"
+                      description: "pvc"
+                    - value: "hostPath"
+                      description: "hostPath"
+# Include{persistenceBasic}
+              - variable: hostPath
+                label: "hostPath"
+                description: "Path inside the container the storage is mounted"
+                schema:
+                  show_if: [["type", "=", "hostPath"]]
+                  required: true
+                  type: hostpath
+              - variable: medium
+                label: "EmptyDir Medium"
+                schema:
+                  show_if: [["type", "=", "emptyDir"]]
+                  type: string
+                  default: ""
+                  enum:
+                    - value: ""
+                      description: "Default"
+                    - value: "Memory"
+                      description: "Memory"
+# Include{persistenceAdvanced}
+
 
 # Include{persistenceList}
 
diff --git a/charts/incubator/tdarr/values.yaml b/charts/incubator/tdarr/values.yaml
index f094637f45d..15f834beef0 100644
--- a/charts/incubator/tdarr/values.yaml
+++ b/charts/incubator/tdarr/values.yaml
@@ -1,7 +1,7 @@
 image:
   repository: tccr.io/truecharts/tdarr
   pullPolicy: IfNotPresent
-  tag: v2.00.16@sha256:cb06a5d50de3c7ea209d9d853dfea9d75bc7347002ef60762e27729382c29946
+  tag: v2.00.18.1@sha256:f6272147724475e95b86269280d598b49bf113ee17deab177d196e14674503c8
 
 securityContext:
   readOnlyRootFilesystem: false
@@ -12,15 +12,17 @@ podSecurityContext:
   runAsGroup: 0
 
 env:
+  webUIPort: "{{ .Values.service.main.ports.main.port }}"
+  serverPort: "{{ .Values.service.comm.ports.comm.port }}"
+  # User Defined
+  internalNode: true
   serverIP: "localhost"
-  serverPort: 8266
-  webUIPort: 8265
+  nodeID: "Internal Node"
 
 service:
   main:
     ports:
       main:
-        targetPort: 8265
         port: 8265
   comm:
     enabled: true
@@ -28,7 +30,6 @@ service:
       comm:
         enabled: true
         port: 8266
-        targetPort: 8266
 
 persistence:
   configs:
@@ -43,5 +44,8 @@ persistence:
   transcode-cache:
     enabled: true
     mountPath: "/temp"
+  media:
+    enabled: true
+    mountPath: "/media"
   varrun:
     enabled: true