diff --git a/VERSION b/VERSION
index 8fc77d0..f8f3c08 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.17
+1.0.18
diff --git a/dbuf/Chart.yaml b/dbuf/Chart.yaml
index fa3466d..098c4cf 100644
--- a/dbuf/Chart.yaml
+++ b/dbuf/Chart.yaml
@@ -18,7 +18,7 @@
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.3
+version: 0.0.4
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/dbuf/values.yaml b/dbuf/values.yaml
index 4043b7b..66fd0f3 100644
--- a/dbuf/values.yaml
+++ b/dbuf/values.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 image:
-  repository: registry.aetherproject.org/tost/dbuf
+  repository: opennetworking/dbuf
   tag: "1.0.0"
 
 extraParams:
diff --git a/int-host-reporter/Chart.yaml b/int-host-reporter/Chart.yaml
index 4db554d..6e3e9a5 100644
--- a/int-host-reporter/Chart.yaml
+++ b/int-host-reporter/Chart.yaml
@@ -3,7 +3,7 @@
 ---
 apiVersion: v2
 name: int-host-reporter
-version: 0.0.3
+version: 0.0.4
 type: application
 keywords:
   - In-band Network Telemetry
diff --git a/int-host-reporter/values.yaml b/int-host-reporter/values.yaml
index 70ed398..886188c 100644
--- a/int-host-reporter/values.yaml
+++ b/int-host-reporter/values.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 image:
-  repository: registry.hub.docker.com/opennetworking/int-host-reporter
+  repository: opennetworking/int-host-reporter
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
   tag: "latest"
diff --git a/pfcp-agent/Chart.yaml b/pfcp-agent/Chart.yaml
index fb3a208..acfc4a9 100644
--- a/pfcp-agent/Chart.yaml
+++ b/pfcp-agent/Chart.yaml
@@ -5,4 +5,4 @@
 apiVersion: v1
 description: PFCP Agent for SD-Fabric's P4 UPF
 name: pfcp-agent
-version: 0.0.4
+version: 0.0.5
diff --git a/pfcp-agent/values.yaml b/pfcp-agent/values.yaml
index ec37c12..b32736c 100644
--- a/pfcp-agent/values.yaml
+++ b/pfcp-agent/values.yaml
@@ -5,7 +5,7 @@
 images:
   tags:
     init: registry.aetherproject.org/tools/busybox:stable
-    pfcpiface: "registry.aetherproject.org/proxy/omecproject/upf-epc-pfcpiface:master-fcdbc95"
+    pfcpiface: omecproject/upf-epc-pfcpiface:master-fcdbc95
   pullPolicy: Always
 
 nodeSelectors:
diff --git a/sdfabric/Chart.yaml b/sdfabric/Chart.yaml
index 628da64..c345d0c 100644
--- a/sdfabric/Chart.yaml
+++ b/sdfabric/Chart.yaml
@@ -7,7 +7,7 @@
 description: A chart to deploy all SD-Fabric components
 kubeVersion: ">=1.18.0"
 type: application
-version: 1.0.17
+version: 1.0.18
 keywords:
   - aether
   - sdn
@@ -27,15 +27,15 @@
     condition: import.stratum.enabled
   - name: pfcp-agent
     repository: file://../pfcp-agent
-    version: 0.0.4
+    version: 0.0.5
     condition: import.pfcp-agent.enabled
   - name: dbuf
     repository: file://../dbuf
-    version: 0.0.3
+    version: 0.0.4
     condition: import.dbuf.enabled
   - name: int-host-reporter
     repository: file://../int-host-reporter
-    version: 0.0.3
+    version: 0.0.4
     condition: import.int-host-reporter.enabled
   - name: di-topology-watchdog
     repository: file://../di-topology-watchdog
diff --git a/sdfabric/values.yaml b/sdfabric/values.yaml
index 24c4e36..1db2550 100644
--- a/sdfabric/values.yaml
+++ b/sdfabric/values.yaml
@@ -20,8 +20,8 @@
 
 onos-classic:
   image:
-    repository: registry.aetherproject.org/tost/tost
-    tag: 1.0.2
+    repository: opennetworking/sdfabric-onos
+    tag: master-2022-02-07
 
   replicas: 3
 
@@ -42,7 +42,6 @@
     - org.onosproject.gui
     - org.onosproject.drivers.barefoot
     - org.onosproject.segmentrouting
-    - org.onosproject.t3
     - org.omecproject.up4
     - org.stratumproject.fabric-tna
     - org.onosproject.dhcprelay
@@ -114,9 +113,8 @@
 
 stratum:
   image:
-    registry: docker.io
     repository: stratumproject/stratum-bfrt
-    tag: 21.12-9.5.0
+    tag: 22.02.04-9.7.0
     pullPolicy: IfNotPresent
 
   extraParams: