diff --git a/osgp/platform/osgp-adapter-domain-admin/Dockerfile b/osgp/platform/osgp-adapter-domain-admin/Dockerfile
index 3545a882fa..43126cd629 100644
--- a/osgp/platform/osgp-adapter-domain-admin/Dockerfile
+++ b/osgp/platform/osgp-adapter-domain-admin/Dockerfile
@@ -11,4 +11,4 @@ RUN mkdir -p /var/log/osp && \
     mkdir -p /usr/local/tomcat/webapps/probe/ && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/platform/osgp-adapter-domain-admin/pom.xml b/osgp/platform/osgp-adapter-domain-admin/pom.xml
index 30426cc7e7..a779910499 100644
--- a/osgp/platform/osgp-adapter-domain-admin/pom.xml
+++ b/osgp/platform/osgp-adapter-domain-admin/pom.xml
@@ -32,6 +32,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <attachClasses>true</attachClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>
diff --git a/osgp/platform/osgp-adapter-domain-core/Dockerfile b/osgp/platform/osgp-adapter-domain-core/Dockerfile
index 3545a882fa..43126cd629 100644
--- a/osgp/platform/osgp-adapter-domain-core/Dockerfile
+++ b/osgp/platform/osgp-adapter-domain-core/Dockerfile
@@ -11,4 +11,4 @@ RUN mkdir -p /var/log/osp && \
     mkdir -p /usr/local/tomcat/webapps/probe/ && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/platform/osgp-adapter-domain-core/pom.xml b/osgp/platform/osgp-adapter-domain-core/pom.xml
index a32508a0b1..41ba3b1093 100644
--- a/osgp/platform/osgp-adapter-domain-core/pom.xml
+++ b/osgp/platform/osgp-adapter-domain-core/pom.xml
@@ -32,6 +32,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <attachClasses>true</attachClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>
diff --git a/osgp/platform/osgp-adapter-domain-publiclighting/Dockerfile b/osgp/platform/osgp-adapter-domain-publiclighting/Dockerfile
index 3545a882fa..43126cd629 100644
--- a/osgp/platform/osgp-adapter-domain-publiclighting/Dockerfile
+++ b/osgp/platform/osgp-adapter-domain-publiclighting/Dockerfile
@@ -11,4 +11,4 @@ RUN mkdir -p /var/log/osp && \
     mkdir -p /usr/local/tomcat/webapps/probe/ && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/platform/osgp-adapter-domain-publiclighting/pom.xml b/osgp/platform/osgp-adapter-domain-publiclighting/pom.xml
index 672627e705..416c79203f 100644
--- a/osgp/platform/osgp-adapter-domain-publiclighting/pom.xml
+++ b/osgp/platform/osgp-adapter-domain-publiclighting/pom.xml
@@ -32,6 +32,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <attachClasses>true</attachClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>
diff --git a/osgp/platform/osgp-adapter-domain-smartmetering/Dockerfile b/osgp/platform/osgp-adapter-domain-smartmetering/Dockerfile
index 3545a882fa..43126cd629 100644
--- a/osgp/platform/osgp-adapter-domain-smartmetering/Dockerfile
+++ b/osgp/platform/osgp-adapter-domain-smartmetering/Dockerfile
@@ -11,4 +11,4 @@ RUN mkdir -p /var/log/osp && \
     mkdir -p /usr/local/tomcat/webapps/probe/ && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/platform/osgp-adapter-domain-smartmetering/pom.xml b/osgp/platform/osgp-adapter-domain-smartmetering/pom.xml
index fd1d2efb3c..a40df40926 100644
--- a/osgp/platform/osgp-adapter-domain-smartmetering/pom.xml
+++ b/osgp/platform/osgp-adapter-domain-smartmetering/pom.xml
@@ -33,6 +33,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <attachClasses>true</attachClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>
diff --git a/osgp/platform/osgp-adapter-domain-tariffswitching/Dockerfile b/osgp/platform/osgp-adapter-domain-tariffswitching/Dockerfile
index 3545a882fa..43126cd629 100644
--- a/osgp/platform/osgp-adapter-domain-tariffswitching/Dockerfile
+++ b/osgp/platform/osgp-adapter-domain-tariffswitching/Dockerfile
@@ -11,4 +11,4 @@ RUN mkdir -p /var/log/osp && \
     mkdir -p /usr/local/tomcat/webapps/probe/ && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/platform/osgp-adapter-domain-tariffswitching/pom.xml b/osgp/platform/osgp-adapter-domain-tariffswitching/pom.xml
index 97d9803eac..033136f0f8 100644
--- a/osgp/platform/osgp-adapter-domain-tariffswitching/pom.xml
+++ b/osgp/platform/osgp-adapter-domain-tariffswitching/pom.xml
@@ -32,6 +32,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <attachClasses>true</attachClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>
diff --git a/osgp/platform/osgp-adapter-ws-admin/Dockerfile b/osgp/platform/osgp-adapter-ws-admin/Dockerfile
index 3545a882fa..43126cd629 100644
--- a/osgp/platform/osgp-adapter-ws-admin/Dockerfile
+++ b/osgp/platform/osgp-adapter-ws-admin/Dockerfile
@@ -11,4 +11,4 @@ RUN mkdir -p /var/log/osp && \
     mkdir -p /usr/local/tomcat/webapps/probe/ && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/platform/osgp-adapter-ws-admin/pom.xml b/osgp/platform/osgp-adapter-ws-admin/pom.xml
index 591c5b97a7..298827f8a4 100644
--- a/osgp/platform/osgp-adapter-ws-admin/pom.xml
+++ b/osgp/platform/osgp-adapter-ws-admin/pom.xml
@@ -37,6 +37,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <attachClasses>true</attachClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>
diff --git a/osgp/platform/osgp-adapter-ws-core/Dockerfile b/osgp/platform/osgp-adapter-ws-core/Dockerfile
index 3545a882fa..43126cd629 100644
--- a/osgp/platform/osgp-adapter-ws-core/Dockerfile
+++ b/osgp/platform/osgp-adapter-ws-core/Dockerfile
@@ -11,4 +11,4 @@ RUN mkdir -p /var/log/osp && \
     mkdir -p /usr/local/tomcat/webapps/probe/ && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/platform/osgp-adapter-ws-core/pom.xml b/osgp/platform/osgp-adapter-ws-core/pom.xml
index 3e6a7e12b5..72cd067b53 100644
--- a/osgp/platform/osgp-adapter-ws-core/pom.xml
+++ b/osgp/platform/osgp-adapter-ws-core/pom.xml
@@ -34,6 +34,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <attachClasses>true</attachClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>
diff --git a/osgp/platform/osgp-adapter-ws-publiclighting/Dockerfile b/osgp/platform/osgp-adapter-ws-publiclighting/Dockerfile
index 3545a882fa..43126cd629 100644
--- a/osgp/platform/osgp-adapter-ws-publiclighting/Dockerfile
+++ b/osgp/platform/osgp-adapter-ws-publiclighting/Dockerfile
@@ -11,4 +11,4 @@ RUN mkdir -p /var/log/osp && \
     mkdir -p /usr/local/tomcat/webapps/probe/ && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/platform/osgp-adapter-ws-publiclighting/pom.xml b/osgp/platform/osgp-adapter-ws-publiclighting/pom.xml
index d6991193a1..ce89ae9f1f 100644
--- a/osgp/platform/osgp-adapter-ws-publiclighting/pom.xml
+++ b/osgp/platform/osgp-adapter-ws-publiclighting/pom.xml
@@ -33,6 +33,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <attachClasses>true</attachClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>
diff --git a/osgp/platform/osgp-adapter-ws-smartmetering/Dockerfile b/osgp/platform/osgp-adapter-ws-smartmetering/Dockerfile
index 3545a882fa..43126cd629 100644
--- a/osgp/platform/osgp-adapter-ws-smartmetering/Dockerfile
+++ b/osgp/platform/osgp-adapter-ws-smartmetering/Dockerfile
@@ -11,4 +11,4 @@ RUN mkdir -p /var/log/osp && \
     mkdir -p /usr/local/tomcat/webapps/probe/ && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/platform/osgp-adapter-ws-smartmetering/pom.xml b/osgp/platform/osgp-adapter-ws-smartmetering/pom.xml
index c164495aa8..c604cd7f4e 100644
--- a/osgp/platform/osgp-adapter-ws-smartmetering/pom.xml
+++ b/osgp/platform/osgp-adapter-ws-smartmetering/pom.xml
@@ -33,6 +33,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <attachClasses>true</attachClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>
diff --git a/osgp/platform/osgp-adapter-ws-tariffswitching/Dockerfile b/osgp/platform/osgp-adapter-ws-tariffswitching/Dockerfile
index 3545a882fa..43126cd629 100644
--- a/osgp/platform/osgp-adapter-ws-tariffswitching/Dockerfile
+++ b/osgp/platform/osgp-adapter-ws-tariffswitching/Dockerfile
@@ -11,4 +11,4 @@ RUN mkdir -p /var/log/osp && \
     mkdir -p /usr/local/tomcat/webapps/probe/ && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/platform/osgp-adapter-ws-tariffswitching/pom.xml b/osgp/platform/osgp-adapter-ws-tariffswitching/pom.xml
index f3f6ab2e0d..fee48c91f8 100644
--- a/osgp/platform/osgp-adapter-ws-tariffswitching/pom.xml
+++ b/osgp/platform/osgp-adapter-ws-tariffswitching/pom.xml
@@ -33,6 +33,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <attachClasses>true</attachClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>
diff --git a/osgp/platform/osgp-core/Dockerfile b/osgp/platform/osgp-core/Dockerfile
index ba025df91c..13a70f1116 100644
--- a/osgp/platform/osgp-core/Dockerfile
+++ b/osgp/platform/osgp-core/Dockerfile
@@ -12,4 +12,4 @@ RUN mkdir -p /var/log/osp && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
 COPY context.xml /usr/local/tomcat/conf
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/platform/osgp-core/pom.xml b/osgp/platform/osgp-core/pom.xml
index 886cd96fc1..1f102f4d65 100644
--- a/osgp/platform/osgp-core/pom.xml
+++ b/osgp/platform/osgp-core/pom.xml
@@ -33,6 +33,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <attachClasses>true</attachClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>
diff --git a/osgp/platform/osgp-logging/Dockerfile b/osgp/platform/osgp-logging/Dockerfile
index ba025df91c..13a70f1116 100644
--- a/osgp/platform/osgp-logging/Dockerfile
+++ b/osgp/platform/osgp-logging/Dockerfile
@@ -12,4 +12,4 @@ RUN mkdir -p /var/log/osp && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
 COPY context.xml /usr/local/tomcat/conf
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/platform/osgp-logging/pom.xml b/osgp/platform/osgp-logging/pom.xml
index d6e06ff1f3..214f55f407 100644
--- a/osgp/platform/osgp-logging/pom.xml
+++ b/osgp/platform/osgp-logging/pom.xml
@@ -32,6 +32,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <attachClasses>true</attachClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>
diff --git a/osgp/protocol-adapter-iec60870/osgp-protocol-adapter-iec60870/Dockerfile b/osgp/protocol-adapter-iec60870/osgp-protocol-adapter-iec60870/Dockerfile
index ba025df91c..13a70f1116 100644
--- a/osgp/protocol-adapter-iec60870/osgp-protocol-adapter-iec60870/Dockerfile
+++ b/osgp/protocol-adapter-iec60870/osgp-protocol-adapter-iec60870/Dockerfile
@@ -12,4 +12,4 @@ RUN mkdir -p /var/log/osp && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
 COPY context.xml /usr/local/tomcat/conf
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/protocol-adapter-iec60870/osgp-protocol-adapter-iec60870/pom.xml b/osgp/protocol-adapter-iec60870/osgp-protocol-adapter-iec60870/pom.xml
index 4a60553b16..d935371255 100644
--- a/osgp/protocol-adapter-iec60870/osgp-protocol-adapter-iec60870/pom.xml
+++ b/osgp/protocol-adapter-iec60870/osgp-protocol-adapter-iec60870/pom.xml
@@ -225,6 +225,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <attachClasses>true</attachClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>
diff --git a/osgp/protocol-adapter-iec61850/osgp-protocol-adapter-iec61850/Dockerfile b/osgp/protocol-adapter-iec61850/osgp-protocol-adapter-iec61850/Dockerfile
index ba025df91c..13a70f1116 100644
--- a/osgp/protocol-adapter-iec61850/osgp-protocol-adapter-iec61850/Dockerfile
+++ b/osgp/protocol-adapter-iec61850/osgp-protocol-adapter-iec61850/Dockerfile
@@ -12,4 +12,4 @@ RUN mkdir -p /var/log/osp && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
 COPY context.xml /usr/local/tomcat/conf
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/protocol-adapter-iec61850/osgp-protocol-adapter-iec61850/pom.xml b/osgp/protocol-adapter-iec61850/osgp-protocol-adapter-iec61850/pom.xml
index eea28034dd..2900d1239a 100644
--- a/osgp/protocol-adapter-iec61850/osgp-protocol-adapter-iec61850/pom.xml
+++ b/osgp/protocol-adapter-iec61850/osgp-protocol-adapter-iec61850/pom.xml
@@ -32,6 +32,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <attachClasses>true</attachClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>
diff --git a/osgp/protocol-adapter-oslp/osgp-protocol-adapter-oslp-elster/Dockerfile b/osgp/protocol-adapter-oslp/osgp-protocol-adapter-oslp-elster/Dockerfile
index ba025df91c..13a70f1116 100644
--- a/osgp/protocol-adapter-oslp/osgp-protocol-adapter-oslp-elster/Dockerfile
+++ b/osgp/protocol-adapter-oslp/osgp-protocol-adapter-oslp-elster/Dockerfile
@@ -12,4 +12,4 @@ RUN mkdir -p /var/log/osp && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
 COPY context.xml /usr/local/tomcat/conf
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/protocol-adapter-oslp/osgp-protocol-adapter-oslp-elster/pom.xml b/osgp/protocol-adapter-oslp/osgp-protocol-adapter-oslp-elster/pom.xml
index b17cfee1ca..d0c1af332e 100644
--- a/osgp/protocol-adapter-oslp/osgp-protocol-adapter-oslp-elster/pom.xml
+++ b/osgp/protocol-adapter-oslp/osgp-protocol-adapter-oslp-elster/pom.xml
@@ -32,6 +32,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <attachClasses>true</attachClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>
diff --git a/osgp/protocol-adapter-oslp/signing-server/Dockerfile b/osgp/protocol-adapter-oslp/signing-server/Dockerfile
index 3545a882fa..43126cd629 100644
--- a/osgp/protocol-adapter-oslp/signing-server/Dockerfile
+++ b/osgp/protocol-adapter-oslp/signing-server/Dockerfile
@@ -11,4 +11,4 @@ RUN mkdir -p /var/log/osp && \
     mkdir -p /usr/local/tomcat/webapps/probe/ && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/protocol-adapter-oslp/signing-server/pom.xml b/osgp/protocol-adapter-oslp/signing-server/pom.xml
index f5a9ab0bfb..41c681e3c8 100644
--- a/osgp/protocol-adapter-oslp/signing-server/pom.xml
+++ b/osgp/protocol-adapter-oslp/signing-server/pom.xml
@@ -32,6 +32,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <attachClasses>true</attachClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>
diff --git a/osgp/protocol-adapter-oslp/web-device-simulator/Dockerfile b/osgp/protocol-adapter-oslp/web-device-simulator/Dockerfile
index 3545a882fa..43126cd629 100644
--- a/osgp/protocol-adapter-oslp/web-device-simulator/Dockerfile
+++ b/osgp/protocol-adapter-oslp/web-device-simulator/Dockerfile
@@ -11,4 +11,4 @@ RUN mkdir -p /var/log/osp && \
     mkdir -p /usr/local/tomcat/webapps/probe/ && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/protocol-adapter-oslp/web-device-simulator/pom.xml b/osgp/protocol-adapter-oslp/web-device-simulator/pom.xml
index 58dbdb2e47..6608a38b4f 100644
--- a/osgp/protocol-adapter-oslp/web-device-simulator/pom.xml
+++ b/osgp/protocol-adapter-oslp/web-device-simulator/pom.xml
@@ -252,6 +252,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>
             <nonFilteredFileExtension>gif</nonFilteredFileExtension>