diff --git a/bpmn/so-bpmn-infrastructure-common/pom.xml b/bpmn/so-bpmn-infrastructure-common/pom.xml
index d485c8a..7510c20 100644
--- a/bpmn/so-bpmn-infrastructure-common/pom.xml
+++ b/bpmn/so-bpmn-infrastructure-common/pom.xml
@@ -7,10 +7,7 @@
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>so-bpmn-infrastructure-common</artifactId>
-	<packaging>jar</packaging>
-	<properties>
-		<camunda.version>7.8.0</camunda.version>
-	</properties>
+	<packaging>jar</packaging>	
 	<build>
 		<plugins>
 			<plugin>
@@ -163,19 +160,15 @@
 		<dependency>
 			<groupId>org.camunda.bpm.springboot</groupId>
 			<artifactId>camunda-bpm-spring-boot-starter</artifactId>
-			<version>2.3.0</version>
+			<version>${camunda.springboot.version}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
+			<groupId>org.camunda.bpm.springboot</groupId>
+			<artifactId>camunda-bpm-spring-boot-starter-webapp</artifactId>
+			<version>${camunda.springboot.version}</version>
 			<scope>test</scope>
-		</dependency>		
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jpa</artifactId>
-			<optional>true</optional>
-		</dependency>
+		</dependency>	
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-spring-boot-starter-jaxws</artifactId>
@@ -197,6 +190,10 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+		</dependency>	
+		<dependency>
 			<groupId>com.fasterxml.uuid</groupId>
 			<artifactId>java-uuid-generator</artifactId>
 		</dependency>
@@ -206,8 +203,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-			<version>3.4</version>
+			<artifactId>commons-lang3</artifactId>			
 		</dependency>
 		<dependency>
 			<groupId>org.onap.so</groupId>
@@ -263,8 +259,7 @@
 		</dependency>
 		<dependency>
 			<groupId>javax.annotation</groupId>
-			<artifactId>javax.annotation-api</artifactId>
-			<version>1.3</version>
+			<artifactId>javax.annotation-api</artifactId>			
 		</dependency>
 		  <dependency>
             <groupId>org.onap.msb.java-sdk</groupId>
@@ -315,7 +310,7 @@
         <dependency>
             <groupId>org.camunda.bpm.springboot</groupId>
             <artifactId>camunda-bpm-spring-boot-starter-test</artifactId>
-            <version>2.3.0</version>
+            <version>${camunda.springboot.version}</version>
             <scope>test</scope>
         </dependency>
 	</dependencies>