diff --git a/recipes-app/fofb-opcua-server/files/devices.dmap b/recipes-app/fofb-opcua-server/files/devices.dmap
index 0dda99fed59c714555cdf0a91a2a95e5e4b89a2c..db9e2c8f802f72e0b15240d5afdd2792f8951a37 100644
--- a/recipes-app/fofb-opcua-server/files/devices.dmap
+++ b/recipes-app/fofb-opcua-server/files/devices.dmap
@@ -1 +1 @@
-APPUIO (uio:uio0?map=/opt/fofb-opcua-server/app.mapt)
+APPUIO (uio:uio0?map=/opt/fofb/map/app.mapt)
diff --git a/recipes-app/fofb-opcua-server/files/fofb-opcua-server.sh b/recipes-app/fofb-opcua-server/files/fofb-opcua-server.sh
index b0b2904cbf432dee444d8368c21f9d84b41f6799..abb62bad93ffaddf175dcea79b595877ff62976e 100755
--- a/recipes-app/fofb-opcua-server/files/fofb-opcua-server.sh
+++ b/recipes-app/fofb-opcua-server/files/fofb-opcua-server.sh
@@ -13,7 +13,7 @@ start() {
     fi
 
     echo "Starting fofb-opcua-server" >> $LOG_FILE
-    cd /opt/fofb-opcua-server
+    cd /opt/fofb/opcua-server
     stdbuf -oL opcua-generic-chimeratk-server01 &>> $LOG_FILE &
 
     ### Create the lock file ###
diff --git a/recipes-app/fofb-opcua-server/fofb-opcua-server_0.1.bb b/recipes-app/fofb-opcua-server/fofb-opcua-server_0.1.bb
index 60d14f0c0cc003c6d503e0e03c8148c9627a0dfe..ff0c7c15eb30e32728c96375f591dc7958d9d9eb 100644
--- a/recipes-app/fofb-opcua-server/fofb-opcua-server_0.1.bb
+++ b/recipes-app/fofb-opcua-server/fofb-opcua-server_0.1.bb
@@ -18,13 +18,13 @@ SRC_URI = " \
 
 RDEPENDS_${PN}=" genericdeviceserver-opcua bash"
 
-FILES_${PN}+="/opt/fofb-opcua-server/*"
+FILES_${PN}+="/opt/fofb/opcua-server/*"
 FILES_${PN}+="/etc/init.d/fofb-opcua-server.sh"
 
 do_install() {
-    install -d ${D}/opt/fofb-opcua-server/
-    install -m 0644 ${WORKDIR}/devices.dmap ${D}/opt/fofb-opcua-server/devices.dmap
-    install -m 0644 ${WORKDIR}/generic_chimeratk_server_configuration.xml ${D}/opt/fofb-opcua-server/generic_chimeratk_server_configuration.xml
+    install -d ${D}/opt/fofb/opcua-server/
+    install -m 0644 ${WORKDIR}/devices.dmap ${D}/opt/fofb/opcua-server/devices.dmap
+    install -m 0644 ${WORKDIR}/generic_chimeratk_server_configuration.xml ${D}/opt/fofb/opcua-server/generic_chimeratk_server_configuration.xml
 
     install -d ${D}/etc/init.d/
     install -m 0755 ${WORKDIR}/fofb-opcua-server.sh ${D}/etc/init.d/fofb-opcua-server.sh