diff --git a/sensors/video/sensorhub-driver-onvif/build.gradle b/sensors/video/sensorhub-driver-onvif/build.gradle
index 95c0d8f6..63a40aaf 100644
--- a/sensors/video/sensorhub-driver-onvif/build.gradle
+++ b/sensors/video/sensorhub-driver-onvif/build.gradle
@@ -1,11 +1,12 @@
 description = 'ONVIF Video Camera'
-ext.details = 'Driver for IP video cameras using the ONFIV standard'
+ext.details = 'Driver for IP video cameras using the ONVIF standard'
 version = '0.0.2'
 
 dependencies {
   implementation 'org.sensorhub:sensorhub-core:' + oshCoreVersion
-  implementation project(':sensorhub-driver-rtpcam')
+  //implementation project(':sensorhub-driver-rtpcam')
   implementation project(':sensorhub-driver-ffmpeg')
+  implementation project(':sensorhub-driver-videocam')
   embeddedImpl 'org.apache.cxf.services.ws-discovery:cxf-services-ws-discovery-api:3.1.11'
   embeddedImpl 'org.apache.cxf.services.ws-discovery:cxf-services-ws-discovery-service:3.1.11'
   embeddedImpl 'org.apache.cxf:cxf-rt-transports-http-jetty:3.1.11'
@@ -45,7 +46,7 @@ dependencies {
   }
 
   embeddedImpl fileTree(dir: 'lib', include: ['*.jar'])
-  testImplementation project(path: ':sensorhub-driver-videocam', configuration: 'testArtifacts')
+  //testImplementation project(path: ':sensorhub-driver-videocam', configuration: 'testArtifacts')
 }
 
 
diff --git a/sensors/video/sensorhub-driver-onvif/lib/onvif-java-1.0-SNAPSHOT.jar b/sensors/video/sensorhub-driver-onvif/lib/onvif-java-1.0-SNAPSHOT.jar
new file mode 100644
index 00000000..748e4b0c
Binary files /dev/null and b/sensors/video/sensorhub-driver-onvif/lib/onvif-java-1.0-SNAPSHOT.jar differ
diff --git a/sensors/video/sensorhub-driver-onvif/lib/onvif-ws-client-1.0-SNAPSHOT.jar b/sensors/video/sensorhub-driver-onvif/lib/onvif-ws-client-1.0-SNAPSHOT.jar
new file mode 100644
index 00000000..074ce01a
Binary files /dev/null and b/sensors/video/sensorhub-driver-onvif/lib/onvif-ws-client-1.0-SNAPSHOT.jar differ
diff --git a/sensors/video/sensorhub-driver-onvif/src/main/java/org/sensorhub/impl/sensor/onvif/OnvifCameraConfig.java b/sensors/video/sensorhub-driver-onvif/src/main/java/org/sensorhub/impl/sensor/onvif/OnvifCameraConfig.java
index 637d1453..d8045461 100644
--- a/sensors/video/sensorhub-driver-onvif/src/main/java/org/sensorhub/impl/sensor/onvif/OnvifCameraConfig.java
+++ b/sensors/video/sensorhub-driver-onvif/src/main/java/org/sensorhub/impl/sensor/onvif/OnvifCameraConfig.java
@@ -20,9 +20,9 @@ Developer are Copyright (C) 2014 the Initial Developer. All Rights Reserved.
 import org.sensorhub.api.config.DisplayInfo;
 import org.sensorhub.api.config.DisplayInfo.Required;
 import org.sensorhub.api.sensor.SensorConfig;
-import de.onvif.discovery.OnvifDiscovery;
+//import de.onvif.discovery.OnvifDiscovery;
 import org.sensorhub.impl.comm.TCPConfig;
-import org.sensorhub.impl.sensor.rtpcam.RTPCameraConfig;
+//import org.sensorhub.impl.sensor.rtpcam.RTPCameraConfig;
 
 import java.net.URL;
 import java.util.*;