diff --git a/.github/workflows/helm-docs.yaml b/.github/workflows/helm-docs.yaml
index 3ed9618c..f09bca6e 100644
--- a/.github/workflows/helm-docs.yaml
+++ b/.github/workflows/helm-docs.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) Magistrala
+# Copyright (c) Abstract Machines
 # SPDX-License-Identifier: Apache-2.0
 
 name: Generate Helm Docs
@@ -23,7 +23,7 @@ jobs:
         id: helm-docs
         uses: losisin/helm-docs-github-action@v1.3.1
         with:
-          chart-search-root: "charts/magistrala"
+          chart-search-root: "charts/supermq"
           values-file: "values.yaml"
           output-file: "README.md"
           template-files: "README.md.gotmpl"
@@ -32,4 +32,4 @@ jobs:
 
       - name: Show README diff
         if: failure() && steps.helm-docs.outcome == 'failure'
-        run: git diff charts/magistrala/README.md || echo "No git diff available."
+        run: git diff charts/supermq/README.md || echo "No git diff available."
diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
index 544b5bd9..78f82a8f 100644
--- a/.github/workflows/lint-test.yaml
+++ b/.github/workflows/lint-test.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) Magistrala
+# Copyright (c) Abstract Machines
 # SPDX-License-Identifier: Apache-2.0
 
 name: Lint and Test Charts
@@ -29,7 +29,7 @@ jobs:
 
       - name: Update Helm dependencies
         run: |
-          helm dependency update charts/magistrala
+          helm dependency update charts/supermq
 
       # Python is required because `ct lint` runs Yamale (https://github.com/23andMe/Yamale) and
       # yamllint (https://github.com/adrienverge/yamllint) which require Python
@@ -61,4 +61,4 @@ jobs:
       - name: Run chart-testing (install)
         if: steps.list-changed.outputs.changed == 'true'
         run: |
-          ct install --target-branch ${{ github.event.repository.default_branch }} --chart-dirs charts/magistrala/charts
+          ct install --target-branch ${{ github.event.repository.default_branch }} --chart-dirs charts/supermq/charts
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 95e740e0..f0539ed0 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) Magistrala
+# Copyright (c) Abstract Machines
 # SPDX-License-Identifier: Apache-2.0
 
 name: Release Charts
@@ -41,7 +41,7 @@ jobs:
 
       - name: Update Helm dependencies
         run: |
-          helm dependency update charts/magistrala
+          helm dependency update charts/supermq
 
       - name: Run chart-releaser
         uses: helm/chart-releaser-action@v1.6.0
diff --git a/charts/magistrala/templates/bootstrap-deployment.yaml b/charts/magistrala/templates/bootstrap-deployment.yaml
deleted file mode 100644
index 15a17f87..00000000
--- a/charts/magistrala/templates/bootstrap-deployment.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright (c) Abstract Machines
-# SPDX-License-Identifier: Apache-2.0
-
-{{- if .Values.bootstrap.enabled }}
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ .Release.Name }}-bootstrap
-spec:
-  selector:
-    matchLabels:
-      app: {{ .Release.Name }}
-      component: bootstrap
-  template:
-    metadata:
-      annotations:
-        prometheus.io/path: /metrics
-        prometheus.io/port: "{{ .Values.bootstrap.httpPort }}"
-        prometheus.io/scrape: "true"
-      labels:
-        app: {{ .Release.Name }}
-        component: bootstrap
-    spec:
-      {{- with (default .Values.defaults.image.pullSecrets .Values.bootstrap.image.pullSecrets) }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      dnsPolicy: ClusterFirst
-      restartPolicy: Always
-      containers:
-        - name: {{ .Release.Name }}-bootstrap
-          image: "{{ default (printf "%s/bootstrap" .Values.defaults.image.rootRepository) .Values.bootstrap.image.repository }}:{{ default .Values.defaults.image.tag .Values.bootstrap.image.tag }}"
-          imagePullPolicy: {{ default .Values.defaults.image.pullPolicy .Values.bootstrap.image.pullPolicy }}
-          env:
-            - name: MG_JAEGER_URL
-              value: "http://{{ .Values.jaeger.fullnameOverride }}-collector:{{ .Values.jaeger.collector.service.otlp.http.port }}/v1/traces"
-            - name: MG_JAEGER_TRACE_RATIO
-              value: {{ default .Values.defaults.jaegerTraceRatio .Values.bootstrap.jaegerTraceRatio | quote }}
-            - name: MG_SEND_TELEMETRY
-              value: {{ default .Values.defaults.sendTelemetry .Values.bootstrap.sendTelemetry | quote }}
-            - name: MG_ES_URL
-              value: {{ .Values.defaults.eventStreamURL | quote }}
-            - name: MG_BOOTSTRAP_LOG_LEVEL
-              value: {{ default .Values.defaults.logLevel .Values.bootstrap.logLevel | quote }}
-            - name: MG_BOOTSTRAP_HTTP_HOST
-              value: "0.0.0.0"
-            - name: MG_BOOTSTRAP_HTTP_PORT
-              value: {{ .Values.bootstrap.httpPort | quote }}
-            - name: MG_THINGS_URL
-              value: http://{{ .Release.Name }}-things:{{ .Values.things.httpPort }}
-            - name: MG_THINGS_ES_URL              
-              value: {{ .Release.Name }}-redis-streams-master:{{ .Values.things.redisESPort }}
-            - name: MG_AUTH_GRPC_URL
-              value: {{ .Release.Name }}-envoy:{{ .Values.auth.grpcPort }}
-            - name: MG_BOOTSTRAP_ENCRYPT_KEY
-              value: {{ .Values.bootstrap.encKey | quote }}
-            - name: MG_BOOTSTRAP_EVENT_CONSUMER
-              value: {{ .Values.bootstrap.eventConsumerName | quote }}
-            - name: MG_BOOTSTRAP_DB_HOST
-            {{- if .Values.postgresqlbootstrap.enabled }}
-              value: {{ .Release.Name }}-postgresqlbootstrap
-            {{- else }}
-              value: {{ .Values.postgresqlbootstrap.host | quote }}
-            {{- end }}
-            - name: MG_BOOTSTRAP_DB_PORT
-              value: {{ .Values.postgresqlbootstrap.port | quote }}
-            - name: MG_BOOTSTRAP_DB_USER
-              value: {{ .Values.postgresqlbootstrap.username | quote }}
-            - name: MG_BOOTSTRAP_DB_PASS
-              value: {{ .Values.postgresqlbootstrap.password | quote }}
-            - name: MG_BOOTSTRAP_DB_NAME
-              value: {{ .Values.postgresqlbootstrap.database | quote }}
-
-          ports:
-            - containerPort: {{ .Values.bootstrap.httpPort }}
-              protocol: TCP
-      {{- with .Values.bootstrap.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.bootstrap.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.bootstrap.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-
-{{- end }}
diff --git a/charts/magistrala/templates/bootstrap-service.yaml b/charts/magistrala/templates/bootstrap-service.yaml
deleted file mode 100644
index 0d28852e..00000000
--- a/charts/magistrala/templates/bootstrap-service.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) Abstract Machines
-# SPDX-License-Identifier: Apache-2.0
-
-{{- if .Values.bootstrap.enabled }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Release.Name }}-bootstrap
-spec:
-  selector:
-    app: {{ .Release.Name }}
-    component: bootstrap
-  ports:
-    - port: {{ .Values.bootstrap.httpPort }}
-      protocol: TCP
-      name: {{ .Release.Name }}-bootstrap-{{ .Values.bootstrap.httpPort }}
-{{- end }}
diff --git a/charts/magistrala/templates/timescal-reader-service.yaml b/charts/magistrala/templates/timescal-reader-service.yaml
deleted file mode 100644
index 8ee370b7..00000000
--- a/charts/magistrala/templates/timescal-reader-service.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (c) Abstract Machines
-# SPDX-License-Identifier: Apache-2.0
-
-{{- if .Values.timescaledb.reader.enabled }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Release.Name }}-timescaledb-reader
-spec:
-  selector:
-    app: {{ .Release.Name }}
-    component: timescaledb-reader
-  ports:
-    - port: {{ .Values.timescaledb.reader.http.port }}
-      protocol: TCP
-      name: {{ .Release.Name }}-timescaledb-reader-{{ .Values.timescaledb.reader.http.port }}
-{{- end }}
-
diff --git a/charts/magistrala/templates/timescale-reader-deployment.yaml b/charts/magistrala/templates/timescale-reader-deployment.yaml
deleted file mode 100644
index 5c2ae8b0..00000000
--- a/charts/magistrala/templates/timescale-reader-deployment.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright (c) Abstract Machines
-# SPDX-License-Identifier: Apache-2.0
-
-{{- if .Values.timescaledb.reader.enabled }}
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ .Release.Name }}-timescaledb-reader
-spec:
-  selector:
-    matchLabels:
-      app: {{ .Release.Name }}
-      component: timescaledb-reader
-  template:
-    metadata:
-      labels:
-        app: {{ .Release.Name }}
-        component: timescaledb-reader
-    spec:
-      {{- with (default .Values.defaults.image.pullSecrets .Values.timescaledb.reader.image.pullSecrets) }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 12 }}
-      {{- end }}
-      dnsPolicy: ClusterFirst
-      restartPolicy: Always
-      containers:
-        - name: {{ .Release.Name }}-timescaledb-reader
-          image: "{{ default (printf "%s/timescale-reader" .Values.defaults.image.rootRepository) .Values.timescaledb.reader.image.repository }}:{{ default .Values.defaults.image.tag .Values.timescaledb.reader.image.tag }}"
-          imagePullPolicy: {{ default .Values.defaults.image.pullPolicy .Values.timescaledb.reader.image.pullPolicy }}
-          env:
-            - name: MG_JAEGER_URL
-              value: "http://{{ .Values.jaeger.fullnameOverride }}-collector:{{ .Values.jaeger.collector.service.otlp.http.port }}/v1/traces"
-            - name: MG_JAEGER_TRACE_RATIO
-              value: {{ default .Values.defaults.jaegerTraceRatio .Values.timescaledb.reader.jaegerTraceRatio | quote  }}
-            - name: MG_SEND_TELEMETRY
-              value: {{ default .Values.defaults.sendTelemetry .Values.timescaledb.reader.sendTelemetry | quote  }}
-            - name: MG_ES_URL
-              value: {{ .Values.defaults.eventStreamURL | quote }}
-            - name: MG_TIMESCALE_READER_LOG_LEVEL
-              value: {{ default .Values.defaults.logLevel .Values.timescaledb.reader.logLevel  | quote }}
-            - name: MG_TIMESCALE_READER_HTTP_HOST
-              value: "0.0.0.0"
-            - name: MG_TIMESCALE_READER_HTTP_PORT
-              value: {{ .Values.timescaledb.reader.http.port | quote }}
-            - name: MG_AUTH_GRPC_URL
-              value: {{ .Release.Name }}-envoy:{{ .Values.auth.grpcPort }}
-            - name: MG_THINGS_AUTH_GRPC_URL
-              value: {{ .Release.Name }}-envoy:{{ .Values.things.authGrpcPort }}
-            - name: MG_TIMESCALE_HOST
-            {{- if .Values.timescaledb.enabled }}
-              value: "{{ .Release.Name }}-timescaledb"
-            {{- else }}
-              value: {{ .Values.timescaledb.host | quote }}
-            {{- end }}
-            - name: MG_TIMESCALE_PORT
-              value: {{ .Values.timescaledb.port | quote  }}
-            - name: MG_TIMESCALE_USER
-              value: {{ .Values.timescaledb.username | quote  }}
-            - name: MG_TIMESCALE_PASS
-              value: {{ .Values.timescaledb.password | quote  }}
-            - name: MG_TIMESCALE_NAME
-              value: {{ .Values.timescaledb.database | quote }}
-          ports:
-            - containerPort: {{ .Values.timescaledb.reader.http.port }}
-              protocol: TCP
-      {{- with .Values.timescaledb.reader.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.timescaledb.reader.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.timescaledb.reader.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-{{- end }}
-
diff --git a/charts/magistrala/templates/timescale-writer-deployment.yaml b/charts/magistrala/templates/timescale-writer-deployment.yaml
deleted file mode 100644
index 7d9c0cc0..00000000
--- a/charts/magistrala/templates/timescale-writer-deployment.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright (c) Abstract Machines
-# SPDX-License-Identifier: Apache-2.0
-
-{{- if .Values.timescaledb.writer.enabled }}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ .Release.Name }}-timescaledb-writer-config
-data:
-  subjects.toml: |
-    # If you want to listen on all subjects, just pass one element ["channels.>"], otherwise
-    # pass the list of subjects (e.g ["channels.<channel_id>", "channels.<channel_id>.sub.topic.x", ...]).
-    [subjects]
-    filter = ["channels.>"]
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ .Release.Name }}-timescaledb-writer
-spec:
-  selector:
-    matchLabels:
-      app: {{ .Release.Name }}
-      component: timescaledb-writer
-  template:
-    metadata:
-      labels:
-        app: {{ .Release.Name }}
-        component: timescaledb-writer
-    spec:
-      {{- with (default .Values.defaults.image.pullSecrets .Values.timescaledb.writer.image.pullSecrets) }}
-      imagePullSecrets:
-        {{- toYaml . | nindent 12 }}
-      {{- end }}
-      dnsPolicy: ClusterFirst
-      restartPolicy: Always
-      volumes:
-        - configMap:
-            defaultMode: 256
-            name: {{ .Release.Name }}-timescaledb-writer-config
-            optional: false
-          name: timescaledb-writer-config
-      containers:
-        - name: {{ .Release.Name }}-timescaledb-writer
-          image: "{{ default (printf "%s/timescale-writer" .Values.defaults.image.rootRepository) .Values.timescaledb.writer.image.repository }}:{{ default .Values.defaults.image.tag .Values.timescaledb.writer.image.tag }}"
-          imagePullPolicy: {{ default .Values.defaults.image.pullPolicy .Values.timescaledb.writer.image.pullPolicy }}
-          env:
-            - name: MG_JAEGER_URL
-              value: "http://{{ .Values.jaeger.fullnameOverride }}-collector:{{ .Values.jaeger.collector.service.otlp.http.port }}/v1/traces"
-            - name: MG_JAEGER_TRACE_RATIO
-              value: {{ default .Values.defaults.jaegerTraceRatio .Values.timescaledb.writer.jaegerTraceRatio | quote  }}
-            - name: MG_SEND_TELEMETRY
-              value: {{ default .Values.defaults.sendTelemetry .Values.timescaledb.writer.sendTelemetry | quote  }}
-            - name: MG_ES_URL
-              value: {{ .Values.defaults.eventStreamURL | quote }}
-            - name: MG_TIMESCALE_WRITER_LOG_LEVEL
-              value: {{ default .Values.defaults.logLevel .Values.timescaledb.writer.logLevel  | quote }}
-            - name: MG_TIMESCALE_WRITER_HTTP_HOST
-              value: "0.0.0.0"
-            - name: MG_TIMESCALE_WRITER_HTTP_PORT
-              value: {{ .Values.timescaledb.writer.http.port | quote }}
-            - name: MG_TIMESCALE_WRITER_CONFIG_PATH
-              value: "/config/subjects.toml"
-            - name: MG_MESSAGE_BROKER_URL
-              value: "nats://{{ .Release.Name }}-nats:{{ .Values.defaults.natsPort }}"
-            - name: MG_TIMESCALE_HOST
-            {{- if .Values.timescaledb.enabled }}
-              value: "{{ .Release.Name }}-timescaledb"
-            {{- else }}
-              value: {{ .Values.timescaledb.host | quote }}
-            {{- end }}
-            - name: MG_TIMESCALE_PORT
-              value: {{ .Values.timescaledb.port | quote }}
-            - name: MG_TIMESCALE_USER
-              value: {{ .Values.timescaledb.username | quote  }}
-            - name: MG_TIMESCALE_PASS
-              value: {{ .Values.timescaledb.password | quote  }}
-            - name: MG_TIMESCALE_NAME
-              value: {{ .Values.timescaledb.database | quote  }}
-          ports:
-            - containerPort: {{ .Values.timescaledb.writer.http.port }}
-              protocol: TCP
-          volumeMounts:
-            - mountPath: /config/subjects.toml
-              name: timescaledb-writer-config
-              subPath: subjects.toml
-      {{- with .Values.timescaledb.writer.nodeSelector }}
-      nodeSelector:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.timescaledb.writer.affinity }}
-      affinity:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      {{- with .Values.timescaledb.writer.tolerations }}
-      tolerations:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-{{- end }}
diff --git a/charts/magistrala/templates/timescale-writer-service.yaml b/charts/magistrala/templates/timescale-writer-service.yaml
deleted file mode 100644
index 23a6b90e..00000000
--- a/charts/magistrala/templates/timescale-writer-service.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (c) Abstract Machines
-# SPDX-License-Identifier: Apache-2.0
-
-{{- if .Values.timescaledb.writer.enabled }}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Release.Name }}-timescaledb-writer
-spec:
-  selector:
-    app: {{ .Release.Name }}
-    component: timescaledb-writer
-  ports:
-    - port: {{ .Values.timescaledb.writer.http.port }}
-      protocol: TCP
-      name: {{ .Release.Name }}-timescaledb-writer-{{ .Values.timescaledb.writer.http.port }}
-{{- end }}
diff --git a/charts/magistrala/.helmignore b/charts/supermq/.helmignore
similarity index 100%
rename from charts/magistrala/.helmignore
rename to charts/supermq/.helmignore
diff --git a/charts/magistrala/Chart.lock b/charts/supermq/Chart.lock
similarity index 84%
rename from charts/magistrala/Chart.lock
rename to charts/supermq/Chart.lock
index 8af33910..eca4865b 100644
--- a/charts/magistrala/Chart.lock
+++ b/charts/supermq/Chart.lock
@@ -35,11 +35,14 @@ dependencies:
 - name: postgresql
   repository: https://charts.bitnami.com/bitnami
   version: 12.5.6
+- name: postgresql
+  repository: https://charts.bitnami.com/bitnami
+  version: 12.5.6
 - name: redis
   repository: https://charts.bitnami.com/bitnami
   version: 19.6.2
 - name: vault
   repository: https://helm.releases.hashicorp.com
   version: 0.28.1
-digest: sha256:9b98511c690b0f1f61f58130390537b9b02727bd1f190d6e334ef9c60d0bc82c
-generated: "2024-08-01T23:25:55.078828535+05:30"
+digest: sha256:23304aa3b2130b5f1dff9a111f0091548df74d444ff38fe85a9675514d520997
+generated: "2025-01-22T17:43:20.602140475+03:00"
diff --git a/charts/magistrala/Chart.yaml b/charts/supermq/Chart.yaml
similarity index 86%
rename from charts/magistrala/Chart.yaml
rename to charts/supermq/Chart.yaml
index 47b546bf..09764d28 100644
--- a/charts/magistrala/Chart.yaml
+++ b/charts/supermq/Chart.yaml
@@ -2,15 +2,15 @@
 # SPDX-License-Identifier: Apache-2.0
 
 apiVersion: v2
-name: magistrala
-description: Magistrala IoT Platform
+name: supermq
+description: Event-driven Infrastructure for Modern Cloud
 icon: https://avatars1.githubusercontent.com/u/13207490
 type: application
-version: 0.14.2  # Incremented chart version if the chart is updated
-appVersion: "0.14.0"  # Update application version if the app is updated
+version: 0.14.2 # Incremented chart version if the chart is updated
+appVersion: "0.14.0" # Update application version if the app is updated
 home: https://abstractmachines.fr/magistrala.html
 sources:
-  - https://hub.docker.com/u/magistrala
+  - https://hub.docker.com/u/supermq
 maintainers:
   - name: drasko
     email: drasko.draskovic@abstractmachines.fr
@@ -32,6 +32,12 @@ dependencies:
     alias: postgresqlauth
     condition: postgresqlauth.enabled
 
+  - name: postgresql
+    version: "12.5.6"
+    repository: "@bitnami"
+    alias: postgresqldomains
+    condition: postgresqldomains.enabled
+
   - name: postgresql
     version: "12.5.6"
     repository: "@bitnami"
@@ -74,12 +80,6 @@ dependencies:
     alias: postgresqljournal
     condition: postgresqljournal.enabled
 
-  - name: postgresql
-    version: "12.5.6"
-    repository: "@bitnami"
-    alias: timescaledb
-    condition: timescaledb.enabled
-
   - name: postgresql
     version: "12.5.6"
     repository: "@bitnami"
diff --git a/charts/magistrala/README.md b/charts/supermq/README.md
similarity index 100%
rename from charts/magistrala/README.md
rename to charts/supermq/README.md
diff --git a/charts/magistrala/README.md.gotmpl b/charts/supermq/README.md.gotmpl
similarity index 100%
rename from charts/magistrala/README.md.gotmpl
rename to charts/supermq/README.md.gotmpl
diff --git a/charts/magistrala/charts/.gitignore b/charts/supermq/charts/.gitignore
similarity index 100%
rename from charts/magistrala/charts/.gitignore
rename to charts/supermq/charts/.gitignore
diff --git a/charts/magistrala/secrets/.gitignore b/charts/supermq/secrets/.gitignore
similarity index 100%
rename from charts/magistrala/secrets/.gitignore
rename to charts/supermq/secrets/.gitignore
diff --git a/charts/magistrala/secrets/secrets.sh b/charts/supermq/secrets/secrets.sh
similarity index 100%
rename from charts/magistrala/secrets/secrets.sh
rename to charts/supermq/secrets/secrets.sh
diff --git a/charts/magistrala/templates/_helpers.tpl b/charts/supermq/templates/_helpers.tpl
similarity index 100%
rename from charts/magistrala/templates/_helpers.tpl
rename to charts/supermq/templates/_helpers.tpl
diff --git a/charts/magistrala/templates/adapter_coap-deployment.yaml b/charts/supermq/templates/adapter_coap-deployment.yaml
similarity index 100%
rename from charts/magistrala/templates/adapter_coap-deployment.yaml
rename to charts/supermq/templates/adapter_coap-deployment.yaml
diff --git a/charts/magistrala/templates/adapter_coap-service.yaml b/charts/supermq/templates/adapter_coap-service.yaml
similarity index 100%
rename from charts/magistrala/templates/adapter_coap-service.yaml
rename to charts/supermq/templates/adapter_coap-service.yaml
diff --git a/charts/magistrala/templates/adapter_http-deployment.yaml b/charts/supermq/templates/adapter_http-deployment.yaml
similarity index 100%
rename from charts/magistrala/templates/adapter_http-deployment.yaml
rename to charts/supermq/templates/adapter_http-deployment.yaml
diff --git a/charts/magistrala/templates/adapter_http-service.yaml b/charts/supermq/templates/adapter_http-service.yaml
similarity index 100%
rename from charts/magistrala/templates/adapter_http-service.yaml
rename to charts/supermq/templates/adapter_http-service.yaml
diff --git a/charts/magistrala/templates/adapter_mqtt-statefulstet.yaml b/charts/supermq/templates/adapter_mqtt-statefulstet.yaml
similarity index 100%
rename from charts/magistrala/templates/adapter_mqtt-statefulstet.yaml
rename to charts/supermq/templates/adapter_mqtt-statefulstet.yaml
diff --git a/charts/magistrala/templates/auth-deployment.yaml b/charts/supermq/templates/auth-deployment.yaml
similarity index 100%
rename from charts/magistrala/templates/auth-deployment.yaml
rename to charts/supermq/templates/auth-deployment.yaml
diff --git a/charts/magistrala/templates/auth-service.yaml b/charts/supermq/templates/auth-service.yaml
similarity index 100%
rename from charts/magistrala/templates/auth-service.yaml
rename to charts/supermq/templates/auth-service.yaml
diff --git a/charts/magistrala/templates/certs-deployment.yaml b/charts/supermq/templates/certs-deployment.yaml
similarity index 100%
rename from charts/magistrala/templates/certs-deployment.yaml
rename to charts/supermq/templates/certs-deployment.yaml
diff --git a/charts/magistrala/templates/certs-service.yaml b/charts/supermq/templates/certs-service.yaml
similarity index 100%
rename from charts/magistrala/templates/certs-service.yaml
rename to charts/supermq/templates/certs-service.yaml
diff --git a/charts/supermq/templates/domains-deplyment.yaml b/charts/supermq/templates/domains-deplyment.yaml
new file mode 100644
index 00000000..2ccb138c
--- /dev/null
+++ b/charts/supermq/templates/domains-deplyment.yaml
@@ -0,0 +1,67 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ .Release.Name }}-domains
+spec:
+  selector:
+    matchLabels:
+      app: {{ .Release.Name }}
+      component: domains
+  template:
+    metadata:
+      annotations:
+        prometheus.io/path: /metrics
+        prometheus.io/port: "{{ .Values.domains.http.port }}"
+        prometheus.io/scrape: "true"
+      labels:
+        app: {{ .Release.Name }}
+        component: domains
+    spec:
+      {{- with (default .Values.defaults.image.pullSecrets .Values.domains.image.pullSecrets) }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 12 }}
+      {{- end }}
+      dnsPolicy: ClusterFirst
+      restartPolicy: Always
+      containers:
+        - name: {{ .Release.Name }}-domains
+          image: "{{ default (printf "%s/domains" .Values.defaults.image.rootRepository) .Values.domains.image.repository }}:{{ default .Values.defaults.image.tag .Values.domains.image.tag }}"
+          imagePullPolicy: {{ default .Values.defaults.image.pullPolicy .Values.domains.image.pullPolicy }}
+          env:
+            - name: SMQ_DOMAINS_LOG_LEVEL
+              value: {{ default .Values.defaults.logLevel .Values.domains.logLevel | quote }}
+            - name: SMQ_DOMAINS_GRPC_HOST
+              value: {{ .Values.domains.grpc.host | quote }}
+            - name: SMQ_DOMAINS_GRPC_PORT
+              value: "{{ .Values.domains.grpc.port | quote }}"
+            - name: SMQ_DOMAINS_HTTP_HOST
+              value: {{ .Values.domains.http.host | quote }}
+            - name: SMQ_DOMAINS_HTTP_PORT
+              value: "{{ .Values.domains.http.port | quote }}"
+            - name: SMQ_DOMAINS_DB_HOST
+              {{- if .Values.postgresqldomains.enabled }}
+              value: "{{ .Release.Name }}-postgresqldomains"
+              {{- else }}
+              value: {{ .Values.postgresqldomains.host | quote }}
+              {{- end }}
+            - name: SMQ_DOMAINS_DB_PORT
+              value: "{{ .Values.postgresqldomains.port | quote }}"
+            - name: SMQ_DOMAINS_DB_USER
+              value: {{ .Values.postgresqldomains.username | quote }}
+            - name: SMQ_DOMAINS_DB_PASS
+              value: {{ .Values.postgresqldomains.password | quote }}
+            - name: SMQ_DOMAINS_DB_NAME
+              value: {{ .Values.postgresqldomains.database | quote }}
+            - name: SMQ_ES_URL
+              value: {{ .Values.defaults.eventStreamURL | quote }}
+            - name: SMQ_JAEGER_URL
+              value: "http://{{ .Values.jaeger.fullnameOverride }}-collector:{{ .Values.jaeger.collector.service.otlp.http.port }}/v1/traces"
+            - name: SMQ_JAEGER_TRACE_RATIO
+              value: {{ default .Values.defaults.jaegerTraceRatio .Values.domains.jaegerTraceRatio | quote }}
+            - name: SMQ_SEND_TELEMETRY
+              value: {{ default .Values.defaults.sendTelemetry .Values.domains.sendTelemetry | quote }}
+          ports:
+            - containerPort: {{ .Values.domains.grpc.port }}
+              name: grpc
+            - containerPort: {{ .Values.domains.http.port }}
+              name: http
diff --git a/charts/supermq/templates/domains-service.yaml b/charts/supermq/templates/domains-service.yaml
new file mode 100644
index 00000000..a123cb8e
--- /dev/null
+++ b/charts/supermq/templates/domains-service.yaml
@@ -0,0 +1,18 @@
+# Copyright (c) Abstract Machines
+# SPDX-License-Identifier: Apache-2.0
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Release.Name }}-domains
+spec:
+  selector:
+    app: {{ .Release.Name }}
+    component: domains
+  ports:
+    - protocol: TCP
+      port: {{ .Values.domains.http.port }}
+      name: {{ .Release.Name }}-domains-http
+    - protocol: TCP
+      port: {{ .Values.domains.grpc.port }}
+      name: {{ .Release.Name }}-domains-grpc
diff --git a/charts/magistrala/templates/envoy-config.yaml b/charts/supermq/templates/envoy-config.yaml
similarity index 100%
rename from charts/magistrala/templates/envoy-config.yaml
rename to charts/supermq/templates/envoy-config.yaml
diff --git a/charts/magistrala/templates/envoy.yaml b/charts/supermq/templates/envoy.yaml
similarity index 100%
rename from charts/magistrala/templates/envoy.yaml
rename to charts/supermq/templates/envoy.yaml
diff --git a/charts/magistrala/templates/ingress.yaml b/charts/supermq/templates/ingress.yaml
similarity index 96%
rename from charts/magistrala/templates/ingress.yaml
rename to charts/supermq/templates/ingress.yaml
index 02090704..22b394fd 100644
--- a/charts/magistrala/templates/ingress.yaml
+++ b/charts/supermq/templates/ingress.yaml
@@ -204,15 +204,6 @@ spec:
                 port:
                   number: {{ .Values.certs.httpPort }}
 {{- end }}
-{{- if .Values.bootstrap.enabled }}
-          - path: /bootstrap/?(.*)
-            pathType: ImplementationSpecific
-            backend:
-              service:
-                name: {{ .Release.Name }}-bootstrap
-                port:
-                  number: {{ .Values.bootstrap.httpPort }}
-{{- end }}
 {{- if .Values.ingress.tls }}
   tls:
     - hosts:
diff --git a/charts/magistrala/templates/invitations-deployment.yaml b/charts/supermq/templates/invitations-deployment.yaml
similarity index 100%
rename from charts/magistrala/templates/invitations-deployment.yaml
rename to charts/supermq/templates/invitations-deployment.yaml
diff --git a/charts/magistrala/templates/invitations-service.yaml b/charts/supermq/templates/invitations-service.yaml
similarity index 100%
rename from charts/magistrala/templates/invitations-service.yaml
rename to charts/supermq/templates/invitations-service.yaml
diff --git a/charts/magistrala/templates/journal-deployment.yaml b/charts/supermq/templates/journal-deployment.yaml
similarity index 100%
rename from charts/magistrala/templates/journal-deployment.yaml
rename to charts/supermq/templates/journal-deployment.yaml
diff --git a/charts/magistrala/templates/journal-service.yaml b/charts/supermq/templates/journal-service.yaml
similarity index 100%
rename from charts/magistrala/templates/journal-service.yaml
rename to charts/supermq/templates/journal-service.yaml
diff --git a/charts/magistrala/templates/nginx-internal.yaml b/charts/supermq/templates/nginx-internal.yaml
similarity index 100%
rename from charts/magistrala/templates/nginx-internal.yaml
rename to charts/supermq/templates/nginx-internal.yaml
diff --git a/charts/magistrala/templates/scpiedb-schema.yaml b/charts/supermq/templates/scpiedb-schema.yaml
similarity index 100%
rename from charts/magistrala/templates/scpiedb-schema.yaml
rename to charts/supermq/templates/scpiedb-schema.yaml
diff --git a/charts/magistrala/templates/spicedb-deployment.yaml b/charts/supermq/templates/spicedb-deployment.yaml
similarity index 100%
rename from charts/magistrala/templates/spicedb-deployment.yaml
rename to charts/supermq/templates/spicedb-deployment.yaml
diff --git a/charts/magistrala/templates/spicedb-envoy-config.yaml b/charts/supermq/templates/spicedb-envoy-config.yaml
similarity index 100%
rename from charts/magistrala/templates/spicedb-envoy-config.yaml
rename to charts/supermq/templates/spicedb-envoy-config.yaml
diff --git a/charts/magistrala/templates/spicedb-envoy-deployment.yaml b/charts/supermq/templates/spicedb-envoy-deployment.yaml
similarity index 100%
rename from charts/magistrala/templates/spicedb-envoy-deployment.yaml
rename to charts/supermq/templates/spicedb-envoy-deployment.yaml
diff --git a/charts/magistrala/templates/spicedb-envoy-service.yaml b/charts/supermq/templates/spicedb-envoy-service.yaml
similarity index 100%
rename from charts/magistrala/templates/spicedb-envoy-service.yaml
rename to charts/supermq/templates/spicedb-envoy-service.yaml
diff --git a/charts/magistrala/templates/spicedb-migration-job.yaml b/charts/supermq/templates/spicedb-migration-job.yaml
similarity index 100%
rename from charts/magistrala/templates/spicedb-migration-job.yaml
rename to charts/supermq/templates/spicedb-migration-job.yaml
diff --git a/charts/magistrala/templates/spicedb-service.yaml b/charts/supermq/templates/spicedb-service.yaml
similarity index 100%
rename from charts/magistrala/templates/spicedb-service.yaml
rename to charts/supermq/templates/spicedb-service.yaml
diff --git a/charts/magistrala/templates/things-deployment.yaml b/charts/supermq/templates/things-deployment.yaml
similarity index 100%
rename from charts/magistrala/templates/things-deployment.yaml
rename to charts/supermq/templates/things-deployment.yaml
diff --git a/charts/magistrala/templates/things-service.yaml b/charts/supermq/templates/things-service.yaml
similarity index 100%
rename from charts/magistrala/templates/things-service.yaml
rename to charts/supermq/templates/things-service.yaml
diff --git a/charts/magistrala/templates/ui-deployment.yaml b/charts/supermq/templates/ui-deployment.yaml
similarity index 91%
rename from charts/magistrala/templates/ui-deployment.yaml
rename to charts/supermq/templates/ui-deployment.yaml
index 479bce56..762068ff 100644
--- a/charts/magistrala/templates/ui-deployment.yaml
+++ b/charts/supermq/templates/ui-deployment.yaml
@@ -41,8 +41,6 @@ spec:
               value: {{ .Values.ui.pathPrefix | quote  }}
             - name: MG_HTTP_ADAPTER_URL
               value: {{ default (printf "http://%s-adapter-http:%s " .Release.Name (.Values.adapter_http.httpPort | toString )) .Values.ui.httpAdapterUrl }}
-            - name: MG_READER_URL
-              value: {{ default (printf "http://%s-timescaledb-reader:%s" .Release.Name (.Values.timescaledb.reader.http.port | toString )) .Values.ui.readerUrl }}
             - name: MG_THINGS_URL
               value: {{ default  (printf "http://%s-things:%s" .Release.Name (.Values.things.httpPort | toString )) .Values.ui.thingsUrl }}
             - name: MG_USERS_URL
@@ -51,8 +49,6 @@ spec:
               value: {{ default  (printf "http://%s-invitations:%s" .Release.Name (.Values.invitations.httpPort | toString ))  .Values.ui.invitationsUrl }}
             - name: MG_DOMAINS_URL
               value: {{ default  (printf "http://%s-auth:%s" .Release.Name (.Values.auth.httpPort | toString )) .Values.ui.authUrl }}
-            - name: MG_BOOTSTRAP_URL
-              value: {{ default  (printf "http://%s-bootstrap:%s" .Release.Name (.Values.bootstrap.httpPort | toString )) .Values.ui.bootstrapUrl }}
             - name: MG_JOURNAL_URL
               value: {{ default  (printf "http://%s-journal:%s" .Release.Name (.Values.journal.httpPort | toString )) .Values.ui.journalUrl }}
             - name: MG_UI_CONTENT_TYPE
diff --git a/charts/magistrala/templates/ui-service.yaml b/charts/supermq/templates/ui-service.yaml
similarity index 100%
rename from charts/magistrala/templates/ui-service.yaml
rename to charts/supermq/templates/ui-service.yaml
diff --git a/charts/magistrala/templates/users-deployment.yaml b/charts/supermq/templates/users-deployment.yaml
similarity index 64%
rename from charts/magistrala/templates/users-deployment.yaml
rename to charts/supermq/templates/users-deployment.yaml
index b1fb6f2a..8aeb7617 100644
--- a/charts/magistrala/templates/users-deployment.yaml
+++ b/charts/supermq/templates/users-deployment.yaml
@@ -29,7 +29,7 @@ spec:
     metadata:
       annotations:
         prometheus.io/path: /metrics
-        prometheus.io/port: "{{ .Values.users.httpPort }}"
+        prometheus.io/port: "{{ .Values.users.http.port }}"
         prometheus.io/scrape: "true"
       labels:
         app: {{ .Release.Name }}
@@ -46,54 +46,60 @@ spec:
           image: "{{ default (printf "%s/users" .Values.defaults.image.rootRepository) .Values.users.image.repository }}:{{ default .Values.defaults.image.tag .Values.users.image.tag }}"
           imagePullPolicy: {{ default .Values.defaults.image.pullPolicy .Values.users.image.pullPolicy }}
           env:
-            - name: MG_JAEGER_URL
+            - name: SMQ_USERS_LOG_LEVEL
+              value: {{ default .Values.defaults.logLevel .Values.users.logLevel  | quote }}
+            - name: SMQ_USERS_SECRET_KEY
+              value: {{ .Values.users.secretKey | quote }}
+            - name: SMQ_USERS_ADMIN_EMAIL
+              value: {{ .Values.users.admin.email | quote }}
+            - name: SMQ_USERS_ADMIN_PASSWORD
+              value: {{ .Values.users.admin.password | quote }}
+            - name: SMQ_USERS_ADMIN_USERNAME
+              value: {{ .Values.users.admin.username | quote }}
+            - name: SMQ_USERS_ADMIN_FIRST_NAME
+              value: {{ .Values.users.admin.firstName | quote }}
+            - name: SMQ_USERS_ADMIN_LAST_NAME
+              value: {{ .Values.users.admin.lastName | quote }}
+            - name: SMQ_USERS_PASS_REGEX
+              value: {{ .Values.users.passRegex | quote }}
+            - name: SMQ_TOKEN_RESET_ENDPOINT
+              value: {{ .Values.users.tokenResetEndpoint | quote }}
+            - name: SMQ_USERS_ALLOW_SELF_REGISTER
+              value: "{{ .Values.users.allowSelfRegister | quote }}"
+            - name: SMQ_USERS_DELETE_INTERVAL
+              value: {{ .Values.users.deleteInterval | quote }}
+            - name: SMQ_USERS_DELETE_AFTER
+              value: {{ .Values.users.deleteAfter | quote }}
+            - name: SMQ_USERS_HTTP_HOST
+              value: {{ .Values.users.http.host | quote }}
+            - name: SMQ_USERS_HTTP_PORT
+              value: "{{ .Values.users.http.port | quote }}"
+            - name: SMQ_ES_URL
+              value: {{ .Values.defaults.eventStreamURL | quote }}
+            - name: SMQ_JAEGER_URL
               value: "http://{{ .Values.jaeger.fullnameOverride }}-collector:{{ .Values.jaeger.collector.service.otlp.http.port }}/v1/traces"
-            - name: MG_JAEGER_TRACE_RATIO
+            - name: SMQ_JAEGER_TRACE_RATIO
               value: {{ default .Values.defaults.jaegerTraceRatio .Values.users.jaegerTraceRatio | quote  }}
-            - name: MG_SEND_TELEMETRY
+            - name: SMQ_SEND_TELEMETRY
               value: {{ default .Values.defaults.sendTelemetry .Values.users.sendTelemetry | quote  }}
-            - name: MG_ES_URL
-              value: {{ .Values.defaults.eventStreamURL | quote }}
-            - name: MG_USERS_LOG_LEVEL
-              value: {{ default .Values.defaults.logLevel .Values.users.logLevel  | quote }}
-            - name: MG_USERS_HTTP_HOST
-              value: "0.0.0.0"
-            - name: MG_USERS_HTTP_PORT
-              value: {{ .Values.users.httpPort  | quote  }}
-            - name: MG_TOKEN_RESET_ENDPOINT
-              value: {{ .Values.users.tokenResetEndpoint | quote }}
-            - name: MG_USERS_ADMIN_EMAIL
-              value: {{ .Values.users.adminEmail | quote }}
-            - name: MG_USERS_ADMIN_PASSWORD
-              value: {{ .Values.users.adminPassword | quote }}
-            - name: MG_USERS_SECRET_KEY
-              value: {{ .Values.users.secretKey | quote }}
-            - name: MG_USERS_PASS_REGEX
-              value: {{ .Values.users.passwordRegex | quote }}
-            - name: MG_USERS_ALLOW_SELF_REGISTER
-              value: {{ .Values.users.allowSelfRegister | quote }}
-            - name: MG_USERS_DELETE_INTERVAL
-              value: {{ .Values.users.deleteInterval | quote  }}
-            - name: MG_USERS_DELETE_AFTER
-              value: {{ .Values.users.deleteAfter | quote  }}
-            - name: MG_USERS_DB_HOST
+            - name: SMQ_USERS_DB_HOST
             {{- if .Values.postgresqlusers.enabled }}
               value: "{{ .Release.Name }}-postgresqlusers"
             {{- else }}
               value: {{ .Values.postgresqlusers.host | quote }}
             {{- end }}
-            - name: MG_USERS_DB_PORT
+            - name: SMQ_USERS_DB_PORT
               value: {{ .Values.postgresqlusers.port  | quote }}
-            - name: MG_USERS_DB_NAME
+            - name: SMQ_USERS_DB_NAME
               value: {{ .Values.postgresqlusers.database | quote }}
-            - name: MG_USERS_DB_USER
+            - name: SMQ_USERS_DB_USER
               value: {{ .Values.postgresqlusers.username | quote }}
-            - name: MG_USERS_DB_PASS
+            - name: SMQ_USERS_DB_PASS
               value: {{ .Values.postgresqlusers.password | quote }}
-            - name : MG_AUTH_GRPC_URL
+            - name : SMQ_AUTH_GRPC_URL
               value: {{ .Release.Name }}-envoy:{{ .Values.auth.grpcPort }}
           ports:
-            - containerPort: {{ .Values.users.httpPort }}
+            - containerPort: {{ .Values.users.http.port }}
               protocol: TCP
           volumeMounts:
             - mountPath: /email.tmpl
diff --git a/charts/magistrala/templates/users-service.yaml b/charts/supermq/templates/users-service.yaml
similarity index 87%
rename from charts/magistrala/templates/users-service.yaml
rename to charts/supermq/templates/users-service.yaml
index 041385e7..ef1c1794 100644
--- a/charts/magistrala/templates/users-service.yaml
+++ b/charts/supermq/templates/users-service.yaml
@@ -11,5 +11,5 @@ spec:
     component: users
   ports:
     - protocol: TCP
-      port: {{ .Values.users.httpPort }}
+      port: {{ .Values.users.http.port }}
       name: {{ .Release.Name }}-users-http
diff --git a/charts/magistrala/values.yaml b/charts/supermq/values.yaml
similarity index 83%
rename from charts/magistrala/values.yaml
rename to charts/supermq/values.yaml
index 7790fe4c..6152cd1c 100644
--- a/charts/magistrala/values.yaml
+++ b/charts/supermq/values.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) Magistrala
+# Copyright (c) Abstract Machines
 # SPDX-License-Identifier: Apache-2.0
 
 # The explanations for optional configuration parameters described in the adapter_coap section
@@ -8,16 +8,56 @@ defaults:
   logLevel: "info"
   image:
     pullPolicy: "IfNotPresent"
-    rootRepository: "magistrala"
+    rootRepository: "supermq"
     tag: "latest"
     # pullSecrets: {}
-  # Replicas of MQTT adapter, NATS, Things, Envoy and Auth
+  # Replicas of MQTT adapter, NATS, Clients, Envoy and Auth
   replicaCount: 3
   natsPort: 4222
   jaegerCollectorPort: 4318
   jaegerTraceRatio: 1.0
   sendTelemetry: true
-  eventStreamURL: "magistrala-nats:4222"
+  eventStreamURL: "supermq-nats:4222"
+
+domains:
+  image:
+    {}
+    # pullSecrets: {}
+    # repository: "supermq/domains"
+    # tag: "latest"
+    # pullPolicy: "IfNotPresent"
+  logLevel: "info"
+  # jaegerTraceRatio: 1.0
+  # sendTelemetry: true
+  grpc:
+    host: "0.0.0.0"
+    port: 7003
+  http:
+    host: "0.0.0.0"
+    port: 9003
+  cache:
+    url: "redis://domains-redis:6379/0"
+    keyDuration: "10m"
+
+postgresqldomains:
+  ## If you want to use an external database, set this to false and change host & port
+  enabled: true
+  name: postgresql-domains
+  host: postgresql-domains
+  port: &postgresqlUsersPort 5432
+  database: &postgresqlUsersDatabase domains
+  username: &postgresqlUsersUsername supermq
+  password: &postgresqlUsersPassword supermq
+  global:
+    postgresql:
+      auth:
+        postgresPassword: *postgresqlUsersPassword
+        username: *postgresqlUsersUsername
+        password: *postgresqlUsersPassword
+        database: *postgresqlUsersDatabase
+      service:
+        ports:
+          postgresql: *postgresqlUsersPort
 
 ingress:
   enabled: true
@@ -283,18 +323,26 @@ users:
   image:
     {}
     # pullSecrets: {}
-    # repository: "magistrala/users"
+    # repository: "supermq/users"
     # tag: "latest"
     # pullPolicy: "IfNotPresent"
   # jaegerTraceRatio: 1.0
   # sendTelemetry: true
   # logLevel: "info"
-  httpPort: 9002
-  grpcPort: 7001
+  secretKey: "HyE2D4RUt9nnKG6v8zKEqAp6g6ka8hhZsqUpzgKvnwpXrNVQSH"
   adminEmail: "admin@example.com"
-  adminPassword: "12345678"
-  secretKey: "secretKey"
+  admin:
+    password: "12345678"
+    username: "admin"
+    firstName: "super"
+    lastName: "admin"
   passwordRegex: "^.{8,}$"
+  accessTokenDuration: "15m"
+  refreshTokenDuration: "24h"
+  http:
+    host: "0.0.0.0"
+    port: 9002
+  grpcPort: 7001
   tokenResetEndpoint: "/reset-request"
   allowSelfRegister: true
   deleteInterval: "24h"
@@ -310,8 +358,8 @@ postgresqlusers:
   host: postgresql-users
   port: &postgresqlUsersPort 5432
   database: &postgresqlUsersDatabase users
-  username: &postgresqlUsersUsername magistrala
-  password: &postgresqlUsersPassword magistrala
+  username: &postgresqlUsersUsername supermq
+  password: &postgresqlUsersPassword supermq
   global:
     postgresql:
       auth:
@@ -367,44 +415,6 @@ redis-things:
     enabled: false
   usePassword: false
 
-bootstrap:
-  enabled: true
-  image: {}
-  #   pullSecrets: {}
-  #   repository: "magistrala/bootstrap"
-  #   tag: "latest"
-  #   pullPolicy: "IfNotPresent"
-  # jaegerTraceRatio: 1.0
-  # sendTelemetry: true
-  # logLevel: "info"
-  httpPort: 9013
-  redisESPort: 6379
-  encKey: "randomstring"
-  eventConsumerName: EventConsumerByBootstrap
-  # nodeSelector: {}
-  # affinity: {}
-  # tolerations: {}
-
-postgresqlbootstrap:
-  ## If you want to use an external database, set this to false and change host & port to external postgresql server host & port respectively
-  enabled: true
-  name: postgresql-bootstrap
-  host: postgresql-bootstrap
-  port: &postgresqlBootstrapPort 5432
-  database: &postgresqlBootstrapDatabase bootstrap
-  username: &postgresqlBootstrapUsername magistrala
-  password: &postgresqlBootstrapPassword magistrala
-  global:
-    postgresql:
-      auth:
-        postgresPassword: *postgresqlBootstrapPassword
-        username: *postgresqlBootstrapUsername
-        password: *postgresqlBootstrapPassword
-        database: *postgresqlBootstrapDatabase
-      service:
-        ports:
-          postgresql: *postgresqlBootstrapPort
-
 certs:
   enabled: true
   image:
@@ -522,61 +532,6 @@ postgresqljournal:
         ports:
           postgresql: *postgresqlJournalPort
 
-timescaledb:
-  ## If you want to use an external database, set this to false and change host & port to external postgresql server host & port respectively
-  enabled: true
-  name: timescalerw
-  host: timescalerw
-  port: &messagesRwTimescalePort 5432
-  database: &messagesRwTimescaleDatabase messages
-  username: &messagesRwTimescaleUsername magistrala
-  password: &messagesRwTimescalePassword magistrala
-  reader:
-    image:
-      {}
-      # pullSecrets: {}
-      # repository: "magistrala/timescale-reader"
-      # tag: "latest"
-      # pullPolicy: "IfNotPresent"
-    # jaegerTraceRatio: 1.0
-    # sendTelemetry: true
-    # logLevel: "info"
-    enabled: true
-    http: {port: 9011}
-    # nodeSelector: {}
-    # affinity: {}
-    # tolerations: {}
-  writer:
-    image:
-      {}
-      # pullSecrets: {}
-      # repository: "magistrala/timescale-writer"
-      # tag: "latest"
-      # pullPolicy: "IfNotPresent"
-    # jaegerTraceRatio: 1.0
-    # sendTelemetry: true
-    # logLevel: "info"
-    # nodeSelector: {}
-    # affinity: {}
-    # tolerations: {}
-    enabled: true
-    http: {port: 9012}
-  ## Configurations of Bitnami postgres
-  global:
-    postgresql:
-      auth:
-        postgresPassword: *messagesRwTimescalePassword
-        username: *messagesRwTimescaleUsername
-        password: *messagesRwTimescalePassword
-        database: *messagesRwTimescaleDatabase
-      service:
-        ports:
-          postgresql: *messagesRwTimescalePort
-  image:
-    registry: docker.io
-    repository: timescale/timescaledb
-    tag: latest-pg12
-
 ui:
   enabled: true
   image:
@@ -596,7 +551,6 @@ ui:
   # authUrl: "http://magistrala-auth:8189"
   # bootstrapUrl: "http://magistrala-bootstrap:9013"
   # thingsUrl: "http://magistrala-things:9000"
-  # readerUrl: "http://magistrala-timescale-reader:9011"
   # invitationsUrl: "http:///magistrala-auth:9020"
   # journalUrl: "http:///magistrala-auth:9021"
   # domainsUrl: "http://magistrala-auth:8189"