diff --git a/horizon/Chart.yaml b/horizon/Chart.yaml
index d5d7106..0da399b 100644
--- a/horizon/Chart.yaml
+++ b/horizon/Chart.yaml
@@ -22,7 +22,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.2-rc1
+version: 1.0.2-b1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/horizon/templates/opennms-core.route.yaml b/horizon/templates/opennms-core.route.yaml
index 24331eb..d4c8183 100644
--- a/horizon/templates/opennms-core.route.yaml
+++ b/horizon/templates/opennms-core.route.yaml
@@ -1,4 +1,4 @@
-{{- if eq (include "omOpenShift" .) "true" }}
+{{- if and (eq (include "onOpenShift" .) "true") ((.Values.dependencies.securitycontext).route) }}
 kind: Route
 apiVersion: route.openshift.io/v1
 metadata:
diff --git a/horizon/templates/opennms-core.sa.yaml b/horizon/templates/opennms-core.sa.yaml
index bfd89d8..5c52e1f 100644
--- a/horizon/templates/opennms-core.sa.yaml
+++ b/horizon/templates/opennms-core.sa.yaml
@@ -1,4 +1,4 @@
-{{- if eq (include "omOpenShift" .) "true" }}
+{{- if and (eq (include "onOpenShift" .) "true") ((.Values.dependencies.securitycontext).serviceaccount) }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
diff --git a/horizon/templates/opennms-core.scc.yaml b/horizon/templates/opennms-core.scc.yaml
index de4a817..c205db3 100644
--- a/horizon/templates/opennms-core.scc.yaml
+++ b/horizon/templates/opennms-core.scc.yaml
@@ -1,4 +1,4 @@
-{{- if eq (include "omOpenShift" .) "true" }}
+{{- if and (eq (include "onOpenShift" .) "true") ((.Values.dependencies.securitycontext).securitycontextconstraints) }}
 ---
 kind: SecurityContextConstraints
 metadata:
diff --git a/horizon/templates/opennms-core.statefulset.yaml b/horizon/templates/opennms-core.statefulset.yaml
index e67c0b1..693c57b 100644
--- a/horizon/templates/opennms-core.statefulset.yaml
+++ b/horizon/templates/opennms-core.statefulset.yaml
@@ -84,7 +84,7 @@ spec:
             name: app-credentials
         env:
         - name: JAVA_HOME
-          value: /usr/lib/jvm/java-nocap
+          value: /usr/lib/jvm/java
         - name: OPENNMS_DATABASE_CONNECTION_MAXPOOL
           value: {{ .Values.core.configuration.database.poolSize | default "50" | quote }}
         volumeMounts:
@@ -164,7 +164,7 @@ spec:
               resource: requests.memory
               divisor: 1Mi
         - name: JAVA_HOME
-          value: /usr/lib/jvm/java-nocap
+          value: /usr/lib/jvm/java
         - name: JAVA_OPTS
           value: -Xms$(MEM_TOTAL_MB)m -Xmx$(MEM_TOTAL_MB)m {{ $opt }}
         {{- end }}
diff --git a/horizon/values.schema.json b/horizon/values.schema.json
index 56aaffa..4a58e5a 100644
--- a/horizon/values.schema.json
+++ b/horizon/values.schema.json
@@ -44,7 +44,8 @@
                                 "32.0.0",
                                 "32.0.1",
                                 "32.0.2",
-                                "bleeding"
+                                "33.0.0-SNAPSHOT",
+                                "develop"
                             ]
                         }
                     }
@@ -162,7 +163,10 @@
                                     "default": "1Gi"
                                 },
                                 "mibs": {
-                                    "type": ["string", "null"],
+                                    "type": [
+                                        "string",
+                                        "null"
+                                    ],
                                     "default": null
                                 }
                             }
@@ -193,15 +197,24 @@
                             "default": "newer"
                         },
                         "nodeSelector": {
-                            "type": ["string", "null"],
+                            "type": [
+                                "string",
+                                "null"
+                            ],
                             "default": null
                         },
                         "affinity": {
-                            "type": ["string", "null"],
+                            "type": [
+                                "string",
+                                "null"
+                            ],
                             "default": null
                         },
                         "tolerations": {
-                            "type": ["string", "null"],
+                            "type": [
+                                "string",
+                                "null"
+                            ],
                             "default": null
                         }
                     },
@@ -244,6 +257,24 @@
             "form": true,
             "title": "Dependencies",
             "properties": {
+                "securitycontext": {
+                    "type": "object",
+                    "form": true,
+                    "properties": {
+                        "securitycontextconstraints": {
+                            "type": "boolean",
+                            "default": true
+                        },
+                        "serviceaccount": {
+                            "type": "boolean",
+                            "default": true
+                        },
+                        "route": {
+                            "type": "boolean",
+                            "default": true
+                        }
+                    }
+                },
                 "truststore": {
                     "type": "object",
                     "form": true,
diff --git a/horizon/values.yaml b/horizon/values.yaml
index 6fbb0c4..2ab0383 100644
--- a/horizon/values.yaml
+++ b/horizon/values.yaml
@@ -19,6 +19,10 @@ imagePullSecrets: []
 #   dockerEmail: admin@agalue.net
 
 dependencies:
+  securitycontext:
+   securitycontextconstraints: true
+   serviceAccount: true
+   route: true
 
   # A common JKS to white-list all CA certificates for all the dependencies OpenNMS or Sentinel uses.
   truststore:
diff --git a/minion/Chart.yaml b/minion/Chart.yaml
index ccc8f76..7a93dc4 100644
--- a/minion/Chart.yaml
+++ b/minion/Chart.yaml
@@ -3,6 +3,9 @@ name: minion
 description: A Helm chart for running OpenNMS Minion in Kubernetes
 home: https://github.com/OpenNMS/helm-charts
 icon: https://www.opennms.com/wp-content/uploads/2021/04/OpenNMS_Favicon_36px.png
+kubeVersion: ">=1.17.1-0"
+annotations:
+   charts.openshift.io/name: OpenNMS Minion
 
 # A chart can be either an 'application' or a 'library' chart.
 #
@@ -17,7 +20,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.2-rc1
+version: 1.0.2-b1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to