diff --git a/submariner-k8s-broker/Chart.yaml b/submariner-k8s-broker/Chart.yaml
index 83ad9a3..577fef3 100644
--- a/submariner-k8s-broker/Chart.yaml
+++ b/submariner-k8s-broker/Chart.yaml
@@ -1,7 +1,7 @@
 ---
 name: submariner-k8s-broker
-version: 0.0.2
-appVersion: v0.0.2
+version: 0.4.1
+appVersion: 0.4.1
 description: Submariner Kubernetes Broker
 keywords:
 home: https://submariner-io.github.io/
diff --git a/submariner/Chart.yaml b/submariner/Chart.yaml
index 57186f0..621be5b 100644
--- a/submariner/Chart.yaml
+++ b/submariner/Chart.yaml
@@ -1,8 +1,8 @@
 ---
 name: submariner
-version: 0.0.4
-appVersion: v0.0.4
-description: k8s 1.16.x support
+version: 0.4.0
+appVersion: 0.4.0
+description: Submariner enables direct networking between Pods and Services in different Kubernetes clusters
 keywords:
 home: https://submariner-io.github.io/
 sources:
diff --git a/submariner/templates/engine-deploy.yaml b/submariner/templates/engine-deploy.yaml
index 5450dab..fdf4871 100644
--- a/submariner/templates/engine-deploy.yaml
+++ b/submariner/templates/engine-deploy.yaml
@@ -108,7 +108,7 @@ spec:
           value: "{{ .Values.leadership.renewDeadline }}"
         - name: LEADERSHIP_RETRYPERIOD
           value: "{{ .Values.leadership.retryPeriod }}"
-        image: {{ .Values.engine.image.repository }}:{{ .Values.engine.image.tag }}
+        image: {{ .Values.engine.image.repository }}:{{ default .Chart.AppVersion .Values.engine.image.tag }}
         imagePullPolicy: {{ .Values.engine.image.pullPolicy }}
         name: submariner
         resources:
diff --git a/submariner/templates/globalnet.yaml b/submariner/templates/globalnet.yaml
index 5774757..de25893 100644
--- a/submariner/templates/globalnet.yaml
+++ b/submariner/templates/globalnet.yaml
@@ -26,7 +26,7 @@ spec:
         submariner.io/gateway: 'true'
       containers:
         - name: {{ template "submariner.fullname" . }}-globalnet
-          image: {{ .Values.globalnet.image.repository }}:{{ .Values.globalnet.image.tag }}
+          image: {{ .Values.globalnet.image.repository }}:{{  default .Chart.AppVersion .Values.globalnet.image.tag }}
           imagePullPolicy: {{ .Values.globalnet.image.pullPolicy }}
           env:
             - name: SUBMARINER_CLUSTERID
diff --git a/submariner/templates/lighthouse-coredns.yaml b/submariner/templates/lighthouse-coredns.yaml
index 6ea200f..4a5870e 100644
--- a/submariner/templates/lighthouse-coredns.yaml
+++ b/submariner/templates/lighthouse-coredns.yaml
@@ -23,7 +23,7 @@ spec:
         - args:
             - -conf
             - /etc/coredns/Corefile
-          image: {{ .Values.lighthouseCoredns.image.repository }}:{{ .Values.lighthouseCoredns.image.tag }}
+          image: {{ .Values.lighthouseCoredns.image.repository }}:{{  default .Chart.AppVersion .Values.lighthouseCoredns.image.tag }}
           imagePullPolicy: {{ .Values.lighthouseCoredns.image.pullPolicy }}
           name: {{ template "submariner.lighthouseDnsName" . }}
           volumeMounts:
diff --git a/submariner/templates/lighthouse.yaml b/submariner/templates/lighthouse.yaml
index f390b7a..8be0240 100644
--- a/submariner/templates/lighthouse.yaml
+++ b/submariner/templates/lighthouse.yaml
@@ -48,7 +48,7 @@ spec:
           value: "{{ .Values.broker.ca }}"
 {{- end }}
         name: {{ template "submariner.fullname" . }}-lighthouse-agent
-        image: {{ .Values.lighthouse.image.repository }}:{{ .Values.lighthouse.image.tag }}
+        image: {{ .Values.lighthouse.image.repository }}:{{  default .Chart.AppVersion  .Values.lighthouse.image.tag }}
         imagePullPolicy: {{ .Values.lighthouse.image.pullPolicy }}
       restartPolicy: Always
       terminationGracePeriodSeconds: 0
diff --git a/submariner/templates/route-agent-ds.yaml b/submariner/templates/route-agent-ds.yaml
index 860ad93..6ee2fdc 100644
--- a/submariner/templates/route-agent-ds.yaml
+++ b/submariner/templates/route-agent-ds.yaml
@@ -28,7 +28,7 @@ spec:
       - name: routeagent
         command:
         - submariner-route-agent.sh
-        image: {{ .Values.routeAgent.image.repository }}:{{ .Values.routeAgent.image.tag }}
+        image: {{ .Values.routeAgent.image.repository }}:{{  default .Chart.AppVersion .Values.routeAgent.image.tag }}
         imagePullPolicy: {{ .Values.routeAgent.image.pullPolicy }}
         env:
         - name: SUBMARINER_NAMESPACE
diff --git a/submariner/values.yaml b/submariner/values.yaml
index 4cb3695..b847cbe 100644
--- a/submariner/values.yaml
+++ b/submariner/values.yaml
@@ -31,44 +31,38 @@ leadership:
   retryPeriod: 2
 engine:
   image:
-    repository: rancher/submariner
-    tag: v0.0.2
-    pullPolicy: Always
+    repository: quay.io/submariner/submariner
+    tag: ""
+    pullPolicy: IfNotPresent
   resources: {}
-    # limits:
-  # cpu: 100m
-  # memory: 100Mi
   nodeSelectorEnabled: true
   nodeSelector: {}
   tolerations: []
   affinity: {}
 routeAgent:
   image:
-    repository: rancher/submariner-route-agent
-    tag: v0.0.2
-    pullPolicy: Always
+    repository: quay.io/submariner/submariner-route-agent
+    tag: ""
+    pullPolicy: IfNotPresent
   resources: {}
-  # limits:
-  # cpu: 100m
-  # memory: 100Mi
   nodeSelector: {}
   tolerations: []
   affinity: {}
 globalnet:
   image:
-    repository: submariner-globalnet
-    tag: local
+    repository: quay.io/submariner/submariner-globalnet
+    tag: ""
     pullPolicy: IfNotPresent
 lighthouse:
   image:
-    repository: lighthouse-agent
-    tag: local
+    repository: quay.io/submariner/lighthouse-agent
+    tag: ""
     pullPolicy: IfNotPresent
 lighthouseCoredns:
   name: ""
   image:
-    repository: lighthouse-coredns
-    tag: local
+    repository: quay.io/submariner/lighthouse-coredns
+    tag: ""
     pullPolicy: IfNotPresent
 serviceAccounts:
   engine: