diff --git a/artifactory-ha/Chart.yaml b/artifactory-ha/Chart.yaml
index 021c37f2..7bba2aed 100644
--- a/artifactory-ha/Chart.yaml
+++ b/artifactory-ha/Chart.yaml
@@ -25,4 +25,4 @@ name: artifactory-ha
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.117.15
+version: 207.117.15
diff --git a/artifactory-ha/templates/extra-manifests.yaml b/artifactory-ha/templates/extra-manifests.yaml
new file mode 100644
index 00000000..fc9a76b8
--- /dev/null
+++ b/artifactory-ha/templates/extra-manifests.yaml
@@ -0,0 +1,8 @@
+{{ range .Values.extraObjects }}
+---
+{{ if typeIs "string" . }}
+    {{- tpl . $ }}
+{{- else }}
+    {{- tpl (toYaml .) $ }}
+{{- end }}
+{{ end }}
diff --git a/artifactory-ha/templates/secret_ingress_tls.yaml b/artifactory-ha/templates/secret_ingress_tls.yaml
deleted file mode 100755
index ac52c207..00000000
--- a/artifactory-ha/templates/secret_ingress_tls.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-{{- if .Values.manifests.secret_ingress_tls }}
-{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "artifactory" "backendService" "artifactory" ) }}
-{{- end }}
diff --git a/artifactory-ha/values.yaml b/artifactory-ha/values.yaml
index 9405613a..34e51c45 100644
--- a/artifactory-ha/values.yaml
+++ b/artifactory-ha/values.yaml
@@ -126,7 +126,8 @@ ingress:
   # traffic-type: external
   # traffic-type: internal
   tls: []
-  ## Secrets must be manually created in the namespace.
+  ## TLS configuration. Referenced secrets must exist in the target namespace.
+  ## Secrets can be created manually, via extraObjects, or by cert-manager.
   # - secretName: chart-example-tls
   #   hosts:
   #     - artifactory.domain.example
@@ -2240,3 +2241,7 @@ splitServicesToContainers: true
 ## Specify common probes parameters
 probes:
   timeoutSeconds: 5
+
+# -- Array of extra K8s manifests to deploy
+## Note: Supports use of custom Helm templates
+extraObjects: []
diff --git a/jenkins/Chart.yaml b/jenkins/Chart.yaml
index 28e78fd9..d456bd35 100644
--- a/jenkins/Chart.yaml
+++ b/jenkins/Chart.yaml
@@ -3,4 +3,4 @@ description: OpenStack-Helm Jenkins
 maintainers:
 - name: OpenStack-Helm Authors
 name: jenkins
-version: 0.1.3
+version: 0.2.0
diff --git a/jenkins/templates/secret_ingress_tls.yaml b/jenkins/templates/secret_ingress_tls.yaml
deleted file mode 100644
index aee906f9..00000000
--- a/jenkins/templates/secret_ingress_tls.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-{{- if .Values.manifests.secret_ingress_tls }}
-{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "jenkins" "backendService" "jenkins" ) }}
-{{- end }}
diff --git a/jenkins/values.yaml b/jenkins/values.yaml
index cc744185..1962465a 100644
--- a/jenkins/values.yaml
+++ b/jenkins/values.yaml
@@ -443,8 +443,9 @@ conf:
     # seed script was doing this before and the following option is added here to provide 'legacy mode'
     # in case of any problems with the forementioned folders
     change_owner_for_all_files: false
+
 ingress:
-  enabled: true
+  enabled: false
   class: nginx
   # Used to create an Ingress record.
   hosts:
@@ -452,8 +453,9 @@ ingress:
   annotations:
   # kubernetes.io/tls-acme: "true"
   # nginx.ingress.kubernetes.io/backend-protocol: https
-  tls:
-  # Secrets must be manually created in the namespace.
+  tls: []
+  ## TLS configuration. Referenced secrets must exist in the target namespace.
+  ## Secrets can be created manually, via extraObjects, or by cert-manager.
   # - secretName: chart-example-tls
   #   hosts:
   #     - jenkins.domain.example
@@ -594,7 +596,6 @@ manifests:
   configmap_bin: true
   configmap_etc: true
   job_ks_user: false
-  secret_ingress_tls: true
   job_create_namespaces: true
   kubernetes_rbac_rule: true
   configmap_init: true
diff --git a/mission-control/Chart.yaml b/mission-control/Chart.yaml
index 67d12ad8..331fbbc7 100755
--- a/mission-control/Chart.yaml
+++ b/mission-control/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: mission-control
 home: https://jfrog.com/mission-control/
-version: 5.3.5
+version: 5.4.0
 appVersion: 4.6.1
 description: A Helm chart for JFrog Mission Control
 sources:
diff --git a/mission-control/requirements.yaml b/mission-control/requirements.yaml
index f094bb31..e5c2e29d 100755
--- a/mission-control/requirements.yaml
+++ b/mission-control/requirements.yaml
@@ -2,3 +2,6 @@ dependencies:
 - name: helm-toolkit
   repository: file://../deps/helm-toolkit
   version: ">= 0.1.0"
+- name: postgresql
+  repository: file://charts/postgresql
+  version: "~9.3.0"
diff --git a/mission-control/templates/extra-manifests.yaml b/mission-control/templates/extra-manifests.yaml
new file mode 100644
index 00000000..fc9a76b8
--- /dev/null
+++ b/mission-control/templates/extra-manifests.yaml
@@ -0,0 +1,8 @@
+{{ range .Values.extraObjects }}
+---
+{{ if typeIs "string" . }}
+    {{- tpl . $ }}
+{{- else }}
+    {{- tpl (toYaml .) $ }}
+{{- end }}
+{{ end }}
diff --git a/mission-control/templates/secret_ingress_tls.yaml b/mission-control/templates/secret_ingress_tls.yaml
deleted file mode 100644
index 1d62bc19..00000000
--- a/mission-control/templates/secret_ingress_tls.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-{{- if .Values.manifests.secret_ingress_tls }}
-{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "missioncontrol" "backendService" "missioncontrol" ) }}
-{{- end }}
diff --git a/mission-control/values.yaml b/mission-control/values.yaml
index e19d96a6..2e22daef 100755
--- a/mission-control/values.yaml
+++ b/mission-control/values.yaml
@@ -923,10 +923,13 @@ ingress:
   path: /
   hosts: []
   tls: []
+  ## TLS configuration. Referenced secrets must exist in the target namespace.
+  ## Secrets can be created manually, via extraObjects, or by cert-manager.
   #  - secretName: missioncontrol-secret-tls
   #    hosts:
   #      - mission.domain.example
   additionalRules: []
 
-manifests:
-  secret_ingress_tls: true
+# -- Array of extra K8s manifests to deploy
+## Note: Supports use of custom Helm templates
+extraObjects: []