diff --git a/submariner-k8s-broker/Chart.yaml b/submariner-k8s-broker/Chart.yaml
index 577fef3..9679702 100644
--- a/submariner-k8s-broker/Chart.yaml
+++ b/submariner-k8s-broker/Chart.yaml
@@ -1,7 +1,7 @@
 ---
 name: submariner-k8s-broker
-version: 0.4.1
-appVersion: 0.4.1
+version: 0.6.0
+appVersion: 0.6.0
 description: Submariner Kubernetes Broker
 keywords:
 home: https://submariner-io.github.io/
diff --git a/submariner/Chart.yaml b/submariner/Chart.yaml
index 621be5b..0de35c5 100644
--- a/submariner/Chart.yaml
+++ b/submariner/Chart.yaml
@@ -1,7 +1,7 @@
 ---
 name: submariner
-version: 0.4.0
-appVersion: 0.4.0
+version: 0.6.0
+appVersion: 0.6.0
 description: Submariner enables direct networking between Pods and Services in different Kubernetes clusters
 keywords:
 home: https://submariner-io.github.io/
diff --git a/submariner/questions.yml b/submariner/questions.yml
index 29750e8..5760c9f 100644
--- a/submariner/questions.yml
+++ b/submariner/questions.yml
@@ -8,12 +8,12 @@ questions:
   group: "Container Images"
   subquestions:
   - variable: engine.image.repository
-    default: "rancher/submariner"
+    default: "quay.io/submariner/submariner"
     description: "Submariner Engine Image Repository"
     type: string
     label: Submariner Engine Image Repository
   - variable: engine.image.tag
-    default: "v0.0.2"
+    default: "0.6.0"
     description: "Submariner Engine Image Tag"
     type: string
     label: Submariner Engine Image Tag
@@ -26,12 +26,12 @@ questions:
   group: "Container Images"
   subquestions:
   - variable: routeAgent.image.repository
-    default: "rancher/submariner-route-agent"
+    default: "quay.io/submariner/submariner-route-agent"
     description: "Submariner Route Agent Image Repository"
     type: string
     label: Submariner Route Agent Image Repository
   - variable: routeAgent.image.tag
-    default: "v0.0.2"
+    default: "0.6.0"
     description: "Submariner Route Agent Image Tag"
     type: string
     label: Submariner Route Agent Image Tag