diff --git a/deployment-configs/dt-berlin-pod-gpon-DT.yaml b/deployment-configs/dt-berlin-pod-gpon-DT.yaml
index 1df96a2..4e42878 100644
--- a/deployment-configs/dt-berlin-pod-gpon-DT.yaml
+++ b/deployment-configs/dt-berlin-pod-gpon-DT.yaml
@@ -63,7 +63,6 @@
         c_tag: 7
         s_tag: 31
         power_switch_port: 1
-        onu_type: 'sercomm'
       -
         ip: 10.34.90.42
         user: community
@@ -76,7 +75,6 @@
         c_tag: 7
         s_tag: 32
         power_switch_port: 2
-        onu_type: 'sercomm'
       -
         ip: 10.34.90.42
         user: community
@@ -89,7 +87,6 @@
         c_tag: 7
         s_tag: 33
         power_switch_port: 4
-        onu_type: 'sercomm'
       -
         ip: 10.34.90.42
         user: community
@@ -102,7 +99,6 @@
         c_tag: 7
         s_tag: 34
         power_switch_port: 7
-        onu_type: 'sercomm'
   
     dst:
       -
diff --git a/deployment-configs/dt-berlin-pod-kubespray.yaml b/deployment-configs/dt-berlin-pod-kubespray.yaml
index 01a7296..b61bedd 100644
--- a/deployment-configs/dt-berlin-pod-kubespray.yaml
+++ b/deployment-configs/dt-berlin-pod-kubespray.yaml
@@ -83,7 +83,6 @@
       onu: ALPHe3d1cf5c
       c_tag: 11
       s_tag: 11
-      onu_type: 'alpha'
     #GPON ONU
     # -
     #   ip: 127.0.0.1
diff --git a/deployment-configs/dt-berlin-pod-multi-olt.yaml b/deployment-configs/dt-berlin-pod-multi-olt.yaml
index add0a01..9a04883 100644
--- a/deployment-configs/dt-berlin-pod-multi-olt.yaml
+++ b/deployment-configs/dt-berlin-pod-multi-olt.yaml
@@ -74,7 +74,6 @@
         c_tag: 7
         s_tag: 31
         power_switch_port: 1
-        onu_type: 'sercomm'
       -
         ip: 10.34.90.42
         user: community
@@ -87,7 +86,6 @@
         c_tag: 7
         s_tag: 32
         power_switch_port: 2
-        onu_type: 'sercomm'
       -
         ip: 10.34.90.42
         user: community
@@ -100,7 +98,6 @@
         c_tag: 7
         s_tag: 33
         power_switch_port: 4
-        onu_type: 'sercomm'
        -
         ip: 10.34.90.42
         user: community
@@ -113,7 +110,6 @@
         c_tag: 7
         s_tag: 34
         power_switch_port: 7
-        onu_type: 'sercomm'
 
         #XGSPON ONU
       -
@@ -128,7 +124,6 @@
         c_tag: 11
         s_tag: 11
         power_switch_port: 6
-        onu_type: 'alpha'
       -
         ip: 127.0.0.1
         user: community
@@ -141,7 +136,6 @@
         c_tag: 7
         s_tag: 11
         power_switch_port: 8
-        onu_type: 'alpha'
 
     dst:
       -
diff --git a/deployment-configs/dt-berlin-pod.yaml b/deployment-configs/dt-berlin-pod.yaml
index 3c0a7cd..27a8b36 100644
--- a/deployment-configs/dt-berlin-pod.yaml
+++ b/deployment-configs/dt-berlin-pod.yaml
@@ -64,7 +64,6 @@
       c_tag: 11
       s_tag: 11
       power_switch_port: 6
-      onu_type: 'alpha'
     -
       ip: 127.0.0.1
       user: community
@@ -77,7 +76,6 @@
       c_tag: 7
       s_tag: 11
       power_switch_port: 8
-      onu_type: 'alpha'
 
   dst:
     -
diff --git a/deployment-configs/onf-demo-pod-DT.yaml b/deployment-configs/onf-demo-pod-DT.yaml
index 5c5dc85..ee61d43 100644
--- a/deployment-configs/onf-demo-pod-DT.yaml
+++ b/deployment-configs/onf-demo-pod-DT.yaml
@@ -50,8 +50,8 @@
     fortygig: 'true'
     aggPort: '1'
     serial: 'EC1904000654'
-    oltDebVersion: openolt_asfvolt16-2.4.6-5d9ab1a36e13e55ca3687af160cfd4f582317493.deb
-    oltDebVersion23: openolt_asfvolt16-2.4.3-c636279643a1cac3128395cc9fc22977e8edc46d.deb
+    oltDebVersion: openolt_asfvolt16-2.4.9-dev-5057a3db7f0c73ef23903901514159963d1ef7a2.deb
+    oltDebVersion23: openolt_asfvolt16-2.4.9-dev-5057a3db7f0c73ef23903901514159963d1ef7a2.deb
 
 onus:
   -
diff --git a/deployment-configs/onf-demo-pod.yaml b/deployment-configs/onf-demo-pod.yaml
index 2c3f24d..b5254fe 100644
--- a/deployment-configs/onf-demo-pod.yaml
+++ b/deployment-configs/onf-demo-pod.yaml
@@ -50,8 +50,8 @@
     fortygig: 'true'
     aggPort: '1'
     serial: 'EC1904000654'
-    oltDebVersion: openolt_asfvolt16-2.4.6-5d9ab1a36e13e55ca3687af160cfd4f582317493.deb
-    oltDebVersion23: openolt_asfvolt16-2.4.3-c636279643a1cac3128395cc9fc22977e8edc46d.deb
+    oltDebVersion: openolt_asfvolt16-2.4.9-dev-5057a3db7f0c73ef23903901514159963d1ef7a2.deb
+    oltDebVersion23: openolt_asfvolt16-2.4.9-dev-5057a3db7f0c73ef23903901514159963d1ef7a2.deb
 
 onus:
   -
diff --git a/kubernetes-configs/voltha/flex-ocp-cord.yml b/kubernetes-configs/voltha/flex-ocp-cord.yml
index 02c0b71..91fc1b7 100644
--- a/kubernetes-configs/voltha/flex-ocp-cord.yml
+++ b/kubernetes-configs/voltha/flex-ocp-cord.yml
@@ -20,10 +20,10 @@
 onosApiPort: 30120
 onosOfPort: 31653
 
-#images:
-#  onos:
-#    repository: voltha/voltha-onos
-#    tag: onos-2.2
+images:
+  onos:
+    repository: voltha/voltha-onos@sha256
+    tag: 9f781ace4c6f4bf3b2e5ff9cb9f26aa4b328284da1d6b6523636dca1375d7666
 #  adapter_open_onu:
 #     repository: gcgirish/voltha-openonu-adapter
 #     tag: flow-sync
diff --git a/kubernetes-configs/voltha/onf-demo-pod.yml b/kubernetes-configs/voltha/onf-demo-pod.yml
index 02c0b71..91fc1b7 100644
--- a/kubernetes-configs/voltha/onf-demo-pod.yml
+++ b/kubernetes-configs/voltha/onf-demo-pod.yml
@@ -20,10 +20,10 @@
 onosApiPort: 30120
 onosOfPort: 31653
 
-#images:
-#  onos:
-#    repository: voltha/voltha-onos
-#    tag: onos-2.2
+images:
+  onos:
+    repository: voltha/voltha-onos@sha256
+    tag: 9f781ace4c6f4bf3b2e5ff9cb9f26aa4b328284da1d6b6523636dca1375d7666
 #  adapter_open_onu:
 #     repository: gcgirish/voltha-openonu-adapter
 #     tag: flow-sync
diff --git a/kubernetes-configs/voltha/tucson-pod.yml b/kubernetes-configs/voltha/tucson-pod.yml
index 6cbbf50..0acb97a 100644
--- a/kubernetes-configs/voltha/tucson-pod.yml
+++ b/kubernetes-configs/voltha/tucson-pod.yml
@@ -11,3 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
+images:
+  onos:
+    repository: voltha/voltha-onos@sha256
+    tag: 9f781ace4c6f4bf3b2e5ff9cb9f26aa4b328284da1d6b6523636dca1375d7666