diff --git a/opensync-ext-cloud/pom.xml b/opensync-ext-cloud/pom.xml
index 044ce8b..7ec3533 100644
--- a/opensync-ext-cloud/pom.xml
+++ b/opensync-ext-cloud/pom.xml
@@ -29,98 +29,98 @@
         <version>${tip-wlan-cloud.release.version}</version>
       </dependency>
 
-      <dependency>
-        <artifactId>webtoken-auth-service</artifactId>
-        <groupId>com.telecominfraproject.wlan</groupId>
-        <version>${tip-wlan-cloud.release.version}</version>
-      </dependency>
+<!--       <dependency> -->
+<!--         <artifactId>webtoken-auth-service</artifactId> -->
+<!--         <groupId>com.telecominfraproject.wlan</groupId> -->
+<!--         <version>${tip-wlan-cloud.release.version}</version> -->
+<!--       </dependency> -->
     
-      <dependency>
-        <artifactId>portal-services</artifactId>
-        <groupId>com.telecominfraproject.wlan</groupId>
-        <version>${tip-wlan-cloud.release.version}</version>
-      </dependency>
+<!--       <dependency> -->
+<!--         <artifactId>portal-services</artifactId> -->
+<!--         <groupId>com.telecominfraproject.wlan</groupId> -->
+<!--         <version>${tip-wlan-cloud.release.version}</version> -->
+<!--       </dependency> -->
       
       <dependency>
-        <artifactId>customer-service-remote</artifactId>
+        <artifactId>customer-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
         <version>${tip-wlan-cloud.release.version}</version>
       </dependency>
 
       <dependency>
-        <artifactId>location-service-remote</artifactId>
+        <artifactId>location-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
         <version>${tip-wlan-cloud.release.version}</version>
       </dependency>      
 
       <dependency>
-        <artifactId>equipment-service-remote</artifactId>
+        <artifactId>equipment-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
         <version>${tip-wlan-cloud.release.version}</version>
       </dependency>      
 
       <dependency>
-        <artifactId>profile-service-remote</artifactId>
+        <artifactId>profile-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
         <version>${tip-wlan-cloud.release.version}</version>
       </dependency>      
       
       <dependency>
-        <artifactId>portal-user-service-remote</artifactId>
+        <artifactId>portal-user-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
         <version>${tip-wlan-cloud.release.version}</version>
       </dependency>      
 
       <dependency>
-        <artifactId>service-metric-service-remote</artifactId>
+        <artifactId>service-metric-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
         <version>${tip-wlan-cloud.release.version}</version>
       </dependency>      
       
       <dependency>
-        <artifactId>system-event-service-remote</artifactId>
+        <artifactId>system-event-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
         <version>${tip-wlan-cloud.release.version}</version>
       </dependency>      
       
       <dependency>
-        <artifactId>alarm-service-remote</artifactId>
+        <artifactId>alarm-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
         <version>${tip-wlan-cloud.release.version}</version>
       </dependency>      
 
       <dependency>
-        <artifactId>status-service-remote</artifactId>
+        <artifactId>status-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
         <version>${tip-wlan-cloud.release.version}</version>
       </dependency>      
 
       <dependency>
-        <artifactId>client-service-remote</artifactId>
+        <artifactId>client-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
         <version>${tip-wlan-cloud.release.version}</version>
       </dependency>      
 
       <dependency>
-        <artifactId>routing-service-remote</artifactId>
+        <artifactId>routing-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
         <version>${tip-wlan-cloud.release.version}</version>
       </dependency>      
  
        <dependency>
-        <artifactId>firmware-service-remote</artifactId>
+        <artifactId>firmware-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
         <version>${tip-wlan-cloud.release.version}</version>
       </dependency>      
 
       <dependency>
-        <artifactId>manufacturer-service-remote</artifactId>
+        <artifactId>manufacturer-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
         <version>${tip-wlan-cloud.release.version}</version>
       </dependency>      
  
       <dependency>
-        <artifactId>cloud-event-dispatcher-remote</artifactId>
+        <artifactId>cloud-event-dispatcher-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
         <version>${tip-wlan-cloud.release.version}</version>
       </dependency>     
diff --git a/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java b/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java
index 3f446fa..a84698e 100644
--- a/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java
+++ b/opensync-ext-cloud/src/main/java/com/telecominfraproject/wlan/opensync/external/integration/OpensyncExternalIntegrationCloud.java
@@ -110,23 +110,23 @@ public class OpensyncExternalIntegrationCloud implements OpensyncExternalIntegra
 
 	public void apConnected(String apId, ConnectNodeInfo connectNodeInfo) {
 		LOG.info("AP {} got connected to the gateway", apId);
-		Customer customer = null;
-		try {
-			customer = customerServiceInterface.get(autoProvisionedCustomerId);
-			LOG.debug("Got Customer {} for apId {}", customer.toPrettyString());
-		} catch (Exception e) {
-			LOG.error("Caught exception getting customer for Id {} for apId {}", autoProvisionedCustomerId, apId, e);
-		}
 
-		Equipment ce = null;
-		try {
-			ce = getCustomerEquipment(apId);
-			LOG.debug("Got Equipment {} for apId {}", ce.toPrettyString());
-		} catch (Exception e) {
-			LOG.error("Caught exception getting equipment for Id {} for apId {}", autoProvisionedEquipmentId, apId, e);
+		Customer customer = null; try { customer =
+				customerServiceInterface.get(autoProvisionedCustomerId);
+		LOG.debug("Got Customer {} for apId {}", customer.toPrettyString()); } catch
+		(Exception e) {
+			LOG.error("Caught exception getting customer for Id {} for apId {}",
+					autoProvisionedCustomerId, apId, e); }
+
+		Equipment ce = null; try { ce = getCustomerEquipment(apId);
+		LOG.debug("Got Equipment {} for apId {}", ce.toPrettyString()); } catch
+		(Exception e) {
+			LOG.error("Caught exception getting equipment for Id {} for apId {}",
+					autoProvisionedEquipmentId, apId, e);
 
 		}
 
+
 		try {
 			OvsdbSession ovsdbSession = ovsdbSessionMapInterface.getSession(apId);
 			ovsdbSession.setEquipmentId(2);
diff --git a/opensync-gateway-cloud-process/pom.xml b/opensync-gateway-cloud-process/pom.xml
index 303b975..b859ccf 100644
--- a/opensync-gateway-cloud-process/pom.xml
+++ b/opensync-gateway-cloud-process/pom.xml
@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
@@ -15,18 +17,116 @@
 	</properties>
 
 	<dependencies>
-		<dependency>
-			<groupId>com.telecominfraproject.wlan</groupId>
-			<artifactId>opensync-gateway</artifactId>
-			<version>${tip-wlan-cloud.release.version}</version>
-		</dependency>
+		<!-- <dependency> <groupId>com.telecominfraproject.wlan</groupId> <artifactId>opensync-gateway</artifactId> 
+			<version>${tip-wlan-cloud.release.version}</version> </dependency> -->
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>opensync-ext-cloud</artifactId>
 			<version>${tip-wlan-cloud.release.version}</version>
 		</dependency>
-		
-		
+		<dependency>
+			<artifactId>base-container</artifactId>
+			<groupId>com.telecominfraproject.wlan</groupId>
+			<version>${tip-wlan-cloud.release.version}</version>
+		</dependency>
+
+		<dependency>
+			<artifactId>webtoken-auth-service</artifactId>
+			<groupId>com.telecominfraproject.wlan</groupId>
+			<version>${tip-wlan-cloud.release.version}</version>
+		</dependency>
+
+		<dependency>
+			<artifactId>portal-services</artifactId>
+			<groupId>com.telecominfraproject.wlan</groupId>
+			<version>${tip-wlan-cloud.release.version}</version>
+		</dependency>
+
+		<dependency>
+			<artifactId>customer-service-remote</artifactId>
+			<groupId>com.telecominfraproject.wlan</groupId>
+			<version>${tip-wlan-cloud.release.version}</version>
+		</dependency>
+
+		<dependency>
+			<artifactId>location-service-remote</artifactId>
+			<groupId>com.telecominfraproject.wlan</groupId>
+			<version>${tip-wlan-cloud.release.version}</version>
+		</dependency>
+
+		<dependency>
+			<artifactId>equipment-service-remote</artifactId>
+			<groupId>com.telecominfraproject.wlan</groupId>
+			<version>${tip-wlan-cloud.release.version}</version>
+		</dependency>
+
+		<dependency>
+			<artifactId>profile-service-remote</artifactId>
+			<groupId>com.telecominfraproject.wlan</groupId>
+			<version>${tip-wlan-cloud.release.version}</version>
+		</dependency>
+
+		<dependency>
+			<artifactId>portal-user-service-remote</artifactId>
+			<groupId>com.telecominfraproject.wlan</groupId>
+			<version>${tip-wlan-cloud.release.version}</version>
+		</dependency>
+
+		<dependency>
+			<artifactId>service-metric-service-remote</artifactId>
+			<groupId>com.telecominfraproject.wlan</groupId>
+			<version>${tip-wlan-cloud.release.version}</version>
+		</dependency>
+
+		<dependency>
+			<artifactId>system-event-service-remote</artifactId>
+			<groupId>com.telecominfraproject.wlan</groupId>
+			<version>${tip-wlan-cloud.release.version}</version>
+		</dependency>
+
+		<dependency>
+			<artifactId>alarm-service-remote</artifactId>
+			<groupId>com.telecominfraproject.wlan</groupId>
+			<version>${tip-wlan-cloud.release.version}</version>
+		</dependency>
+
+		<dependency>
+			<artifactId>status-service-remote</artifactId>
+			<groupId>com.telecominfraproject.wlan</groupId>
+			<version>${tip-wlan-cloud.release.version}</version>
+		</dependency>
+
+		<dependency>
+			<artifactId>client-service-remote</artifactId>
+			<groupId>com.telecominfraproject.wlan</groupId>
+			<version>${tip-wlan-cloud.release.version}</version>
+		</dependency>
+
+		<dependency>
+			<artifactId>routing-service-remote</artifactId>
+			<groupId>com.telecominfraproject.wlan</groupId>
+			<version>${tip-wlan-cloud.release.version}</version>
+		</dependency>
+
+		<dependency>
+			<artifactId>firmware-service-remote</artifactId>
+			<groupId>com.telecominfraproject.wlan</groupId>
+			<version>${tip-wlan-cloud.release.version}</version>
+		</dependency>
+
+		<dependency>
+			<artifactId>manufacturer-service-remote</artifactId>
+			<groupId>com.telecominfraproject.wlan</groupId>
+			<version>${tip-wlan-cloud.release.version}</version>
+		</dependency>
+
+		<dependency>
+			<artifactId>cloud-event-dispatcher-remote</artifactId>
+			<groupId>com.telecominfraproject.wlan</groupId>
+			<version>${tip-wlan-cloud.release.version}</version>
+		</dependency>
+
+
 
 	</dependencies>
 
diff --git a/opensync-gateway-cloud-process/src/main/resources/application.properties b/opensync-gateway-cloud-process/src/main/resources/application.properties
index 768d32a..15e931a 100644
--- a/opensync-gateway-cloud-process/src/main/resources/application.properties
+++ b/opensync-gateway-cloud-process/src/main/resources/application.properties
@@ -79,7 +79,7 @@ spring.profiles.include=use_ssl,use_webtoken_auth,use_single_ds,RestTemplateConf
 
 #used by *-remote client classes when they authenticate their requests
 tip.wlan.httpClientConfig=classpath:httpClientConfig.json
-tip.wlan.introspectTokenApi.host=localhost:9096
+tip.wlan.introspectTokenApi.host=localhost:9091
 tip.wlan.introspectTokenApi.clientToken=token_placeholder
 #this user/password is used together with http_digest_auth and http_basic_auth spring profiles
 tip.wlan.serviceUser=user
@@ -89,7 +89,7 @@ spring.main.show-banner=false
 server.port=9096
 
 #this port is used by secondary server connector, it is protected by digest authentication, while primary server.port is protected by client certificate auth 
-tip.wlan.secondaryPort=7071
+tip.wlan.secondaryPort=9097
 
 #this server only supports REST requests, CSRF would get in the way
 tip.wlan.csrf-enabled=false
diff --git a/opensync-gateway-cloud-process/src/main/resources/launchers/OpenSyncProcess (local, KDC certs) cloud.launch b/opensync-gateway-cloud-process/src/main/resources/launchers/OpenSyncProcess (local, KDC certs) cloud.launch
index 92d6dec..77a5020 100644
--- a/opensync-gateway-cloud-process/src/main/resources/launchers/OpenSyncProcess (local, KDC certs) cloud.launch	
+++ b/opensync-gateway-cloud-process/src/main/resources/launchers/OpenSyncProcess (local, KDC certs) cloud.launch	
@@ -20,5 +20,5 @@
     <listAttribute key="org.eclipse.jdt.launching.MODULEPATH"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="opensync-gateway-cloud-process"/>
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="--add-opens java.base/java.lang=ALL-UNNAMED&#10;&#10;-Dssl.props=file://${project_loc:opensync-gateway-cloud-process}/src/main/resources/app/certs/ssl.properties&#10;-Dtip.wlan.httpClientConfig=file://${project_loc:opensync-gateway-cloud-process}/src/main/resources/app/certs/httpClientConfig.json&#10;&#10;-Djavax.net.ssl.keyStore=${connectus_certs}/client_keystore.jks&#10;-Djavax.net.ssl.keyStorePassword=mypassword&#10;-Djavax.net.ssl.trustStore=${connectus_certs}/truststore.jks&#10;-Djavax.net.ssl.trustStorePassword=mypassword&#10;&#10;-Dconnectus.ovsdb.managerAddr=${local_server_address}&#10;-Dconnectus.ovsdb.listenPort=6640&#10;-Dconnectus.ovsdb.redirector.listenPort=6643&#10;-Dconnectus.ovsdb.timeoutSec=30&#10;-Dconnectus.ovsdb.trustStore=${connectus_certs}/truststore.jks&#10;-Dconnectus.ovsdb.keyStore=${connectus_certs}/server.pkcs12&#10;&#10;-Dconnectus.ovsdb.configFileName=${project_loc:opensync-ext-cloud}/src/main/resources/config_2_ssids.json&#10;&#10;-Dconnectus.mqttBroker.address=${local_server_address}&#10;-Dconnectus.mqttBroker.listenPort=1883&#10;-Dtip.wlan.introspectTokenApi.host=localhost:9096&#10;-Dtip.wlan.introspectTokenApi.clientToken=token_placeholder&#10;-Dtip.wlan.serviceUser=user&#10;-Dtip.wlan.servicePassword=password&#10;&#10;-Dspring.main.show-banner=false&#10;-Dserver.port=9096&#10;&#10;-Dtip.wlan.secondaryPort=7071&#10;&#10;-Dtip.wlan.csrf-enabled=false&#10;-Dspring.profiles.include=use_ssl,use_webtoken_auth,use_single_ds,RestTemplateConfiguration_X509_client_cert_auth,opensync_cloud_config,mqtt_receiver,ovsdb_redirector,ovsdb_manager&#10;-Dtip.wlan.cloudEventDispatcherBaseUrl=https://localhost:9031&#10;-Dtip.wlan.customerServiceBaseUrl=https://localhost:9091&#10;-Dtip.wlan.locationServiceBaseUrl=https://localhost:9091&#10;-Dtip.wlan.equipmentServiceBaseUrl=https://localhost:9091&#10;-Dtip.wlan.profileServiceBaseUrl=https://localhost:9091"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="--add-opens java.base/java.lang=ALL-UNNAMED&#10;&#10;-Dssl.props=file://${project_loc:opensync-gateway-cloud-process}/src/main/resources/app/certs/ssl.properties&#10;-Dtip.wlan.httpClientConfig=file://${project_loc:opensync-gateway-cloud-process}/src/main/resources/app/certs/httpClientConfig.json&#10;&#10;-Djavax.net.ssl.keyStore=${connectus_certs}/client_keystore.jks&#10;-Djavax.net.ssl.keyStorePassword=mypassword&#10;-Djavax.net.ssl.trustStore=${connectus_certs}/truststore.jks&#10;-Djavax.net.ssl.trustStorePassword=mypassword&#10;&#10;-Dconnectus.ovsdb.managerAddr=${local_server_address}&#10;-Dconnectus.ovsdb.listenPort=6640&#10;-Dconnectus.ovsdb.redirector.listenPort=6643&#10;-Dconnectus.ovsdb.timeoutSec=30&#10;-Dconnectus.ovsdb.trustStore=${connectus_certs}/truststore.jks&#10;-Dconnectus.ovsdb.keyStore=${connectus_certs}/server.pkcs12&#10;&#10;-Dconnectus.ovsdb.configFileName=${project_loc:opensync-ext-cloud}/src/main/resources/config_2_ssids.json&#10;&#10;-Dconnectus.mqttBroker.address=${local_server_address}&#10;-Dconnectus.mqttBroker.listenPort=1883&#10;-Dtip.wlan.introspectTokenApi.host=localhost:9091&#10;-Dtip.wlan.introspectTokenApi.clientToken=token_placeholder&#10;-Dtip.wlan.serviceUser=user&#10;-Dtip.wlan.servicePassword=password&#10;&#10;-Dspring.main.show-banner=false&#10;-Dserver.port=9096&#10;&#10;-Dtip.wlan.secondaryPort=9097&#10;&#10;-Dtip.wlan.csrf-enabled=false&#10;-Dspring.profiles.include=use_ssl,use_webtoken_auth,use_single_ds,RestTemplateConfiguration_X509_client_cert_auth,opensync_cloud_config,mqtt_receiver,ovsdb_redirector,ovsdb_manager&#10;-Dtip.wlan.cloudEventDispatcherBaseUrl=https://localhost:9031&#10;-Dtip.wlan.customerServiceBaseUrl=https://localhost:9091&#10;-Dtip.wlan.locationServiceBaseUrl=https://localhost:9091&#10;-Dtip.wlan.equipmentServiceBaseUrl=https://localhost:9091&#10;-Dtip.wlan.profileServiceBaseUrl=https://localhost:9091"/>
 </launchConfiguration>