diff --git a/Docker-Swarm-deployment/single-node/acl-apd/acl-apd-stack.yaml b/Docker-Swarm-deployment/single-node/acl-apd/acl-apd-stack.yaml
index 19bbd5514..c81b6e679 100644
--- a/Docker-Swarm-deployment/single-node/acl-apd/acl-apd-stack.yaml
+++ b/Docker-Swarm-deployment/single-node/acl-apd/acl-apd-stack.yaml
@@ -7,7 +7,7 @@ networks:
 
 services:
   acl-apd:
-    image: ghcr.io/datakaveri/acl-apd-depl:5.0.0-alpha-92f87e8
+    image: ghcr.io/datakaveri/acl-apd-depl:1.0.0-66c8df1
     env_file:
       - ./secrets/.apd.env
     read_only: true
@@ -36,6 +36,7 @@ services:
       options:
         max-file: "5"
         max-size: "10m"
+        tag: "{\"name\":\"{{.Name}}\",\"id\":\"{{.ID}}\"}"
     command:  bash -c "exec java $$FS_JAVA_OPTS  -Dvertx.logger-delegate-factory-class-name=io.vertx.core.logging.Log4j2LogDelegateFactory -jar ./fatjar.jar  --host $$(hostname) -c secrets/configs/config.json"
 
 secrets:
diff --git a/Docker-Swarm-deployment/single-node/acl-apd/example-secrets/secrets/config.json b/Docker-Swarm-deployment/single-node/acl-apd/example-secrets/secrets/config.json
index e1a4702f9..d39eb15c1 100644
--- a/Docker-Swarm-deployment/single-node/acl-apd/example-secrets/secrets/config.json
+++ b/Docker-Swarm-deployment/single-node/acl-apd/example-secrets/secrets/config.json
@@ -1,6 +1,8 @@
 {
   "version": "1.0",
-  "zookeepers": ["zookeeper"],
+  "zookeepers": [
+  "zookeeper"
+  ],
   "clusterId": "iudx-acl-apd-cluster",
   "commonConfig": {
     "dxApiBasePath": "/ngsi-ld/v1",
@@ -9,8 +11,10 @@
     "catServerHost": "<catalogue-domain>",
     "catServerPort": 443,
     "authHost": "<authhost>",
+    "authPort": 443,
     "databaseIP": "tasks.postgres",
     "databasePort": 5432,
+    "databaseSchema" : "<database-aclApd-schema>",
     "databaseName": "<database-name>",
     "databaseUserName": "<datbase-user-name>",
     "databasePassword": "<database-password>",
@@ -38,7 +42,6 @@
       "id": "iudx.apd.acl.server.notification.NotificationVerticle",
       "isWorkerVerticle": false,
       "verticleInstances": 1,
-      "authPort": 443,
       "domain": "iudx.io",
       "emailHostName": "<email-hostname>",
       "emailPort": 2587,
@@ -78,8 +81,6 @@
       "prodVhost": "IUDX",
       "internalVhost": "IUDX-INTERNAL",
       "externalVhost": "IUDX-EXTERNAL"
-    }
-    
+    } 
   ]
 }
-
diff --git a/Docker-Swarm-deployment/single-node/auditing-server/auditing-stack.yaml b/Docker-Swarm-deployment/single-node/auditing-server/auditing-stack.yaml
index e51e9b091..30d9210bc 100644
--- a/Docker-Swarm-deployment/single-node/auditing-server/auditing-stack.yaml
+++ b/Docker-Swarm-deployment/single-node/auditing-server/auditing-stack.yaml
@@ -2,7 +2,7 @@ version: "3.9"
 
 services:
   auditing:
-    image: ghcr.io/datakaveri/auditing-server-depl:1.5.0-alpha-7eb8130
+    image: ghcr.io/datakaveri/auditing-server-depl:5.0.0-d332b94
     read_only: true
     cap_drop:
       - ALL
diff --git a/Docker-Swarm-deployment/single-node/auditing-server/example-secrets/secrets/config.json b/Docker-Swarm-deployment/single-node/auditing-server/example-secrets/secrets/config.json
index 1014a952d..45987acdc 100644
--- a/Docker-Swarm-deployment/single-node/auditing-server/example-secrets/secrets/config.json
+++ b/Docker-Swarm-deployment/single-node/auditing-server/example-secrets/secrets/config.json
@@ -47,19 +47,21 @@
     },
     {
       "id": "iudx.auditing.server.immudb.ImmudbVerticle",
+      "isWorkerVerticle": false,
       "verticleInstances": 1,
       "meteringDatabaseIP": "tasks.immudb",
       "meteringDatabasePort": 5432,
-      "meteringRSDatabaseName": "iudxrsorg",
+      "meteringRSDatabaseName": "iudx",
       "meteringRSDatabaseUserName": "iudx_rs",
       "meteringRSDatabasePassword": "<immudb-rs-db-password:- cat iudx-deployment/Docker-Swarm-deployment/single-node/immudb/secrets/passwords/rs-password>",
-      "meteringAAADatabaseName": "iudxauth",
+      "meteringAAADatabaseName": "iudx",
       "meteringAAADatabaseUserName": "iudx_auth",
       "meteringAAADatabasePassword": "<immudb-aaa-db-password:- cat iudx-deployment/Docker-Swarm-deployment/single-node/immudb/secrets/passwords/auth-password>",
-      "meteringCATDatabaseName": "iudxcat",
+      "meteringCATDatabaseName": "iudx",
       "meteringCATDatabaseUserName": "iudx_cat",
       "meteringCATDatabasePassword": "<immudb-cat-db-password:- cat iudx-deployment/Docker-Swarm-deployment/single-node/immudb/secrets/passwords/cat-password>",
       "meteringPoolSize": 25
     }
   ]
 }
+
diff --git a/Docker-Swarm-deployment/single-node/auth/auth-stack.yaml b/Docker-Swarm-deployment/single-node/auth/auth-stack.yaml
index c99a8de29..14c5d5d39 100644
--- a/Docker-Swarm-deployment/single-node/auth/auth-stack.yaml
+++ b/Docker-Swarm-deployment/single-node/auth/auth-stack.yaml
@@ -2,7 +2,7 @@ version: "3.9"
 
 services:
   auth:
-    image: ghcr.io/datakaveri/aaa-depl:5.0.0-alpha-0a34c52
+    image: ghcr.io/datakaveri/aaa-depl:5.0.0-3f434f6
     command: bash -c "exec java $$AUTH_JAVA_OPTS  -Dvertx.logger-delegate-factory-class-name=io.vertx.core.logging.Log4j2LogDelegateFactory -jar ./fatjar.jar  --host $$(hostname) -c secrets/configs/config.json"
     cap_drop:
       - ALL
diff --git a/Docker-Swarm-deployment/single-node/auth/example-secrets/secrets/config.json b/Docker-Swarm-deployment/single-node/auth/example-secrets/secrets/config.json
index a1a4d8263..3af83bcfe 100644
--- a/Docker-Swarm-deployment/single-node/auth/example-secrets/secrets/config.json
+++ b/Docker-Swarm-deployment/single-node/auth/example-secrets/secrets/config.json
@@ -18,17 +18,11 @@
       "cosAdminUserId": "<cos-admin-userid>"
     },
     "keycloakOptions": {
-      "keycloakHost": "<keycloak-server-public-domain",
-      "keycloakPort": 443,
       "keycloakRealm": "iudx",
-      "keycloakSite": "https://{{keycloakHost}}/auth/realms/iudx",
       "keycloakUrl": "https://{{keycloakHost}}/auth",
-      "keycloakTokenUri": "/auth/realms/iudx/protocol/openid-connect/token",
       "keycloakAdminClientId": "<AAA-admin Client ID:- get-from-configured-realm>",
       "keycloakAdminClientSecret": "<AAA-admin-Client-Secret:- get-from-configured-realm>",
       "keycloakAdminPoolSize": "10",
-      "keycloakAaaClientId": "<AAA-user client ID:- get-from-configured-realms>",
-      "keycloakAaaClientSecret": "<AAA-user client Secret:- get-from-configured-realm>",
       "keycloakJwtLeeway": 90
     },
     "jwtKeystoreOptions": {
@@ -37,86 +31,42 @@
     }
   },
   "modules": [
-    {
+  {
       "id": "iudx.aaa.server.policy.PolicyVerticle",
       "verticleInstances": 1,
-      "required": [
-        "postgresOptions",
-        "commonOptions"
-      ],
+      "required": [  "postgresOptions",  "commonOptions" ],
       "poolSize": "25",
-      "domain": "<domain-name-of-IUDX-system, Eg: iudx.test>",
       "catalogueOptions": {
         "catServerHost": "<catalogue-api-domain-name>",
         "catServerPort": "443",
-        "catServerItemPath": "/iudx/cat/v1/item"
-      },
-      "authOptions": {
-        "policyExpiry": "12",
-        "adminPolicyExpiry": "60"
-      },
-      "catOptions": {
-        "catURL": "<cat-audience-domain-name>",
-        "catItem": "catalogue/crud"
-      },
-      "resOptions": {
-        "resURL": "<rs-audience-domain-name>"
-      },
-      "emailOptions": {
-        "emailHostName": "<SMTP-host-name>",
-        "emailPort": 2587,
-        "emailUserName": "<SMTP-username>",
-        "emailPassword": "<SMTP-password>",
-        "emailSender": "<sender-email:- eg:  no-reply@example.com>",
-        "emailSupport": "<support-email:-eg:  supportemail@example.com",
-        "publisherPanelUrl": "<publisher-panel-url:- eg: https://publisher.test >",
-        "notifyByEmail": true,
-        "senderName": "<sender-name>"
+        "catServerBasePath": "/iudx/cat/v1"
       }
     },
-    {
+   {
       "id": "iudx.aaa.server.registration.RegistrationVerticle",
       "verticleInstances": 2,
-      "required": [
-        "postgresOptions",
-        "keycloakOptions",
-        "commonOptions"
-      ],
-      "serversOmittedFromRevoke": [
-        "<catalogue-audience-domain>"
-      ],
+      "required": [  "postgresOptions",   "keycloakOptions",   "commonOptions"   ],
+      "serversOmittedFromRevoke": [    "<catalogue-audience-domain>"  ],
       "poolSize": "15"
     },
     {
       "id": "iudx.aaa.server.token.TokenVerticle",
-      "verticleInstances": 2,
-      "required": [
-        "postgresOptions",
-        "commonOptions",
-        "keycloakOptions",
-        "jwtKeystoreOptions"
-      ],
+      "verticleInstances": 1,
+      "required":["postgresOptions", "commonOptions",     "keycloakOptions", "jwtKeystoreOptions"],
       "poolSize": "5"
     },
     {
       "id": "iudx.aaa.server.admin.AdminVerticle",
-      "verticleInstances": 2,
-      "required": [
-        "postgresOptions",
-        "commonOptions",
-        "keycloakOptions"
-      ],
-      "poolSize": "15"
+      "verticleInstances": 1,
+      "required":["postgresOptions", "commonOptions", "keycloakOptions"],
+      "poolSize": "25"
     },
     {
       "id": "iudx.aaa.server.apd.ApdVerticle",
-      "verticleInstances": 2,
-      "required": [
-        "postgresOptions",
-        "commonOptions"
-      ],
+      "verticleInstances": 1,
+      "required":["postgresOptions", "commonOptions"],
       "webClientTimeoutMs": 4000,
-      "poolSize": "15"
+      "poolSize": "25"
     },
     {
       "id": "iudx.aaa.server.auditing.AuditingVerticle",
diff --git a/Docker-Swarm-deployment/single-node/catalogue/cat-stack.yaml b/Docker-Swarm-deployment/single-node/catalogue/cat-stack.yaml
index 336010ded..e3735e5a3 100644
--- a/Docker-Swarm-deployment/single-node/catalogue/cat-stack.yaml
+++ b/Docker-Swarm-deployment/single-node/catalogue/cat-stack.yaml
@@ -2,7 +2,7 @@ version: "3.9"
 
 services:
   cat:
-    image: ghcr.io/datakaveri/cat-prod:5.0.0-alpha-9ea1757
+    image: ghcr.io/datakaveri/cat-prod:5.0.0-cd67af0 
     networks:
       - overlay-net
     secrets:
diff --git a/Docker-Swarm-deployment/single-node/catalogue/example-secrets/secrets/config.json b/Docker-Swarm-deployment/single-node/catalogue/example-secrets/secrets/config.json
index 3a5d006eb..ec1a8ff70 100644
--- a/Docker-Swarm-deployment/single-node/catalogue/example-secrets/secrets/config.json
+++ b/Docker-Swarm-deployment/single-node/catalogue/example-secrets/secrets/config.json
@@ -4,6 +4,7 @@
     "zookeeper"
   ],
   "clusterId": "dx-catalogue-cluster",
+  "host": "server",
   "commonConfig": {
     "dxApiBasePath": "/iudx/cat/v1",
     "dxAuthBasePath": "/auth/v1",
@@ -24,18 +25,16 @@
       "mlayerDomainIndex": "cat_instances",
       "databaseUser": "cat-user",
       "databasePassword": "<elastic-pass:- cat iudx-deployment/Docker-Swarm-deployment/single-node/elk/secrets/passwords/elasticsearch-cat-password>",
-      "databasePort": 9200
+      "databasePort": 9200,
+      "bypassAuth": true
     },
     {
       "id": "iudx.catalogue.server.authenticator.AuthenticationVerticle",
       "host": "<cat-audience-domain>",
-      "tempCopAudience": "<tempCopAudience>",
-      "issuer": "<auth-issuer>",
-      "tempCopIssuer": "<tempCopIssuer>",
-      "keycloakServerHost": "https://{{keycloak-domain}}/auth/realms/demo",
-      "certsEndpoint": "/protocol/openid-connect/certs",
+      "consumerHost": "<consumer-host-domain>",
       "verticleInstances": 1,
       "authServerHost": "<AAA-server-public-domain>",
+      "issuer": "<auth-issuer>",
       "jwtIgnoreExpiry": false
     },
     {
@@ -45,16 +44,29 @@
       "docIndex": "cat",
       "databaseUser": "cat-user",
       "databasePassword": "<elastic-pass:- cat iudx-deployment/Docker-Swarm-deployment/single-node/elk/secrets/passwords/elasticsearch-cat-password>",
-      "verticleInstances": 2
+      "verticleInstances": 2,
+      "@context": ""
     },
     {
       "id": "iudx.catalogue.server.apiserver.ApiServerVerticle",
       "host": "<cat-audience-domain>",
       "ssl": false,
       "ip": "127.0.0.1",
+      "httpPort": 8080,
       "catAdmin": "<catalogue-admin-id>",
       "verticleInstances": 2
     },
+    {
+      "id": "iudx.catalogue.server.auditing.AuditingVerticle",
+      "verticleInstances": 1,
+      "auditingDatabaseIP": "tasks.immudb",
+      "auditingDatabasePort": 5432,
+      "auditingDatabaseName": "iudx",
+      "auditingDatabaseUserName": "iudx_cat",
+      "auditingDatabasePassword": "<immudb-pass:- cat iudx-deployment/Docker-Swarm-deployment/single-node/immudb/secrets/passwords/cat-password>",
+      "auditingPoolSize": 25,
+      "auditingDatabaseTableName": "auditingtable"
+    },
     {
       "id": "iudx.catalogue.server.geocoding.GeocodingVerticle",
       "peliasUrl": "<pelias-service-domain/ip>",
@@ -66,18 +78,7 @@
       "nlpServiceUrl": "<nlp-service-domain/ip>",
       "nlpServicePort": 3000,
       "verticleInstances": 1
-    },
-    {
-      "id": "iudx.catalogue.server.auditing.AuditingVerticle",
-      "verticleInstances": 1,
-      "auditingDatabaseIP": "tasks.immudb",
-      "auditingDatabasePort": 5432,
-      "auditingDatabaseName": "iudxcat",
-      "auditingDatabaseUserName": "iudx_cat",
-      "auditingDatabasePassword": "<immudb-pass:- cat iudx-deployment/Docker-Swarm-deployment/single-node/immudb/secrets/passwords/cat-password>",
-      "auditingPoolSize": 25,
-      "auditingDatabaseTableName": "auditingtable"
-    },
+    },    
     {
       "id": "iudx.catalogue.server.rating.RatingVerticle",
       "verticleInstances": 1,
@@ -107,6 +108,7 @@
     },
     {
       "id": "iudx.catalogue.server.database.postgres.PostgresVerticle",
+      "isWorkerVerticle": false,
       "verticleInstances": 1,
       "databaseIP": "tasks.postgres",
       "databasePort": 5432,
@@ -117,3 +119,4 @@
     }
   ]
 }
+
diff --git a/Docker-Swarm-deployment/single-node/consent-validator/consent-stack.yaml b/Docker-Swarm-deployment/single-node/consent-validator/consent-stack.yaml
index b08d2afd5..851d4cac1 100644
--- a/Docker-Swarm-deployment/single-node/consent-validator/consent-stack.yaml
+++ b/Docker-Swarm-deployment/single-node/consent-validator/consent-stack.yaml
@@ -7,7 +7,7 @@ networks:
 
 services:
   consent:
-    image: ghcr.io/datakaveri/consent-validator:1.0.0-alpha-81ab723
+    image: ghcr.io/datakaveri/consent-validator:1.5.0-e3c3aec
     env_file:
       - ./secrets/.consent.env
     read_only: true
@@ -37,6 +37,7 @@ services:
          options:
              max-file: "5"
              max-size: "10m"
+             tag: "{\"name\":\"{{.Name}}\",\"id\":\"{{.ID}}\"}"
     command: bash -c "exec java  -Dvertx.logger-delegate-factory-class-name=io.vertx.core.logging.Log4j2LogDelegateFactory -jar ./fatjar.jar  --host $$(hostname) -c secrets/configs/config.json"
 
 secrets:
diff --git a/Docker-Swarm-deployment/single-node/data-ingestion-server/di-stack.yaml b/Docker-Swarm-deployment/single-node/data-ingestion-server/di-stack.yaml
index 89216a276..5fb618032 100644
--- a/Docker-Swarm-deployment/single-node/data-ingestion-server/di-stack.yaml
+++ b/Docker-Swarm-deployment/single-node/data-ingestion-server/di-stack.yaml
@@ -2,7 +2,7 @@ version: '3.9'
 
 services:
   di:
-    image: ghcr.io/datakaveri/di-depl:5.0.0-alpha-ae31210
+    image: ghcr.io/datakaveri/di-depl:5.0.0-fa953b3
     command:  bash -c "exec java $$DI_JAVA_OPTS  -Dvertx.logger-delegate-factory-class-name=io.vertx.core.logging.Log4j2LogDelegateFactory -jar ./fatjar.jar  --host $$(hostname) -c secrets/configs/config.json"
     # Dropping all Linux capabilities
     cap_drop:
diff --git a/Docker-Swarm-deployment/single-node/data-ingestion-server/example-secrets/secrets/config.json b/Docker-Swarm-deployment/single-node/data-ingestion-server/example-secrets/secrets/config.json
index 56316f5f6..837061bdf 100644
--- a/Docker-Swarm-deployment/single-node/data-ingestion-server/example-secrets/secrets/config.json
+++ b/Docker-Swarm-deployment/single-node/data-ingestion-server/example-secrets/secrets/config.json
@@ -41,6 +41,7 @@
 		{
 			"id": "iudx.data.ingestion.server.apiserver.ApiServerVerticle",
 			"ssl": false,
+			"httpPort": 8443,
 			"catServerHost": "<catalogue-api-public-domain>",
 			"catServerPort": 443,
 			"verticleInstances": 2
@@ -51,3 +52,4 @@
 		}
 	]
 }
+
diff --git a/Docker-Swarm-deployment/single-node/file-server/example-secrets/secrets/config.json b/Docker-Swarm-deployment/single-node/file-server/example-secrets/secrets/config.json
index d0537c8bc..9afd66b98 100644
--- a/Docker-Swarm-deployment/single-node/file-server/example-secrets/secrets/config.json
+++ b/Docker-Swarm-deployment/single-node/file-server/example-secrets/secrets/config.json
@@ -4,17 +4,13 @@
 		"zookeeper"
 	],
 	"clusterId": "dx-fs-cluster",
-	"commonConfig" : {
-		"dxApiBasePath" : "/ngsi-ld/v1",
-		"iudxApiBasePath" : "/iudx/v1",
-		"dxCatalogueBasePath": "/iudx/cat/v1",
-		"dxAuthBasePath": "/auth/v1"
-        },
+	"host": "fs",
 	"modules": [
 		{
 			"id": "iudx.file.server.apiserver.FileServerVerticle",
 			"verticleInstances": 2,
 			"ssl": false,
+			"httpPort": 8443,
 			"automaticRecoveryEnabled": true,
 			"catalogueHost": "<catalogue-api-public-domain-name>",
 			"cataloguePort": 443,
@@ -23,7 +19,6 @@
 			"allowedContentType": {
 				"text/plain": "txt",
 				"text/csv": "csv",
-				"application/json": "json",
 				"application/pdf": "pdf",
 				"video/mp4": "mp4",
 				"application/zip": "zip",
@@ -87,7 +82,14 @@
 		},
 		{
 			"id": "iudx.file.server.auditing.AuditingVerticle",
-			"verticleInstances": 1
+			"verticleInstances": 1,
+		      "auditingDatabaseIP": "tasks.immudb",
+		      "auditingDatabasePort": 5432,
+		      "auditingDatabaseName": "iudx",
+		      "auditingDatabaseUserName": "iudx_cat",
+		      "auditingDatabasePassword": "<immudb-pass:- cat iudx-deployment/Docker-Swarm-deployment/single-node/immudb/secrets/passwords/cat-password>",
+		      "auditingPoolSize": 25,
+		      "auditingDatabaseTableName": "auditingtable"
 		}
 	]
 }
diff --git a/Docker-Swarm-deployment/single-node/file-server/file-server-stack.yaml b/Docker-Swarm-deployment/single-node/file-server/file-server-stack.yaml
index d080ea423..e5e0efc6b 100644
--- a/Docker-Swarm-deployment/single-node/file-server/file-server-stack.yaml
+++ b/Docker-Swarm-deployment/single-node/file-server/file-server-stack.yaml
@@ -2,7 +2,7 @@ version: "3.9"
 
 services:
   file-server:
-    image: ghcr.io/datakaveri/fs-depl:5.0.0-alpha-68f153f
+    image: ghcr.io/datakaveri/fs-depl:5.0.0-43db6ce
     command: bash -c "exec java $$FS_JAVA_OPTS  -Dvertx.logger-delegate-factory-class-name=io.vertx.core.logging.Log4j2LogDelegateFactory -jar ./fatjar.jar  --host $$(hostname) -c secrets/configs/config.json"
     cap_drop:
       - ALL
diff --git a/Docker-Swarm-deployment/single-node/gis/example-secrets/secrets/config.json b/Docker-Swarm-deployment/single-node/gis/example-secrets/secrets/config.json
index f2484d9ea..cf9b3de89 100644
--- a/Docker-Swarm-deployment/single-node/gis/example-secrets/secrets/config.json
+++ b/Docker-Swarm-deployment/single-node/gis/example-secrets/secrets/config.json
@@ -14,6 +14,7 @@
     {
       "id": "iudx.gis.server.apiserver.ApiServerVerticle",
       "ssl": false,
+      "httpPort": 8080,
       "verticleInstances": 2,
       "catServerHost": "<catalogue-api-public-domain>",
       "catServerPort": 443
@@ -48,7 +49,6 @@
       "dataBrokerPort": 5672,
       "dataBrokerUserName": "dx-gis-user",
       "dataBrokerPassword": "<rmq-pass:- cat iudx-deployment/Docker-Swarm-deployment/single-node/databroker/secrets/passwords/gis-password>",
-      "dataBrokerManagementPort": 15672,
       "connectionTimeout": 6000,
       "requestedHeartbeat": 60,
       "handshakeTimeout": 6000,
diff --git a/Docker-Swarm-deployment/single-node/gis/gis-stack.yaml b/Docker-Swarm-deployment/single-node/gis/gis-stack.yaml
index 9165cc86d..82f09863a 100644
--- a/Docker-Swarm-deployment/single-node/gis/gis-stack.yaml
+++ b/Docker-Swarm-deployment/single-node/gis/gis-stack.yaml
@@ -2,7 +2,7 @@ version: "3.9"
 
 services:
   gis:
-    image: ghcr.io/datakaveri/gis-depl:5.0.0-alpha-46117ae
+    image: ghcr.io/datakaveri/gis-depl:5.0.0-dcd7025
     command: bash -c "exec java $$GIS_JAVA_OPTS  -Dvertx.logger-delegate-factory-class-name=io.vertx.core.logging.Log4j2LogDelegateFactory -jar ./fatjar.jar  --host $$(hostname) -c secrets/configs/config.json"
     cap_drop:
       - ALL
diff --git a/Docker-Swarm-deployment/single-node/immudb/immudb-config-generator.yaml b/Docker-Swarm-deployment/single-node/immudb/immudb-config-generator.yaml
index 7fcae9065..a83b3ddfb 100644
--- a/Docker-Swarm-deployment/single-node/immudb/immudb-config-generator.yaml
+++ b/Docker-Swarm-deployment/single-node/immudb/immudb-config-generator.yaml
@@ -23,8 +23,6 @@ services:
             - "node.labels.immudb-node==true"
       cap_drop:
         - ALL
-      env_file:
-        - ./secrets/.config.env
       logging:
         driver: "json-file"
         options:
diff --git a/Docker-Swarm-deployment/single-node/immudb/immudb-stack.yaml b/Docker-Swarm-deployment/single-node/immudb/immudb-stack.yaml
index db1873bab..9a8f61a8d 100644
--- a/Docker-Swarm-deployment/single-node/immudb/immudb-stack.yaml
+++ b/Docker-Swarm-deployment/single-node/immudb/immudb-stack.yaml
@@ -37,6 +37,10 @@ services:
       - type: tmpfs
         target: /tmp/
         read_only: false
+
+      - type: tmpfs
+        target: /root/
+        read_only: false
       networks:
         - overlay-net
       env_file:
diff --git a/Docker-Swarm-deployment/single-node/lip/lip-stack.yaml b/Docker-Swarm-deployment/single-node/lip/lip-stack.yaml
index 1ba92805d..290f65116 100644
--- a/Docker-Swarm-deployment/single-node/lip/lip-stack.yaml
+++ b/Docker-Swarm-deployment/single-node/lip/lip-stack.yaml
@@ -2,7 +2,7 @@ version: "3.9"
 
 services:
   lip:
-    image: ghcr.io/datakaveri/lip-depl:5.0.0-alpha-9adc1d8
+    image: ghcr.io/datakaveri/lip-depl:5.0.0-9adc1d8
     read_only: true
     cap_drop:
       - ALL
diff --git a/Docker-Swarm-deployment/single-node/nginx/example-configs/conf/onboarding.conf b/Docker-Swarm-deployment/single-node/nginx/example-configs/conf/onboarding.conf
deleted file mode 100644
index 38859a1a3..000000000
--- a/Docker-Swarm-deployment/single-node/nginx/example-configs/conf/onboarding.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-    # Main block for Resource server
-    server {
-        listen 443  ssl http2 ;
-        server_name         onboarding.io.test;
-
-	      ssl_certificate     /etc/nginx/certs/default-ssl/cert.pem;
-        ssl_certificate_key /etc/nginx/certs/default-ssl/key.pem;
-
-        # security headers
-        add_header Referrer-Policy   "no-referrer-when-downgrade" always;
-        add_header X-Frame-Options   "deny" always;
-        add_header X-XSS-Protection  "1; mode=block" always;
-        add_header X-Permitted-Cross-Domain-Policies  "none" always;
-        add_header Cross-Origin-Embedder-Policy "require-corp" always;
-        add_header Cross-Origin-Resource-Policy "cross-origin" always;
-        
-        # include error codes 
-        include /etc/nginx/error.conf;
-
-      	# enable rate and connection limiting for resource server.
-        limit_conn onboarding_conn_total 2000;
-        limit_conn onboarding_conn_per_ip 150;
-        limit_req zone=onboarding_req_total burst=400;
-        limit_req zone=onboarding_req_per_ip burst=150;
-
-        # adding proxy headers 
-        proxy_set_header X-Forwarded-For $remote_addr; # To forward the original client's IP address
-        proxy_set_header X-Forwarded-Proto $scheme; # to forward the  original protocol (HTTP or HTTPS)
-        proxy_set_header Host  $http_host; # to forward the original host requested by the client
-        proxy_buffer_size                       32k;
-        proxy_buffers                           4 32k;
-
-        # redirect request on '/' to '/apis' 
-        if ($uri = /) {
-                        return 302 $scheme://$http_host/apis;
-                }
-
-
-        location / {
-            set $backend_servers tasks.onboarding-server;
-            # compression is supported in HTTP >=1.1
-            proxy_http_version 1.1;
-            proxy_pass http://$backend_servers:8080;
-        }
-}
diff --git a/Docker-Swarm-deployment/single-node/onboarding-server/example-secrets/secrets/config.json b/Docker-Swarm-deployment/single-node/onboarding-server/example-secrets/secrets/config.json
index 13faa4734..855e0429a 100644
--- a/Docker-Swarm-deployment/single-node/onboarding-server/example-secrets/secrets/config.json
+++ b/Docker-Swarm-deployment/single-node/onboarding-server/example-secrets/secrets/config.json
@@ -5,19 +5,20 @@
   ],
   "clusterId": "iudx-onboarding-cluster",
   "commonConfig": {
-    "dxApiBasePath": "/ngsi-ld/v1",
+    "dxApiBasePath": "/iudx/cat/v1",
     "dxCatalogueBasePath": "/iudx/cat/v1",
-    "dxAuthBasePath": "/auth/v1"
+    "dxAuthBasePath": "/auth/v1",
+    "localCatServerHost": "<cat-server-domain>",
+    "localCatServerPort": 443,
+    "isUacAvailable": true,
+    "centralCatServerHost": "<central-cat-domain>",
+    "centralCatServerPort": 443
   },
   "host": "onboarding.iudx.io",
   "modules": [
     {
       "id": "iudx.onboarding.server.catalogue.CatalogueVerticle",
       "isWorkerVerticle": false,
-      "localCatServerHost": "<catalogue-domain>",
-      "localCatServerPort": 443,
-      "centralCatServerHost": "<uac-catalogue-domain>",
-      "centralCatServerPort": 443,
       "verticleInstances": 1
     },
     {
@@ -34,6 +35,18 @@
       "keycloakSite": "{{protocol}}://{{keycloakHost}}:{{keycloakPort}}/auth/realms/{{keycloakRealm}}",
       "keycloakClientId": "<keycloak-client-id>",
       "keycloakClientSecret": "<keycloak-client-secret>"
+    },
+    {
+      "id": "iudx.onboarding.server.ingestion.IngestionVerticle",
+      "isWorkerVerticle": false,
+      "verticleInstances": 1,
+      "resourceServerPort": 443,
+      "resourceServerBasePath": "/ngsi-ld/v1"
+    },
+    {
+      "id": "iudx.onboarding.server.resourceserver.ResourceServerVerticle",
+      "isWorkerVerticle": false,
+      "verticleInstances": 1
     }
   ]
 }
diff --git a/Docker-Swarm-deployment/single-node/onboarding-server/onboarding-server-stack.yaml b/Docker-Swarm-deployment/single-node/onboarding-server/onboarding-server-stack.yaml
index d81f2ebe6..ebc8f389f 100644
--- a/Docker-Swarm-deployment/single-node/onboarding-server/onboarding-server-stack.yaml
+++ b/Docker-Swarm-deployment/single-node/onboarding-server/onboarding-server-stack.yaml
@@ -7,7 +7,7 @@ networks:
 
 services:
   onboarding-server:
-    image: ghcr.io/datakaveri/onboarding-server-depl:5.0.0-alpha-addd306
+    image: ghcr.io/datakaveri/onboarding-server-depl:1.0.0-73d255b
     env_file:
       - ./secrets/.onboarding.env
     volumes:
@@ -33,6 +33,7 @@ services:
       options:
         max-file: "5"
         max-size: "10m"
+        tag: "{\"name\":\"{{.Name}}\",\"id\":\"{{.ID}}\"}"
     command: bash -c "exec java  -Dvertx.logger-delegate-factory-class-name=io.vertx.core.logging.Log4j2LogDelegateFactory -jar ./fatjar.jar  --host $$(hostname) -c configs/config.json"
 
 secrets:
diff --git a/Docker-Swarm-deployment/single-node/resource-server/example-secrets/secrets/config.json b/Docker-Swarm-deployment/single-node/resource-server/example-secrets/secrets/config.json
index d29f04646..0d8308831 100644
--- a/Docker-Swarm-deployment/single-node/resource-server/example-secrets/secrets/config.json
+++ b/Docker-Swarm-deployment/single-node/resource-server/example-secrets/secrets/config.json
@@ -13,6 +13,7 @@
     {
       "id": "iudx.resource.server.database.archives.DatabaseVerticle",
       "isWorkerVerticle": false,
+      "tenantPrefix": "iudx",
       "verticleInstances": 2,
       "databaseIP": "tasks.elasticsearch",
       "databasePort": 9200,
@@ -62,6 +63,7 @@
       "id": "iudx.resource.server.apiserver.ApiServerVerticle",
       "isWorkerVerticle": false,
       "ssl": false,
+      "httpPort": 8443,
       "verticleInstances": 2,
       "catServerHost": "<catalogue-api-public-domain>",
       "catServerPort": 443
@@ -69,6 +71,7 @@
     {
       "id": "iudx.resource.server.database.latest.LatestVerticle",
       "isWorkerVerticle": false,
+      "tenantPrefix": "iudx",
       "verticleInstances": 2,
       "redisMode": "STANDALONE",
       "redisUsername": "default",
@@ -103,6 +106,7 @@
     {
       "id": "iudx.resource.server.database.async.AsyncVerticle",
       "isWorkerVerticle": true,
+      "tenantPrefix": "iudx",
       "threadPoolName": "async-query-pool",
       "threadPoolSize": 20,
       "verticleInstances": 20,
@@ -121,3 +125,4 @@
     }
   ]
 }
+
diff --git a/Docker-Swarm-deployment/single-node/resource-server/rs-stack.yaml b/Docker-Swarm-deployment/single-node/resource-server/rs-stack.yaml
index cc34ca01c..aea94e8ca 100644
--- a/Docker-Swarm-deployment/single-node/resource-server/rs-stack.yaml
+++ b/Docker-Swarm-deployment/single-node/resource-server/rs-stack.yaml
@@ -7,7 +7,7 @@ networks:
 
 services:
   rs:
-    image: ghcr.io/datakaveri/rs-depl:5.0.0-alpha-cfe8c7f
+    image: ghcr.io/datakaveri/rs-depl:5.0.0-6c98c5c
     networks:
       - overlay-net
     secrets:
diff --git a/K8s-deployment/Charts/acl-apd/values.yaml b/K8s-deployment/Charts/acl-apd/values.yaml
index 7a00dbea6..a4ee127ca 100644
--- a/K8s-deployment/Charts/acl-apd/values.yaml
+++ b/K8s-deployment/Charts/acl-apd/values.yaml
@@ -72,7 +72,7 @@ diagnosticMode:
 image:
   registry: ghcr.io
   repository: datakaveri/acl-apd-depl
-  tag: 5.0.0-alpha-f8fd671
+  tag: 1.0.0-66c8df1
   pullSecrets: 
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
diff --git a/K8s-deployment/Charts/auditing-server/example-secrets/secrets/config.json b/K8s-deployment/Charts/auditing-server/example-secrets/secrets/config.json
index 9b6e436f4..d616a3786 100644
--- a/K8s-deployment/Charts/auditing-server/example-secrets/secrets/config.json
+++ b/K8s-deployment/Charts/auditing-server/example-secrets/secrets/config.json
@@ -34,7 +34,6 @@
       "postgresCatTableName": "auditing_cat",
       "postgresAuthTableName": "auditing_aaa",
       "postgersApdTableName": "auditing_acl_apd"
-
     },
     {
       "id": "iudx.auditing.server.postgres.PostgresVerticle",
@@ -48,20 +47,20 @@
     },
     {
       "id": "iudx.auditing.server.immudb.ImmudbVerticle",
+      "isWorkerVerticle": false,
       "verticleInstances": 1,
       "meteringDatabaseIP": "immudb.immudb.svc.cluster.local",
       "meteringDatabasePort": 5432,
-      "meteringRSDatabaseName": "iudxrsorg",
+      "meteringRSDatabaseName": "iudx",
       "meteringRSDatabaseUserName": "iudx_rs",
       "meteringRSDatabasePassword": "<immudb-rs-password:- cat iudx-deployment/K8s-deployment/Charts/immudb/secrets/passwords/rs-password>",
-      "meteringAAADatabaseName": "iudxauth",
+      "meteringAAADatabaseName": "iudx",
       "meteringAAADatabaseUserName": "iudx_auth",
       "meteringAAADatabasePassword": "<immudb-auth-password:- cat iudx-deployment/K8s-deployment/Charts/immudb/secrets/passwords/auth-password>",
-      "meteringCATDatabaseName": "iudxcat",
+      "meteringCATDatabaseName": "iudx",
       "meteringCATDatabaseUserName": "iudx_cat",
       "meteringCATDatabasePassword": "<immudb-cat-password:- cat iudx-deployment/K8s-deployment/Charts/immudb/secrets/passwords/cat-password>",
       "meteringPoolSize": 25
     }
   ]
 }
-
diff --git a/K8s-deployment/Charts/auditing-server/values.yaml b/K8s-deployment/Charts/auditing-server/values.yaml
index 01a5be104..1fd427887 100644
--- a/K8s-deployment/Charts/auditing-server/values.yaml
+++ b/K8s-deployment/Charts/auditing-server/values.yaml
@@ -74,7 +74,7 @@ diagnosticMode:
 image:
   registry: ghcr.io
   repository: datakaveri/auditing-server-depl
-  tag: 1.5.0-alpha-d332b94
+  tag: 5.0.0-d332b94
   pullSecrets: {} 
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
diff --git a/K8s-deployment/Charts/auth-server/example-secrets/secrets/config.json b/K8s-deployment/Charts/auth-server/example-secrets/secrets/config.json
index 6c000acc9..fcd6be7ee 100644
--- a/K8s-deployment/Charts/auth-server/example-secrets/secrets/config.json
+++ b/K8s-deployment/Charts/auth-server/example-secrets/secrets/config.json
@@ -31,13 +31,10 @@
     }
   },
   "modules": [
-    {
+     {
       "id": "iudx.aaa.server.policy.PolicyVerticle",
       "verticleInstances": 1,
-      "required": [
-        "postgresOptions",
-        "commonOptions"
-      ],
+      "required": [  "postgresOptions",  "commonOptions" ],
       "poolSize": "25",
       "catalogueOptions": {
         "catServerHost": "<catalogue-api-domain-name>",
@@ -48,46 +45,28 @@
     {
       "id": "iudx.aaa.server.registration.RegistrationVerticle",
       "verticleInstances": 2,
-      "required": [
-        "postgresOptions",
-        "keycloakOptions",
-        "commonOptions"
-      ],
-      "serversOmittedFromRevoke": [
-        "<catalogue-audience-domain>"
-      ],
+      "required": [  "postgresOptions",   "keycloakOptions",   "commonOptions"   ],
+      "serversOmittedFromRevoke": [    "<catalogue-audience-domain>"  ],
       "poolSize": "15"
     },
     {
       "id": "iudx.aaa.server.token.TokenVerticle",
-      "verticleInstances": 2,
-      "required": [
-        "postgresOptions",
-        "commonOptions",
-        "keycloakOptions",
-        "jwtKeystoreOptions"
-      ],
+      "verticleInstances": 1,
+      "required":["postgresOptions", "commonOptions",     "keycloakOptions", "jwtKeystoreOptions"],
       "poolSize": "5"
     },
     {
       "id": "iudx.aaa.server.admin.AdminVerticle",
-      "verticleInstances": 2,
-      "required": [
-        "postgresOptions",
-        "commonOptions",
-        "keycloakOptions"
-      ],
-      "poolSize": "15"
+      "verticleInstances": 1,
+      "required":["postgresOptions", "commonOptions", "keycloakOptions"],
+      "poolSize": "25"
     },
     {
       "id": "iudx.aaa.server.apd.ApdVerticle",
-      "verticleInstances": 2,
-      "required": [
-        "postgresOptions",
-        "commonOptions"
-      ],
+      "verticleInstances": 1,
+      "required":["postgresOptions", "commonOptions"],
       "webClientTimeoutMs": 4000,
-      "poolSize": "15"
+      "poolSize": "25"
     },
     {
       "id": "iudx.aaa.server.auditing.AuditingVerticle",
@@ -115,3 +94,4 @@
     }
   ]
 }
+
diff --git a/K8s-deployment/Charts/auth-server/values.yaml b/K8s-deployment/Charts/auth-server/values.yaml
index 068fe5131..a355b0708 100644
--- a/K8s-deployment/Charts/auth-server/values.yaml
+++ b/K8s-deployment/Charts/auth-server/values.yaml
@@ -72,7 +72,7 @@ diagnosticMode:
 image:
   registry: ghcr.io
   repository: datakaveri/aaa-depl
-  tag: 5.0.0-alpha-0a34c52
+  tag: 5.0.0-3f434f6
   pullSecrets: {}
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
diff --git a/K8s-deployment/Charts/catalogue/example-secrets/secrets/config.json b/K8s-deployment/Charts/catalogue/example-secrets/secrets/config.json
index bfae83600..3ae9fe8d6 100644
--- a/K8s-deployment/Charts/catalogue/example-secrets/secrets/config.json
+++ b/K8s-deployment/Charts/catalogue/example-secrets/secrets/config.json
@@ -4,11 +4,11 @@
     "zookeeper.zookeeper.svc.cluster.local"
   ],
   "clusterId": "dx-catalogue-cluster",
+  "host": "server",
   "commonConfig": {
     "dxApiBasePath": "/iudx/cat/v1",
     "dxAuthBasePath": "/auth/v1",
     "isUACInstance": false
-
   },
   "modules": [
     {
@@ -25,15 +25,14 @@
       "mlayerDomainIndex": "iudx__cat_domains",
       "databaseUser": "cat-user",
       "databasePassword": "<elastic-pass:- cat iudx-deployment/K8s-deployment/Charts/elk/secrets/passwords/elasticsearch-cat-password>",
-      "databasePort": 9200
+      "databasePort": 9200,
+      "bypassAuth": true
     },
     {
       "id": "iudx.catalogue.server.authenticator.AuthenticationVerticle",
       "host": "<cat-audience-domain>",
       "consumerHost": "<consumer-host-domain>",
       "issuer": "<auth-issuer>",
-      "keycloakServerHost": "https://{{keycloak-domain}}/auth/realms/demo",
-      "certsEndpoint": "/protocol/openid-connect/certs",
       "verticleInstances": 2,
       "authServerHost": "<AAA-server-public-domain>",
       "jwtIgnoreExpiry": false
@@ -53,9 +52,21 @@
       "host": "<cat-audience-domain>",
       "ssl": false,
       "ip": "127.0.0.1",
+      "httpPort": 8080,
       "catAdmin": "<catalogue-admin-id>",
       "verticleInstances": 2
     },
+    {
+      "id": "iudx.catalogue.server.auditing.AuditingVerticle",
+      "verticleInstances": 1,
+      "auditingDatabaseIP": "immudb.immudb.svc.cluster.local",
+      "auditingDatabasePort": 5432,
+      "auditingDatabaseName": "iudx",
+      "auditingDatabaseUserName": "iudx_cat",
+      "auditingDatabasePassword": "<immudb-pass:- cat iudx-deployment/K8s-deployment/Charts/immudb/secrets/passwords/cat-password>",
+      "auditingPoolSize": 25,
+      "auditingDatabaseTableName": "auditingtable"
+    },
     {
       "id": "iudx.catalogue.server.geocoding.GeocodingVerticle",
       "peliasUrl": "<pelias-service-domain/ip>",
@@ -97,6 +108,7 @@
     },
     {
       "id": "iudx.catalogue.server.database.postgres.PostgresVerticle",
+      "isWorkerVerticle": false,
       "verticleInstances": 2,
       "databaseIP": "psql-postgresql-ha-pgpool.postgres.svc.cluster.local",
       "databasePort": 5432,
diff --git a/K8s-deployment/Charts/catalogue/values.yaml b/K8s-deployment/Charts/catalogue/values.yaml
index a1aee73ff..c31b2f7b0 100644
--- a/K8s-deployment/Charts/catalogue/values.yaml
+++ b/K8s-deployment/Charts/catalogue/values.yaml
@@ -72,7 +72,7 @@ diagnosticMode:
 image:
   registry: ghcr.io
   repository: datakaveri/cat-prod
-  tag: 5.0.0-alpha-033cef8
+  tag: 5.0.0-cd67af0 
   pullSecrets:
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
diff --git a/K8s-deployment/Charts/consent-validator/values.yaml b/K8s-deployment/Charts/consent-validator/values.yaml
index 47c3d491e..c450572d3 100644
--- a/K8s-deployment/Charts/consent-validator/values.yaml
+++ b/K8s-deployment/Charts/consent-validator/values.yaml
@@ -72,7 +72,7 @@ diagnosticMode:
 image:
   registry: ghcr.io
   repository: datakaveri/consent-validator
-  tag: 1.0.0-alpha-f8c2ed9
+  tag: 1.5.0-e3c3aec
   pullSecrets: 
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
diff --git a/K8s-deployment/Charts/data-ingestion/example-secrets/secrets/config.json b/K8s-deployment/Charts/data-ingestion/example-secrets/secrets/config.json
index 51b6f380c..1b05b27c2 100644
--- a/K8s-deployment/Charts/data-ingestion/example-secrets/secrets/config.json
+++ b/K8s-deployment/Charts/data-ingestion/example-secrets/secrets/config.json
@@ -37,11 +37,11 @@
 			"catServerHost": "<catalogue-api-public-domain>",
 			"catServerPort": 443,
 			"jwtIgnoreExpiry": false
-
 		},
 		{
 			"id": "iudx.data.ingestion.server.apiserver.ApiServerVerticle",
 			"ssl": false,
+			"httpPort": 8443,
 			"catServerHost": "<catalogue-api-public-domain>",
 			"catServerPort": 443,
 			"verticleInstances": 2
diff --git a/K8s-deployment/Charts/data-ingestion/values.yaml b/K8s-deployment/Charts/data-ingestion/values.yaml
index 37bb7af5f..d6abd2278 100644
--- a/K8s-deployment/Charts/data-ingestion/values.yaml
+++ b/K8s-deployment/Charts/data-ingestion/values.yaml
@@ -72,7 +72,7 @@ diagnosticMode:
 image:
   registry: ghcr.io
   repository: datakaveri/di-depl
-  tag: 5.0.0-alpha-ae31210
+  tag: 5.0.0-fa953b3
   pullSecrets: 
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
diff --git a/K8s-deployment/Charts/file-server/example-secrets/secrets/config.json b/K8s-deployment/Charts/file-server/example-secrets/secrets/config.json
index 508efd1d7..4b52aefe4 100644
--- a/K8s-deployment/Charts/file-server/example-secrets/secrets/config.json
+++ b/K8s-deployment/Charts/file-server/example-secrets/secrets/config.json
@@ -4,17 +4,13 @@
 		"zookeeper.zookeeper.svc.cluster.local"
 	],
 	"clusterId": "dx-fs-cluster",
-	"commonConfig" : {
-		"dxApiBasePath" : "/ngsi-ld/v1",
-		"iudxApiBasePath" : "/iudx/v1",
-		"dxCatalogueBasePath": "/iudx/cat/v1",
-		"dxAuthBasePath": "/auth/v1"
-        },
+	"host": "fs",
 	"modules": [
 		{
 			"id": "iudx.file.server.apiserver.FileServerVerticle",
 			"verticleInstances": 2,
 			"ssl": false,
+			"httpPort": 8443,
 			"automaticRecoveryEnabled": true,
 			"catalogueHost": "<catalogue-api-public-domain-name>",
 			"cataloguePort": 443,
@@ -23,7 +19,6 @@
 			"allowedContentType": {
 				"text/plain": "txt",
 				"text/csv": "csv",
-				"application/json": "json",
 				"application/pdf": "pdf",
 				"video/mp4": "mp4",
 				"application/zip": "zip",
@@ -87,7 +82,14 @@
 		},
 		{
 			"id": "iudx.file.server.auditing.AuditingVerticle",
-			"verticleInstances": 2
+			"verticleInstances": 2,
+		      "auditingDatabaseIP": "immudb.immudb.svc.cluster.local",
+		      "auditingDatabasePort": 5432,
+		      "auditingDatabaseName": "iudx",
+		      "auditingDatabaseUserName": "iudx_cat",
+		      "auditingDatabasePassword": "<immudb-pass:- cat iudx-deployment/K8s-deployment/Charts/immudb/secrets/passwords/cat-password>",
+		      "auditingPoolSize": 25,
+		      "auditingDatabaseTableName": "auditingtable"
 		}
 	]
 }
diff --git a/K8s-deployment/Charts/file-server/values.yaml b/K8s-deployment/Charts/file-server/values.yaml
index 15ee5027f..f3592136b 100644
--- a/K8s-deployment/Charts/file-server/values.yaml
+++ b/K8s-deployment/Charts/file-server/values.yaml
@@ -74,7 +74,7 @@ diagnosticMode:
 image:
   registry: ghcr.io
   repository: datakaveri/fs-depl
-  tag: 5.0.0-alpha-68f153f
+  tag: 5.0.0-43db6ce
   pullSecrets: {} 
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
diff --git a/K8s-deployment/Charts/gis-interface/example-secrets/secrets/config.json b/K8s-deployment/Charts/gis-interface/example-secrets/secrets/config.json
index 4d375aa14..180aa3bce 100644
--- a/K8s-deployment/Charts/gis-interface/example-secrets/secrets/config.json
+++ b/K8s-deployment/Charts/gis-interface/example-secrets/secrets/config.json
@@ -14,6 +14,7 @@
     {
       "id": "iudx.gis.server.apiserver.ApiServerVerticle",
       "ssl": false,
+      "httpPort": 8080,
       "verticleInstances": 2,
       "catServerHost": "<catalogue-api-public-domain>",
       "catServerPort": 443
@@ -48,7 +49,6 @@
       "dataBrokerPort": 5672,
       "dataBrokerUserName": "dx-gis-user",
       "dataBrokerPassword": "<rmq-pass:-  cat iudx-deployment/K8s-deployment/Charts/databroker/secrets/credentials/gis-password>",
-      "dataBrokerManagementPort": 15672,
       "connectionTimeout": 6000,
       "requestedHeartbeat": 60,
       "handshakeTimeout": 6000,
diff --git a/K8s-deployment/Charts/gis-interface/values.yaml b/K8s-deployment/Charts/gis-interface/values.yaml
index 528d253ef..4db663fdc 100644
--- a/K8s-deployment/Charts/gis-interface/values.yaml
+++ b/K8s-deployment/Charts/gis-interface/values.yaml
@@ -73,7 +73,7 @@ diagnosticMode:
 image:
   registry: ghcr.io
   repository: datakaveri/gis-depl
-  tag: 5.0.0-alpha-46117ae
+  tag: 5.0.0-dcd7025
   pullSecrets: 
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
diff --git a/K8s-deployment/Charts/latest-ingestion-pipeline/values.yaml b/K8s-deployment/Charts/latest-ingestion-pipeline/values.yaml
index 35fa111eb..3a1c237b7 100644
--- a/K8s-deployment/Charts/latest-ingestion-pipeline/values.yaml
+++ b/K8s-deployment/Charts/latest-ingestion-pipeline/values.yaml
@@ -72,7 +72,7 @@ diagnosticMode:
 image:
   registry: ghcr.io
   repository: datakaveri/lip-depl
-  tag: 5.0.0-alpha-9adc1d8
+  tag: 5.0.0-9adc1d8
   pullSecrets: {}
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
diff --git a/K8s-deployment/Charts/onboarding-server/example-secrets/secrets/config.json b/K8s-deployment/Charts/onboarding-server/example-secrets/secrets/config.json
index 8468a29fa..76b6130a4 100644
--- a/K8s-deployment/Charts/onboarding-server/example-secrets/secrets/config.json
+++ b/K8s-deployment/Charts/onboarding-server/example-secrets/secrets/config.json
@@ -10,6 +10,7 @@
     "dxAuthBasePath": "/auth/v1",
     "localCatServerHost": "<cat-server-domain>",
     "localCatServerPort": 443,
+    "isUacAvailable": true,
     "centralCatServerHost": "<central-cat-domain>",
     "centralCatServerPort": 443
   },
diff --git a/K8s-deployment/Charts/onboarding-server/values.yaml b/K8s-deployment/Charts/onboarding-server/values.yaml
index 06b022f89..a02bf59d7 100644
--- a/K8s-deployment/Charts/onboarding-server/values.yaml
+++ b/K8s-deployment/Charts/onboarding-server/values.yaml
@@ -72,7 +72,7 @@ diagnosticMode:
 image:
   registry: ghcr.io
   repository: datakaveri/onboarding-server-depl
-  tag: 5.0.0-alpha-844fe20
+  tag: 1.0.0-73d255b
   pullSecrets: 
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
diff --git a/K8s-deployment/Charts/resource-server/example-secrets/secrets/config.json b/K8s-deployment/Charts/resource-server/example-secrets/secrets/config.json
index 035563646..91945c20a 100644
--- a/K8s-deployment/Charts/resource-server/example-secrets/secrets/config.json
+++ b/K8s-deployment/Charts/resource-server/example-secrets/secrets/config.json
@@ -63,6 +63,7 @@
       "id": "iudx.resource.server.apiserver.ApiServerVerticle",
       "isWorkerVerticle": false,
       "ssl": false,
+      "httpPort": 8443,
       "verticleInstances": 2,
       "catServerHost": "<catalogue-api-public-domain>",
       "catServerPort": 443
@@ -70,6 +71,7 @@
     {
       "id": "iudx.resource.server.database.latest.LatestVerticle",
       "isWorkerVerticle": false,
+      "tenantPrefix": "iudx",
       "verticleInstances": 2,
       "redisMode": "CLUSTER",
       "redisUsername": "default",
@@ -123,3 +125,4 @@
     }
   ]
 }
+
diff --git a/K8s-deployment/Charts/resource-server/values.yaml b/K8s-deployment/Charts/resource-server/values.yaml
index 5def6bdfe..9976ae37c 100644
--- a/K8s-deployment/Charts/resource-server/values.yaml
+++ b/K8s-deployment/Charts/resource-server/values.yaml
@@ -72,7 +72,7 @@ diagnosticMode:
 image:
   registry: ghcr.io
   repository: datakaveri/rs-depl
-  tag: 5.0.0-alpha-cfe8c7f
+  tag: 5.0.0-6c98c5c
   pullSecrets: 
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'