diff --git a/CHANGELOG.md b/CHANGELOG.md
index 309363044f317abd25c4405a4e55f235e3cde380..f33f0b6e7bececa712b904bd3bcc85eb04856b05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ---
+## [0.1.8-bb.0] - 2021-08-18
+### Added
+- default user value set to null
+- Set replica count to 1
+- Resource requests and limits for all containers
+- Updated to latest Minio and Minio Operator dependency
+- Updated Gluon test library
+
 ## [0.1.7-bb.1] - 2021-07-23
 ### Changed
 - Updated to latest IronBank image 5.37.0
diff --git a/chart/Chart.lock b/chart/Chart.lock
index 59e69eff307e86a60ca595d86dac1cfaab73bb3f..b92b63eb799b4d4fb17ae64f57beca36d0f10df2 100644
--- a/chart/Chart.lock
+++ b/chart/Chart.lock
@@ -4,9 +4,9 @@ dependencies:
   version: 10.3.5
 - name: minio-instance
   repository: file://./deps/minio
-  version: 4.1.2-bb.3
+  version: 4.1.2-bb.5
 - name: gluon
   repository: oci://registry.dso.mil/platform-one/big-bang/apps/library-charts/gluon
-  version: 0.1.1
-digest: sha256:4f58bc0a89971b5e64c0fd8d57d8cee0a116fd8bd62315722a6fea37fdfd44e3
-generated: "2021-07-27T10:06:13.1849167-06:00"
+  version: 0.2.3
+digest: sha256:cde5de559ca3093d910f05987ba958d2310f93546e486d6b36e5049879ffd781
+generated: "2021-08-18T11:24:54.7908191-06:00"
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 79440d1a1dcb4a14f3fa51f19ef53bfc19ba66c5..8fdd2bb482dc301e6ed909f87987a904f3c6b182 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -2,7 +2,7 @@
 apiVersion: v2
 name: mattermost
 type: application
-version: "0.1.7-bb.1"
+version: "0.1.8-bb.0"
 appVersion: "5.37.0"
 description: "Deployment of mattermost"
 keywords: 
@@ -17,10 +17,10 @@ dependencies:
     condition: postgresql.install
     repository: file://./deps/postgresql
   - name: minio-instance
-    version: 4.1.2-bb.3
+    version: 4.1.2-bb.5
     alias: minio
     condition: minio.install
     repository: file://./deps/minio
   - name: gluon
-    version: 0.1.1
+    version: 0.2.3
     repository: oci://registry.dso.mil/platform-one/big-bang/apps/library-charts/gluon
diff --git a/chart/charts/gluon-0.1.1.tgz b/chart/charts/gluon-0.1.1.tgz
deleted file mode 100644
index b4a4878dae126348cdee9d80977a15121ba59f9f..0000000000000000000000000000000000000000
Binary files a/chart/charts/gluon-0.1.1.tgz and /dev/null differ
diff --git a/chart/charts/gluon-0.2.3.tgz b/chart/charts/gluon-0.2.3.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..03fa0d4f6be0bd975ba08b14c5831025ec52c02f
Binary files /dev/null and b/chart/charts/gluon-0.2.3.tgz differ
diff --git a/chart/charts/minio-instance-4.1.2-bb.3.tgz b/chart/charts/minio-instance-4.1.2-bb.3.tgz
deleted file mode 100644
index 55b0f2d15b28e792c9522e59f53a131c3d858d2f..0000000000000000000000000000000000000000
Binary files a/chart/charts/minio-instance-4.1.2-bb.3.tgz and /dev/null differ
diff --git a/chart/charts/minio-instance-4.1.2-bb.5.tgz b/chart/charts/minio-instance-4.1.2-bb.5.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..678650c412a2fc8844141b9bbc3a291eee5b604b
Binary files /dev/null and b/chart/charts/minio-instance-4.1.2-bb.5.tgz differ
diff --git a/chart/charts/postgresql-10.3.5.tgz b/chart/charts/postgresql-10.3.5.tgz
index f76462857d424c500f186cabe2256559b87091e0..1296f8398029c9fac73466f64f3176fb73649c7a 100644
Binary files a/chart/charts/postgresql-10.3.5.tgz and b/chart/charts/postgresql-10.3.5.tgz differ
diff --git a/chart/deps/minio/Chart.yaml b/chart/deps/minio/Chart.yaml
index 1b0a01f8b1f6a4468e6c9b73ffaeb33b728e83ff..4f3992f4064179aaadb9693b679b94b1b6889465 100644
--- a/chart/deps/minio/Chart.yaml
+++ b/chart/deps/minio/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 type: application
 name: minio-instance
-version: 4.1.2-bb.3
+version: 4.1.2-bb.5
 appVersion: v4.1.2
 description: A Helm chart for MinIO based on Minio Operator 4.1.2
 home: https://min.io
diff --git a/chart/deps/minio/Kptfile b/chart/deps/minio/Kptfile
index cf023c60f7445ff0213318cf43bef808d36bc520..5a4d373a23d02facc8e658922853d8487ea04147 100644
--- a/chart/deps/minio/Kptfile
+++ b/chart/deps/minio/Kptfile
@@ -5,7 +5,7 @@ metadata:
 upstream:
   type: git
   git:
-    commit: 2ac9e5bf5aaaa414ea9790b2057d42e30b86df92
+    commit: 1176a5f860ff5580d3feb1ba2ff24e5522487416
     repo: https://repo1.dso.mil/platform-one/big-bang/apps/application-utilities/minio
     directory: /chart
-    ref: 4.1.2-bb.3
+    ref: 4.1.2-bb.5
diff --git a/chart/deps/minio/templates/bigbang/networkpolicies/default-deny-egress.yaml b/chart/deps/minio/templates/bigbang/networkpolicies/default-deny-egress.yaml
index c086ccaefd638de13fa73b1999b32471becb1665..6854b11b3e23fa03f4e65be6a0700c309fc3a00e 100644
--- a/chart/deps/minio/templates/bigbang/networkpolicies/default-deny-egress.yaml
+++ b/chart/deps/minio/templates/bigbang/networkpolicies/default-deny-egress.yaml
@@ -15,4 +15,8 @@ spec:
     ports:
     - port: 53
       protocol: UDP
+    {{- if .Values.openshift }}
+    - port: 5353
+      protocol: UDP
+    {{- end }}
 {{- end }}
diff --git a/chart/deps/minio/values.yaml b/chart/deps/minio/values.yaml
index 4c7310ad9e1270e2a3584eb83126d904d8026708..f307b41213011ce7b4d419524cd97e729531a755 100644
--- a/chart/deps/minio/values.yaml
+++ b/chart/deps/minio/values.yaml
@@ -115,9 +115,6 @@ tenants:
   ## here: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity.
   #affinity: {}
 
-  ## Configure resource requests and limits for MinIO containers
-  #resources: {}
-
   ## Configure security context
   ## BB Note: Defaults for Ironbank image are 1001 for user, group, and fsGroup
   #securityContext:
@@ -148,7 +145,14 @@ tenants:
         ## here: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity.
       affinity: {}
         ## Configure resource requests and limits for MinIO containers
-      resources: {}
+      resources:
+        requests:
+          cpu: 250m
+          memory: 2Gi
+        limits:
+          cpu: 250m
+          memory: 2Gi
+
         ## Configure security context
         ## BB Note: Defaults for Ironbank image are 1001 for user, group, and fsGroup
       securityContext:
@@ -235,3 +239,5 @@ tenants:
       salt: SECRET
       accessKey: YOURCONSOLEACCESS
       secretKey: YOURCONSOLESECRET
+
+openshift: false
diff --git a/chart/deps/postgresql/values.yaml b/chart/deps/postgresql/values.yaml
index 324670ac24ca68f90403cd53c71495fb34855e1f..0a958d6a2c7fe1aeda64d9b027881d0f85ba9546 100644
--- a/chart/deps/postgresql/values.yaml
+++ b/chart/deps/postgresql/values.yaml
@@ -615,10 +615,13 @@ readReplicas:
     enabled: true
 
   # Override the resource configuration for read replicas
-  resources: {}
-  # requests:
-  #   memory: 256Mi
-  #   cpu: 250m
+  resources:
+    requests:
+      memory: 256Mi
+      cpu: 250m
+    limits:
+      memory: 256Mi
+      cpu: 250m
 
 ## Configure resource requests and limits
 ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
@@ -627,6 +630,9 @@ resources:
   requests:
     memory: 256Mi
     cpu: 250m
+  limits:
+    memory: 256Mi
+    cpu: 250m
 
 ## Add annotations to all the deployed resources
 ##
@@ -728,7 +734,13 @@ tls:
 ##
 metrics:
   enabled: false
-  # resources: {}
+  resources:
+    requests:
+      memory: 256Mi
+      cpu: 100m
+    limits:
+      memory: 256Mi
+      cpu: 100m
   service:
     type: ClusterIP
     annotations:
diff --git a/chart/templates/default-bucket.yaml b/chart/templates/default-bucket.yaml
index f3065f2958eef89b05d2ee2e06818a56fff13ca7..694dae34d0b4d1ec3ba2a40636526591cd4f85e9 100644
--- a/chart/templates/default-bucket.yaml
+++ b/chart/templates/default-bucket.yaml
@@ -36,5 +36,12 @@ spec:
                 attempt_counter=$(($attempt_counter+1))
                 sleep 10
               done
-              mc mb bigbang/mattermost            
+              mc mb bigbang/mattermost   
+          resources:
+            requests:
+              memory: 256Mi
+              cpu: 100m
+            limits:
+              memory: 256Mi
+              cpu: 100m
 {{- end }}
diff --git a/chart/templates/mattermost.yaml b/chart/templates/mattermost.yaml
index 6360eec2dc35e3fe380d2c6b6fd1bf46441866d5..4da007ae8fd20898481f822e24131a19ab5c6a94 100644
--- a/chart/templates/mattermost.yaml
+++ b/chart/templates/mattermost.yaml
@@ -16,8 +16,11 @@ spec:
 
   size: {{ .Values.users }}users
   version: {{ .Values.image.tag }}
+  {{- if .Values.enterprise.enabled }}
   replicas: {{ .Values.replicaCount }}
-
+  {{- else }}
+  replicas: 1
+  {{- end }}
   {{- if .Values.istio.chat.hosts }}
   ingressName: {{ tpl (index .Values.istio.chat.hosts 0) $ }}
   {{- else }}
@@ -140,9 +143,10 @@ spec:
       periodSeconds: 120
 
   scheduling:
+    {{- with .Values.resources }}
     resources:
-    {{- toYaml .Values.resources | nindent 6 }}
-
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
     {{- if .Values.affinity }}
     affinity:
       {{ toYaml .Values.affinity | nindent 6 }}
diff --git a/chart/values.yaml b/chart/values.yaml
index 541b99cebae176602653f7c89569cd926d29cbf1..7bc34602d88a8464adacdeb74e47624d221b2c03 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -44,9 +44,9 @@ global:
   - name: private-registry
 
 # Mattermost instance desired replicas
-replicaCount: 3
+replicaCount: 1
 
-users: 100 # Allowable: 100, 1000, 5000, 10000, 25000
+users: null # Allowable: 100, 1000, 5000, 10000, 25000
 
 enterprise:
   enabled: false
@@ -57,13 +57,13 @@ enterprise:
 
 nameOverride: ""
 
-resources: {}
-  # limits:
-  #   cpu: 500m
-  #   memory: 512Mi
-  # requests:
-  #   cpu: 250m
-  #   memory: 256Mi
+resources:
+  limits:
+    cpu: 2
+    memory: 4Gi
+  requests:
+    cpu: 2
+    memory: 4Gi
 
 affinity: {}
   # podAntiAffinity:
diff --git a/tests/dependencies.yaml b/tests/dependencies.yaml
index 8ca3e4856d93c8fcb7d5e9a7b0f54cba6399cb1b..f0aaebb9e979b7f7ea11dea6627888eac41b2976 100644
--- a/tests/dependencies.yaml
+++ b/tests/dependencies.yaml
@@ -6,4 +6,4 @@ mattermostoperator:
 miniooperator:
   git: "https://repo1.dso.mil/platform-one/big-bang/apps/application-utilities/minio-operator.git"
   namespace: "minio-operator"
-  branch: "4.1.2-bb.1"
+  branch: "4.1.2-bb.2"