diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
index 8024cba..0159c73 100644
--- a/.github/workflows/lint-test.yaml
+++ b/.github/workflows/lint-test.yaml
@@ -14,7 +14,7 @@ jobs:
       - name: Set up Helm
         uses: azure/setup-helm@v1
         with:
-          version: 3.*
+          version: 3.10.1
 
       - name: Add dependencies
         run: |
diff --git a/charts/pact-broker/Chart.yaml b/charts/pact-broker/Chart.yaml
index 4d943f7..42be48e 100644
--- a/charts/pact-broker/Chart.yaml
+++ b/charts/pact-broker/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: pact-broker
 description: The Pact Broker is an application for sharing for Pact contracts and verification results.
 type: application
-version: 0.2.0
+version: 0.2.1
 appVersion: 2.100.0.1
 dependencies:
   - condition: postgresql.enabled
diff --git a/charts/pact-broker/README.md b/charts/pact-broker/README.md
index 4b50add..f32e40c 100644
--- a/charts/pact-broker/README.md
+++ b/charts/pact-broker/README.md
@@ -1,6 +1,6 @@
 # pact-broker
 
-![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.100.0.1](https://img.shields.io/badge/AppVersion-2.100.0.1-informational?style=flat-square)
+![Version: 0.2.1](https://img.shields.io/badge/Version-0.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.100.0.1](https://img.shields.io/badge/AppVersion-2.100.0.1-informational?style=flat-square)
 
 The Pact Broker is an application for sharing for Pact contracts and verification results.
 
diff --git a/charts/pact-broker/templates/deployment.yaml b/charts/pact-broker/templates/deployment.yaml
index df525cf..306ffd9 100644
--- a/charts/pact-broker/templates/deployment.yaml
+++ b/charts/pact-broker/templates/deployment.yaml
@@ -120,6 +120,7 @@ spec:
             # Authentication and authorization
             - name: PACT_BROKER_BASIC_AUTH_ENABLED
               value: {{ .Values.broker.config.basicAuth.enabled | quote }}
+            {{- if .Values.broker.config.basicAuth.enabled }}
             - name: PACT_BROKER_BASIC_AUTH_USERNAME
               {{- if .Values.broker.config.basicAuth.writeUser.username }}
               value: {{ .Values.broker.config.basicAuth.writeUser.username }}
@@ -129,6 +130,8 @@ spec:
                   name: {{ .Values.broker.config.basicAuth.writeUser.existingSecret }}
                   key: {{ .Values.broker.config.basicAuth.writeUser.existingSecretUsernameKey }}
               {{- end }}
+            {{- end }}
+            {{- if .Values.broker.config.basicAuth.enabled }}
             - name: PACT_BROKER_BASIC_AUTH_PASSWORD
               {{- if .Values.broker.config.basicAuth.writeUser.password }}
               value: {{ .Values.broker.config.basicAuth.writeUser.password }}
@@ -138,6 +141,8 @@ spec:
                   name: {{ .Values.broker.config.basicAuth.writeUser.existingSecret }}
                   key: {{ .Values.broker.config.basicAuth.writeUser.existingSecretPasswordKey }}
               {{- end }}
+            {{- end }}
+            {{- if .Values.broker.config.basicAuth.enabled }}
             - name: PACT_BROKER_BASIC_AUTH_READ_ONLY_USERNAME
               {{- if .Values.broker.config.basicAuth.readUser.username }}
               value: {{ .Values.broker.config.basicAuth.readUser.username }}
@@ -147,6 +152,8 @@ spec:
                   name: {{ .Values.broker.config.basicAuth.readUser.existingSecret }}
                   key: {{ .Values.broker.config.basicAuth.readUser.existingSecretUsernameKey }}
               {{- end }}
+            {{- end }}
+            {{- if .Values.broker.config.basicAuth.enabled }}
             - name: PACT_BROKER_BASIC_AUTH_READ_ONLY_PASSWORD
               {{- if .Values.broker.config.basicAuth.readUser.password }}
               value: {{ .Values.broker.config.basicAuth.readUser.password }}
@@ -156,6 +163,7 @@ spec:
                   name: {{ .Values.broker.config.basicAuth.readUser.existingSecret }}
                   key: {{ .Values.broker.config.basicAuth.readUser.existingSecretPasswordKey }}
               {{- end }}
+            {{- end }}
             - name: PACT_BROKER_ALLOW_PUBLIC_READ
               value: {{ .Values.broker.config.basicAuth.allowPublicRead | quote }}
             - name: PACT_BROKER_PUBLIC_HEARTBEAT
diff --git a/charts/pact-broker/values.yaml b/charts/pact-broker/values.yaml
index 1921027..546d8ef 100644
--- a/charts/pact-broker/values.yaml
+++ b/charts/pact-broker/values.yaml
@@ -135,7 +135,7 @@ broker:
 
       # -- Set to true if you basic authentication to be enabled
       #
-      enabled: true
+      enabled: false
 
       # -- Set to true if you want public read access, but still require credentials for writing.
       #
@@ -152,10 +152,10 @@ broker:
       writeUser:
 
         # -- Usermame for write access to the Pact Broker
-        username: "admin"
+        username: ""
 
         # -- Password for write access to the Pact Broker
-        password: "admin"
+        password: ""
 
         # -- Name of an existing Kubernetes secret containing credentials to access the Pact Broker
         existingSecret: ""
@@ -170,10 +170,10 @@ broker:
       readUser:
 
         # -- Usermame for read access to the Pact Broker
-        username: "admin"
+        username: ""
 
         # -- Password for read access to the Pact Broker
-        password: "admin"
+        password: ""
 
         # -- Name of an existing Kubernetes secret containing credentials to access the Pact Broker
         existingSecret: ""