diff --git a/CHANGELOG.md b/CHANGELOG.md
index f33f0b6e7bececa712b904bd3bcc85eb04856b05..f2641dc3d02f722dd057401cabf1e04d6d0398ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@
 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-19
+### Fix
+- Fixes issue with default bucket creation already existing
+
 ## [0.1.8-bb.0] - 2021-08-18
 ### Added
 - default user value set to null
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 8fdd2bb482dc301e6ed909f87987a904f3c6b182..04735b4448f648d601f8597495f57c2dfa627274 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -2,7 +2,7 @@
 apiVersion: v2
 name: mattermost
 type: application
-version: "0.1.8-bb.0"
+version: "0.1.8-bb.1"
 appVersion: "5.37.0"
 description: "Deployment of mattermost"
 keywords: 
diff --git a/chart/templates/default-bucket.yaml b/chart/templates/default-bucket.yaml
index 694dae34d0b4d1ec3ba2a40636526591cd4f85e9..92e38d5cf1628f862cff7f79ab6bf70c6dcb525b 100644
--- a/chart/templates/default-bucket.yaml
+++ b/chart/templates/default-bucket.yaml
@@ -36,7 +36,12 @@ spec:
                 attempt_counter=$(($attempt_counter+1))
                 sleep 10
               done
-              mc mb bigbang/mattermost   
+              if [ $(mc ls bigbang/mattermost >/dev/null; echo $?) -eq 0 ]; then
+                echo "Default Bucket Exists"
+                exit 0
+              else
+                mc mb bigbang/mattermost
+              fi
           resources:
             requests:
               memory: 256Mi