diff --git a/branding-preset-states b/branding-preset-states
index 8a364b4..a593de1 100644
--- a/branding-preset-states
+++ b/branding-preset-states
@@ -69,7 +69,7 @@ apply_preset_state_changes () {
 		exec 3<&-
 	done
 	if test -x /usr/bin/systemctl ; then
-		/usr/bin/systemctl --type=service,socket list-unit-files
+		/usr/bin/systemctl list-unit-files
 	fi >systemd_preset-states.rpm-tmp
 	exec 3<systemd_preset-states.rpm-tmp
 	read -u3 PAD
diff --git a/systemd-presets-common-SUSE.changes b/systemd-presets-common-SUSE.changes
index 4c64692..5efa407 100644
--- a/systemd-presets-common-SUSE.changes
+++ b/systemd-presets-common-SUSE.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jan 18 23:01:47 CET 2019 - sbrabec@suse.com
+
+- branding-preset-states: Apply preset to all unit types
+  (bsc#1121219).
+- Rename 90-default-SUSE.preset to 95-default-SUSE.preset, so
+  product branding takes precedence over common presets.
+
 -------------------------------------------------------------------
 Tue Jan 15 17:26:42 CET 2019 - tiwai@suse.de
 
diff --git a/systemd-presets-common-SUSE.spec b/systemd-presets-common-SUSE.spec
index 864e262..bcbd54a 100644
--- a/systemd-presets-common-SUSE.spec
+++ b/systemd-presets-common-SUSE.spec
@@ -52,10 +52,10 @@ mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-preset
 mkdir -p %{buildroot}%{_prefix}/lib/systemd/user-preset
 # everything that must be enabled to have a working system.
 # shared across all brands
-install -m644 %{SOURCE0}  %{buildroot}%{_prefix}/lib/systemd/system-preset/90-default-SUSE.preset
+install -m644 %{SOURCE0}  %{buildroot}%{_prefix}/lib/systemd/system-preset/95-default-SUSE.preset
 install -m644 %{SOURCE2}  %{buildroot}%{_prefix}/lib/systemd/system-preset/
 install -m755 %{SOURCE3}  %{buildroot}%{_prefix}/lib/%{generic_name}/
-install -m644 %{SOURCE4}  %{buildroot}%{_prefix}/lib/systemd/user-preset/90-default-SUSE.preset
+install -m644 %{SOURCE4}  %{buildroot}%{_prefix}/lib/systemd/user-preset/95-default-SUSE.preset
 
 %pre
 # On initial installation, branding-preset-states does not yet exist,