diff --git a/workflows/att-workflow/Chart.yaml b/workflows/att-workflow/Chart.yaml
index 7611871..e8e12a3 100644
--- a/workflows/att-workflow/Chart.yaml
+++ b/workflows/att-workflow/Chart.yaml
@@ -17,7 +17,7 @@
 name: att-workflow
 description: A Helm chart for XOS's "att-workflow"
 icon: https://guide.opencord.org/logos/cord.svg
-version: 1.3.0
+version: 2.0.0-dev
 
 # xosproject/tosca-loader version
 appVersion: 1.3.1
diff --git a/workflows/att-workflow/requirements.yaml b/workflows/att-workflow/requirements.yaml
index 3e59cc8..6f6e0da 100644
--- a/workflows/att-workflow/requirements.yaml
+++ b/workflows/att-workflow/requirements.yaml
@@ -15,5 +15,5 @@
 
 dependencies:
 - name: att-workflow-driver
-  version: 1.1.2
-  repository: https://charts.opencord.org
+  version: 2.0.0
+  repository: file://../../xos-services/att-workflow-driver
diff --git a/workflows/dt-workflow/Chart.yaml b/workflows/dt-workflow/Chart.yaml
index 03b5737..3896015 100644
--- a/workflows/dt-workflow/Chart.yaml
+++ b/workflows/dt-workflow/Chart.yaml
@@ -17,7 +17,7 @@
 name: dt-workflow
 description: A Helm chart for XOS's "dt-workflow"
 icon: https://guide.opencord.org/logos/cord.svg
-version: 1.0.2
+version: 2.0.0-dev
 
 # xosproject/tosca-loader version
 appVersion: 1.3.1
diff --git a/workflows/dt-workflow/requirements.yaml b/workflows/dt-workflow/requirements.yaml
index b2d0fa6..0b14072 100644
--- a/workflows/dt-workflow/requirements.yaml
+++ b/workflows/dt-workflow/requirements.yaml
@@ -15,5 +15,5 @@
 
 dependencies:
 - name: dt-workflow-driver
-  version: 1.0.1
-  repository: https://charts.opencord.org
+  version: 2.0.0
+  repository: file://../../xos-services/dt-workflow-driver
diff --git a/workflows/tt-workflow/Chart.yaml b/workflows/tt-workflow/Chart.yaml
index d8e2563..ee50935 100644
--- a/workflows/tt-workflow/Chart.yaml
+++ b/workflows/tt-workflow/Chart.yaml
@@ -17,7 +17,7 @@
 name: tt-workflow
 description: A Helm chart for XOS's "tt-workflow"
 icon: https://guide.opencord.org/logos/cord.svg
-version: 0.2.0-dev
+version: 1.0.0-dev
 
 # xosproject/tosca-loader version
 appVersion: 1.3.1
diff --git a/workflows/tt-workflow/requirements.yaml b/workflows/tt-workflow/requirements.yaml
index 6c41cad..86d8761 100644
--- a/workflows/tt-workflow/requirements.yaml
+++ b/workflows/tt-workflow/requirements.yaml
@@ -15,5 +15,5 @@
 
 dependencies:
 - name: tt-workflow-driver
-  version: 0.1.0
-  repository: https://charts.opencord.org
+  version: 1.0.0
+  repository: file://../../xos-services/tt-workflow-driver
diff --git a/xos-core/Chart.yaml b/xos-core/Chart.yaml
index 96f479d..0d9ab87 100644
--- a/xos-core/Chart.yaml
+++ b/xos-core/Chart.yaml
@@ -13,12 +13,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+apiVersion: v1
 name: xos-core
 description: XOS - An Extensible Cloud Operating System
 icon: https://guide.opencord.org/logos/xos.svg
 
-version: 3.0.13
+version: 4.0.0
 
 # appVersion is of the xos-core containers.
 # xos-tosca, xos-chameleon, and xos-api-tester are versioned in values.yaml
-appVersion: 3.3.1
+appVersion: 4.0.1
diff --git a/xos-core/values.yaml b/xos-core/values.yaml
index b915104..4e875f3 100644
--- a/xos-core/values.yaml
+++ b/xos-core/values.yaml
@@ -23,12 +23,12 @@
 
   xos_chameleon:
     repository: 'xosproject/chameleon'
-    tag: '3.3.0'
+    tag: '4.0.0'
     pullPolicy: 'Always'
 
   xos_tosca:
     repository: 'xosproject/xos-tosca'
-    tag: '1.3.0'
+    tag: '2.0.0'
     pullPolicy: 'Always'
 
   xos_api_tester:
diff --git a/xos-profiles/base-kubernetes/Chart.yaml b/xos-profiles/base-kubernetes/Chart.yaml
index d9c7ddc..d205ca2 100644
--- a/xos-profiles/base-kubernetes/Chart.yaml
+++ b/xos-profiles/base-kubernetes/Chart.yaml
@@ -13,10 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+apiVersion: v1
 name: base-kubernetes
 description: A Helm chart for XOS's "base-kubernetes" profile
 icon: https://guide.opencord.org/logos/cord.svg
-version: 1.2.3
+version: 2.0.0-dev
 
 # xosproject/tosca-loader version
 appVersion: 1.3.1
diff --git a/xos-profiles/base-kubernetes/requirements.yaml b/xos-profiles/base-kubernetes/requirements.yaml
index 2252916..4e61408 100644
--- a/xos-profiles/base-kubernetes/requirements.yaml
+++ b/xos-profiles/base-kubernetes/requirements.yaml
@@ -15,5 +15,5 @@
 
 dependencies:
 - name: kubernetes
-  version: 1.3.2
-  repository: https://charts.opencord.org
+  version: 2.0.0
+  repository: file://../../xos-services/kubernetes
diff --git a/xos-profiles/seba-services/Chart.yaml b/xos-profiles/seba-services/Chart.yaml
index 3663616..a668f98 100644
--- a/xos-profiles/seba-services/Chart.yaml
+++ b/xos-profiles/seba-services/Chart.yaml
@@ -17,7 +17,7 @@
 name: seba-services
 description: A Helm chart for XOS's "SEBA" profile
 icon: https://guide.opencord.org/logos/cord.svg
-version: 1.4.5
+version: 2.0.0-dev
 
 # xosproject/tosca-loader version
 appVersion: 1.3.1
diff --git a/xos-profiles/seba-services/requirements.yaml b/xos-profiles/seba-services/requirements.yaml
index 31297a1..5d8d6bc 100644
--- a/xos-profiles/seba-services/requirements.yaml
+++ b/xos-profiles/seba-services/requirements.yaml
@@ -15,26 +15,26 @@
 
 dependencies:
 - name: rcord
-  version: 1.0.17
-  repository: https://charts.opencord.org
+  version: 2.0.0
+  repository: file://../../xos-services/rcord
 - name: onos-service
-  version: 2.1.4
-  repository: https://charts.opencord.org
+  version: 3.0.0
+  repository: file://../../xos-services/onos-service
   condition: onos-service.enabled
 - name: fabric
-  version: 2.3.0
-  repository: https://charts.opencord.org
+  version: 3.0.0
+  repository: file://../../xos-services/fabric
   condition: fabric.enabled
 - name: volt
-  version: 2.2.5
-  repository: https://charts.opencord.org
+  version: 3.0.0
+  repository: file://../../xos-services/volt
 - name: fabric-crossconnect
-  version: 1.3.0
-  repository: https://charts.opencord.org
+  version: 2.0.0
+  repository: file://../../xos-services/fabric-crossconnect
   condition: bng.external.enabled
 - name: vrouter
-  version: 2.1.1
-  repository: https://charts.opencord.org
+  version: 3.0.0
+  repository: file://../../xos-services/vrouter
   condition: bng.embedded.enabled
 - name: sadis-server
   version: 1.0.4
diff --git a/xos-services/att-workflow-driver/Chart.yaml b/xos-services/att-workflow-driver/Chart.yaml
index 88014ac..70fad37 100644
--- a/xos-services/att-workflow-driver/Chart.yaml
+++ b/xos-services/att-workflow-driver/Chart.yaml
@@ -13,9 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+apiVersion: v1
 name: att-workflow-driver
 description: A Helm chart for XOS's "att-workflow-driver" service
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 1.1.2
-appVersion: 1.2.3
+version: 2.0.0
+appVersion: 2.0.0
diff --git a/xos-services/dt-workflow-driver/Chart.yaml b/xos-services/dt-workflow-driver/Chart.yaml
index 2c6303e..da35a9b 100644
--- a/xos-services/dt-workflow-driver/Chart.yaml
+++ b/xos-services/dt-workflow-driver/Chart.yaml
@@ -18,5 +18,5 @@
 description: A Helm chart for XOS's "dt-workflow-driver" service
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 1.0.1
-appVersion: 1.0.0
+version: 2.0.0
+appVersion: 2.0.1
diff --git a/xos-services/fabric-crossconnect/Chart.yaml b/xos-services/fabric-crossconnect/Chart.yaml
index 0537773..80cf294 100644
--- a/xos-services/fabric-crossconnect/Chart.yaml
+++ b/xos-services/fabric-crossconnect/Chart.yaml
@@ -13,9 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+apiVersion: v1
 name: fabric-crossconnect
 description: A Helm chart for XOS's "fabric-crossconnect" service
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 1.3.0
-appVersion: 1.3.0
+version: 2.0.0
+appVersion: 2.0.0
diff --git a/xos-services/fabric/Chart.yaml b/xos-services/fabric/Chart.yaml
index a8eab56..71a4d54 100644
--- a/xos-services/fabric/Chart.yaml
+++ b/xos-services/fabric/Chart.yaml
@@ -13,9 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+apiVersion: v1
 name: fabric
 description: A Helm chart for XOS's "fabric" service
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 2.3.0
-appVersion: 2.3.0
+version: 3.0.0
+appVersion: 3.0.0
diff --git a/xos-services/kubernetes/Chart.yaml b/xos-services/kubernetes/Chart.yaml
index 2221402..a1f7eda 100644
--- a/xos-services/kubernetes/Chart.yaml
+++ b/xos-services/kubernetes/Chart.yaml
@@ -13,9 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+apiVersion: v1
 name: kubernetes
 description: A Helm chart for XOS's "kubernetes" service
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 1.3.2
-appVersion: 1.3.2
+version: 2.0.0
+appVersion: 2.0.0
diff --git a/xos-services/onos-service/Chart.yaml b/xos-services/onos-service/Chart.yaml
index 6326cfc..d8bf9a0 100644
--- a/xos-services/onos-service/Chart.yaml
+++ b/xos-services/onos-service/Chart.yaml
@@ -13,9 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+apiVersion: v1
 description: A Helm chart for XOS's "onos-service" service, which configures ONOS
 name: onos-service
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 2.1.4
-appVersion: 2.1.3
+version: 3.0.0
+appVersion: 3.0.0
diff --git a/xos-services/rcord/Chart.yaml b/xos-services/rcord/Chart.yaml
index af4d9f3..2a87c9c 100644
--- a/xos-services/rcord/Chart.yaml
+++ b/xos-services/rcord/Chart.yaml
@@ -13,9 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+apiVersion: v1
 name: rcord
 description: A Helm chart for XOS's "rcord" service
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 1.0.17
-appVersion: 1.3.3
+version: 2.0.0
+appVersion: 2.0.0
diff --git a/xos-services/tt-workflow-driver/Chart.yaml b/xos-services/tt-workflow-driver/Chart.yaml
index 2b98026..b23b204 100644
--- a/xos-services/tt-workflow-driver/Chart.yaml
+++ b/xos-services/tt-workflow-driver/Chart.yaml
@@ -13,9 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+apiVersion: v1
 name: tt-workflow-driver
 description: A Helm chart for XOS's "tt-workflow-driver" service
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 0.1.0
-appVersion: 0.1.0
+version: 1.0.0
+appVersion: 1.0.0
diff --git a/xos-services/volt/Chart.yaml b/xos-services/volt/Chart.yaml
index 5019c90..d261edd 100644
--- a/xos-services/volt/Chart.yaml
+++ b/xos-services/volt/Chart.yaml
@@ -13,9 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+apiVersion: v1
 name: volt
 description: A Helm chart for XOS's "olt-service" service
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 2.2.5
-appVersion: 2.2.4
+version: 3.0.0
+appVersion: 3.0.0
diff --git a/xos-services/vrouter/Chart.yaml b/xos-services/vrouter/Chart.yaml
index 7bcc3e8..0c0a59c 100644
--- a/xos-services/vrouter/Chart.yaml
+++ b/xos-services/vrouter/Chart.yaml
@@ -13,9 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+apiVersion: v1
 name: vrouter
 description: A Helm chart for XOS's "vRouter" service
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 2.1.1
-appVersion: 2.1.0
+version: 3.0.0
+appVersion: 3.0.0