diff --git a/bbsim/templates/deployment.yaml b/bbsim/templates/deployment.yaml
index 279a0b6..8156ed2 100644
--- a/bbsim/templates/deployment.yaml
+++ b/bbsim/templates/deployment.yaml
@@ -39,8 +39,8 @@
       serviceAccountName: {{ .Values.serviceAccountName }}
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ .Values.global.registry }}{{ .Values.images.bbsim.repository }}:{{ tpl .Values.images.bbsim.tag . }}
+          imagePullPolicy: {{ .Values.images.bbsim.pullPolicy }}
           securityContext:
             privileged: true
           command: [
diff --git a/bbsim/values.yaml b/bbsim/values.yaml
index 6ef6634..7cd295b 100644
--- a/bbsim/values.yaml
+++ b/bbsim/values.yaml
@@ -40,10 +40,11 @@
 # -k option
 kafka_broker: 'cord-kafka.default.svc.cluster.local:9092'
 
-image:
-  repository: 'voltha/voltha-bbsim'
-  tag: '{{ .Chart.AppVersion }}'
-  pullPolicy: 'Always'
+images:
+  bbsim:
+    repository: 'voltha/voltha-bbsim'
+    tag: '{{ .Chart.AppVersion }}'
+    pullPolicy: 'Always'
 
 global:
   registry: ''