diff --git a/docker.service b/docker.service
index 3f563cb..b3d2f49 100644
--- a/docker.service
+++ b/docker.service
@@ -2,7 +2,6 @@
 Description=Docker Application Container Engine
 Documentation=http://docs.docker.com
 After=network.target
-Wants=docker-storage-setup.service
 
 [Service]
 Type=notify
diff --git a/docker.spec b/docker.spec
index 35075ee..33c0068 100644
--- a/docker.spec
+++ b/docker.spec
@@ -11,7 +11,7 @@
 Summary:	Automates deployment of containerized applications
 Name:		docker
 Version:	19.03.1
-Release:	1
+Release:	2
 License:	ASL 2.0
 Group:		System/Kernel and hardware
 Url:		http://www.docker.com
@@ -77,10 +77,8 @@ servers, OpenStack clusters, public instances, or combinations of the above.
 %{_presetdir}/86-%{name}.preset
 %{_unitdir}/%{name}.service
 %{_unitdir}/%{name}.socket
-%dir %{_sysconfdir}/bash_completion.d
 %{_sysconfdir}/bash_completion.d/%{name}.bash
 %dir %{_localstatedir}/lib/%{name}
-%dir %{_udevrulesdir}
 %{_udevrulesdir}/80-%{name}.rules
 %{_sysconfdir}/modules-load.d/overlay.conf
 
@@ -205,7 +203,7 @@ install -p -m 755 libnetwork/proxy %{buildroot}%{_bindir}/%{name}-proxy
 install -p -m 755 tini/build/tini-static %{buildroot}%{_bindir}/%{name}-init
 
 # Place to store images
-install -d %{buildroot}%{_var}/lib/%{name}
+install -d %{buildroot}%{_localstatedir}/lib/%{name}
 
 # install bash completion
 install -d %{buildroot}%{_sysconfdir}/bash_completion.d
@@ -230,7 +228,7 @@ install -p -m 644 components/cli/contrib/completion/zsh/_%{name} %{buildroot}%{_
 install -d %{buildroot}%{_udevrulesdir}
 install -p -m 644 components/engine/contrib/udev/80-%{name}.rules %{buildroot}%{_udevrulesdir}
 # install storage dir
-install -d -m 700 %{buildroot}%{_var}/lib/%{name}
+install -d -m 700 %{buildroot}%{_localstatedir}/lib/%{name}
 # install systemd/init scripts
 install -d %{buildroot}%{_unitdir}
 install -p -m 644 %{SOURCE1} %{SOURCE7} %{buildroot}%{_unitdir}