diff --git a/server/dockerfile b/server/dockerfile
index a30a5c2..42a5cfe 100644
--- a/server/dockerfile
+++ b/server/dockerfile
@@ -3,9 +3,6 @@ FROM node:16-alpine
 # set nodejs to production mode
 ENV NODE_ENV production
 
-# use non-root user
-USER node
-
 # Change to directory owned by node user
 WORKDIR /home/openbackhaul/ExecutionAndTraceLog
 
@@ -18,8 +15,11 @@ COPY --chown=node:node package*.json ./
 # If you are building your code for production
 RUN npm ci --only=production
 
+# use non-root user
+USER node
+
 # Bundle app source
 COPY --chown=node:node . .
 
 EXPOSE 3002
-CMD [ "node", "index.js" ]
\ No newline at end of file
+CMD [ "node", "index.js" ]
diff --git a/server/index.js b/server/index.js
index 7c816cb..39154da 100644
--- a/server/index.js
+++ b/server/index.js
@@ -36,3 +36,5 @@ global.databasePath = './database/load.json'
 prepareElasticsearch(false).then().catch(err => {
     console.error(`Error preparing Elasticsearch : ${err}`);
 });
+
+appCommons.performApplicationRegistration();
diff --git a/server/package-lock.json b/server/package-lock.json
index 136d2b2..99b015f 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -12,8 +12,8 @@
         "connect": "^3.2.0",
         "http-errors": "^2.0.0",
         "js-yaml": "^3.3.0",
-        "onf-core-model-ap": "2.0.1-alpha.19",
-        "onf-core-model-ap-bs": "2.0.1-alpha.19",
+        "onf-core-model-ap": "2.0.1-alpha.22",
+        "onf-core-model-ap-bs": "2.0.1-alpha.22",
         "openbackhaul-oas3-tools": "2.3.1-alpha.3"
       }
     },
@@ -224,6 +224,11 @@
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
       "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
     },
+    "node_modules/async-lock": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/async-lock/-/async-lock-1.4.0.tgz",
+      "integrity": "sha512-coglx5yIWuetakm3/1dsX9hxCNox22h7+V80RQOu2XUUMidtArxKoZoOtHUPuR84SycKTXzgGzAUR5hJxujyJQ=="
+    },
     "node_modules/axios": {
       "version": "0.21.4",
       "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
@@ -1009,11 +1014,12 @@
       }
     },
     "node_modules/onf-core-model-ap": {
-      "version": "2.0.1-alpha.19",
-      "resolved": "https://registry.npmjs.org/onf-core-model-ap/-/onf-core-model-ap-2.0.1-alpha.19.tgz",
-      "integrity": "sha512-vRfGTU4BK0a8bDYtimjDqwN10WLSbbAYh0B9yDYLFftVSJqSXEBDH5CW78d96ab39URJwYa3bRY7GH3JrywCSg==",
+      "version": "2.0.1-alpha.22",
+      "resolved": "https://registry.npmjs.org/onf-core-model-ap/-/onf-core-model-ap-2.0.1-alpha.22.tgz",
+      "integrity": "sha512-I0NvlnmPBgS/N4lxgsRzeP0QY6T31MFmP8fQn+N22DIDapr/QBZfQedjEBlIYXu89kNtf/h0IS3uBWVkW091hA==",
       "dependencies": {
         "@elastic/elasticsearch": "~7.17.0",
+        "async-lock": "^1.4.0",
         "axios": "^0.21.1",
         "base-64": "^1.0.0",
         "connect": "^3.2.0",
@@ -1027,9 +1033,9 @@
       }
     },
     "node_modules/onf-core-model-ap-bs": {
-      "version": "2.0.1-alpha.19",
-      "resolved": "https://registry.npmjs.org/onf-core-model-ap-bs/-/onf-core-model-ap-bs-2.0.1-alpha.19.tgz",
-      "integrity": "sha512-bhBhKse+chokpVSw32zcxZsRNjY1Rsumuc4Pz/MrhUvE1+HzqAziJgtvjP9PUzAKayldE2IevO2XodMOdbweiw==",
+      "version": "2.0.1-alpha.22",
+      "resolved": "https://registry.npmjs.org/onf-core-model-ap-bs/-/onf-core-model-ap-bs-2.0.1-alpha.22.tgz",
+      "integrity": "sha512-Y4Rb7hMs6eYgNiibolvThqwo0bJI0urOTVOogdIUEiV4W2rEVXTXPy/uGQSbWE0UdoP4xWyw7nl/xvAZzmXSQw==",
       "dependencies": {
         "axios": "^0.21.1",
         "base-64": "^1.0.0",
@@ -1038,7 +1044,7 @@
         "js-yaml": "^3.3.0",
         "moment": "^2.29.1",
         "node-statsd": "^0.1.1",
-        "onf-core-model-ap": "2.0.1-alpha.19",
+        "onf-core-model-ap": "2.0.1-alpha.22",
         "openbackhaul-oas3-tools": "2.3.1-alpha.3",
         "randexp": "^0.5.3",
         "response-time": "^2.3.2"
@@ -1653,6 +1659,11 @@
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
       "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
     },
+    "async-lock": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/async-lock/-/async-lock-1.4.0.tgz",
+      "integrity": "sha512-coglx5yIWuetakm3/1dsX9hxCNox22h7+V80RQOu2XUUMidtArxKoZoOtHUPuR84SycKTXzgGzAUR5hJxujyJQ=="
+    },
     "axios": {
       "version": "0.21.4",
       "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
@@ -2255,11 +2266,12 @@
       "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="
     },
     "onf-core-model-ap": {
-      "version": "2.0.1-alpha.19",
-      "resolved": "https://registry.npmjs.org/onf-core-model-ap/-/onf-core-model-ap-2.0.1-alpha.19.tgz",
-      "integrity": "sha512-vRfGTU4BK0a8bDYtimjDqwN10WLSbbAYh0B9yDYLFftVSJqSXEBDH5CW78d96ab39URJwYa3bRY7GH3JrywCSg==",
+      "version": "2.0.1-alpha.22",
+      "resolved": "https://registry.npmjs.org/onf-core-model-ap/-/onf-core-model-ap-2.0.1-alpha.22.tgz",
+      "integrity": "sha512-I0NvlnmPBgS/N4lxgsRzeP0QY6T31MFmP8fQn+N22DIDapr/QBZfQedjEBlIYXu89kNtf/h0IS3uBWVkW091hA==",
       "requires": {
         "@elastic/elasticsearch": "~7.17.0",
+        "async-lock": "^1.4.0",
         "axios": "^0.21.1",
         "base-64": "^1.0.0",
         "connect": "^3.2.0",
@@ -2273,9 +2285,9 @@
       }
     },
     "onf-core-model-ap-bs": {
-      "version": "2.0.1-alpha.19",
-      "resolved": "https://registry.npmjs.org/onf-core-model-ap-bs/-/onf-core-model-ap-bs-2.0.1-alpha.19.tgz",
-      "integrity": "sha512-bhBhKse+chokpVSw32zcxZsRNjY1Rsumuc4Pz/MrhUvE1+HzqAziJgtvjP9PUzAKayldE2IevO2XodMOdbweiw==",
+      "version": "2.0.1-alpha.22",
+      "resolved": "https://registry.npmjs.org/onf-core-model-ap-bs/-/onf-core-model-ap-bs-2.0.1-alpha.22.tgz",
+      "integrity": "sha512-Y4Rb7hMs6eYgNiibolvThqwo0bJI0urOTVOogdIUEiV4W2rEVXTXPy/uGQSbWE0UdoP4xWyw7nl/xvAZzmXSQw==",
       "requires": {
         "axios": "^0.21.1",
         "base-64": "^1.0.0",
@@ -2284,7 +2296,7 @@
         "js-yaml": "^3.3.0",
         "moment": "^2.29.1",
         "node-statsd": "^0.1.1",
-        "onf-core-model-ap": "2.0.1-alpha.19",
+        "onf-core-model-ap": "2.0.1-alpha.22",
         "openbackhaul-oas3-tools": "2.3.1-alpha.3",
         "randexp": "^0.5.3",
         "response-time": "^2.3.2"
diff --git a/server/package.json b/server/package.json
index e32530a..1bb119e 100644
--- a/server/package.json
+++ b/server/package.json
@@ -16,8 +16,8 @@
     "connect": "^3.2.0",
     "http-errors": "^2.0.0",
     "js-yaml": "^3.3.0",
-    "onf-core-model-ap": "2.0.1-alpha.19",
-    "onf-core-model-ap-bs": "2.0.1-alpha.19",
+    "onf-core-model-ap": "2.0.1-alpha.22",
+    "onf-core-model-ap-bs": "2.0.1-alpha.22",
     "openbackhaul-oas3-tools": "2.3.1-alpha.3"
   }
 }