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: