diff --git a/hack/e2e-apps/etcd.bats b/hack/e2e-apps/etcd.bats
new file mode 100644
index 000000000..cdee713d9
--- /dev/null
+++ b/hack/e2e-apps/etcd.bats
@@ -0,0 +1,58 @@
+#!/usr/bin/env bats
+
+@test "Create Etcd" {
+  name='test'
+  kubectl -n tenant-test delete etcd.apps.cozystack.io $name --ignore-not-found --timeout=2m || true
+  kubectl apply -f- <<EOF
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Etcd
+metadata:
+  name: $name
+  namespace: tenant-test
+spec:
+  size: 1Gi
+  replicas: 3
+  storageClass: ""
+  resources:
+    cpu: 100m
+    memory: 128Mi
+EOF
+  sleep 5
+  kubectl -n tenant-test wait hr etcd-$name --timeout=60s --for=condition=ready
+  kubectl -n tenant-test wait etcdcluster.etcd.aenix.io etcd --timeout=120s --for=jsonpath='{.status.conditions[?(@.type=="Ready")].status}'=True
+  kubectl -n tenant-test delete etcd.apps.cozystack.io $name
+}
+
+@test "Create Etcd with backup schedule" {
+  name='test-backup'
+  kubectl -n tenant-test delete etcd.apps.cozystack.io $name --ignore-not-found --timeout=2m || true
+  kubectl apply -f- <<EOF
+apiVersion: apps.cozystack.io/v1alpha1
+kind: Etcd
+metadata:
+  name: $name
+  namespace: tenant-test
+spec:
+  size: 1Gi
+  replicas: 3
+  storageClass: ""
+  resources:
+    cpu: 100m
+    memory: 128Mi
+  backup:
+    enabled: true
+    schedule: "0 2 * * *"
+    destinationPath: "s3://test-bucket/etcd-backups/"
+    endpointURL: "http://minio-gateway-service:9000"
+    forcePathStyle: true
+    s3AccessKey: "test-access-key"
+    s3SecretKey: "test-secret-key"
+    successfulJobsHistoryLimit: 3
+    failedJobsHistoryLimit: 1
+EOF
+  sleep 5
+  kubectl -n tenant-test wait hr etcd-$name --timeout=60s --for=condition=ready
+  kubectl -n tenant-test wait etcdbackupschedule.etcd.aenix.io etcd --timeout=60s --for=jsonpath='{.spec.schedule}'='0 2 * * *'
+  kubectl -n tenant-test get secret etcd-s3-creds
+  kubectl -n tenant-test delete etcd.apps.cozystack.io $name
+}
diff --git a/packages/extra/etcd/templates/backup-secret.yaml b/packages/extra/etcd/templates/backup-secret.yaml
index 15aec23fd..99db7c301 100644
--- a/packages/extra/etcd/templates/backup-secret.yaml
+++ b/packages/extra/etcd/templates/backup-secret.yaml
@@ -3,7 +3,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ .Release.Name }}-s3-creds
+  name: etcd-s3-creds
 stringData:
   AWS_ACCESS_KEY_ID: {{ required "s3AccessKey is not specified!" .Values.backup.s3AccessKey | quote }}
   AWS_SECRET_ACCESS_KEY: {{ required "s3SecretKey is not specified!" .Values.backup.s3SecretKey | quote }}
diff --git a/packages/extra/etcd/templates/etcd-backup-schedule.yaml b/packages/extra/etcd/templates/etcd-backup-schedule.yaml
index 1de48ef98..8b632689f 100644
--- a/packages/extra/etcd/templates/etcd-backup-schedule.yaml
+++ b/packages/extra/etcd/templates/etcd-backup-schedule.yaml
@@ -7,7 +7,7 @@
 apiVersion: etcd.aenix.io/v1alpha1
 kind: EtcdBackupSchedule
 metadata:
-  name: {{ .Release.Name }}
+  name: etcd
 spec:
   clusterRef:
     name: etcd
@@ -26,5 +26,5 @@ spec:
       {{- end }}
       forcePathStyle: {{ .Values.backup.forcePathStyle }}
       credentialsSecretRef:
-        name: {{ .Release.Name }}-s3-creds
+        name: etcd-s3-creds
 {{- end }}