diff --git a/packages/rancher-pushprox/charts/templates/pushprox-clients.yaml b/packages/rancher-pushprox/charts/templates/pushprox-clients.yaml
index 34ad32427..b64656910 100644
--- a/packages/rancher-pushprox/charts/templates/pushprox-clients.yaml
+++ b/packages/rancher-pushprox/charts/templates/pushprox-clients.yaml
@@ -26,8 +26,11 @@ spec:
       {{- end }}
       containers:
       - name: pushprox-client
-        image: arvindiyengar/pushprox-linux-amd64:add_flag_for_token_path
-        command: [ "/app/pushprox-client" ]
+        image: {{ .Values.clients.image.repository }}:{{ .Values.clients.image.tag }}
+        command:
+        {{- range .Values.clients.command }}
+          - {{ . | quote }}
+        {{- end }}
         args:
         - --fqdn=$(HOST_IP)
         - --proxy-url=$(PROXY_URL)
diff --git a/packages/rancher-pushprox/charts/templates/pushprox-proxy.yaml b/packages/rancher-pushprox/charts/templates/pushprox-proxy.yaml
index 2f4ab86db..0f475755c 100644
--- a/packages/rancher-pushprox/charts/templates/pushprox-proxy.yaml
+++ b/packages/rancher-pushprox/charts/templates/pushprox-proxy.yaml
@@ -21,8 +21,11 @@ spec:
 {{- end }}
       containers:
       - name: pushprox-proxy
-        image: arvindiyengar/pushprox-linux-amd64:add_flag_for_token_path
-        command: [ "/app/pushprox-proxy" ]
+        image: {{ .Values.proxy.image.repository }}:{{ .Values.proxy.image.tag }}
+        command:
+        {{- range .Values.proxy.command }}
+          - {{ . | quote }}
+        {{- end }}
         {{- if .Values.proxy.resources }}
         resources: {{ toYaml .Values.proxy.resources | nindent 10 }}
         {{- end }}
diff --git a/packages/rancher-pushprox/charts/values.yaml b/packages/rancher-pushprox/charts/values.yaml
index bc62f6d33..4d63a9b85 100644
--- a/packages/rancher-pushprox/charts/values.yaml
+++ b/packages/rancher-pushprox/charts/values.yaml
@@ -55,6 +55,11 @@ clients:
   nodeSelector: {}
   tolerations: []
 
+  image:
+    repository: rancher/pushprox-client
+    tag: v0.1.0-rancher1-client
+  command: ["pushprox-client"]
+
 proxy:
   enabled: true
   # The port through which PushProx clients will communicate to the proxy
@@ -65,4 +70,9 @@ proxy:
   
   # Options to select a node to run a single proxy deployment on
   nodeSelector: {}
-  tolerations: []
\ No newline at end of file
+  tolerations: []
+
+  image:
+    repository: rancher/pushprox-proxy
+    tag: v0.1.0-rancher1-proxy
+  command: ["pushprox-proxy"]
\ No newline at end of file