diff --git a/.github/workflows/artifact-publish.yml b/.github/workflows/artifact-publish.yml
index c3e8a0b96..f94d16d21 100644
--- a/.github/workflows/artifact-publish.yml
+++ b/.github/workflows/artifact-publish.yml
@@ -7,6 +7,9 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
 
     steps:
     - name: Checkout code (with submodules)
diff --git a/README.md b/README.md
index 02e1229b2..ba074aac9 100644
--- a/README.md
+++ b/README.md
@@ -444,6 +444,23 @@ In order to utilize Confluent Cloud:
 
 #### Note
 
+### Port Mapped Receiver Configuration
+Many production deployments may not send intersection data directly from an RSU unit. This often happens if another device is responsible for generating MAP / SPaT messages or if a proxy or load balancer is used between an RSU unit and the ODE. To handle these edge cases the ODE has a configurable port-mapped receiver which can be used for receiving data on a variety of ports. The intent of this feature is to allow the ODE to continue to identify different source RSU units based upon the port the data is forwarded on. 
+
+To use port-mapped ingest, add an entry similar to the below to the application.yaml file. The entry below creates a BSM receiver which listens on port 1234. Any BSM data received on port 1234 will be marked as having been received from the IP 1.2.3.4.
+
+```
+port-mapped-ingest:
+  sources:
+    - intersectipon-name: "Name"
+      intersection-id: 1234
+      origin-ip: 1.2.3.4
+      port: 1234
+      type: BSM
+```
+
+Please note, ports added here are not automatically opened in the host docker container. Any port added here should separately be added to the running docker container.
+
 This has only been tested with Confluent Cloud but technically all SASL authenticated Kafka brokers can be reached using this method.
 
 [Back to top](#table-of-contents)
@@ -464,6 +481,8 @@ The configuration that defines this is in the jpo-utils submodule [here](jpo-uti
 
 For further documentation on configuring the MongoDB Kafka Connect image refer [to this readme](jpo-utils/README.md).
 
+
+
 ## Note
 
 Kafka connect is being used for MongoDB in this implementation but it can interact with many types of databases, here is further documentation for [kafka connect](https://docs.confluent.io/platform/current/connect/index.html)
diff --git a/asn1_codec b/asn1_codec
index 1b6dc4c0e..a51fc0a8c 160000
--- a/asn1_codec
+++ b/asn1_codec
@@ -1 +1 @@
-Subproject commit 1b6dc4c0eac3a741ad88ddff4fae3a005091b408
+Subproject commit a51fc0a8c1ced0654b61667f9fcb79cf799e4db1
diff --git a/docker-compose.yml b/docker-compose.yml
index c4f059187..1da358793 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -64,6 +64,7 @@ services:
       ODE_ROCKSDB_BLOCK_SIZE: ${ODE_ROCKSDB_BLOCK_SIZE}
       ODE_ROCKSDB_N_MEMTABLES: ${ODE_ROCKSDB_N_MEMTABLES}
       ODE_ROCKSDB_MEMTABLE_SIZE: ${ODE_ROCKSDB_MEMTABLE_SIZE}
+      ODE_KAFKA_LISTENER_CONCURRENCY: ${ODE_KAFKA_LISTENER_CONCURRENCY}
     depends_on:
       kafka:
         condition: service_healthy
@@ -104,6 +105,7 @@ services:
       ACM_LOG_TO_CONSOLE: ${ADM_LOG_TO_CONSOLE}
       ACM_LOG_TO_FILE: ${ADM_LOG_TO_FILE}
       ACM_LOG_LEVEL: ${ADM_LOG_LEVEL}
+      ACM_NUMBER_OF_PROCESSES: ${ADM_NUMBER_OF_PROCESSES:-1}
     depends_on:
       kafka:
         condition: service_healthy
@@ -137,6 +139,7 @@ services:
       ACM_LOG_TO_CONSOLE: ${AEM_LOG_TO_CONSOLE}
       ACM_LOG_TO_FILE: ${AEM_LOG_TO_FILE}
       ACM_LOG_LEVEL: ${AEM_LOG_LEVEL}
+      ACM_NUMBER_OF_PROCESSES: ${AEM_NUMBER_OF_PROCESSES:-1}
     depends_on:
       kafka:
         condition: service_healthy
diff --git a/docs/Release_notes.md b/docs/Release_notes.md
index 6e9ad8d88..1a635c6c7 100644
--- a/docs/Release_notes.md
+++ b/docs/Release_notes.md
@@ -1,6 +1,19 @@
 JPO-ODE Release Notes
 ----------------------------
 
+Version 6.0.0, released May 2026
+----------------------------------------
+### **Summary**
+This release expands support for existing jpo-ode functionality and improves flexibility in deployment and data handling. JSON schemas are now bundled within the jpo-asn-pojos submodule, enabling offline usage without external dependencies. Additionally, a receiving port remapping configuration has been introduced to better identify traffic sources that may not originate from an RSU. This release also includes several minor fixes.
+
+Enhancements in this release:
+- [ASN Hex 1609.2 Signature Retention (ITSA)](https://github.com/usdot-jpo-ode/jpo-ode/pull/596)
+- [Submodule update to provide JSON schemas in resources for offline availability](https://github.com/neaeraconsulting/jpo-ode/pull/1)
+- [Port remap receiver](https://github.com/neaeraconsulting/jpo-ode/pull/2)
+- [Configurable kafka concurrency](https://github.com/neaeraconsulting/jpo-ode/pull/3)
+- [Docker shared Kafka fix](https://github.com/neaeraconsulting/jpo-ode/pull/9)
+- [Add env vars for number of ACM processes, update test process](https://github.com/neaeraconsulting/jpo-ode/pull/7)
+
 Version 5.1.0, released October 2025
 ----------------------------------------
 ### **Summary**
diff --git a/docs/compatibility.md b/docs/compatibility.md
index 98f6598a9..3b00a9868 100644
--- a/docs/compatibility.md
+++ b/docs/compatibility.md
@@ -3,6 +3,7 @@ This table serves as a guide, suggesting which versions of individual submodules
 
 | [ODE (this project)](https://github.com/usdot-jpo-ode/jpo-ode/releases) | [ACM](https://github.com/usdot-jpo-ode/asn1_codec/releases) | [PPM](https://github.com/usdot-jpo-ode/jpo-cvdp/releases) | [SEC](https://github.com/usdot-jpo-ode/jpo-security-svcs/releases) | [SDWD](https://github.com/usdot-jpo-ode/jpo-sdw-depositor/releases) | [S3D](https://github.com/usdot-jpo-ode/jpo-s3-deposit/releases) | [GJConverter](https://github.com/usdot-jpo-ode/jpo-geojsonconverter/releases) | [CMonitor](https://github.com/usdot-jpo-ode/jpo-conflictmonitor/releases) | [CVisualizer](https://github.com/usdot-jpo-ode/jpo-conflictvisualizer/releases) | [CVManager](https://github.com/usdot-jpo-ode/jpo-cvmanager/releases) | [MEC](https://github.com/usdot-jpo-ode/jpo-mec-deposit/releases) |
 |-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|-------|
+| 6.0.0 | 3.3.0 | 1.6.0 | 1.7.0 | 1.10.0 | 1.7.1 | 3.3.0 | 3.2.0 |  N/A  | 2.1.0 | 1.1.0 |
 | 5.1.0 | 3.2.0 | 1.6.0 | 1.7.0 | 1.10.0 | 1.7.1 | 3.2.0 | 3.1.0 |  N/A  | 2.0.0 | 1.0.0 |
 | 4.1.2 | 3.1.0 | 1.5.0 | 1.6.0 | 1.9.1 | 1.7.1 | 2.1.0 | 2.1.0 | 1.5.0 | 1.6.0 |  N/A  |
 | 4.0.0 | 3.0.0 | 1.5.0 | 1.5.0 | 1.9.0 | 1.7.0 | 2.0.0 | 2.0.0 | 1.5.0 | 1.5.0 |  N/A  |
diff --git a/docs/release_process_quarterly.md b/docs/release_process_quarterly.md
index 4d6263a7e..8f55b2fcf 100644
--- a/docs/release_process_quarterly.md
+++ b/docs/release_process_quarterly.md
@@ -43,6 +43,31 @@ None
     - [ ] messages get decoded as expected
     - [ ] messages get encoded as expected
 
+#### Details on how to do tests
+
+Run compilation and unit tests in Docker: From the root directory of asn1_codec issue:
+```
+docker build -t acm .
+docker run --env-file .env --name acm -it acm
+```
+In a separate shell:
+```
+docker exec -it acm bash
+/build/acm_tests
+```
+
+where the `.env` file is configured with necessary environment variables.
+
+To test program startup and encoding/decoding:
+
+Pull the release branch into the ODE submodule, and run the ODE via `docker compose up --build -d` from the jpo-ode root directory, with the following profiles set in the `.env` file:
+```
+COMPOSE_PROFILES=ode,adm,aem,kafka,kafka_setup,kafka_ui
+```
+To test decoding send test messages with the `udpsender_generic.py` script and verify the messages are decoded by looking at the `topic.Asn1DecoderOutput` in the kafka UI.
+
+To test encoding, use the Kafka UI to produce one of the decoded messages from `topic.Asn1DecoderOutput` to `topic.Asn1EncoderInput` and check the decoded output appears on `topic.Asn1EncoderOutput`.
+
 ### 3. Project Reference Updates & Release Creation
     - [ ] Merge ‘release/(year)-(quarter)’ branch into ‘master’ branch for the asn1_codec project
     - [ ] Create a release for the asn1_codec project from the ‘master’ branch and tag the release with the version number of the release. (e.g. asn1_codec-x.x.x)
@@ -220,11 +245,13 @@ None
     - [ ] code compiles
         - gradle build
             - [ ] `jpo-asn-j2735-2024` subproject builds via gradle
-            - [ ] `jpo-asn-test-generator` subproject build via gradle
+            - [ ] `jpo-asn-test-generator` subproject builds via gradle
+            - [ ] `jpo-asn-jsonschema-generator` subproject builds via gradle
         - maven build:
             - [ ] `jpo-asn-j2735-2024` subproject builds via maven
     - [ ] unit tests pass
     - [ ] test generator command line tool can generate messages
+    - [ ] schema generator command line tool can generate schemas
 
 ### 3. Project Reference Updates & Release Creation
     - [ ] Update Gradle build version number
diff --git a/jpo-asn-pojos b/jpo-asn-pojos
index c7d446df1..1ff018d20 160000
--- a/jpo-asn-pojos
+++ b/jpo-asn-pojos
@@ -1 +1 @@
-Subproject commit c7d446df1ba24d6bf7f485ce7c112423c9cf6f26
+Subproject commit 1ff018d20a64e7f0d8f57f039252618ab9e978b4
diff --git a/jpo-ode-common/pom.xml b/jpo-ode-common/pom.xml
index c01fb219c..d47f8bc29 100644
--- a/jpo-ode-common/pom.xml
+++ b/jpo-ode-common/pom.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0"?>
-<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>usdot.jpo.ode</groupId>
     <artifactId>jpo-ode</artifactId>
-    <version>5.1.0</version>
+    <version>6.0.0</version>
   </parent>
-  
+
   <artifactId>jpo-ode-common</artifactId>
   <name>jpo-ode-common</name>
   <description>JPO ODE Common Components</description>
   <packaging>jar</packaging>
-  
+
   <properties>
     <!-- SonarQube Properties -->
     <sonar.exclusions>src/main/java/us/dot/its/jpo/ode/util/GeoUtils.java</sonar.exclusions>
@@ -21,26 +23,26 @@
     <sonar.inclusions>src/main/java/us/dot/its/jpo/ode/inet/*</sonar.inclusions>
   </properties>
 
-  
+
   <dependencies>
     <dependency>
       <groupId>org.json</groupId>
       <artifactId>json</artifactId>
-    <version>20231013</version>
+      <version>20231013</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
     </dependency>
     <dependency>
-    	<groupId>com.fasterxml.jackson.dataformat</groupId>
-    	<artifactId>jackson-dataformat-xml</artifactId>
+      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-xml</artifactId>
     </dependency>
-		<dependency>
+    <dependency>
       <groupId>jakarta.xml.bind</groupId>
       <artifactId>jakarta.xml.bind-api</artifactId>
       <version>4.0.0</version>
-		</dependency>
+    </dependency>
     <dependency>
       <groupId>javax.websocket</groupId>
       <artifactId>javax.websocket-client-api</artifactId>
@@ -52,4 +54,4 @@
       <version>4.0.0</version>
     </dependency>
   </dependencies>
-</project>
+</project>
\ No newline at end of file
diff --git a/jpo-ode-core/pom.xml b/jpo-ode-core/pom.xml
index c5ea2bfd1..5aca2eddd 100644
--- a/jpo-ode-core/pom.xml
+++ b/jpo-ode-core/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>usdot.jpo.ode</groupId>
     <artifactId>jpo-ode</artifactId>
-    <version>5.1.0</version>
+    <version>6.0.0</version>
   </parent>
 
   <artifactId>jpo-ode-core</artifactId>
@@ -25,12 +25,12 @@
     <dependency>
       <groupId>usdot.jpo.ode</groupId>
       <artifactId>jpo-ode-common</artifactId>
-      <version>5.1.0</version>
+      <version>6.0.0</version>
     </dependency>
     <dependency>
       <groupId>usdot.jpo.ode</groupId>
       <artifactId>jpo-ode-plugins</artifactId>
-      <version>5.1.0</version>
+      <version>6.0.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
@@ -90,13 +90,13 @@
     <dependency>
       <groupId>com.networknt</groupId>
       <artifactId>json-schema-validator</artifactId>
-      <version>1.0.76</version>
+      <version>1.0.88</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>usdot.jpo.asn</groupId>
       <artifactId>jpo-asn-j2735-2024</artifactId>
-      <version>1.1.0</version>
+      <version>1.2.0</version>
     </dependency>
   </dependencies>
 
diff --git a/jpo-ode-plugins/pom.xml b/jpo-ode-plugins/pom.xml
index 6b1324f33..8cc564282 100644
--- a/jpo-ode-plugins/pom.xml
+++ b/jpo-ode-plugins/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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>
 
   <artifactId>jpo-ode-plugins</artifactId>
@@ -11,7 +13,7 @@
   <parent>
     <groupId>usdot.jpo.ode</groupId>
     <artifactId>jpo-ode</artifactId>
-    <version>5.1.0</version>
+    <version>6.0.0</version>
   </parent>
   <properties>
     <!-- SonarQube Properties -->
@@ -27,7 +29,7 @@
     <dependency>
       <groupId>usdot.jpo.ode</groupId>
       <artifactId>jpo-ode-common</artifactId>
-      <version>5.1.0</version>
+      <version>6.0.0</version>
     </dependency>
     <!-- TODO open-ode
     <dependency>
@@ -39,4 +41,4 @@
   </dependencies>
 
 
-</project>
+</project>
\ No newline at end of file
diff --git a/jpo-ode-svcs/pom.xml b/jpo-ode-svcs/pom.xml
index f9e8537d3..565f3ac40 100644
--- a/jpo-ode-svcs/pom.xml
+++ b/jpo-ode-svcs/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>usdot.jpo.ode</groupId>
     <artifactId>jpo-ode</artifactId>
-    <version>5.1.0</version>
+    <version>6.0.0</version>
   </parent>
   <artifactId>jpo-ode-svcs</artifactId>
   <packaging>jar</packaging>
@@ -127,12 +127,12 @@
     <dependency>
       <groupId>usdot.jpo.ode</groupId>
       <artifactId>jpo-ode-core</artifactId>
-      <version>5.1.0</version>
+      <version>6.0.0</version>
     </dependency>
     <dependency>
       <groupId>usdot.jpo.ode</groupId>
       <artifactId>jpo-ode-plugins</artifactId>
-      <version>5.1.0</version>
+      <version>6.0.0</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
@@ -156,13 +156,13 @@
     <dependency>
       <groupId>com.networknt</groupId>
       <artifactId>json-schema-validator</artifactId>
-      <version>1.0.76</version>
+      <version>1.0.88</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>usdot.jpo.asn</groupId>
       <artifactId>jpo-asn-j2735-2024</artifactId>
-      <version>1.1.0</version>
+      <version>1.2.0</version>
     </dependency>
     <dependency>
       <groupId>net.javacrumbs.json-unit</groupId>
diff --git a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/kafka/KafkaConsumerConfig.java b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/kafka/KafkaConsumerConfig.java
index 4dd35f434..4b4073fd4 100644
--- a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/kafka/KafkaConsumerConfig.java
+++ b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/kafka/KafkaConsumerConfig.java
@@ -4,6 +4,7 @@
 import java.util.Map;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.kafka.KafkaProperties;
+import org.springframework.boot.autoconfigure.kafka.KafkaProperties.Listener;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.kafka.annotation.EnableKafka;
@@ -65,6 +66,11 @@ public ConcurrentKafkaListenerContainerFactory<String, String> kafkaListenerCont
     ConcurrentKafkaListenerContainerFactory<String, String> factory =
         new ConcurrentKafkaListenerContainerFactory<>();
     factory.setConsumerFactory(consumerFactory());
+
+    // Set concurrency
+    // Usually set to number of partitions per topic per ode app instance
+    factory.setConcurrency(kafkaProperties.getListener().getConcurrency());
+
     return factory;
   }
 
diff --git a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/controller/UdpServicesController.java b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/controller/UdpServicesController.java
index ae69b128c..e04f47cd7 100644
--- a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/controller/UdpServicesController.java
+++ b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/controller/UdpServicesController.java
@@ -15,6 +15,7 @@
 import us.dot.its.jpo.ode.udp.bsm.BsmReceiver;
 import us.dot.its.jpo.ode.udp.generic.GenericReceiver;
 import us.dot.its.jpo.ode.udp.map.MapReceiver;
+import us.dot.its.jpo.ode.udp.portmapped.PortMappedIngestConfigLoader;
 import us.dot.its.jpo.ode.udp.psm.PsmReceiver;
 import us.dot.its.jpo.ode.udp.rsm.RsmReceiver;
 import us.dot.its.jpo.ode.udp.rtcm.RtcmReceiver;
@@ -44,7 +45,8 @@ public class UdpServicesController {
   @Autowired
   public UdpServicesController(UDPReceiverProperties udpProps,
                                RawEncodedJsonTopics rawEncodedJsonTopics,
-                               KafkaTemplate<String, String> kafkaTemplate) {
+                               KafkaTemplate<String, String> kafkaTemplate,
+                               PortMappedIngestConfigLoader portMappedIngestConfigLoader) {
 
     log.debug("Starting UDP receiver services...");
 
@@ -60,6 +62,13 @@ public UdpServicesController(UDPReceiverProperties udpProps,
     startReceiver(new RsmReceiver(udpProps.getRsm(), kafkaTemplate, rawEncodedJsonTopics.getRsm()));
     startReceiver(new GenericReceiver(udpProps.getGeneric(), kafkaTemplate, rawEncodedJsonTopics));
 
+    
+    List<AbstractUdpReceiverPublisher> receivers = portMappedIngestConfigLoader
+      .loadReceivers(udpProps, rawEncodedJsonTopics, kafkaTemplate);
+    for (AbstractUdpReceiverPublisher receiver : receivers) {
+      startReceiver(receiver);
+    }
+
     log.debug("UDP receiver services started.");
   }
 
diff --git a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/generic/GenericReceiver.java b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/generic/GenericReceiver.java
index fa5fdc84d..64539c94e 100644
--- a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/generic/GenericReceiver.java
+++ b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/generic/GenericReceiver.java
@@ -115,7 +115,7 @@ private static String describePacketForLog(DatagramPacket packet) {
     return sb.toString();
   }
 
-  private void routeMessageByMessageType(String messageType, DatagramPacket packet)
+  protected void routeMessageByMessageType(String messageType, DatagramPacket packet)
       throws InvalidPayloadException, UnsupportedMessageTypeException {
     log.debug("Detected Message Type {}", messageType);
     switch (messageType) {
diff --git a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/portmapped/PortMappedConfigurableReceiver.java b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/portmapped/PortMappedConfigurableReceiver.java
new file mode 100644
index 000000000..bbcda9fb6
--- /dev/null
+++ b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/portmapped/PortMappedConfigurableReceiver.java
@@ -0,0 +1,82 @@
+package us.dot.its.jpo.ode.udp.portmapped;
+
+import io.netty.handler.codec.UnsupportedMessageTypeException;
+import java.net.DatagramPacket;
+import java.net.InetAddress;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.kafka.core.KafkaTemplate;
+import us.dot.its.jpo.ode.kafka.topics.RawEncodedJsonTopics;
+import org.apache.tomcat.util.buf.HexUtils;
+import us.dot.its.jpo.ode.udp.InvalidPayloadException;
+import us.dot.its.jpo.ode.udp.controller.UDPReceiverProperties.ReceiverProperties;
+import us.dot.its.jpo.ode.udp.generic.GenericReceiver;
+
+/**
+ * PortMappedConfigurableReceiver is a class that listens for UDP packets and processes them based on the
+ * determined message type. It extends GenericReceiver to take advantage multi message routing
+ *
+ * </p>The class is designed to handle all {@link us.dot.its.jpo.ode.uper.SupportedMessageType}
+ * message types encoded in UDP packets such as and routes them to the appropriate Kafka topic.
+ */
+@Slf4j
+public class PortMappedConfigurableReceiver extends GenericReceiver {
+
+  private final PortMappedIngestConfig.PortMappedIngestSource ingestConfig;
+
+  /**
+   * Constructs a new GenericReceiver with the specified properties, Kafka template, and raw encoded
+   * JSON topics.
+   *
+   * @param props                the receiver properties containing configuration settings such as
+   *                             port and buffer size
+   * @param ingestConfig         the configuration object containing the ingest settings
+   */
+    public PortMappedConfigurableReceiver(ReceiverProperties props, KafkaTemplate<String, String> kafkaTemplate,
+      RawEncodedJsonTopics rawEncodedJsonTopics, PortMappedIngestConfig.PortMappedIngestSource ingestConfig) {
+      super(props, kafkaTemplate, rawEncodedJsonTopics);
+      log.info("Creating PortMappedConfigurableReceiver with port " + props.getReceiverPort() + " and buffer size " + props.getBufferSize() + " and Remap IP " + ingestConfig.getOriginIp());
+
+      this.ingestConfig = ingestConfig;
+  }
+
+  @Override
+  public void run() {
+    log.debug("");
+
+    byte[] buffer;
+    do {
+      buffer = new byte[bufferSize];
+      // packet should be recreated on each loop to prevent latent data in buffer
+      DatagramPacket packet = new DatagramPacket(buffer, buffer.length);
+      try {
+        socket.receive(packet);
+        byte[] payload = packet.getData();
+        if ((packet.getLength() <= 0) || (payload == null)) {
+          log.debug("Skipping empty payload");
+          continue;
+        }
+
+        
+
+        senderIp = this.ingestConfig.getOriginIp();
+        InetAddress senderAddress = InetAddress.getByName(senderIp);
+        packet.setAddress(senderAddress);
+        senderPort = packet.getPort();
+        log.debug("Packet received from {}:{}", senderIp, senderPort);
+
+        String payloadHexString = HexUtils.toHexString(payload).toLowerCase();
+        log.debug("Raw Payload {}", payloadHexString);
+
+        routeMessageByMessageType(this.ingestConfig.getType(), packet);
+
+      } catch (UnsupportedMessageTypeException e) {
+        log.error("Unsupported Message Type", e);
+      } catch (InvalidPayloadException e) {
+        log.error("Error decoding packet", e);
+      } catch (Exception e) {
+        log.error("Error receiving packet", e);
+      }
+    } while (!isStopped());
+  }
+}
diff --git a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/portmapped/PortMappedIngestConfig.java b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/portmapped/PortMappedIngestConfig.java
new file mode 100644
index 000000000..bc350c8af
--- /dev/null
+++ b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/portmapped/PortMappedIngestConfig.java
@@ -0,0 +1,25 @@
+package us.dot.its.jpo.ode.udp.portmapped;
+
+import java.util.List;
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@Data
+@Configuration
+@ConfigurationProperties(prefix = "ode.port-mapped-ingest")
+public class PortMappedIngestConfig {
+
+  private List<PortMappedIngestSource> sources;
+
+  @Data
+  public static class PortMappedIngestSource {
+    private String intersectionName;
+    private String intersectionId;
+    private String originIp;
+
+    private int port;
+
+    private String type;
+  }
+}
diff --git a/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/portmapped/PortMappedIngestConfigLoader.java b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/portmapped/PortMappedIngestConfigLoader.java
new file mode 100644
index 000000000..b02a4d9ef
--- /dev/null
+++ b/jpo-ode-svcs/src/main/java/us/dot/its/jpo/ode/udp/portmapped/PortMappedIngestConfigLoader.java
@@ -0,0 +1,89 @@
+package us.dot.its.jpo.ode.udp.portmapped;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.kafka.core.KafkaTemplate;
+import org.springframework.stereotype.Component;
+import us.dot.its.jpo.ode.kafka.topics.RawEncodedJsonTopics;
+import us.dot.its.jpo.ode.udp.AbstractUdpReceiverPublisher;
+import us.dot.its.jpo.ode.udp.controller.UDPReceiverProperties;
+import us.dot.its.jpo.ode.udp.controller.UDPReceiverProperties.ReceiverProperties;
+
+@Slf4j
+@Component
+public class PortMappedIngestConfigLoader {
+
+  private final PortMappedIngestConfig config;
+
+  public PortMappedIngestConfigLoader(PortMappedIngestConfig config) {
+    this.config = config;
+  }
+
+  public List<AbstractUdpReceiverPublisher> loadReceivers(UDPReceiverProperties udpProps,
+      RawEncodedJsonTopics rawEncodedJsonTopics, KafkaTemplate<String, String> kafkaTemplate) {
+        log.debug("Loading configurable UDP receivers from config...");
+
+    
+    if (config == null || config.getSources() == null || config.getSources().isEmpty()) {
+      return Collections.emptyList();
+    }
+
+    List<AbstractUdpReceiverPublisher> receivers = new ArrayList<>();
+    for (PortMappedIngestConfig.PortMappedIngestSource source : config.getSources()) {
+
+      String type = normalizeType(source.getType());
+      if (type == null) {
+        log.warn("Skipping configurable UDP ingest source with missing type. Source: {}", source);
+        continue;
+      }else{
+        source.setType(type);
+      }
+
+      PortMappedConfigurableReceiver receiver = new PortMappedConfigurableReceiver(
+          buildReceiverProperties(udpProps, source),
+          kafkaTemplate,
+          rawEncodedJsonTopics,
+          source
+      );
+      receivers.add(receiver);
+    }
+    return receivers;
+  }
+
+  private String normalizeType(String type) {
+    if (type == null || type.isBlank()) {
+      return null;
+    }
+
+    return type.trim().toUpperCase(Locale.ROOT);
+  }
+
+  private ReceiverProperties buildReceiverProperties(UDPReceiverProperties udpProps,PortMappedIngestConfig.PortMappedIngestSource source) {
+    ReceiverProperties baseProps = switch (source.getType()) {
+      case "BSM" -> udpProps.getBsm();
+      case "TIM" -> udpProps.getTim();
+      case "SSM" -> udpProps.getSsm();
+      case "SRM" -> udpProps.getSrm();
+      case "SPAT" -> udpProps.getSpat();
+      case "MAP" -> udpProps.getMap();
+      case "PSM" -> udpProps.getPsm();
+      case "SDSM" -> udpProps.getSdsm();
+      case "RTCM" -> udpProps.getRtcm();
+      case "RSM" -> udpProps.getRsm();
+      case "GENERIC" -> udpProps.getGeneric();
+      default -> null;
+    };
+
+    if (baseProps == null) {
+      return null;
+    }
+
+    ReceiverProperties props = new ReceiverProperties();
+    props.setBufferSize(baseProps.getBufferSize());
+    props.setReceiverPort(source.getPort());
+    return props;
+  }
+}
diff --git a/jpo-ode-svcs/src/main/resources/application.yaml b/jpo-ode-svcs/src/main/resources/application.yaml
index 06fa18c28..229d60853 100644
--- a/jpo-ode-svcs/src/main/resources/application.yaml
+++ b/jpo-ode-svcs/src/main/resources/application.yaml
@@ -17,6 +17,7 @@ spring:
         attempts: 0
     listener:
       log-container-config: true
+      concurrency: ${ODE_KAFKA_LISTENER_CONCURRENCY:10}
   http:
     multipart:
       max-file-size: 1MB
diff --git a/jpo-ode-svcs/src/main/resources/configurable_ingest_config_sample.json b/jpo-ode-svcs/src/main/resources/configurable_ingest_config_sample.json
new file mode 100644
index 000000000..d631ccb7a
--- /dev/null
+++ b/jpo-ode-svcs/src/main/resources/configurable_ingest_config_sample.json
@@ -0,0 +1,11 @@
+{
+  "sources":[
+    {
+      "intersection_name": "My Intersection",
+      "intersection_id": "1234",
+      "origin_ip":"10.0.0.0",
+      "port": "5800",
+      "type": "BSM"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/kafka/listeners/Asn1DecodedDataRouterTest.java b/jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/kafka/listeners/Asn1DecodedDataRouterTest.java
index 3d5899dec..840217bf0 100644
--- a/jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/kafka/listeners/Asn1DecodedDataRouterTest.java
+++ b/jpo-ode-svcs/src/test/java/us/dot/its/jpo/ode/kafka/listeners/Asn1DecodedDataRouterTest.java
@@ -124,11 +124,11 @@ void testAsn1DecodedDataRouterTIMDataFlow() throws IOException {
     String baseTestData =
         loadFromResource("us/dot/its/jpo/ode/services/asn1/decoder-output-tim.xml");
 
-    var consumerProps = KafkaTestUtils.consumerProps("timDecoderTest", "false", embeddedKafka);
+    var consumerProps = KafkaTestUtils.consumerProps("timDecoderTest", "true", embeddedKafka);
     var consumerFactory = new DefaultKafkaConsumerFactory<>(consumerProps, new StringDeserializer(),
         new StringDeserializer());
     var testConsumer = consumerFactory.createConsumer();
-    embeddedKafka.consumeFromEmbeddedTopics(testConsumer, topics);
+    embeddedKafka.consumeFromEmbeddedTopics(testConsumer, true, topics);
 
     String baseExpectedTim = loadFromResource("us/dot/its/jpo/ode/services/asn1/expected-tim.json");
     for (String recordType : new String[] {"timMsg", "rxMsg"}) {
diff --git a/jpo-utils b/jpo-utils
index d9298120d..e38f3e3b5 160000
--- a/jpo-utils
+++ b/jpo-utils
@@ -1 +1 @@
-Subproject commit d9298120d603b9ff9ce3a5520ce885c8bd7ec23d
+Subproject commit e38f3e3b5483f41e03a8075c86505b482b0c23f3
diff --git a/pom.xml b/pom.xml
index 0076525cd..4ed8fb657 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,12 +13,12 @@
 
   <scm>
     <developerConnection>scm:git:https://github.com/usdot-jpo-ode/jpo-ode.git</developerConnection>
-    <tag>jpo-ode-5.1.0</tag>
+    <tag>jpo-ode-6.0.0</tag>
   </scm>
 
   <groupId>usdot.jpo.ode</groupId>
   <artifactId>jpo-ode</artifactId>
-  <version>5.1.0</version>
+  <version>6.0.0</version>
   <packaging>pom</packaging>
   <modules>
     <module>jpo-ode-common</module>
@@ -151,7 +151,9 @@
           <artifactId>maven-surefire-plugin</artifactId>
           <version>3.2.5</version>
           <configuration>
-            <argLine>@{argLine} -javaagent:${user.home}/.m2/repository/com/github/hazendaz/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar -Xshare:off</argLine>
+            <argLine>@{argLine}
+              -javaagent:${user.home}/.m2/repository/com/github/hazendaz/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar
+              -Xshare:off</argLine>
             <!-- <testFailureIgnore>true</testFailureIgnore> -->
             <systemPropertyVariables>
               <loader.path>${loader.path}</loader.path>
diff --git a/sample.env b/sample.env
index 77292c198..16a1f0441 100644
--- a/sample.env
+++ b/sample.env
@@ -63,6 +63,9 @@ DEFAULT_SNMP_PROTOCOL=
 #########################
 # Kafka and Confluent Cloud Properties
 
+# While not strictly required for the ODE to operate properly. Setting this value is required to allow applications outside of the ODE's docker network to connect to Kafka.
+KAFKA_BOOTSTRAP_SERVERS=${DOCKER_HOST_IP}:9092
+
 # The type of Kafka broker to connect to. If set to "CONFLUENT", the broker will be Confluent Cloud. Otherwise, it will be a local Kafka broker.
 KAFKA_TYPE=
 KAFKA_LINGER_MS=1
@@ -142,4 +145,11 @@ ODE_TIM_INGEST_MONITORING_INTERVAL=60
 # ODE STOMP Exporter for Demo UI
 # Set this to false to save resources when running the application in a production environement. The StompStringExporter
 # is exclusively used to support the Demo Console hosted at http://localhost:8080
-ODE_STOMP_EXPORTER_ENABLED=true
\ No newline at end of file
+ODE_STOMP_EXPORTER_ENABLED=true
+
+# Kafka listener concurrency
+ODE_KAFKA_LISTENER_CONCURRENCY=1
+
+# Number of processes for ACM
+ADM_NUMBER_OF_PROCESSES=1
+AEM_NUMBER_OF_PROCESSES=1
\ No newline at end of file