diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region/http-click-ingest/pom.xml b/multi-io-samples/kafka-streams/user-clicks-per-region/http-click-ingest/pom.xml
index 6d9ce02..4932870 100644
--- a/multi-io-samples/kafka-streams/user-clicks-per-region/http-click-ingest/pom.xml
+++ b/multi-io-samples/kafka-streams/user-clicks-per-region/http-click-ingest/pom.xml
@@ -162,7 +162,7 @@
               <org.springframework.cloud.dataflow.spring-configuration-metadata.json>
                 ${org.springframework.cloud.dataflow.spring.configuration.metadata.json}
               </org.springframework.cloud.dataflow.spring-configuration-metadata.json>
-              <configuration-properties.outbound-ports>user-clicks</configuration-properties.outbound-ports>
+              <configuration-properties.outbound-ports>${configuration-properties.outbound-ports}</configuration-properties.outbound-ports>
             </labels>
           </container>
         </configuration>
@@ -182,6 +182,9 @@
                 <file>
                   ${project.build.outputDirectory}/META-INF/spring-configuration-metadata-encoded.properties
                 </file>
+                <file>
+                  ${project.build.outputDirectory}/META-INF/dataflow-configuration-port-mapping.properties
+                </file>
               </files>
             </configuration>
           </execution>
@@ -190,7 +193,7 @@
       <plugin>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-app-starter-metadata-maven-plugin</artifactId>
-        <version>2.0.1.M1</version>
+        <version>2.0.2.BUILD-SNAPSHOT</version>
         <configuration>
           <storeFilteredMetadata>true</storeFilteredMetadata>
           <metadataFilter>
diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region/http-region-ingest/pom.xml b/multi-io-samples/kafka-streams/user-clicks-per-region/http-region-ingest/pom.xml
index e3f2d59..4674436 100644
--- a/multi-io-samples/kafka-streams/user-clicks-per-region/http-region-ingest/pom.xml
+++ b/multi-io-samples/kafka-streams/user-clicks-per-region/http-region-ingest/pom.xml
@@ -160,7 +160,7 @@
               <org.springframework.cloud.dataflow.spring-configuration-metadata.json>
                 ${org.springframework.cloud.dataflow.spring.configuration.metadata.json}
               </org.springframework.cloud.dataflow.spring-configuration-metadata.json>
-              <configuration-properties.outbound-ports>user-regions</configuration-properties.outbound-ports>
+              <configuration-properties.outbound-ports>${configuration-properties.outbound-ports}</configuration-properties.outbound-ports>
             </labels>
           </container>
         </configuration>
@@ -180,6 +180,9 @@
                 <file>
                   ${project.build.outputDirectory}/META-INF/spring-configuration-metadata-encoded.properties
                 </file>
+                <file>
+                  ${project.build.outputDirectory}/META-INF/dataflow-configuration-port-mapping.properties
+                </file>
               </files>
             </configuration>
           </execution>
@@ -188,7 +191,7 @@
       <plugin>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-app-starter-metadata-maven-plugin</artifactId>
-        <version>2.0.1.M1</version>
+        <version>2.0.2.BUILD-SNAPSHOT</version>
         <configuration>
           <storeFilteredMetadata>true</storeFilteredMetadata>
           <metadataFilter>
diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/pom.xml b/multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/pom.xml
index dd95d72..7af0cba 100644
--- a/multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/pom.xml
+++ b/multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/pom.xml
@@ -141,7 +141,7 @@
 						<image>springcloud/openjdk</image>
 					</from>
 					<to>
-						<image>springcloudstream/multi-io-sample-${project.artifactId}</image>
+						<image>ilayaperumalg/multi-io-sample-${project.artifactId}</image>
 						<tags>
 							<tag>1.0.0-SNAPSHOT</tag>
 						</tags>
@@ -150,12 +150,46 @@
 						<creationTime>USE_CURRENT_TIMESTAMP</creationTime>
 						<format>Docker</format>
 						<labels>
-							<configuration-properties.inbound-ports>userClicks,userRegions</configuration-properties.inbound-ports>
-							<configuration-properties.outbound-ports>clicksPerRegion</configuration-properties.outbound-ports>
+							<configuration-properties.inbound-ports>${configuration-properties.inbound-ports}</configuration-properties.inbound-ports>
+							<configuration-properties.outbound-ports>${configuration-properties.outbound-ports}</configuration-properties.outbound-ports>
 						</labels>
 					</container>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-app-starter-metadata-maven-plugin</artifactId>
+				<version>2.0.2.BUILD-SNAPSHOT</version>
+				<executions>
+					<execution>
+						<id>aggregate-metadata</id>
+						<phase>compile</phase>
+						<goals>
+							<goal>aggregate-metadata</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>properties-maven-plugin</artifactId>
+				<version>1.0.0</version>
+				<executions>
+					<execution>
+						<phase>process-classes</phase>
+						<goals>
+							<goal>read-project-properties</goal>
+						</goals>
+						<configuration>
+							<files>
+								<file>
+									${project.build.outputDirectory}/META-INF/dataflow-configuration-port-mapping.properties
+								</file>
+							</files>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 
diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties b/multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
deleted file mode 100644
index f30fe1d..0000000
--- a/multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-configuration-properties.inbound-ports=userClicks,userRegions
-configuration-properties.outbound-ports=clicksPerRegion
diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/src/main/resources/application.yml b/multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/src/main/resources/application.yml
index 0dc8e79..73ca9aa 100644
--- a/multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/src/main/resources/application.yml
+++ b/multi-io-samples/kafka-streams/user-clicks-per-region/user-clicks-per-region-processor/src/main/resources/application.yml
@@ -1,7 +1,18 @@
-spring.cloud.function.definition: processUserClickStream
-spring.cloud.stream.function.bindings.processUserClickStream-in-0: userClicks
-spring.cloud.stream.function.bindings.processUserClickStream-in-1: userRegions
-spring.cloud.stream.function.bindings.processUserClickStream-out-0: clicksPerRegion
+#spring.cloud.function.definition: processUserClickStream
+#spring.cloud.stream.function.bindings.processUserClickStream-in-0: userClicks
+#spring.cloud.stream.function.bindings.processUserClickStream-in-1: userRegions
+#spring.cloud.stream.function.bindings.processUserClickStream-out-0: clicksPerRegion
+
+spring:
+  cloud:
+    function:
+      definition: processUserClickStream
+    stream:
+      function:
+        bindings:
+          processUserClickStream-in-0: userClicks
+          processUserClickStream-in-1: userRegions
+          processUserClickStream-out-0: clicksPerRegion
 
 spring.cloud.stream.bindings.userClicks.consumer.useNativeDecoding: true
 spring.cloud.stream.bindings.userRegions.consumer.useNativeDecoding: true
diff --git a/multi-io-samples/ticktock/multi-input-log-kafka/pom.xml b/multi-io-samples/ticktock/multi-input-log-kafka/pom.xml
index 53bd82a..bd667b5 100644
--- a/multi-io-samples/ticktock/multi-input-log-kafka/pom.xml
+++ b/multi-io-samples/ticktock/multi-input-log-kafka/pom.xml
@@ -247,7 +247,7 @@
 			<plugin>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-app-starter-metadata-maven-plugin</artifactId>
-				<version>2.0.1.M1</version>
+				<version>2.0.2.BUILD-SNAPSHOT</version>
 				<configuration>
 					<storeFilteredMetadata>true</storeFilteredMetadata>
 					<metadataFilter>
diff --git a/multi-io-samples/ticktock/multi-input-log-kafka/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties b/multi-io-samples/ticktock/multi-input-log-kafka/src/main/resources/META-INF/dataflow-configuration-metadata.properties
similarity index 61%
rename from multi-io-samples/ticktock/multi-input-log-kafka/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
rename to multi-io-samples/ticktock/multi-input-log-kafka/src/main/resources/META-INF/dataflow-configuration-metadata.properties
index 51233a2..ab4592d 100644
--- a/multi-io-samples/ticktock/multi-input-log-kafka/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
+++ b/multi-io-samples/ticktock/multi-input-log-kafka/src/main/resources/META-INF/dataflow-configuration-metadata.properties
@@ -1,2 +1 @@
 configuration-properties.classes=org.springframework.cloud.fn.consumer.log.LogConsumerProperties
-configuration-properties.inbound-ports=input1,input2,input3
diff --git a/multi-io-samples/ticktock/multi-input-log-kafka/src/main/resources/application.properties b/multi-io-samples/ticktock/multi-input-log-kafka/src/main/resources/application.properties
index dad608a..015701a 100644
--- a/multi-io-samples/ticktock/multi-input-log-kafka/src/main/resources/application.properties
+++ b/multi-io-samples/ticktock/multi-input-log-kafka/src/main/resources/application.properties
@@ -4,7 +4,7 @@ info.app.description=@project.description@
 info.app.version=@project.version@
 management.endpoints.web.exposure.include=health,info,bindings
 
-spring.cloud.stream.function.definition=byteArrayTextToString|logConsumer;byteArrayTextToString|logConsumer2;byteArrayTextToString|logConsumer3
+spring.cloud.stream.function.definition=byteArrayTextToString|logConsumer
 
 spring.cloud.stream.function.bindings.byteArrayTextToString|logConsumer-in-0=input1
 spring.cloud.stream.function.bindings.byteArrayTextToString|logConsumer2-in-0=input2
diff --git a/multi-io-samples/ticktock/multi-input-log-rabbit/pom.xml b/multi-io-samples/ticktock/multi-input-log-rabbit/pom.xml
index 7c89aac..5ae587f 100644
--- a/multi-io-samples/ticktock/multi-input-log-rabbit/pom.xml
+++ b/multi-io-samples/ticktock/multi-input-log-rabbit/pom.xml
@@ -247,7 +247,7 @@
 			<plugin>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-app-starter-metadata-maven-plugin</artifactId>
-				<version>2.0.1.M1</version>
+				<version>2.0.2.BUILD-SNAPSHOT</version>
 				<configuration>
 					<storeFilteredMetadata>true</storeFilteredMetadata>
 					<metadataFilter>
diff --git a/multi-io-samples/ticktock/multi-input-log-rabbit/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties b/multi-io-samples/ticktock/multi-input-log-rabbit/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
index 51233a2..ab4592d 100644
--- a/multi-io-samples/ticktock/multi-input-log-rabbit/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
+++ b/multi-io-samples/ticktock/multi-input-log-rabbit/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
@@ -1,2 +1 @@
 configuration-properties.classes=org.springframework.cloud.fn.consumer.log.LogConsumerProperties
-configuration-properties.inbound-ports=input1,input2,input3