diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index ef08a6414..bbe61bd78 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -4,7 +4,7 @@ SPDX-License-Identifier: Apache-2.0 -->
 <!--
 
 Pull request title should be `MG-XXX - description` or `NOISSUE - description` where XXX is ID of the issue that this PR relate to.
-Please review the [CONTRIBUTING.md](https://github.com/absmach/magistrala/blob/master/CONTRIBUTING.md) file for detailed contributing guidelines.
+Please review the [CONTRIBUTING.md](https://github.com/absmach/magistrala/blob/main/CONTRIBUTING.md) file for detailed contributing guidelines.
 
 For Work In Progress Pull Requests, please use the Draft PR feature, see https://github.blog/2019-02-14-introducing-draft-pull-requests/ for further details.
 
diff --git a/ADOPTERS.md b/ADOPTERS.md
index d0479a15f..96c96423e 100644
--- a/ADOPTERS.md
+++ b/ADOPTERS.md
@@ -33,4 +33,4 @@ Pull request commit must be [signed](https://docs.github.com/en/github/authentic
 ## Adopters list (alphabetical)
 
 
-**Note:** The list is maintained by the users themselves. If you find yourself on this list, and you think it's inappropriate. Please contact [project maintainers](https://github.com/absmach/magistrala/blob/master/MAINTAINERS) and you will be permanently removed from the list.
+**Note:** The list is maintained by the users themselves. If you find yourself on this list, and you think it's inappropriate. Please contact [project maintainers](https://github.com/absmach/magistrala/blob/main/MAINTAINERS) and you will be permanently removed from the list.
diff --git a/README.md b/README.md
index a1c80ea5d..71a402f3c 100644
--- a/README.md
+++ b/README.md
@@ -38,8 +38,7 @@ For more details, check out the [official documentation][docs].
 
 The following are needed to run Magistrala:
 
-- [Docker](https://docs.docker.com/install/) (version 24.0.7)
-- [Docker compose](https://docs.docker.com/compose/install/) (version 2.24.0)
+- [Docker](https://docs.docker.com/install/) (version 26.0.0)
 
 Developing Magistrala will also require:
 
diff --git a/api/asyncapi/mqtt.yml b/api/asyncapi/mqtt.yml
index 540250c3b..4a4d1575e 100644
--- a/api/asyncapi/mqtt.yml
+++ b/api/asyncapi/mqtt.yml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 asyncapi: '2.6.0'
-id: 'https://github.com/absmach/magistrala/blob/master/api/asyncapi/mqtt.yml'
+id: 'https://github.com/absmach/magistrala/blob/main/api/asyncapi/mqtt.yml'
 info:
   title: Magistrala MQTT Adapter
   version: '1.0.0'
@@ -16,7 +16,7 @@ info:
 
   license:
     name: Apache 2.0
-    url: 'https://github.com/absmach/magistrala/blob/master/LICENSE'
+    url: 'https://github.com/absmach/magistrala/blob/main/LICENSE'
   
   
 defaultContentType: application/json
diff --git a/api/asyncapi/websocket.yml b/api/asyncapi/websocket.yml
index d77db0bca..0f514c8ab 100644
--- a/api/asyncapi/websocket.yml
+++ b/api/asyncapi/websocket.yml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 asyncapi: 2.6.0
-id: 'https://github.com/absmach/magistrala/blob/master/api/asyncapi/websocket.yml'
+id: 'https://github.com/absmach/magistrala/blob/main/api/asyncapi/websocket.yml'
 info:
   title: Magistrala WebSocket adapter
   description: WebSocket adapter provides a WebSocket API for sending messages through communication channels. WebSocket adapter uses [mProxy](https://github.com/absmach/mproxy) for proxying traffic between client and MQTT broker.
@@ -13,7 +13,7 @@ info:
     email: info@abstractmachines.fr
   license:
     name: Apache 2.0
-    url: 'https://github.com/absmach/magistrala/blob/master/LICENSE'
+    url: 'https://github.com/absmach/magistrala/blob/main/LICENSE'
 tags:
   - name: WebSocket
 defaultContentType: application/json
diff --git a/api/openapi/auth.yml b/api/openapi/auth.yml
index 432c6ae4b..bd75c9e91 100644
--- a/api/openapi/auth.yml
+++ b/api/openapi/auth.yml
@@ -12,7 +12,7 @@ info:
     email: info@abstractmachines.fr
   license:
     name: Apache 2.0
-    url: https://github.com/absmach/magistrala/blob/master/LICENSE
+    url: https://github.com/absmach/magistrala/blob/main/LICENSE
   version: 0.14.0
 
 servers:
diff --git a/api/openapi/bootstrap.yml b/api/openapi/bootstrap.yml
index fc8f98b5a..6318f0dc5 100644
--- a/api/openapi/bootstrap.yml
+++ b/api/openapi/bootstrap.yml
@@ -12,7 +12,7 @@ info:
     email: info@abstractmachines.fr
   license:
     name: Apache 2.0
-    url: https://github.com/absmach/magistrala/blob/master/LICENSE
+    url: https://github.com/absmach/magistrala/blob/main/LICENSE
   version: 0.14.0
 
 servers:
diff --git a/api/openapi/certs.yml b/api/openapi/certs.yml
index 9bfb2e471..6387a0468 100644
--- a/api/openapi/certs.yml
+++ b/api/openapi/certs.yml
@@ -12,7 +12,7 @@ info:
     email: info@abstractmachines.fr
   license:
     name: Apache 2.0
-    url: https://github.com/absmach/magistrala/blob/master/LICENSE
+    url: https://github.com/absmach/magistrala/blob/main/LICENSE
   version: 0.14.0
 
 servers:
diff --git a/api/openapi/http.yml b/api/openapi/http.yml
index 18d69bffc..7e8f6a2b7 100644
--- a/api/openapi/http.yml
+++ b/api/openapi/http.yml
@@ -12,7 +12,7 @@ info:
     email: info@abstractmachines.fr
   license:
     name: Apache 2.0
-    url: https://github.com/absmach/magistrala/blob/master/LICENSE
+    url: https://github.com/absmach/magistrala/blob/main/LICENSE
   version: 0.14.0
 
 servers:
diff --git a/api/openapi/invitations.yml b/api/openapi/invitations.yml
index 1fb3c7ba8..d31f1a9d5 100644
--- a/api/openapi/invitations.yml
+++ b/api/openapi/invitations.yml
@@ -12,7 +12,7 @@ info:
     email: info@abstractmachines.fr
   license:
     name: Apache 2.0
-    url: https://github.com/absmach/magistrala/blob/master/LICENSE
+    url: https://github.com/absmach/magistrala/blob/main/LICENSE
   version: 0.14.0
 
 servers:
diff --git a/api/openapi/notifiers.yml b/api/openapi/notifiers.yml
index 913494442..d6e861f7e 100644
--- a/api/openapi/notifiers.yml
+++ b/api/openapi/notifiers.yml
@@ -12,7 +12,7 @@ info:
     email: info@abstractmachines.fr
   license:
     name: Apache 2.0
-    url: https://github.com/absmach/magistrala/blob/master/LICENSE
+    url: https://github.com/absmach/magistrala/blob/main/LICENSE
   version: 0.14.0
 
 servers:
diff --git a/api/openapi/provision.yml b/api/openapi/provision.yml
index 83ed48f4c..8243e73b9 100644
--- a/api/openapi/provision.yml
+++ b/api/openapi/provision.yml
@@ -12,7 +12,7 @@ info:
     email: info@abstracmachines.fr
   license:
     name: Apache 2.0
-    url: https://github.com/absmach/magistrala/blob/master/LICENSE
+    url: https://github.com/absmach/magistrala/blob/main/LICENSE
   version: 0.14.0
 
 servers:
diff --git a/api/openapi/readers.yml b/api/openapi/readers.yml
index 3ea484661..0eadeb177 100644
--- a/api/openapi/readers.yml
+++ b/api/openapi/readers.yml
@@ -12,7 +12,7 @@ info:
     email: info@abstractmachines.fr
   license:
     name: Apache 2.0
-    url: https://github.com/absmach/magistrala/blob/master/LICENSE
+    url: https://github.com/absmach/magistrala/blob/main/LICENSE
   version: 0.14.0
 
 servers:
diff --git a/api/openapi/things.yml b/api/openapi/things.yml
index 2ff2dff78..33c71af38 100644
--- a/api/openapi/things.yml
+++ b/api/openapi/things.yml
@@ -12,7 +12,7 @@ info:
     email: info@abstractmachines.fr
   license:
     name: Apache 2.0
-    url: https://github.com/absmach/magistrala/blob/master/LICENSE
+    url: https://github.com/absmach/magistrala/blob/main/LICENSE
   version: 0.14.0
 
 servers:
diff --git a/api/openapi/twins.yml b/api/openapi/twins.yml
index 6f85e0ce0..355d5bf48 100644
--- a/api/openapi/twins.yml
+++ b/api/openapi/twins.yml
@@ -12,7 +12,7 @@ info:
     email: info@abstractmachines.fr
   license:
     name: Apache 2.0
-    url: https://github.com/absmach/magistrala/blob/master/LICENSE
+    url: https://github.com/absmach/magistrala/blob/main/LICENSE
   version: 0.14.0
 
 servers:
diff --git a/api/openapi/users.yml b/api/openapi/users.yml
index 63d7643e8..255381f58 100644
--- a/api/openapi/users.yml
+++ b/api/openapi/users.yml
@@ -12,7 +12,7 @@ info:
     email: info@abstractmachines.fr
   license:
     name: Apache 2.0
-    url: https://github.com/absmach/magistrala/blob/master/LICENSE
+    url: https://github.com/absmach/magistrala/blob/main/LICENSE
   version: 0.14.0
 
 servers:
diff --git a/auth/README.md b/auth/README.md
index 9950b7c5a..41a667ef2 100644
--- a/auth/README.md
+++ b/auth/README.md
@@ -96,7 +96,7 @@ The service is configured using the environment variables presented in the follo
 
 ## Deployment
 
-The service itself is distributed as Docker container. Check the [`auth`](https://github.com/absmach/magistrala/blob/master/docker/docker-compose.yml) service section in docker-compose to see how service is deployed.
+The service itself is distributed as Docker container. Check the [`auth`](https://github.com/absmach/magistrala/blob/main/docker/docker-compose.yml) service section in docker-compose file to see how service is deployed.
 
 Running this service outside of container requires working instance of the postgres database, SpiceDB, and Jaeger server.
 To start the service outside of the container, execute the following shell script:
diff --git a/auth/postgres/setup_test.go b/auth/postgres/setup_test.go
index 24d08acc6..d0a279552 100644
--- a/auth/postgres/setup_test.go
+++ b/auth/postgres/setup_test.go
@@ -36,7 +36,7 @@ func TestMain(m *testing.M) {
 
 	container, err := pool.RunWithOptions(&dockertest.RunOptions{
 		Repository: "postgres",
-		Tag:        "16.1-alpine",
+		Tag:        "16.2-alpine",
 		Env: []string{
 			"POSTGRES_USER=test",
 			"POSTGRES_PASSWORD=test",
diff --git a/bootstrap/README.md b/bootstrap/README.md
index 32c2299ae..128a275bc 100644
--- a/bootstrap/README.md
+++ b/bootstrap/README.md
@@ -67,7 +67,7 @@ The service is configured using the environment variables presented in the follo
 
 ## Deployment
 
-The service itself is distributed as Docker container. Check the [`boostrap`](https://github.com/absmach/magistrala/blob/master/docker/addons/bootstrap/docker-compose.yml) service section in docker-compose to see how service is deployed.
+The service itself is distributed as Docker container. Check the [`bootstrap`](https://github.com/absmach/magistrala/blob/main/docker/addons/bootstrap/docker-compose.yml) service section in docker-compose file to see how service is deployed.
 
 To start the service outside of the container, execute the following shell script:
 
@@ -77,7 +77,7 @@ git clone https://github.com/absmach/magistrala
 
 cd magistrala
 
-# compile the service
+# compile the servic e
 make bootstrap
 
 # copy binary to bin
diff --git a/bootstrap/api/logging.go b/bootstrap/api/logging.go
index 53fb12c4d..eb92d7a45 100644
--- a/bootstrap/api/logging.go
+++ b/bootstrap/api/logging.go
@@ -76,10 +76,10 @@ func (lm *loggingMiddleware) Update(ctx context.Context, token string, cfg boots
 		}
 		if err != nil {
 			args = append(args, slog.Any("error", err))
-			lm.logger.Warn("Update boostrap config failed to complete successfully", args...)
+			lm.logger.Warn("Update bootstrap config failed to complete successfully", args...)
 			return
 		}
-		lm.logger.Info("Update boostrap config completed successfully", args...)
+		lm.logger.Info("Update bootstrap config completed successfully", args...)
 	}(time.Now())
 
 	return lm.svc.Update(ctx, token, cfg)
diff --git a/bootstrap/postgres/setup_test.go b/bootstrap/postgres/setup_test.go
index a501f4584..e993546ec 100644
--- a/bootstrap/postgres/setup_test.go
+++ b/bootstrap/postgres/setup_test.go
@@ -30,7 +30,7 @@ func TestMain(m *testing.M) {
 
 	container, err := pool.RunWithOptions(&dockertest.RunOptions{
 		Repository: "postgres",
-		Tag:        "16.1-alpine",
+		Tag:        "16.2-alpine",
 		Env: []string{
 			"POSTGRES_USER=test",
 			"POSTGRES_PASSWORD=test",
diff --git a/certs/README.md b/certs/README.md
index 1b921db23..52124be2c 100644
--- a/certs/README.md
+++ b/certs/README.md
@@ -9,7 +9,7 @@ When `MG_CERTS_VAULT_HOST` is set it is presumed that `Vault` is installed and `
 First you'll need to set up `Vault`.
 To setup `Vault` follow steps in [Build Your Own Certificate Authority (CA)](https://learn.hashicorp.com/tutorials/vault/pki-engine).
 
-For lab purposes you can use docker-compose and script for setting up PKI in [https://github.com/absmach/magistrala/blob/master/docker/addons/vault/README.md](https://github.com/absmach/magistrala/blob/master/docker/addons/vault/README.md)
+For lab purposes you can use docker-compose and script for setting up PKI in [https://github.com/absmach/magistrala/blob/main/docker/addons/vault/README.md](https://github.com/absmach/magistrala/blob/main/docker/addons/vault/README.md)
 
 ```bash
 MG_CERTS_VAULT_HOST=<https://vault-domain:8200>
@@ -68,7 +68,7 @@ The service is configured using the environment variables presented in the follo
 
 ## Deployment
 
-The service is distributed as Docker container. Check the [`certs`](https://github.com/absmach/magistrala/blob/main/docker/addons/bootstrap/docker-compose.yml) service section in docker-compose to see how the service is deployed.
+The service is distributed as Docker container. Check the [`certs`](https://github.com/absmach/magistrala/blob/main/docker/addons/bootstrap/docker-compose.yml) service section in docker-compose file to see how the service is deployed.
 
 Running this service outside of container requires working instance of the auth service, things service, postgres database, vault and Jaeger server.
 To start the service outside of the container, execute the following shell script:
diff --git a/certs/postgres/setup_test.go b/certs/postgres/setup_test.go
index 000d7522c..961b126d0 100644
--- a/certs/postgres/setup_test.go
+++ b/certs/postgres/setup_test.go
@@ -32,7 +32,7 @@ func TestMain(m *testing.M) {
 
 	container, err := pool.RunWithOptions(&dockertest.RunOptions{
 		Repository: "postgres",
-		Tag:        "16.1-alpine",
+		Tag:        "16.2-alpine",
 		Env: []string{
 			"POSTGRES_USER=test",
 			"POSTGRES_PASSWORD=test",
diff --git a/cli/bootstrap.go b/cli/bootstrap.go
index 0c1d9c03d..78a987a57 100644
--- a/cli/bootstrap.go
+++ b/cli/bootstrap.go
@@ -79,7 +79,7 @@ var cmdBootstrap = []cobra.Command{
 				config <JSON_config> - Updates editable fields of the provided Config.
 				connection <id> <channel_ids> - Updates connections performs update of the channel list corresponding Thing is connected to.
 				channel_ids - '["channel_id1", ...]'
-				certs  <id> <client_cert> <client_key> <ca> - Update boostrap config certificates.`,
+				certs  <id> <client_cert> <client_key> <ca> - Update bootstrap config certificates.`,
 		Run: func(cmd *cobra.Command, args []string) {
 			if len(args) < 3 {
 				logUsage(cmd.Use)
diff --git a/coap/README.md b/coap/README.md
index 2f0d31a0f..2a9a1ff91 100644
--- a/coap/README.md
+++ b/coap/README.md
@@ -30,7 +30,7 @@ The service is configured using the environment variables presented in the follo
 
 ## Deployment
 
-The service itself is distributed as Docker container. Check the [`coap-adapter`](https://github.com/absmach/magistrala/blob/main/docker/docker-compose.yml) service section in docker-compose to see how service is deployed.
+The service itself is distributed as Docker container. Check the [`coap-adapter`](https://github.com/absmach/magistrala/blob/main/docker/docker-compose.yml) service section in docker-compose file to see how service is deployed.
 
 Running this service outside of container requires working instance of the message broker service, things service and Jaeger server.
 To start the service outside of the container, execute the following shell script:
diff --git a/consumers/notifiers/postgres/setup_test.go b/consumers/notifiers/postgres/setup_test.go
index 2851594d0..56e3bf308 100644
--- a/consumers/notifiers/postgres/setup_test.go
+++ b/consumers/notifiers/postgres/setup_test.go
@@ -33,7 +33,7 @@ func TestMain(m *testing.M) {
 
 	container, err := pool.RunWithOptions(&dockertest.RunOptions{
 		Repository: "postgres",
-		Tag:        "16.1-alpine",
+		Tag:        "16.2-alpine",
 		Env: []string{
 			"POSTGRES_USER=test",
 			"POSTGRES_PASSWORD=test",
diff --git a/consumers/writers/cassandra/README.md b/consumers/writers/cassandra/README.md
index a9bb2140b..9862ef4e9 100644
--- a/consumers/writers/cassandra/README.md
+++ b/consumers/writers/cassandra/README.md
@@ -24,11 +24,11 @@ default values.
 | MG_MESSAGE_BROKER_URL                | Message broker instance URL                                             | nats://localhost:4222          |
 | MG_JAEGER_URL                        | Jaeger server URL                                                       | http://jaeger:14268/api/traces |
 | MG_SEND_TELEMETRY                    | Send telemetry to magistrala call home server                           | true                           |
-| MG_CASSANDRA_WRITER_INSANCE_ID       | Cassandra writer instance ID                                            |                                |
+| MG_CASSANDRA_WRITER_INSTANCE_ID      | Cassandra writer instance ID                                            |                                |
 
 ## Deployment
 
-The service itself is distributed as Docker container. Check the [`cassandra-writer`](https://github.com/absmach/magistrala/blob/master/docker/addons/cassandra-writer/docker-compose.yml#L30-L49) service section in docker-compose to see how service is deployed.
+The service itself is distributed as Docker container. Check the [`cassandra-writer`](https://github.com/absmach/magistrala/blob/main/docker/addons/cassandra-writer/docker-compose.yml#L30-L49) service section in docker-compose file to see how service is deployed.
 
 To start the service, execute the following shell script:
 
@@ -59,7 +59,7 @@ MG_CASSANDRA_PORT=[Cassandra DB port] \
 MG_MESSAGE_BROKER_URL=[Message Broker instance URL] \
 MG_JAEGER_URL=[Jaeger server URL] \
 MG_SEND_TELEMETRY=[Send telemetry to magistrala call home server] \
-MG_CASSANDRA_WRITER_INSANCE_ID=[Cassandra writer instance ID] \
+MG_CASSANDRA_WRITER_INSTANCE_ID=[Cassandra writer instance ID] \
 $GOBIN/magistrala-cassandra-writer
 ```
 
diff --git a/consumers/writers/influxdb/README.md b/consumers/writers/influxdb/README.md
index 8aa28e8db..fdf30cf4f 100644
--- a/consumers/writers/influxdb/README.md
+++ b/consumers/writers/influxdb/README.md
@@ -36,7 +36,7 @@ default values.
 
 ## Deployment
 
-The service itself is distributed as Docker container. Check the [`influxdb-writer`](https://github.com/absmach/magistrala/blob/master/docker/addons/influxdb-writer/docker-compose.yml#L35-L58) service section in docker-compose to see how service is deployed.
+The service itself is distributed as Docker container. Check the [`influxdb-writer`](https://github.com/absmach/magistrala/blob/main/docker/addons/influxdb-writer/docker-compose.yml#L35-L58) service section in docker-compose file to see how service is deployed.
 
 To start the service, execute the following shell script:
 
@@ -87,13 +87,13 @@ and writer service, it contains InfluxData Web Admin Interface which can be used
 exploration and data visualization and analytics. In order to run Magistrala InfluxDB writer, execute the following command:
 
 ```bash
-docker-compose -f docker/addons/influxdb-writer/docker-compose.yml up -d
+docker compose -f docker/addons/influxdb-writer/docker-compose.yml up -d
 ```
 
 And, to use the default .env file, execute the following command:
 
 ```bash
-docker-compose -f docker/addons/influxdb-writer/docker-compose.yml up --env-file docker/.env -d
+docker compose -f docker/addons/influxdb-writer/docker-compose.yml up --env-file docker/.env -d
 ```
 
 _Please note that you need to start core services before the additional ones._
diff --git a/consumers/writers/mongodb/README.md b/consumers/writers/mongodb/README.md
index 772c54286..f9fbf3605 100644
--- a/consumers/writers/mongodb/README.md
+++ b/consumers/writers/mongodb/README.md
@@ -26,7 +26,7 @@ default values.
 
 ## Deployment
 
-The service itself is distributed as Docker container. Check the [`mongodb-writer`](https://github.com/absmach/magistrala/blob/master/docker/addons/mongodb-writer/docker-compose.yml#L36-L55) service section in docker-compose to see how service is deployed.
+The service itself is distributed as Docker container. Check the [`mongodb-writer`](https://github.com/absmach/magistrala/blob/main/docker/addons/mongodb-writer/docker-compose.yml#L36-L55) service section in docker-compose file to see how service is deployed.
 
 To start the service, execute the following shell script:
 
diff --git a/consumers/writers/postgres/README.md b/consumers/writers/postgres/README.md
index ef39613a5..bd9907e5e 100644
--- a/consumers/writers/postgres/README.md
+++ b/consumers/writers/postgres/README.md
@@ -32,7 +32,7 @@ default values.
 
 ## Deployment
 
-The service itself is distributed as Docker container. Check the [`postgres-writer`](https://github.com/absmach/magistrala/blob/master/docker/addons/postgres-writer/docker-compose.yml#L34-L59) service section in docker-compose to see how service is deployed.
+The service itself is distributed as Docker container. Check the [`postgres-writer`](https://github.com/absmach/magistrala/blob/main/docker/addons/postgres-writer/docker-compose.yml#L34-L59) service section in docker-compose file to see how service is deployed.
 
 To start the service, execute the following shell script:
 
diff --git a/consumers/writers/postgres/setup_test.go b/consumers/writers/postgres/setup_test.go
index c50012760..d2c4b1e9e 100644
--- a/consumers/writers/postgres/setup_test.go
+++ b/consumers/writers/postgres/setup_test.go
@@ -28,7 +28,7 @@ func TestMain(m *testing.M) {
 
 	container, err := pool.RunWithOptions(&dockertest.RunOptions{
 		Repository: "postgres",
-		Tag:        "16.1-alpine",
+		Tag:        "16.2-alpine",
 		Env: []string{
 			"POSTGRES_USER=test",
 			"POSTGRES_PASSWORD=test",
diff --git a/consumers/writers/timescale/README.md b/consumers/writers/timescale/README.md
index d03c51cae..4cbbdddb2 100644
--- a/consumers/writers/timescale/README.md
+++ b/consumers/writers/timescale/README.md
@@ -32,7 +32,7 @@ default values.
 
 ## Deployment
 
-The service itself is distributed as Docker container. Check the [`timescale-writer`](https://github.com/absmach/magistrala/blob/master/docker/addons/timescale-writer/docker-compose.yml#L34-L59) service section in docker-compose to see how service is deployed.
+The service itself is distributed as Docker container. Check the [`timescale-writer`](https://github.com/absmach/magistrala/blob/main/docker/addons/timescale-writer/docker-compose.yml#L34-L59) service section in docker-compose file to see how service is deployed.
 
 To start the service, execute the following shell script:
 
diff --git a/docker/README.md b/docker/README.md
index 4f36f96e7..c21e20d4a 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -13,11 +13,11 @@ Follow the [official documentation](https://docs.docker.com/compose/install/).
 Run the following commands from the project root directory.
 
 ```bash
-docker-compose -f docker/docker-compose.yml up
+docker compose -f docker/docker-compose.yml up
 ```
 
 ```bash
-docker-compose -f docker/addons/<path>/docker-compose.yml  up
+docker compose -f docker/addons/<path>/docker-compose.yml up
 ```
 
 To pull docker images from a specific release you need to change the value of `MG_RELEASE_TAG` in `.env` before running these commands.
diff --git a/docker/addons/bootstrap/docker-compose.yml b/docker/addons/bootstrap/docker-compose.yml
index b9acd52e6..979297271 100644
--- a/docker/addons/bootstrap/docker-compose.yml
+++ b/docker/addons/bootstrap/docker-compose.yml
@@ -3,11 +3,9 @@
 
 # This docker-compose file contains optional bootstrap services. Since it's optional, this file is
 # dependent of docker-compose file from <project_root>/docker. In order to run this services, execute command:
-# docker-compose -f docker/docker-compose.yml -f docker/addons/bootstrap/docker-compose.yml up
+# docker compose -f docker/docker-compose.yml -f docker/addons/bootstrap/docker-compose.yml up
 # from project root.
 
-version: "3.7"
-
 networks:
   magistrala-base-net:
 
@@ -17,7 +15,7 @@ volumes:
 
 services:
   bootstrap-db:
-    image: postgres:16.1-alpine
+    image: postgres:16.2-alpine
     container_name: magistrala-bootstrap-db
     restart: on-failure
     environment:
diff --git a/docker/addons/cassandra-reader/docker-compose.yml b/docker/addons/cassandra-reader/docker-compose.yml
index 4b5b0e75e..fc381ea04 100644
--- a/docker/addons/cassandra-reader/docker-compose.yml
+++ b/docker/addons/cassandra-reader/docker-compose.yml
@@ -3,11 +3,9 @@
 
 # This docker-compose file contains optional cassandra-reader. Since it's optional, this file is
 # dependent of docker-compose file from <project_root>/docker. In order to run this service, execute command:
-# docker-compose -f docker/docker-compose.yml -f docker/addons/cassandra-reader/docker-compose.yml up
+# docker compose -f docker/docker-compose.yml -f docker/addons/cassandra-reader/docker-compose.yml up
 # from project root.
 
-version: "3.7"
-
 networks:
   magistrala-base-net:
 
diff --git a/docker/addons/cassandra-writer/docker-compose.yml b/docker/addons/cassandra-writer/docker-compose.yml
index 835658bf0..c7edec82e 100644
--- a/docker/addons/cassandra-writer/docker-compose.yml
+++ b/docker/addons/cassandra-writer/docker-compose.yml
@@ -3,11 +3,9 @@
 
 # This docker-compose file contains optional Cassandra and cassandra-writer. Since these are optional, this file is
 # dependent of docker-compose file from <project_root>/docker. In order to run these services, execute command:
-# docker-compose -f docker/docker-compose.yml -f docker/addons/cassandra-writer/docker-compose.yml up
+# docker compose -f docker/docker-compose.yml -f docker/addons/cassandra-writer/docker-compose.yml up
 # from project root.
 
-version: "3.7"
-
 networks:
   magistrala-base-net:
 
@@ -59,7 +57,7 @@ services:
       MG_JAEGER_URL: ${MG_JAEGER_URL}
       MG_JAEGER_TRACE_RATIO: ${MG_JAEGER_TRACE_RATIO}
       MG_SEND_TELEMETRY: ${MG_SEND_TELEMETRY}
-      MG_CASSANDRA_WRITER_INSANCE_ID: ${MG_CASSANDRA_WRITER_INSANCE_ID}
+      MG_CASSANDRA_WRITER_INSTANCE_ID: ${MG_CASSANDRA_WRITER_INSTANCE_ID}
     ports:
       - ${MG_CASSANDRA_WRITER_HTTP_PORT}:${MG_CASSANDRA_WRITER_HTTP_PORT}
     networks:
diff --git a/docker/addons/certs/docker-compose.yml b/docker/addons/certs/docker-compose.yml
index 41b966116..69cc9e002 100644
--- a/docker/addons/certs/docker-compose.yml
+++ b/docker/addons/certs/docker-compose.yml
@@ -3,11 +3,9 @@
 
 # This docker-compose file contains optional certs services. Since it's optional, this file is
 # dependent of docker-compose file from <project_root>/docker. In order to run this services, execute command:
-# docker-compose -f docker/docker-compose.yml -f docker/addons/certs/docker-compose.yml up
+# docker compose -f docker/docker-compose.yml -f docker/addons/certs/docker-compose.yml up
 # from project root.
 
-version: "3.7"
-
 networks:
   magistrala-base-net:
 
@@ -17,7 +15,7 @@ volumes:
 
 services:
   certs-db:
-    image: postgres:16.1-alpine
+    image: postgres:16.2-alpine
     container_name: magistrala-certs-db
     restart: on-failure
     environment:
diff --git a/docker/addons/influxdb-reader/docker-compose.yml b/docker/addons/influxdb-reader/docker-compose.yml
index 7ce8b04b6..464844dd1 100644
--- a/docker/addons/influxdb-reader/docker-compose.yml
+++ b/docker/addons/influxdb-reader/docker-compose.yml
@@ -8,8 +8,6 @@
 # as well as the network from the core composition, should be already running.
 ###
 
-version: "3.7"
-
 networks:
   magistrala-base-net:
 
diff --git a/docker/addons/influxdb-writer/docker-compose.yml b/docker/addons/influxdb-writer/docker-compose.yml
index abe20ba1b..172598d2c 100644
--- a/docker/addons/influxdb-writer/docker-compose.yml
+++ b/docker/addons/influxdb-writer/docker-compose.yml
@@ -6,8 +6,6 @@
 # docker-compose.yml file from <project_root>/docker/. In order to run these services,
 # core services, as well as the network from the core composition, should be already running.
 
-version: "3.7"
-
 networks:
   magistrala-base-net:
 
@@ -16,7 +14,7 @@ volumes:
 
 services:
   influxdb:
-    image: influxdb:2.7-alpine
+    image: influxdb:2.7.5-alpine
     container_name: magistrala-influxdb
     restart: on-failure
     environment:
diff --git a/docker/addons/lora-adapter/docker-compose.yml b/docker/addons/lora-adapter/docker-compose.yml
index d77e6336c..39e9c5753 100644
--- a/docker/addons/lora-adapter/docker-compose.yml
+++ b/docker/addons/lora-adapter/docker-compose.yml
@@ -6,8 +6,6 @@
 # docker-compose.yml file from <project_root>/docker/. In order to run these services,
 # core services, as well as the network from the core composition, should be already running.
 
-version: "3.7"
-
 networks:
   magistrala-base-net:
 
diff --git a/docker/addons/mongodb-reader/docker-compose.yml b/docker/addons/mongodb-reader/docker-compose.yml
index fb6a914f3..5b39e46cc 100644
--- a/docker/addons/mongodb-reader/docker-compose.yml
+++ b/docker/addons/mongodb-reader/docker-compose.yml
@@ -4,11 +4,9 @@
 # This docker-compose file contains optional MongoDB-reader service
 # for Magistrala platform. Since these are optional, this file is dependent of docker-compose file
 # from <project_root>/docker. In order to run this service, execute command:
-# docker-compose -f docker/docker-compose.yml -f docker/addons/mongodb-reader/docker-compose.yml up
+# docker compose -f docker/docker-compose.yml -f docker/addons/mongodb-reader/docker-compose.yml up
 # from project root. MongoDB service is defined in docker/addons/mongodb-writer/docker-compose.yml.
 
-version: "3.7"
-
 networks:
   magistrala-base-net:
 
diff --git a/docker/addons/mongodb-writer/docker-compose.yml b/docker/addons/mongodb-writer/docker-compose.yml
index dc7c439d9..7a18cddb8 100644
--- a/docker/addons/mongodb-writer/docker-compose.yml
+++ b/docker/addons/mongodb-writer/docker-compose.yml
@@ -4,12 +4,10 @@
 # This docker-compose file contains optional MongoDB and MongoDB-writer services
 # for Magistrala platform. Since these are optional, this file is dependent of docker-compose file
 # from <project_root>/docker. In order to run these services, execute command:
-# docker-compose -f docker/docker-compose.yml -f docker/addons/mongodb-writer/docker-compose.yml up
+# docker compose -f docker/docker-compose.yml -f docker/addons/mongodb-writer/docker-compose.yml up
 # from project root. MongoDB default port (27017) is exposed, so you can use various tools for database
 # inspection and data visualization.
 
-version: "3.7"
-
 networks:
   magistrala-base-net:
 
@@ -19,7 +17,7 @@ volumes:
 
 services:
   mongodb:
-    image: mongo:7.0.5
+    image: mongo:7.0.8
     container_name: magistrala-mongodb
     restart: on-failure
     environment:
diff --git a/docker/addons/opcua-adapter/docker-compose.yml b/docker/addons/opcua-adapter/docker-compose.yml
index a2088c8c2..2c6722793 100644
--- a/docker/addons/opcua-adapter/docker-compose.yml
+++ b/docker/addons/opcua-adapter/docker-compose.yml
@@ -6,8 +6,6 @@
 # docker-compose.yml file from <project_root>/docker/. In order to run these services,
 # core services, as well as the network from the core composition, should be already running.
 
-version: "3.7"
-
 networks:
   magistrala-base-net:
 
diff --git a/docker/addons/postgres-reader/docker-compose.yml b/docker/addons/postgres-reader/docker-compose.yml
index 32b606093..3b84d6c9b 100644
--- a/docker/addons/postgres-reader/docker-compose.yml
+++ b/docker/addons/postgres-reader/docker-compose.yml
@@ -4,11 +4,9 @@
 # This docker-compose file contains optional Postgres-reader service for Magistrala platform.
 # Since this service is optional, this file is dependent of docker-compose.yml file
 # from <project_root>/docker. In order to run this service, execute command:
-# docker-compose -f docker/docker-compose.yml -f docker/addons/postgres-reader/docker-compose.yml up
+# docker compose -f docker/docker-compose.yml -f docker/addons/postgres-reader/docker-compose.yml up
 # from project root.
 
-version: "3.7"
-
 networks:
   magistrala-base-net:
 
diff --git a/docker/addons/postgres-writer/docker-compose.yml b/docker/addons/postgres-writer/docker-compose.yml
index a2bf9feda..c5e1964c1 100644
--- a/docker/addons/postgres-writer/docker-compose.yml
+++ b/docker/addons/postgres-writer/docker-compose.yml
@@ -4,12 +4,10 @@
 # This docker-compose file contains optional Postgres and Postgres-writer services
 # for Magistrala platform. Since these are optional, this file is dependent of docker-compose file
 # from <project_root>/docker. In order to run these services, execute command:
-# docker-compose -f docker/docker-compose.yml -f docker/addons/postgres-writer/docker-compose.yml up
+# docker compose -f docker/docker-compose.yml -f docker/addons/postgres-writer/docker-compose.yml up
 # from project root. PostgreSQL default port (5432) is exposed, so you can use various tools for database
 # inspection and data visualization.
 
-version: "3.7"
-
 networks:
   magistrala-base-net:
 
@@ -18,7 +16,7 @@ volumes:
 
 services:
   postgres:
-    image: postgres:16.1-alpine
+    image: postgres:16.2-alpine
     container_name: magistrala-postgres
     restart: on-failure
     environment:
diff --git a/docker/addons/prometheus/docker-compose.yml b/docker/addons/prometheus/docker-compose.yml
index 1b3668ebc..100319be1 100644
--- a/docker/addons/prometheus/docker-compose.yml
+++ b/docker/addons/prometheus/docker-compose.yml
@@ -4,11 +4,9 @@
 # This docker-compose file contains optional Prometheus and Grafana service for Magistrala platform.
 # Since this service is optional, this file is dependent of docker-compose.yml file
 # from <project_root>/docker. In order to run this service, execute command:
-# docker-compose -f docker/addons/prometheus/docker-compose.yml up
+# docker compose -f docker/addons/prometheus/docker-compose.yml up
 # from project root.
 
-version: "3.7"
-
 networks:
   magistrala-base-net:
 
diff --git a/docker/addons/provision/docker-compose.yml b/docker/addons/provision/docker-compose.yml
index f4e1a526e..7709f4065 100644
--- a/docker/addons/provision/docker-compose.yml
+++ b/docker/addons/provision/docker-compose.yml
@@ -3,11 +3,9 @@
 
 # This docker-compose file contains optional provision services. Since it's optional, this file is
 # dependent of docker-compose file from <project_root>/docker. In order to run this services, execute command:
-# docker-compose -f docker/docker-compose.yml -f docker/addons/provision/docker-compose.yml up
+# docker compose -f docker/docker-compose.yml -f docker/addons/provision/docker-compose.yml up
 # from project root.
 
-version: "3.7"
-
 networks:
   magistrala-base-net:
 
diff --git a/docker/addons/smpp-notifier/docker-compose.yml b/docker/addons/smpp-notifier/docker-compose.yml
index 6e095f1b0..50a9f60b8 100644
--- a/docker/addons/smpp-notifier/docker-compose.yml
+++ b/docker/addons/smpp-notifier/docker-compose.yml
@@ -6,8 +6,6 @@
 # docker-compose.yml file from <project_root>/docker/. In order to run these services,
 # core services, as well as the network from the core composition, should be already running.
 
-version: "3.7"
-
 networks:
   magistrala-base-net:
 
@@ -16,7 +14,7 @@ volumes:
 
 services:
   smpp-notifier-db:
-    image: postgres:16.1-alpine
+    image: postgres:16.2-alpine
     container_name: magistrala-smpp-notifier-db
     restart: on-failure
     environment:
diff --git a/docker/addons/smtp-notifier/docker-compose.yml b/docker/addons/smtp-notifier/docker-compose.yml
index 39d9bc15f..8279cd58a 100644
--- a/docker/addons/smtp-notifier/docker-compose.yml
+++ b/docker/addons/smtp-notifier/docker-compose.yml
@@ -6,8 +6,6 @@
 # docker-compose.yml file from <project_root>/docker/. In order to run these services,
 # core services, as well as the network from the core composition, should be already running.
 
-version: "3.7"
-
 networks:
   magistrala-base-net:
 
@@ -16,7 +14,7 @@ volumes:
 
 services:
   smtp-notifier-db:
-    image: postgres:16.1-alpine
+    image: postgres:16.2-alpine
     container_name: magistrala-smtp-notifier-db
     restart: on-failure
     environment:
diff --git a/docker/addons/timescale-reader/docker-compose.yml b/docker/addons/timescale-reader/docker-compose.yml
index 6329d589b..269e1c602 100644
--- a/docker/addons/timescale-reader/docker-compose.yml
+++ b/docker/addons/timescale-reader/docker-compose.yml
@@ -4,11 +4,9 @@
 # This docker-compose file contains optional Timescale-reader service for Magistrala platform.
 # Since this service is optional, this file is dependent of docker-compose.yml file
 # from <project_root>/docker. In order to run this service, execute command:
-# docker-compose -f docker/docker-compose.yml -f docker/addons/timescale-reader/docker-compose.yml up
+# docker compose -f docker/docker-compose.yml -f docker/addons/timescale-reader/docker-compose.yml up
 # from project root.
 
-version: "3.7"
-
 networks:
   magistrala-base-net:
 
diff --git a/docker/addons/timescale-writer/docker-compose.yml b/docker/addons/timescale-writer/docker-compose.yml
index 9b3c7a951..125315a44 100644
--- a/docker/addons/timescale-writer/docker-compose.yml
+++ b/docker/addons/timescale-writer/docker-compose.yml
@@ -4,12 +4,10 @@
 # This docker-compose file contains optional Timescale and Timescale-writer services
 # for Magistrala platform. Since these are optional, this file is dependent of docker-compose file
 # from <project_root>/docker. In order to run these services, execute command:
-# docker-compose -f docker/docker-compose.yml -f docker/addons/timescale-writer/docker-compose.yml up
+# docker compose -f docker/docker-compose.yml -f docker/addons/timescale-writer/docker-compose.yml up
 # from project root. PostgreSQL default port (5432) is exposed, so you can use various tools for database
 # inspection and data visualization.
 
-version: "3.7"
-
 networks:
   magistrala-base-net:
 
diff --git a/docker/addons/twins/docker-compose.yml b/docker/addons/twins/docker-compose.yml
index 814dc5f4c..6f78a2990 100644
--- a/docker/addons/twins/docker-compose.yml
+++ b/docker/addons/twins/docker-compose.yml
@@ -6,8 +6,6 @@
 # docker-compose.yml file from <project_root>/docker/. In order to run these services,
 # core services, as well as the network from the core composition, should be already running.
 
-version: "3.7"
-
 networks:
   magistrala-base-net:
 
diff --git a/docker/addons/vault/docker-compose.yml b/docker/addons/vault/docker-compose.yml
index 0158a0dce..102ca168a 100644
--- a/docker/addons/vault/docker-compose.yml
+++ b/docker/addons/vault/docker-compose.yml
@@ -4,7 +4,7 @@
 # This docker-compose file contains optional Vault service for Magistrala platform.
 # Since this is optional, this file is dependent of docker-compose file
 # from <project_root>/docker. In order to run these services, execute command:
-# docker-compose -f docker/docker-compose.yml -f docker/addons/vault/docker-compose.yml up
+# docker compose -f docker/docker-compose.yml -f docker/addons/vault/docker-compose.yml up
 # from project root. Vault default port (8200) is exposed, so you can use Vault CLI tool for
 # vault inspection and administration, as well as access the UI.
 
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 452cae381..3d2dbd7dc 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,7 +1,6 @@
 # Copyright (c) Abstract Machines
 # SPDX-License-Identifier: Apache-2.0
 
-version: "3.7"
 name: "magistrala"
 
 networks:
@@ -21,7 +20,7 @@ volumes:
 
 services:
   spicedb:
-    image: "authzed/spicedb:v1.29.0"
+    image: "authzed/spicedb:v1.30.0"
     container_name: magistrala-spicedb
     command: "serve"
     restart: "always"
@@ -39,7 +38,7 @@ services:
       - spicedb-migrate
 
   spicedb-migrate:
-    image: "authzed/spicedb:v1.29.0"
+    image: "authzed/spicedb:v1.30.0"
     container_name: magistrala-spicedb-migrate
     command: "migrate head"
     restart: "on-failure"
@@ -52,7 +51,7 @@ services:
       - spicedb-db
 
   spicedb-db:
-    image: "postgres:16.1-alpine"
+    image: "postgres:16.2-alpine"
     container_name: magistrala-spicedb-db
     networks:
       - magistrala-base-net
@@ -66,7 +65,7 @@ services:
       - magistrala-spicedb-db-volume:/var/lib/postgresql/data
 
   auth-db:
-    image: postgres:16.1-alpine
+    image: postgres:16.2-alpine
     container_name: magistrala-auth-db
     restart: on-failure
     ports:
@@ -155,7 +154,7 @@ services:
           create_host_path: true
 
   invitations-db:
-    image: postgres:16.1-alpine
+    image: postgres:16.2-alpine
     container_name: magistrala-invitations-db
     restart: on-failure
     command: postgres -c "max_connections=${MG_POSTGRES_MAX_CONNECTIONS}"
@@ -226,7 +225,7 @@ services:
           create_host_path: true
 
   nginx:
-    image: nginx:1.25.0-alpine
+    image: nginx:1.25.4-alpine
     container_name: magistrala-nginx
     restart: on-failure
     volumes:
@@ -264,7 +263,7 @@ services:
       - coap-adapter
 
   things-db:
-    image: postgres:16.1-alpine
+    image: postgres:16.2-alpine
     container_name: magistrala-things-db
     restart: on-failure
     command: postgres -c "max_connections=${MG_POSTGRES_MAX_CONNECTIONS}"
@@ -378,7 +377,7 @@ services:
           create_host_path: true
 
   users-db:
-    image: postgres:16.1-alpine
+    image: postgres:16.2-alpine
     container_name: magistrala-users-db
     restart: on-failure
     command: postgres -c "max_connections=${MG_POSTGRES_MAX_CONNECTIONS}"
@@ -744,7 +743,7 @@ services:
       - magistrala-base-net
 
   ui-db:
-    image: postgres:16.1-alpine
+    image: postgres:16.2-alpine
     container_name: magistrala-ui-db
     restart: on-failure
     command: postgres -c "max_connections=${MG_POSTGRES_MAX_CONNECTIONS}"
diff --git a/docker/nginx/nginx-key.conf b/docker/nginx/nginx-key.conf
index f561229a9..153a7b7a4 100644
--- a/docker/nginx/nginx-key.conf
+++ b/docker/nginx/nginx-key.conf
@@ -36,8 +36,9 @@ http {
     server {
         listen 80 default_server;
         listen [::]:80 default_server;
-        listen 443 ssl http2 default_server;
-        listen [::]:443 ssl http2 default_server;
+        listen 443 ssl default_server;
+        listen [::]:443 ssl default_server;
+        http2 on;
 
         set $dynamic_server_name "$MG_NGINX_SERVER_NAME";
 
diff --git a/docker/nginx/nginx-x509.conf b/docker/nginx/nginx-x509.conf
index 49f0170e6..1da22b0fb 100644
--- a/docker/nginx/nginx-x509.conf
+++ b/docker/nginx/nginx-x509.conf
@@ -43,8 +43,9 @@ http {
     server {
         listen 80 default_server;
         listen [::]:80 default_server;
-        listen 443 ssl http2 default_server;
-        listen [::]:443 ssl http2 default_server;
+        listen 443 ssl default_server;
+        listen [::]:443 ssl default_server;
+        http2 on;
 
         set $dynamic_server_name "$MG_NGINX_SERVER_NAME";
 
diff --git a/http/README.md b/http/README.md
index 39f586fdf..109ea0bb3 100644
--- a/http/README.md
+++ b/http/README.md
@@ -26,7 +26,7 @@ The service is configured using the environment variables presented in the follo
 
 ## Deployment
 
-The service itself is distributed as Docker container. Check the [`http-adapter`](https://github.com/absmach/magistrala/blob/main/docker/docker-compose.yml) service section in docker-compose to see how service is deployed.
+The service itself is distributed as Docker container. Check the [`http-adapter`](https://github.com/absmach/magistrala/blob/main/docker/docker-compose.yml) service section in docker-compose file to see how service is deployed.
 
 Running this service outside of container requires working instance of the message broker service, things service and Jaeger server.
 To start the service outside of the container, execute the following shell script:
diff --git a/internal/groups/postgres/setup_test.go b/internal/groups/postgres/setup_test.go
index aba582754..0412bf9fe 100644
--- a/internal/groups/postgres/setup_test.go
+++ b/internal/groups/postgres/setup_test.go
@@ -34,7 +34,7 @@ func TestMain(m *testing.M) {
 
 	container, err := pool.RunWithOptions(&dockertest.RunOptions{
 		Repository: "postgres",
-		Tag:        "16.1-alpine",
+		Tag:        "16.2-alpine",
 		Env: []string{
 			"POSTGRES_USER=test",
 			"POSTGRES_PASSWORD=test",
diff --git a/invitations/README.md b/invitations/README.md
index e522a357d..de5c65fba 100644
--- a/invitations/README.md
+++ b/invitations/README.md
@@ -33,7 +33,7 @@ The service is configured using the environment variables presented in the follo
 
 ## Deployment
 
-The service itself is distributed as Docker container. Check the [`invitation`](https://github.com/absmach/amdm/blob/master/docker/docker-compose.yml) service section in docker-compose to see how service is deployed.
+The service itself is distributed as Docker container. Check the [`invitation`](https://github.com/absmach/amdm/blob/main/docker/docker-compose.yml) service section in docker-compose file to see how service is deployed.
 
 To start the service outside of the container, execute the following shell script:
 
diff --git a/invitations/postgres/setup_test.go b/invitations/postgres/setup_test.go
index 4f3233674..e49c56587 100644
--- a/invitations/postgres/setup_test.go
+++ b/invitations/postgres/setup_test.go
@@ -34,7 +34,7 @@ func TestMain(m *testing.M) {
 
 	container, err := pool.RunWithOptions(&dockertest.RunOptions{
 		Repository: "postgres",
-		Tag:        "16.1-alpine",
+		Tag:        "16.2-alpine",
 		Env: []string{
 			"POSTGRES_USER=test",
 			"POSTGRES_PASSWORD=test",
diff --git a/lora/README.md b/lora/README.md
index 8a0772476..4f619941b 100644
--- a/lora/README.md
+++ b/lora/README.md
@@ -33,7 +33,7 @@ The service is configured using the environment variables presented in the follo
 
 ## Deployment
 
-The service itself is distributed as Docker container. Check the [`lora-adapter`](https://github.com/absmach/magistrala/blob/main/docker/addons/lora-adapter/docker-compose.yml) service section in docker-compose to see how service is deployed.
+The service itself is distributed as Docker container. Check the [`lora-adapter`](https://github.com/absmach/magistrala/blob/main/docker/addons/lora-adapter/docker-compose.yml) service section in docker-compose file to see how service is deployed.
 
 Running this service outside of container requires working instance of the message broker service, LoRa server, things service and Jaeger server.
 To start the service outside of the container, execute the following shell script:
@@ -79,7 +79,7 @@ Setting `MG_LORA_ADAPTER_HTTP_SERVER_CERT` and `MG_LORA_ADAPTER_HTTP_SERVER_KEY`
 This service can be deployed using docker containers. Docker compose file is available in `<project_root>/docker/addons/lora-adapter/docker-compose.yml`. In order to run Magistrala lora-adapter, execute the following command:
 
 ```bash
-docker-compose -f docker/addons/lora-adapter/docker-compose.yml up -d
+docker compose -f docker/addons/lora-adapter/docker-compose.yml up -d
 ```
 
 ## Usage
diff --git a/mqtt/README.md b/mqtt/README.md
index b8e927517..413156cdc 100644
--- a/mqtt/README.md
+++ b/mqtt/README.md
@@ -34,7 +34,7 @@ The service is configured using the environment variables presented in the follo
 
 ## Deployment
 
-The service itself is distributed as Docker container. Check the [`mqtt-adapter`](https://github.com/absmach/magistrala/blob/main/docker/docker-compose.yml) service section in docker-compose to see how service is deployed.
+The service itself is distributed as Docker container. Check the [`mqtt-adapter`](https://github.com/absmach/magistrala/blob/main/docker/docker-compose.yml) service section in docker-compose file to see how service is deployed.
 
 Running this service outside of container requires working instance of the message broker service, things service and Jaeger server.
 To start the service outside of the container, execute the following shell script:
@@ -80,4 +80,4 @@ $GOBIN/magistrala-mqtt
 
 Setting `MG_THINGS_AUTH_GRPC_CLIENT_CERT` and `MG_THINGS_AUTH_GRPC_CLIENT_KEY` will enable TLS against the things service. The service expects a file in PEM format for both the certificate and the key. Setting `MG_THINGS_AUTH_GRPC_SERVER_CERTS` will enable TLS against the things service trusting only those CAs that are provided. The service expects a file in PEM format of trusted CAs.
 
-For more information about service capabilities and its usage, please check out the API documentation [API](https://github.com/absmach/magistrala/blob/master/api/mqtt.yml).
+For more information about service capabilities and its usage, please check out the API documentation [API](https://github.com/absmach/magistrala/blob/main/api/mqtt.yml).
diff --git a/opcua/README.md b/opcua/README.md
index c1d2cde2e..3856bf13f 100644
--- a/opcua/README.md
+++ b/opcua/README.md
@@ -28,7 +28,7 @@ The service is configured using the environment variables presented in the follo
 
 ## Deployment
 
-The service itself is distributed as Docker container. Check the [`opcua-adapter`](https://github.com/absmach/magistrala/blob/master/docker/addons/opcua-adapter/docker-compose.yml) service section in docker-compose to see how service is deployed.
+The service itself is distributed as Docker container. Check the [`opcua-adapter`](https://github.com/absmach/magistrala/blob/main/docker/addons/opcua-adapter/docker-compose.yml) service section in docker-compose file to see how service is deployed.
 
 Running this service outside of container requires working instance of the message broker service, redis routemap server and Jaeger server.
 To start the service outside of the container, execute the following shell script:
@@ -69,7 +69,7 @@ Setting `MG_LORA_ADAPTER_HTTP_SERVER_CERT` and `MG_LORA_ADAPTER_HTTP_SERVER_KEY`
 This service can be deployed using docker containers. Docker compose file is available in `<project_root>/docker/addons/opcua-adapter/docker-compose.yml`. In order to run Magistrala opcua-adapter, execute the following command:
 
 ```bash
-docker-compose -f docker/addons/opcua-adapter/docker-compose.yml up -d
+docker compose -f docker/addons/opcua-adapter/docker-compose.yml up -d
 ```
 
 ## Usage
diff --git a/pkg/clients/postgres/setup_test.go b/pkg/clients/postgres/setup_test.go
index 984659aca..29c3f728c 100644
--- a/pkg/clients/postgres/setup_test.go
+++ b/pkg/clients/postgres/setup_test.go
@@ -34,7 +34,7 @@ func TestMain(m *testing.M) {
 
 	container, err := pool.RunWithOptions(&dockertest.RunOptions{
 		Repository: "postgres",
-		Tag:        "16.1-alpine",
+		Tag:        "16.2-alpine",
 		Env: []string{
 			"POSTGRES_USER=test",
 			"POSTGRES_PASSWORD=test",
diff --git a/pkg/sdk/go/responses.go b/pkg/sdk/go/responses.go
index 1c960f507..2bc4ee7d8 100644
--- a/pkg/sdk/go/responses.go
+++ b/pkg/sdk/go/responses.go
@@ -67,7 +67,7 @@ type revokeCertsRes struct {
 	RevocationTime time.Time `json:"revocation_time"`
 }
 
-// BoostrapsPage contains list of boostrap configs in a page with proper metadata.
+// bootstrapsPage contains list of bootstrap configs in a page with proper metadata.
 type BootstrapPage struct {
 	Configs []BootstrapConfig `json:"configs"`
 	pageRes
diff --git a/provision/README.md b/provision/README.md
index d790dac40..73f6c8639 100644
--- a/provision/README.md
+++ b/provision/README.md
@@ -108,7 +108,7 @@ build/magistrala-provision
 Docker composition:
 
 ```bash
-docker-compose -f docker/addons/provision/docker-compose.yml up
+docker compose -f docker/addons/provision/docker-compose.yml up
 ```
 
 For the case that credentials or API token is passed in configuration file or environment variables, call to `/mapping` endpoint doesn't require `Authentication` header:
diff --git a/readers/cassandra/README.md b/readers/cassandra/README.md
index 3c8cc414c..b38ed90b9 100644
--- a/readers/cassandra/README.md
+++ b/readers/cassandra/README.md
@@ -34,8 +34,8 @@ default values.
 
 ## Deployment
 
-The service itself is distributed as Docker container. Check the [`cassandra-reader`](https://github.com/absmach/magistrala/blob/master/docker/addons/cassandra-reader/docker-compose.yml#L15-L35) service section in
-docker-compose to see how service is deployed.
+The service itself is distributed as Docker container. Check the [`cassandra-reader`](https://github.com/absmach/magistrala/blob/main/docker/addons/cassandra-reader/docker-compose.yml#L15-L35) service section in
+docker-compose file to see how service is deployed.
 
 To start the service, execute the following shell script:
 
@@ -84,9 +84,9 @@ In order to run all Magistrala core services, as well as mentioned optional ones
 execute following command:
 
 ```bash
-docker-compose -f docker/docker-compose.yml up -d
+docker compose -f docker/docker-compose.yml up -d
 ./docker/addons/cassandra-writer/init.sh
-docker-compose -f docker/addons/casandra-reader/docker-compose.yml up -d
+docker compose -f docker/addons/casandra-reader/docker-compose.yml up -d
 ```
 
 ## Usage
diff --git a/readers/influxdb/README.md b/readers/influxdb/README.md
index 5fc968e77..ea515fc22 100644
--- a/readers/influxdb/README.md
+++ b/readers/influxdb/README.md
@@ -42,7 +42,7 @@ default values.
 
 ## Deployment
 
-The service itself is distributed as Docker container. Check the [`influxdb-reader`](https://github.com/absmach/magistrala/blob/master/docker/addons/influxdb-reader/docker-compose.yml#L17-L40) service section in docker-compose to see how service is deployed.
+The service itself is distributed as Docker container. Check the [`influxdb-reader`](https://github.com/absmach/magistrala/blob/main/docker/addons/influxdb-reader/docker-compose.yml#L17-L40) service section in docker-compose file to see how service is deployed.
 
 To start the service, execute the following shell script:
 
@@ -100,14 +100,14 @@ In order to run all Magistrala core services, as well as mentioned optional ones
 execute following command:
 
 ```bash
-docker-compose -f docker/docker-compose.yml up -d
-docker-compose -f docker/addons/influxdb-reader/docker-compose.yml up -d
+docker compose -f docker/docker-compose.yml up -d
+docker compose -f docker/addons/influxdb-reader/docker-compose.yml up -d
 ```
 
 And, to use the default .env file, execute the following command:
 
 ```bash
-docker-compose -f docker/addons/influxdb-reader/docker-compose.yml up --env-file docker/.env -d
+docker compose -f docker/addons/influxdb-reader/docker-compose.yml up --env-file docker/.env -d
 ```
 
 ## Usage
diff --git a/readers/mongodb/README.md b/readers/mongodb/README.md
index 9a53a6d13..3f5d31f10 100644
--- a/readers/mongodb/README.md
+++ b/readers/mongodb/README.md
@@ -32,8 +32,8 @@ default values.
 
 ## Deployment
 
-The service itself is distributed as Docker container. Check the [`mongodb-reader`](https://github.com/absmach/magistrala/blob/master/docker/addons/mongodb-reader/docker-compose.yml#L16-L37) service section in
-docker-compose to see how service is deployed.
+The service itself is distributed as Docker container. Check the [`mongodb-reader`](https://github.com/absmach/magistrala/blob/main/docker/addons/mongodb-reader/docker-compose.yml#L16-L37) service section in
+docker-compose file to see how service is deployed.
 
 To start the service, execute the following shell script:
 
@@ -81,8 +81,8 @@ In order to run all Magistrala core services, as well as mentioned optional ones
 execute following command:
 
 ```bash
-docker-compose -f docker/docker-compose.yml up -d
-docker-compose -f docker/addons/mongodb-reader/docker-compose.yml up -d
+docker compose -f docker/docker-compose.yml up -d
+docker compose -f docker/addons/mongodb-reader/docker-compose.yml up -d
 ```
 
 ## Usage
diff --git a/readers/postgres/README.md b/readers/postgres/README.md
index 16384533f..5df71d18b 100644
--- a/readers/postgres/README.md
+++ b/readers/postgres/README.md
@@ -38,8 +38,8 @@ default values.
 
 ## Deployment
 
-The service itself is distributed as Docker container. Check the [`postgres-reader`](https://github.com/absmach/magistrala/blob/master/docker/addons/postgres-reader/docker-compose.yml#L17-L41) service section in
-docker-compose to see how service is deployed.
+The service itself is distributed as Docker container. Check the [`postgres-reader`](https://github.com/absmach/magistrala/blob/main/docker/addons/postgres-reader/docker-compose.yml#L17-L41) service section in
+docker-compose file to see how service is deployed.
 
 To start the service, execute the following shell script:
 
diff --git a/readers/postgres/setup_test.go b/readers/postgres/setup_test.go
index fdf71fbb5..4e3bb0e41 100644
--- a/readers/postgres/setup_test.go
+++ b/readers/postgres/setup_test.go
@@ -27,7 +27,7 @@ func TestMain(m *testing.M) {
 	}
 	container, err := pool.RunWithOptions(&dockertest.RunOptions{
 		Repository: "postgres",
-		Tag:        "16.1-alpine",
+		Tag:        "16.2-alpine",
 		Env: []string{
 			"POSTGRES_USER=test",
 			"POSTGRES_PASSWORD=test",
diff --git a/readers/timescale/README.md b/readers/timescale/README.md
index ab29c0ce1..807939efc 100644
--- a/readers/timescale/README.md
+++ b/readers/timescale/README.md
@@ -38,7 +38,7 @@ default values.
 
 ## Deployment
 
-The service itself is distributed as Docker container. Check the [`timescale-reader`](https://github.com/absmach/magistrala/blob/master/docker/addons/timescale-reader/docker-compose.yml#L17-L41) service section in docker-compose to see how service is deployed.
+The service itself is distributed as Docker container. Check the [`timescale-reader`](https://github.com/absmach/magistrala/blob/main/docker/addons/timescale-reader/docker-compose.yml#L17-L41) service section in docker-compose file to see how service is deployed.
 
 To start the service, execute the following shell script:
 
diff --git a/things/README.md b/things/README.md
index 88add98de..3f3f8a517 100644
--- a/things/README.md
+++ b/things/README.md
@@ -55,8 +55,8 @@ default values.
 
 ## Deployment
 
-The service itself is distributed as Docker container. Check the [`things `](https://github.com/absmach/magistrala/blob/master/docker/docker-compose.yml#L167-L194) service section in
-docker-compose to see how service is deployed.
+The service itself is distributed as Docker container. Check the [`things `](https://github.com/absmach/magistrala/blob/main/docker/docker-compose.yml#L167-L194) service section in
+docker-compose file to see how service is deployed.
 
 To start the service outside of the container, execute the following shell script:
 
diff --git a/things/postgres/setup_test.go b/things/postgres/setup_test.go
index ce4358cf1..894abbbb0 100644
--- a/things/postgres/setup_test.go
+++ b/things/postgres/setup_test.go
@@ -34,7 +34,7 @@ func TestMain(m *testing.M) {
 
 	container, err := pool.RunWithOptions(&dockertest.RunOptions{
 		Repository: "postgres",
-		Tag:        "16.1-alpine",
+		Tag:        "16.2-alpine",
 		Env: []string{
 			"POSTGRES_USER=test",
 			"POSTGRES_PASSWORD=test",
diff --git a/twins/README.md b/twins/README.md
index dee0bfec9..e77c4eb0e 100644
--- a/twins/README.md
+++ b/twins/README.md
@@ -35,8 +35,8 @@ default values.
 
 ## Deployment
 
-The service itself is distributed as Docker container. Check the [`twins`](https://github.com/absmach/magistrala/blob/master/docker/addons/twins/docker-compose.yml#L35-L58) service section in
-docker-compose to see how service is deployed.
+The service itself is distributed as Docker container. Check the [`twins`](https://github.com/absmach/magistrala/blob/main/docker/addons/twins/docker-compose.yml#L35-L58) service section in
+docker-compose file to see how service is deployed.
 
 To start the service outside of the container, execute the following shell
 script:
diff --git a/users/README.md b/users/README.md
index 3b1583b07..e1c63cd12 100644
--- a/users/README.md
+++ b/users/README.md
@@ -54,7 +54,7 @@ The service is configured using the environment variables presented in the follo
 
 ## Deployment
 
-The service itself is distributed as Docker container. Check the [`users`](https://github.com/absmach/magistrala/blob/main/docker/docker-compose.yml) service section in docker-compose to see how service is deployed.
+The service itself is distributed as Docker container. Check the [`users`](https://github.com/absmach/magistrala/blob/main/docker/docker-compose.yml) service section in docker-compose file to see how service is deployed.
 
 To start the service outside of the container, execute the following shell script:
 
diff --git a/users/postgres/setup_test.go b/users/postgres/setup_test.go
index a6d84c89c..fc3143563 100644
--- a/users/postgres/setup_test.go
+++ b/users/postgres/setup_test.go
@@ -34,7 +34,7 @@ func TestMain(m *testing.M) {
 
 	container, err := pool.RunWithOptions(&dockertest.RunOptions{
 		Repository: "postgres",
-		Tag:        "16.1-alpine",
+		Tag:        "16.2-alpine",
 		Env: []string{
 			"POSTGRES_USER=test",
 			"POSTGRES_PASSWORD=test",
diff --git a/ws/README.md b/ws/README.md
index 339604406..3dd0ac547 100644
--- a/ws/README.md
+++ b/ws/README.md
@@ -26,7 +26,7 @@ The service is configured using the environment variables presented in the follo
 
 ## Deployment
 
-The service is distributed as Docker container. Check the [`ws-adapter`](https://github.com/absmach/magistrala/blob/main/docker/docker-compose.yml) service section in docker-compose to see how the service is deployed.
+The service is distributed as Docker container. Check the [`ws-adapter`](https://github.com/absmach/magistrala/blob/main/docker/docker-compose.yml) service section in docker-compose file to see how the service is deployed.
 
 Running this service outside of container requires working instance of the message broker service, things service and Jaeger server.
 To start the service outside of the container, execute the following shell script: