diff --git a/pom.xml b/pom.xml
index eb81882..887db1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,15 +10,15 @@
 
     <groupId>com.bitbar</groupId>
     <artifactId>remote-device-client</artifactId>
-    <version>2.96</version>
+    <version>2.125</version>
     <packaging>jar</packaging>
 
     <properties>
         <java.version>1.8</java.version>
-        <testdroid-api.version>2.96</testdroid-api.version>
-        <cli.version>1.3.1</cli.version>
+        <testdroid-api.version>2.125</testdroid-api.version>
+        <cli.version>1.4</cli.version>
         <jsch.version>0.1.55</jsch.version>
-        <springboot.version>2.2.0.RELEASE</springboot.version>
+        <springboot.version>2.5.2</springboot.version>
     </properties>
 
     <dependencies>
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
deleted file mode 100644
index 2585462..0000000
--- a/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-log4j.rootLogger=ALL, stdout, debugfile
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.layout=org.apache.log4j.EnhancedPatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%m%n %throwable{1}
-log4j.appender.stdout.Threshold=INFO
-
-log4j.appender.debugfile=org.apache.log4j.FileAppender
-log4j.appender.debugfile.File=remotedevice-debug.log
-log4j.appender.debugfile.layout=org.apache.log4j.EnhancedPatternLayout
-log4j.appender.debugfile.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n %throwable
-log4j.appender.debugfile.append=false
-
-log4j.logger.org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler=WARN
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
new file mode 100644
index 0000000..9a7c3f7
--- /dev/null
+++ b/src/main/resources/log4j2.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration>
+    <Appenders>
+        <Console name="CONSOLE" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} [%t] %-5p %c %x - %m%n" />
+        </Console>
+        <File name="DEBUG_FILE" fileName="remotedevice-debug.log" append="false">
+            <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} [%t] %-5p %c %x - %m%n" />
+        </File>
+    </Appenders>
+    <Loggers>
+        <Logger name="com.testdroid" level="DEBUG"/>
+        <Logger name="org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler" level="WARN"/>
+        <Root level="ALL">
+            <AppenderRef ref="CONSOLE" level="INFO"/>
+            <AppenderRef ref="DEBUG_FILE"/>
+        </Root>
+    </Loggers>
+</Configuration>