diff --git a/bbsim/Chart.yaml b/bbsim/Chart.yaml
index aea4fc5..f763142 100644
--- a/bbsim/Chart.yaml
+++ b/bbsim/Chart.yaml
@@ -16,5 +16,5 @@
 description: Broadband Simulator
 icon: https://guide.opencord.org/logos/cord.svg
 apiVersion: v1
-version: 4.1.6
+version: 4.1.7
 appVersion: 1.4.2
diff --git a/bbsim/values.yaml b/bbsim/values.yaml
index 0fc805b..a73872f 100644
--- a/bbsim/values.yaml
+++ b/bbsim/values.yaml
@@ -15,7 +15,7 @@
 # bbsim values
 
 # Default overrides
-defaults:
+global:
   log_level: "DEBUG"
   image_registry: ""
   image_tag: ~
@@ -31,7 +31,7 @@
 oltRebootDelay: 60
 # delay between ONU discovery indication
 delay: 200
-log_level: '{{ .Values.defaults.log_level }}'
+log_level: '{{ .Values.global.log_level }}'
 kafkaEventTopic: ""
 authRetry: false
 dhcpRetry: false
@@ -62,10 +62,10 @@
 
 images:
   bbsim:
-    registry: '{{ .Values.defaults.image_registry }}'
-    repository: '{{ .Values.defaults.image_org }}bbsim'
-    tag: '{{- if hasKey .Values.defaults "image_tag" }}{{- if .Values.defaults.image_tag }}{{ .Values.defaults.image_tag }}{{- else }}{{ .Chart.AppVersion }}{{- end }}{{- else }}{{ .Chart.AppVersion }}{{- end }}'
-    pullPolicy: '{{ .Values.defaults.image_pullPolicy | default "Always" }}'
+    registry: '{{ .Values.global.image_registry }}'
+    repository: '{{ .Values.global.image_org }}bbsim'
+    tag: '{{- if hasKey .Values.global "image_tag" }}{{- if .Values.global.image_tag }}{{ .Values.global.image_tag }}{{- else }}{{ .Chart.AppVersion }}{{- end }}{{- else }}{{ .Chart.AppVersion }}{{- end }}'
+    pullPolicy: '{{ .Values.global.image_pullPolicy | default "Always" }}'
 
 global:
   registry: ''