diff --git a/internal/pkg/vpagent/packetIn.go b/internal/pkg/vpagent/packetIn.go
index 81f6ff2..33a63b4 100644
--- a/internal/pkg/vpagent/packetIn.go
+++ b/internal/pkg/vpagent/packetIn.go
@@ -88,7 +88,7 @@
 			break top
 		case packet := <-vpa.packetInChannel:
 			if vpc := vpa.getVPClient(packet.Id); vpc != nil {
-				vpc.PacketIn(packet)
+				vpc.PacketIn(ctx, packet)
 			}
 		}
 	}
diff --git a/internal/pkg/vpagent/refresh.go b/internal/pkg/vpagent/refresh.go
index 83792d0..2761408 100644
--- a/internal/pkg/vpagent/refresh.go
+++ b/internal/pkg/vpagent/refresh.go
@@ -33,7 +33,7 @@
 	}
 
 	// Refresh once to get everything started
-	vpa.refreshDeviceList()
+	vpa.refreshDeviceList(ctx)
 
 	tick := time.NewTicker(vpa.DeviceListRefreshInterval)
 loop:
@@ -43,13 +43,13 @@
 			logger.Errorw(ctx, "Context Done", log.Fields{"Context": ctx})
 			break loop
 		case <-tick.C:
-			vpa.refreshDeviceList()
+			vpa.refreshDeviceList(ctx)
 		}
 	}
 	tick.Stop()
 }
 
-func (vpa *VPAgent) refreshDeviceList() {
+func (vpa *VPAgent) refreshDeviceList(cntx context.Context) {
 	// If we exit, assume disconnected
 	if vpa.volthaClient == nil {
 		logger.Error(ctx, "no-voltha-connection")
@@ -93,7 +93,7 @@
 	}
 
 	for i := 0; i < len(toDel); i++ {
-		vpa.VPClientAgent.DelDevice(toDel[i])
+		vpa.VPClientAgent.DelDevice(cntx, toDel[i])
 		vpa.mapLock.Lock()
 		delete(vpa.clientMap, toDel[i])
 		vpa.mapLock.Unlock()