diff --git a/charts/dev/docker-compose/.helmignore b/charts/dev/docker-compose/.helmignore
new file mode 100644
index 00000000000..e559de0a012
--- /dev/null
+++ b/charts/dev/docker-compose/.helmignore
@@ -0,0 +1,24 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
+# OWNERS file for Kubernetes
+OWNERS
diff --git a/charts/dev/docker-compose/Chart.yaml b/charts/dev/docker-compose/Chart.yaml
new file mode 100644
index 00000000000..47f45cd8dc1
--- /dev/null
+++ b/charts/dev/docker-compose/Chart.yaml
@@ -0,0 +1,29 @@
+apiVersion: v2
+appVersion: "0.20.590"
+dependencies:
+- name: common
+  repository: https://truecharts.org
+  version: 8.16.0
+deprecated: false
+description: Dedicated App for using Docker-Compose on TrueNAS SCALE
+home: https://github.com/truecharts/apps/tree/master/charts/dev/docker-compose
+icon: https://truecharts.org/_static/img/appicons/docker-compose.png
+keywords:
+- docker-compose
+- docker
+kubeVersion: '>=1.16.0-0'
+maintainers:
+- email: info@truecharts.org
+  name: TrueCharts
+  url: https://truecharts.org
+name: docker-compose
+sources:
+- https://github.com/Jackett/Jackett
+type: application
+version: 0.0.1
+annotations:
+  truecharts.org/catagories: |
+    - docker
+    - test
+  truecharts.org/SCALE-support: "true"
+  truecharts.org/grade: U
diff --git a/charts/dev/docker-compose/questions.yaml b/charts/dev/docker-compose/questions.yaml
new file mode 100644
index 00000000000..3bf627f4ee8
--- /dev/null
+++ b/charts/dev/docker-compose/questions.yaml
@@ -0,0 +1,181 @@
+# Include{groups}
+portals:
+  web_portal:
+    protocols:
+      - "$kubernetes-resource_configmap_portal_protocol"
+    host:
+      - "$kubernetes-resource_configmap_portal_host"
+    ports:
+      - "$kubernetes-resource_configmap_portal_port"
+questions:
+  - variable: portal
+    group: "Container Image"
+    label: "Configure Portal Button"
+    schema:
+      type: dict
+      hidden: true
+      attrs:
+        - variable: enabled
+          label: "Enable"
+          description: "enable the portal button"
+          schema:
+            hidden: true
+            editable: false
+            type: boolean
+            default: true
+# Include{global}
+
+  - variable: controller
+    group: "Controller"
+    label: ""
+    schema:
+      additional_attrs: true
+      type: dict
+      attrs:
+        - variable: advanced
+          label: "Show Advanced Controller Settings"
+          schema:
+            type: boolean
+            default: false
+            show_subquestions_if: true
+            subquestions:
+              - variable: type
+                description: "Please specify type of workload to deploy"
+                label: "(Advanced) Controller Type"
+                schema:
+                  type: string
+                  default: "statefulset"
+                  required: true
+                  enum:
+                    - value: "deployment"
+                      description: "Deployment"
+                    - value: "statefulset"
+                      description: "Statefulset"
+                    - value: "daemonset"
+                      description: "Daemonset"
+              - variable: replicas
+                description: "Number of desired pod replicas"
+                label: "Desired Replicas"
+                schema:
+                  type: int
+                  default: 1
+                  required: true
+              - variable: strategy
+                description: "Please specify type of workload to deploy"
+                label: "(Advanced) Update Strategy"
+                schema:
+                  type: string
+                  default: "RollingUpdate"
+                  required: true
+                  enum:
+                    - value: "Recreate"
+                      description: "Recreate: Kill existing pods before creating new ones"
+                    - value: "RollingUpdate"
+                      description: "RollingUpdate: Create new pods and then kill old ones"
+                    - value: "OnDelete"
+                      description: "(Legacy) OnDelete: ignore .spec.template changes"
+# Include{controllerExpert}
+
+  - variable: env
+    group: "Container Configuration"
+    label: "Image Environment"
+    schema:
+      additional_attrs: true
+      type: dict
+      attrs:
+# Include{fixedEnv}
+
+# Include{containerConfig}
+
+  - variable: serviceexpert
+    group: "Networking and Services"
+    label: "Show Expert Config"
+    schema:
+      type: boolean
+      default: false
+      show_subquestions_if: true
+      subquestions:
+        - variable: hostNetwork
+          group: "Networking and Services"
+          label: "Host-Networking (Complicated)"
+          schema:
+            type: boolean
+            default: true
+
+# Include{serviceExpert}
+
+# Include{serviceList}
+
+# Include{persistenceList}
+
+# Include{ingressList}
+
+  - variable: advancedSecurity
+    label: "Show Advanced Security Settings"
+    group: "Security and Permissions"
+    schema:
+      type: boolean
+      default: false
+      show_subquestions_if: true
+      subquestions:
+        - variable: securityContext
+          label: "Security Context"
+          schema:
+            additional_attrs: true
+            type: dict
+            attrs:
+              - variable: privileged
+                label: "Privileged mode"
+                schema:
+                  type: boolean
+                  default: true
+              - variable: readOnlyRootFilesystem
+                label: "ReadOnly Root Filesystem"
+                schema:
+                  type: boolean
+                  default: false
+              - variable: allowPrivilegeEscalation
+                label: "Allow Privilege Escalation"
+                schema:
+                  type: boolean
+                  default: true
+              - variable: runAsNonRoot
+                label: "runAsNonRoot"
+                schema:
+                  type: boolean
+                  default: false
+# Include{securityContextAdvanced}
+
+  - variable: podSecurityContext
+    group: "Security and Permissions"
+    label: "Pod Security Context"
+    schema:
+      additional_attrs: true
+      type: dict
+      attrs:
+        - variable: runAsUser
+          label: "runAsUser"
+          description: "The UserID of the user running the application"
+          schema:
+            type: int
+            default: 0
+        - variable: runAsGroup
+          label: "runAsGroup"
+          description: The groupID this App of the user running the application"
+          schema:
+            type: int
+            default: 0
+        - variable: fsGroup
+          label: "fsGroup"
+          description: "The group that should own ALL storage."
+          schema:
+            type: int
+            default: 0
+# Include{podSecurityContextAdvanced}
+
+
+# Include{resources}
+
+# Include{advanced}
+
+# Include{addons}
diff --git a/charts/dev/docker-compose/templates/common.yaml b/charts/dev/docker-compose/templates/common.yaml
new file mode 100644
index 00000000000..a6613c2ce21
--- /dev/null
+++ b/charts/dev/docker-compose/templates/common.yaml
@@ -0,0 +1 @@
+{{ include "common.all" . }}
diff --git a/charts/dev/docker-compose/values.yaml b/charts/dev/docker-compose/values.yaml
new file mode 100644
index 00000000000..815882e845c
--- /dev/null
+++ b/charts/dev/docker-compose/values.yaml
@@ -0,0 +1,78 @@
+image:
+  repository: tccr.io/truecharts/docker-in-docker
+  pullPolicy: IfNotPresent
+  tag: v20.10.12@sha256:e672e85d8141beffea3f7e5b97c79a2bca726bde478474e845fc338a08a1092f
+
+controller:
+  # -- Set the controller type.
+  # Valid options are deployment, daemonset or statefulset
+  type: statefulset
+  # -- Number of desired pods
+  replicas: 1
+  # -- Set the controller upgrade strategy
+  # For Deployments, valid values are Recreate (default) and RollingUpdate.
+  # For StatefulSets, valid values are OnDelete and RollingUpdate (default).
+  # DaemonSets ignore this.
+  strategy: RollingUpdate
+  rollingUpdate:
+    # -- Set deployment RollingUpdate max unavailable
+    unavailable: 1
+    # -- Set deployment RollingUpdate max surge
+    surge:
+    # -- Set statefulset RollingUpdate partition
+    partition:
+  # -- ReplicaSet revision history limit
+  revisionHistoryLimit: 3
+
+securityContext:
+  privileged: true
+  readOnlyRootFilesystem: false
+  allowPrivilegeEscalation: true
+  runAsNonRoot: false
+
+podSecurityContext:
+  runAsUser: 0
+  runAsGroup: 0
+  fsGroup: 0
+
+hostNetwork: true
+
+service:
+  main:
+    enabled: true
+    ports:
+      main:
+        port: 2376
+        type: HTTPS
+
+env:
+  DOCKER_TLS_CERTDIR: "/certs"
+
+persistence:
+  varrun:
+    enabled: false
+  mnt:
+    enabled: true
+    type: hostPath
+    hostPath: /mnt
+    mountPath: /mnt
+    hostPathType: ""
+    readOnly: false
+  root:
+    enabled: true
+    type: hostPath
+    hostPath: /root
+    mountPath: /root
+    hostPathType: ""
+    readOnly: false
+  docker-certs-ca:
+    enabled: true
+    mountPath: "/config"
+
+volumeClaimTemplates:
+  docker-certs-client:
+    enabled: true
+    mountPath: "/certs/client"
+  docker:
+    enabled: true
+    mountPath: "/var/lib/docker"