diff --git a/.gitignore b/.gitignore
index f42adf5..e9a97fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,5 @@
 /man-3.4.14.tar.gz
 /etcd-3.5.0.tar.gz
 /etcd-3.5.5.tar.gz
+/etcd-3.5.11.tar.gz
+/etcd-3.5.13.tar.gz
diff --git a/etcd.spec b/etcd.spec
index 0e7422f..4f0d194 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -9,7 +9,7 @@
 # https://github.com/etcd-io/etcd
 %global goipath         go.etcd.io/etcd
 %global forgeurl        https://github.com/etcd-io/etcd
-Version:                3.5.5
+Version:                3.5.13
 
 %gometa
 
@@ -47,7 +47,6 @@ Source2:        %{name}.conf
 
 BuildRequires:  python3-devel
 BuildRequires:  systemd-rpm-macros
-Requires(pre):  shadow-utils
 
 %description %{common_description}
 
@@ -83,6 +82,11 @@ shopt -u extglob
 %generate_buildrequires
 %go_generate_buildrequires
 
+# Create a sysusers.d config file
+cat >etcd.sysusers.conf <<EOF
+u etcd - 'etcd user' %{_sharedstatedir}/%{name} -
+EOF
+
 %build
 %gobuild -o %{gobuilddir}/bin/etcd %{goipath}/server/v3
 %gobuild -o %{gobuilddir}/bin/etcdctl %{goipath}/etcdctl/v3
@@ -103,6 +107,8 @@ install -pm 644 -t %{buildroot}%{_sysconfdir}/%{name} %{SOURCE2}
 # And create /var/lib/etcd
 install -dm 0755 %{buildroot}%{_sharedstatedir}/%{name}
 
+install -m0644 -D etcd.sysusers.conf %{buildroot}%{_sysusersdir}/etcd.conf
+
 %if %{with check}
 %check
 %gocheck -d client/v2 \
@@ -120,10 +126,6 @@ install -dm 0755 %{buildroot}%{_sharedstatedir}/%{name}
          -d pkg/v3/proxy
 %endif
 
-%pre
-getent group %{name} >/dev/null || groupadd -r %{name}
-getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/%{name} \
-    -s /sbin/nologin -c "etcd user" %{name}
 
 %post
 %systemd_post %{name}.service
@@ -145,6 +147,7 @@ getent passwd %{name} >/dev/null || useradd -r -g %{name} -d %{_sharedstatedir}/
 %endif
 
 %gopkgfiles
+%{_sysusersdir}/etcd.conf
 
 %changelog
 %autochangelog
diff --git a/sources b/sources
index 6329787..86bef60 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (etcd-3.5.5.tar.gz) = 0e1d00a6c94b56cfb5e8f27172e749710938c0891eeaf3257e1dd22722e81d7402d44debb9784a1d330f900203e079956fcfe76e0e16f02a7d891e92f67976da
+SHA512 (etcd-3.5.13.tar.gz) = dc85d80079b61e96eb06eb573d41d8972060392e49140a2414c283ea9edfef7b01d5554e50c7ab37c6ad079b373ae12a1b84dbcc533addc1d4d30a2a5abf7b7b
diff --git a/tests/tests.yml b/tests/tests.yml
index 4baeb34..28f2cb0 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -1,3 +1,3 @@
 ---
 # Tests for classic environment
-- include: e2e_test_from_src_include.yml
+- import_playbook: e2e_test_from_src_include.yml