diff --git a/rpm/crypto-sdcard.spec b/rpm/crypto-sdcard.spec
index 1e12101e..d591f122 100644
--- a/rpm/crypto-sdcard.spec
+++ b/rpm/crypto-sdcard.spec
@@ -16,7 +16,7 @@ Group:         System/Base
 Distribution:  SailfishOS
 Vendor:        olf
 Packager:      olf
-License:       MIT
+License:       LGPL-2.1-only
 URL:           https://github.com/Olf0/%{name}
 Source:        https://github.com/Olf0/%{name}/archive/%{version}-%{release}/%{name}-%{version}-%{release}.tar.gz
 # rpmbuild (as of v4.14.1) handles the Icon tag awkwardly and in contrast to the Source tag(s):
diff --git a/systemd/system/mount-cryptosd-luks@.service b/systemd/system/mount-cryptosd-luks@.service
index 9748eebf..6c024636 100644
--- a/systemd/system/mount-cryptosd-luks@.service
+++ b/systemd/system/mount-cryptosd-luks@.service
@@ -18,6 +18,7 @@ Before=alien-service-manager.service umount.target
 Type=oneshot
 RemainAfterExit=yes
 EnvironmentFile=-/var/lib/environment/udisks2/%p@.conf
+EnvironmentFile=-/var/lib/environment/udisks2/%N.conf
 EnvironmentFile=-/var/lib/environment/udisks2/%p@%I.conf
 ExecStart=/usr/bin/udisksctl-user mount $UDISKS2_MOUNT_OPTIONS -b /dev/mapper/%I
 ExecStop=/usr/bin/udisksctl unmount -b /dev/mapper/%I
diff --git a/systemd/system/mount-cryptosd-plain@.service b/systemd/system/mount-cryptosd-plain@.service
index d9e0b7d1..66f785b3 100644
--- a/systemd/system/mount-cryptosd-plain@.service
+++ b/systemd/system/mount-cryptosd-plain@.service
@@ -18,6 +18,7 @@ Before=alien-service-manager.service umount.target
 Type=oneshot
 RemainAfterExit=yes
 EnvironmentFile=-/var/lib/environment/udisks2/%p@.conf
+EnvironmentFile=-/var/lib/environment/udisks2/%N.conf
 EnvironmentFile=-/var/lib/environment/udisks2/%p@%I.conf
 ExecStart=/usr/bin/udisksctl-user mount $UDISKS2_MOUNT_OPTIONS -b /dev/mapper/%I
 ExecStop=/usr/bin/udisksctl unmount -b /dev/mapper/%I