diff --git a/charts/testops/CHANGELOG.md b/charts/testops/CHANGELOG.md
index 82c66d6..111943f 100644
--- a/charts/testops/CHANGELOG.md
+++ b/charts/testops/CHANGELOG.md
@@ -9,6 +9,10 @@ Entries are ordered by priority:
 3. `[ENHANCEMENT]` Improvements to existing features
 4. `[BUGFIX]` Fixes for defects
 
+## 5.25.1
+
+- [BUGFIX] Added SQS secrets to secret.yaml and vault.yaml
+
 ## 5.25.0
 
 - [FEATURE] Added support of AWS SQS messaging service.
diff --git a/charts/testops/Chart.yaml b/charts/testops/Chart.yaml
index e6ade3e..614d7ad 100644
--- a/charts/testops/Chart.yaml
+++ b/charts/testops/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: testops
-version: 5.22.0
+version: 5.25.1
 appVersion: 25.3.2
 kubeVersion: '>= 1.20.0-0'
 
diff --git a/charts/testops/templates/infra/secret.yaml b/charts/testops/templates/infra/secret.yaml
index 2f5e8f9..53e9e18 100644
--- a/charts/testops/templates/infra/secret.yaml
+++ b/charts/testops/templates/infra/secret.yaml
@@ -23,8 +23,15 @@ data:
   cryptoPass: {{ randAlphaNum 64 | b64enc | quote }}
 {{- end }}
 
+{{- if eq .Values.messaging.type "rabbitmq" }}
   rabbitUser: {{ .Values.rabbitmq.auth.username | b64enc | quote }}
   rabbitPass: {{ .Values.rabbitmq.auth.password | b64enc | quote }}
+{{- end }}
+
+{{- if eq .Values.messaging.type "sqs" }}
+  sqsAccessKey: {{ .Values.messaging.sqs.accessKey | b64enc | quote }}
+  sqsSecretKey: {{ .Values.messaging.sqs.secretKey | b64enc | quote }}
+{{- end }}
 
 {{- if not .Values.postgresql.enabled }}
   testopsDbUser: {{ .Values.datasources.mainDatasource.username | b64enc | quote }}
diff --git a/charts/testops/templates/infra/vault.yaml b/charts/testops/templates/infra/vault.yaml
index f3f1bca..5ad5088 100644
--- a/charts/testops/templates/infra/vault.yaml
+++ b/charts/testops/templates/infra/vault.yaml
@@ -32,15 +32,23 @@ spec:
 {{- end }}
         - objectName: "redisPass"
           key: "redisPass"
+{{- if eq .Values.messaging.type "rabbitmq" }}
         - objectName: "rabbitUser"
           key: "rabbitUser"
         - objectName: "rabbitPass"
           key: "rabbitPass"
+{{- end }}
 {{- if not .Values.storage.awsSTS.enabled }}
         - objectName: "s3AccessKey"
           key: "s3AccessKey"
         - objectName: "s3SecretKey"
           key: "s3SecretKey"
+{{- if eq .Values.messaging.type "sqs" }}
+        - objectName: "sqsAccessKey"
+          key: "sqsAccessKey"
+        - objectName: "sqsSecretKey"
+          key: "sqsSecretKey"
+{{- end }}
 {{- end }}
         - objectName: "smtpUsername"
           key: "smtpUsername"
@@ -110,6 +118,7 @@ spec:
         secretPath: "{{ .Values.vault.secretPath }}"
         secretKey: "redis_pass"
 
+{{- if eq .Values.messaging.type "rabbitmq" }}
       - objectName: "rabbitUser"
         secretPath: "{{ .Values.vault.secretPath }}"
         secretKey: "rabbit_user"
@@ -117,6 +126,7 @@ spec:
       - objectName: "rabbitPass"
         secretPath: "{{ .Values.vault.secretPath }}"
         secretKey: "rabbit_pass"
+{{- end }}
 
 {{- if not .Values.storage.awsSTS.enabled }}
       - objectName: "s3AccessKey"
@@ -126,6 +136,15 @@ spec:
       - objectName: "s3SecretKey"
         secretPath: "{{ .Values.vault.secretPath }}"
         secretKey: "s3_secret_key"
+{{- if eq .Values.messaging.type "sqs" }}
+      - objectName: "sqsAccessKey"
+        secretPath: "{{ .Values.vault.secretPath }}"
+        secretKey: "sqs_access_key"
+
+      - objectName: "sqsSecretKey"
+        secretPath: "{{ .Values.vault.secretPath }}"
+        secretKey: "sqs_secret_key"
+{{- end }}
 {{- end }}
 
       - objectName: "smtpUsername"
diff --git a/charts/testops/values.yaml b/charts/testops/values.yaml
index 57a55e9..3b0e5ca 100644
--- a/charts/testops/values.yaml
+++ b/charts/testops/values.yaml
@@ -780,6 +780,27 @@ messaging:
     # The AWS region where the SQS queues are located.
     region: us-east-1
     ############################################################################################################
+    # queuePrefix is prepended to all automatically generated SQS queue names.
+    ############################################################################################################
+    queuePrefix: testops
+    ############################################################################################################
+    # Allows providing explicit names for SQS queues, overriding the default generated names.
+    # If a value is left empty, a default name will be constructed using the queuePrefix and a standard suffix
+    # (e.g., "testops_allure_upload_process").
+    ############################################################################################################
+    queues: {}
+      # uploadProcess: ""
+      # uploadProcessDlq: ""
+      # uploadPostProcess: ""
+      # uploadPostProcessDlq: ""
+      # uploadCompleteProcess: ""
+      # integrationExportLaunch: ""
+      # systemCleanBlobStorage: ""
+      # systemDeadLetter: ""
+    # If you run Testops in AWS EKS you don't need stating accessKey & secretKey
+    accessKey: WBuetMuTAMAB4M78NG3gQ4dCFJr3SSmU
+    secretKey: m9F4qupW4ucKBDQBWr4rwQLSAeC6FE2L
+    ############################################################################################################
     # Consumer settings for different queue types.
     # These settings allow fine-tuning of performance and resource consumption for message processing.
     ############################################################################################################
@@ -810,24 +831,6 @@ messaging:
       # The duration that a received message is hidden from subsequent retrieve requests.
       # Format: duration string (e.g., "10m", "1h", "30s").
       visibilityTimeout: 10m
-    ############################################################################################################
-    # queuePrefix is prepended to all automatically generated SQS queue names.
-    ############################################################################################################
-    queuePrefix: testops
-    ############################################################################################################
-    # Allows providing explicit names for SQS queues, overriding the default generated names.
-    # If a value is left empty, a default name will be constructed using the queuePrefix and a standard suffix
-    # (e.g., "testops_allure_upload_process").
-    ############################################################################################################
-    queues: {}
-      # uploadProcess: ""
-      # uploadProcessDlq: ""
-      # uploadPostProcess: ""
-      # uploadPostProcessDlq: ""
-      # uploadCompleteProcess: ""
-      # integrationExportLaunch: ""
-      # systemCleanBlobStorage: ""
-      # systemDeadLetter: ""
 
 ############################################################################################################
 # Software required for Testops to work