diff --git a/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/CargoHandledConsumer.java b/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/CargoHandledConsumer.java
index e469a4e..bce4df7 100644
--- a/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/CargoHandledConsumer.java
+++ b/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/CargoHandledConsumer.java
@@ -25,7 +25,7 @@
           propertyValue = "jakarta.jms.Queue"),
       @ActivationConfigProperty(
           propertyName = "destinationLookup",
-          propertyValue = "java:app/jms/CargoHandledQueue")
+          propertyValue = "jms/CargoHandledQueue")
     })
 public class CargoHandledConsumer implements MessageListener {
 
diff --git a/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/DeliveredCargoConsumer.java b/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/DeliveredCargoConsumer.java
index 555c4ae..4a652c7 100644
--- a/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/DeliveredCargoConsumer.java
+++ b/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/DeliveredCargoConsumer.java
@@ -16,7 +16,7 @@
           propertyValue = "jakarta.jms.Queue"),
       @ActivationConfigProperty(
           propertyName = "destinationLookup",
-          propertyValue = "java:app/jms/DeliveredCargoQueue")
+          propertyValue = "jms/DeliveredCargoQueue")
     })
 public class DeliveredCargoConsumer implements MessageListener {
 
diff --git a/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/HandlingEventRegistrationAttemptConsumer.java b/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/HandlingEventRegistrationAttemptConsumer.java
index 62e7c24..ebad02b 100644
--- a/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/HandlingEventRegistrationAttemptConsumer.java
+++ b/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/HandlingEventRegistrationAttemptConsumer.java
@@ -19,7 +19,7 @@
           propertyValue = "jakarta.jms.Queue"),
       @ActivationConfigProperty(
           propertyName = "destinationLookup",
-          propertyValue = "java:app/jms/HandlingEventRegistrationAttemptQueue")
+          propertyValue = "jms/HandlingEventRegistrationAttemptQueue")
     })
 public class HandlingEventRegistrationAttemptConsumer implements MessageListener {
 
diff --git a/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/JmsApplicationEvents.java b/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/JmsApplicationEvents.java
index c408b3a..c8e16ee 100644
--- a/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/JmsApplicationEvents.java
+++ b/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/JmsApplicationEvents.java
@@ -20,16 +20,16 @@ public class JmsApplicationEvents implements ApplicationEvents, Serializable {
   private static final int LOW_PRIORITY = 0;
   @Inject JMSContext jmsContext;
 
-  @Resource(lookup = "java:app/jms/CargoHandledQueue")
+  @Resource(lookup = "jms/CargoHandledQueue")
   private Destination cargoHandledQueue;
 
-  @Resource(lookup = "java:app/jms/MisdirectedCargoQueue")
+  @Resource(lookup = "jms/MisdirectedCargoQueue")
   private Destination misdirectedCargoQueue;
 
-  @Resource(lookup = "java:app/jms/DeliveredCargoQueue")
+  @Resource(lookup = "jms/DeliveredCargoQueue")
   private Destination deliveredCargoQueue;
 
-  @Resource(lookup = "java:app/jms/HandlingEventRegistrationAttemptQueue")
+  @Resource(lookup = "jms/HandlingEventRegistrationAttemptQueue")
   private Destination handlingEventQueue;
 
   @Inject private Logger logger;
diff --git a/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/MisdirectedCargoConsumer.java b/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/MisdirectedCargoConsumer.java
index 1ef9859..250b525 100644
--- a/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/MisdirectedCargoConsumer.java
+++ b/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/MisdirectedCargoConsumer.java
@@ -16,7 +16,7 @@
           propertyValue = "jakarta.jms.Queue"),
       @ActivationConfigProperty(
           propertyName = "destinationLookup",
-          propertyValue = "java:app/jms/MisdirectedCargoQueue")
+          propertyValue = "jms/MisdirectedCargoQueue")
     })
 public class MisdirectedCargoConsumer implements MessageListener {
 
diff --git a/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/RejectedRegistrationAttemptsConsumer.java b/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/RejectedRegistrationAttemptsConsumer.java
index 940df71..e8b00b7 100644
--- a/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/RejectedRegistrationAttemptsConsumer.java
+++ b/src/main/java/org/eclipse/cargotracker/infrastructure/messaging/jms/RejectedRegistrationAttemptsConsumer.java
@@ -16,7 +16,7 @@
           propertyValue = "jakarta.jms.Queue"),
       @ActivationConfigProperty(
           propertyName = "destinationLookup",
-          propertyValue = "java:app/jms/RejectedRegistrationAttemptsQueue")
+          propertyValue = "jms/RejectedRegistrationAttemptsQueue")
     })
 public class RejectedRegistrationAttemptsConsumer implements MessageListener {
 
diff --git a/src/main/java/org/eclipse/cargotracker/interfaces/booking/sse/RealtimeCargoTrackingService.java b/src/main/java/org/eclipse/cargotracker/interfaces/booking/sse/RealtimeCargoTrackingService.java
index d49e0c4..70af997 100644
--- a/src/main/java/org/eclipse/cargotracker/interfaces/booking/sse/RealtimeCargoTrackingService.java
+++ b/src/main/java/org/eclipse/cargotracker/interfaces/booking/sse/RealtimeCargoTrackingService.java
@@ -46,7 +46,7 @@ public void init() {
     public void tracking(@Context SseEventSink eventSink) {
         synchronized (RealtimeCargoTrackingService.class) {
             try {
-                String name = "java:app/jms/CargoHandledQueue";
+                String name = "jms/CargoHandledQueue";
                 InitialContext ctx = new InitialContext();
                 Object obj = InitialContext.doLookup(name);
             } catch (NamingException e) {
diff --git a/src/main/liberty/config/server.xml b/src/main/liberty/config/server.xml
index 2b666f2..2acca46 100644
--- a/src/main/liberty/config/server.xml
+++ b/src/main/liberty/config/server.xml
@@ -95,18 +95,18 @@
                maxQueueDepth="5000" />
     </messagingEngine>
 
-    <jmsQueueConnectionFactory connectionManagerRef="CargoCM" jndiName="java:app/jms/QueueConnectionFactory">
+    <jmsQueueConnectionFactory connectionManagerRef="CargoCM" jndiName="jms/QueueConnectionFactory">
     </jmsQueueConnectionFactory>
 
-    <jmsQueue id="CargoHandledQueue" jndiName="java:app/jms/CargoHandledQueue">
+    <jmsQueue id="CargoHandledQueue" jndiName="jms/CargoHandledQueue">
         <properties.wasJms queueName="CargoHandledQueue"/>
     </jmsQueue>
 
     <jmsActivationSpec id="cargo-tracker/CargoHandledConsumer">
-        <properties.wasJms destinationLookup="java:app/jms/CargoHandledQueue" destinationRef="CargoHandledQueue" destinationType="jakarta.jms.Queue" maxConcurrency="200"/>
+        <properties.wasJms destinationLookup="jms/CargoHandledQueue" destinationRef="CargoHandledQueue" destinationType="jakarta.jms.Queue" maxConcurrency="200"/>
     </jmsActivationSpec>  
 
-    <jmsQueue id="MisdirectedCargoQueue" jndiName="java:app/jms/MisdirectedCargoQueue">
+    <jmsQueue id="MisdirectedCargoQueue" jndiName="jms/MisdirectedCargoQueue">
         <properties.wasJms queueName="MisdirectedCargoQueue"/>
     </jmsQueue>
 
@@ -114,7 +114,7 @@
         <properties.wasJms destinationRef="MisdirectedCargoQueue" destinationType="jakarta.jms.Queue" maxConcurrency="200"/>
     </jmsActivationSpec>  
 
-    <jmsQueue id="DeliveredCargoQueue" jndiName="java:app/jms/DeliveredCargoQueue">
+    <jmsQueue id="DeliveredCargoQueue" jndiName="jms/DeliveredCargoQueue">
         <properties.wasJms queueName="DeliveredCargoQueue"/>
     </jmsQueue>
 
@@ -122,7 +122,7 @@
         <properties.wasJms destinationRef="DeliveredCargoQueue" destinationType="jakarta.jms.Queue" maxConcurrency="200"/>
     </jmsActivationSpec>  
 
-    <jmsQueue id="HandlingEventRegistrationAttemptQueue" jndiName="java:app/jms/HandlingEventRegistrationAttemptQueue">
+    <jmsQueue id="HandlingEventRegistrationAttemptQueue" jndiName="jms/HandlingEventRegistrationAttemptQueue">
         <properties.wasJms queueName="HandlingEventRegistrationAttemptQueue"/>
     </jmsQueue>
 
@@ -130,7 +130,7 @@
         <properties.wasJms destinationRef="HandlingEventRegistrationAttemptQueue" destinationType="jakarta.jms.Queue" maxConcurrency="200"/>
     </jmsActivationSpec>  
 
-    <jmsQueue id="RejectedRegistrationAttemptsQueue" jndiName="java:app/jms/RejectedRegistrationAttemptsQueue">
+    <jmsQueue id="RejectedRegistrationAttemptsQueue" jndiName="jms/RejectedRegistrationAttemptsQueue">
         <properties.wasJms queueName="RejectedRegistrationAttemptsQueue"/>
     </jmsQueue>
 
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 80f7a76..368552a 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -64,27 +64,27 @@
     <!-- Defining these at the application server level instead of here can 
 	 be more operations friendly and help make deployment even faster. -->
     <jms-destination>
-        <name>java:app/jms/CargoHandledQueue</name>
+        <name>jms/CargoHandledQueue</name>
         <interface-name>jakarta.jms.Queue</interface-name>
         <destination-name>CargoHandledQueue</destination-name>
     </jms-destination>
     <jms-destination>
-        <name>java:app/jms/MisdirectedCargoQueue</name>
+        <name>jms/MisdirectedCargoQueue</name>
         <interface-name>jakarta.jms.Queue</interface-name>
         <destination-name>MisdirectedCargoQueue</destination-name>
     </jms-destination>
     <jms-destination>
-        <name>java:app/jms/DeliveredCargoQueue</name>
+        <name>jms/DeliveredCargoQueue</name>
         <interface-name>jakarta.jms.Queue</interface-name>
         <destination-name>DeliveredCargoQueue</destination-name>
     </jms-destination>
     <jms-destination>
-        <name>java:app/jms/RejectedRegistrationAttemptsQueue</name>
+        <name>jms/RejectedRegistrationAttemptsQueue</name>
         <interface-name>jakarta.jms.Queue</interface-name>
         <destination-name>RejectedRegistrationAttemptsQueue</destination-name>
     </jms-destination>
     <jms-destination>
-        <name>java:app/jms/HandlingEventRegistrationAttemptQueue</name>
+        <name>jms/HandlingEventRegistrationAttemptQueue</name>
         <interface-name>jakarta.jms.Queue</interface-name>
         <destination-name>HandlingEventRegistrationAttemptQueue</destination-name>
     </jms-destination>