diff --git a/xos-core/templates/chameleon-deployment.yaml b/xos-core/templates/chameleon-deployment.yaml
index 6fcc8d5..765c67f 100644
--- a/xos-core/templates/chameleon-deployment.yaml
+++ b/xos-core/templates/chameleon-deployment.yaml
@@ -17,7 +17,7 @@
 metadata:
   name: xos-chameleon
   labels:
-    app: xos-chameleon    
+    app: xos-chameleon
 spec:
   replicas: 1
   template:
@@ -28,6 +28,7 @@
       containers:
         - name: xos-chameleon
           image: {{ .Values.pull_docker_registry }}{{ .Values.images.xos_chameleon.repository }}:{{ .Values.images.xos_chameleon.tag }}
+          imagePullPolicy: {{ .Values.images.xos_chameleon.pullPolicy }}
           command: [ "python", "chameleon/chameleon/main.py", "-R", "9101", "-G", "xos-core:50055", "--swagger-url", "/apidocs", "-r" ]
           ports:
             - containerPort: 9101
diff --git a/xos-core/templates/core-deployment.yaml b/xos-core/templates/core-deployment.yaml
index 6515de8..1389fd6 100644
--- a/xos-core/templates/core-deployment.yaml
+++ b/xos-core/templates/core-deployment.yaml
@@ -17,17 +17,18 @@
 metadata:
   name: xos-core
   labels:
-    app: xos-core    
+    app: xos-core
 spec:
   replicas: 1
   template:
     metadata:
       labels:
-        app: xos-core    
+        app: xos-core
     spec:
       containers:
-        - name: xos-core 
+        - name: xos-core
           image: {{ .Values.pull_docker_registry }}{{ .Values.images.xos_core.repository }}:{{ .Values.images.xos_core.tag }}
+          imagePullPolicy: {{ .Values.images.xos_core.pullPolicy }}
           command: ["/bin/bash", "-c", "cd coreapi; ./start_coreapi.sh"]
           ports:
             - containerPort: 50051
@@ -62,13 +63,13 @@
               path: core_api_key.pem
         - name: xos-core-config
           configMap:
-            name: xos-core 
-            items: 
+            name: xos-core
+            items:
              - key: config
                path: config/xos_config.yaml
         - name: initial-data-config
           configMap:
-            name: xos-initial-data 
-            items: 
+            name: xos-initial-data
+            items:
              - key: config
                path: migrations/initial_data.yaml
diff --git a/xos-core/templates/db-deployment.yaml b/xos-core/templates/db-deployment.yaml
index 166e101..f950b32 100644
--- a/xos-core/templates/db-deployment.yaml
+++ b/xos-core/templates/db-deployment.yaml
@@ -17,21 +17,22 @@
 metadata:
   name: xos-db
   labels:
-    app: xos-db    
+    app: xos-db
 spec:
   replicas: 1
   template:
     metadata:
       labels:
-        app: xos-db    
+        app: xos-db
       annotations:
         checksum/config-map: {{ include (print $.Template.BasePath "/db-configmap.yaml") . | sha256sum }}
     spec:
       containers:
-        - name: xos-db 
+        - name: xos-db
           image: {{ .Values.pull_docker_registry }}{{ .Values.images.xos_db.repository }}:{{ .Values.images.xos_db.tag }}
+          imagePullPolicy: {{ .Values.images.xos_db.pullPolicy }}
           ports:
-            - containerPort: 5432 
+            - containerPort: 5432
               protocol: TCP
           env:
             - name: SERVICE_5432_NAME
diff --git a/xos-core/templates/gui-deployment.yaml b/xos-core/templates/gui-deployment.yaml
index 7c29fb7..58de697 100644
--- a/xos-core/templates/gui-deployment.yaml
+++ b/xos-core/templates/gui-deployment.yaml
@@ -17,17 +17,18 @@
 metadata:
   name: xos-gui
   labels:
-    app: xos-gui    
+    app: xos-gui
 spec:
   replicas: 1
   template:
     metadata:
       labels:
-        app: xos-gui    
+        app: xos-gui
     spec:
       containers:
-        - name: xos-gui 
+        - name: xos-gui
           image: {{ .Values.pull_docker_registry }}{{ .Values.images.xos_gui.repository }}:{{ .Values.images.xos_gui.tag }}
+          imagePullPolicy: {{ .Values.images.xos_gui.pullPolicy }}
           ports:
             - containerPort: 4000
               port: 4000
@@ -44,14 +45,14 @@
       volumes:
         - name: style-config
           configMap:
-            name: xos-style-config 
-            items: 
+            name: xos-style-config
+            items:
              - key: config
                path: style/style.config.js
         - name: app-config
           configMap:
-            name: xos-app-config 
-            items: 
+            name: xos-app-config
+            items:
              - key: config
                path: app/app.config.js
         - name: extensions-volume
diff --git a/xos-core/templates/redis-deployment.yaml b/xos-core/templates/redis-deployment.yaml
index 6f4a6af..3a91ab0 100644
--- a/xos-core/templates/redis-deployment.yaml
+++ b/xos-core/templates/redis-deployment.yaml
@@ -17,7 +17,7 @@
 metadata:
   name: xos-redis
   labels:
-    app: xos-redis    
+    app: xos-redis
 spec:
   replicas: 1
   template:
@@ -28,7 +28,8 @@
       containers:
         - name: xos-redis
           image: {{ .Values.pull_docker_registry }}{{ .Values.images.redis.repository }}:{{ .Values.images.redis.tag }}
+          imagePullPolicy: {{ .Values.images.redis.pullPolicy }}
           ports:
             - containerPort: 6379
-              port: 6379 
+              port: 6379
               protocol: TCP
\ No newline at end of file
diff --git a/xos-core/templates/tosca-deployment.yaml b/xos-core/templates/tosca-deployment.yaml
index 4957ef4..5dd61f2 100644
--- a/xos-core/templates/tosca-deployment.yaml
+++ b/xos-core/templates/tosca-deployment.yaml
@@ -17,20 +17,21 @@
 metadata:
   name: xos-tosca
   labels:
-    app: xos-tosca    
+    app: xos-tosca
 spec:
   replicas: 1
   template:
     metadata:
       labels:
-        app: xos-tosca    
+        app: xos-tosca
     spec:
       containers:
-        - name: xos-tosca 
+        - name: xos-tosca
           image: {{ .Values.pull_docker_registry }}{{ .Values.images.xos_tosca.repository }}:{{ .Values.images.xos_tosca.tag }}
+          imagePullPolicy: {{ .Values.images.xos_tosca.pullPolicy }}
           ports:
             - containerPort: 9102
-              port: 9102 
+              port: 9102
               protocol: TCP
           volumeMounts:
             - name: secret-volume
@@ -44,7 +45,7 @@
             secretName: cert-chain-secret
         - name: xos-core-config
           configMap:
-            name: xos-tosca 
-            items: 
+            name: xos-tosca
+            items:
              - key: config
                path: config/xos-tosca.config.yaml
diff --git a/xos-core/templates/ws-deployment.yaml b/xos-core/templates/ws-deployment.yaml
index ebd428e..0710c11 100644
--- a/xos-core/templates/ws-deployment.yaml
+++ b/xos-core/templates/ws-deployment.yaml
@@ -17,7 +17,7 @@
 metadata:
   name: xos-ws
   labels:
-    app: xos-ws    
+    app: xos-ws
 spec:
   replicas: 1
   template:
@@ -28,6 +28,7 @@
       containers:
         - name: xos-ws
           image: {{ .Values.pull_docker_registry }}{{ .Values.images.xos_ws.repository }}:{{ .Values.images.xos_ws.tag }}
+          imagePullPolicy: {{ .Values.images.xos_ws.pullPolicy }}
           command: ["npm", "start", "--",  "--config", "gateway-config.yml"]
           ports:
             - containerPort: 3000
@@ -40,7 +41,7 @@
       volumes:
         - name: gateway-config
           configMap:
-            name: xos-gateway 
-            items: 
+            name: xos-gateway
+            items:
              - key: config
                path: config/gateway-config.yml
\ No newline at end of file
diff --git a/xos-core/values.yaml b/xos-core/values.yaml
index 13560de..3305d23 100644
--- a/xos-core/values.yaml
+++ b/xos-core/values.yaml
@@ -17,33 +17,36 @@
 images:
   xos_core:
     repository: xosproject/xos
-    tag: 'a12cfe6417ed48edf01bc5ad16f029e974325f39'
+    tag: 'master'
+    pullPolicy: 'IfNotPresent'
   xos_gui:
     repository: xosproject/xos-gui
-    tag: '865b11c6804a8ede882fa87d506a4c18d58e6e0c'
+    tag: 'master'
+    pullPolicy: 'IfNotPresent'
   xos_db:
     repository: xosproject/xos-postgres
-    tag: 'a12cfe6417ed48edf01bc5ad16f029e974325f39'
+    tag: 'master'
+    pullPolicy: 'IfNotPresent'
   xos_tosca:
     repository: xosproject/xos-tosca
-    tag: 'b2eff2c795d9058a76c2fdb804c340200840cb13'
+    tag: 'master'
+    pullPolicy: 'IfNotPresent'
   xos_chameleon:
     repository: xosproject/chameleon
-    tag: 'a12cfe6417ed48edf01bc5ad16f029e974325f39'
+    tag: 'master'
+    pullPolicy: 'IfNotPresent'
   node:
     repository: node
     tag: '7.9.0'
+    pullPolicy: 'IfNotPresent'
   redis:
     repository: redis
     tag: '3.2'
+    pullPolicy: 'IfNotPresent'
   xos_ws:
     repository: xosproject/xos-ws
-    tag: 'a263b67c0448ab9fd450424327cf70dadb4574d3'
-
-# synchronizers:
-#   - name: vsg
-#     repository: xosprogect/vsg-synchronizer
-#     tag: 'latest'
+    tag: 'master'
+    pullPolicy: 'IfNotPresent'
 
 node_ports:
   ws_service_port: 30008
@@ -79,7 +82,7 @@
               - file
           level: DEBUG
     xos_dir: /opt/xos
-  
+
   db_config: 'xos-db'
 
   gateway_config:
@@ -92,7 +95,7 @@
       port: 6379
     gateway:
       port: 3000
-  
+
   gui_app: |
 
     angular.module('app')
@@ -125,7 +128,7 @@
           },
       ]
     });
-  
+
   initial_data_config:
     - model: core.Site
       fields:
@@ -147,7 +150,7 @@
           fields:
             name: "my_site"
           model: core.Site
-  
+
   tosca_config:
     name: xos-tosca
     gprc_endpoint: "xos-core"