diff --git a/libssu/ssudeviceinfo.cpp b/libssu/ssudeviceinfo.cpp
index a02b182..7f27cfd 100644
--- a/libssu/ssudeviceinfo.cpp
+++ b/libssu/ssudeviceinfo.cpp
@@ -136,10 +136,15 @@ QString SsuDeviceInfo::deviceFamily()
 
     QString model = deviceVariant(true);
 
-    cachedFamily = "UNKNOWN";
-
-    if (boardMappings->contains(model + "/family"))
+    if (boardMappings->contains(model + "/family")) {
         cachedFamily = boardMappings->value(model + "/family").toString();
+    } else {
+        // In case family is not defined, lets use device variant, which
+        // falls back to device model. This way we can use the deviceFamily
+        // in common repository names where we want to have same feature package
+        // for multiple devices some of which have family and some which do not.
+        cachedFamily = model;
+    }
 
     return cachedFamily;
 }
diff --git a/libssu/ssurepomanager.cpp b/libssu/ssurepomanager.cpp
index 9b246ae..bf3276c 100644
--- a/libssu/ssurepomanager.cpp
+++ b/libssu/ssurepomanager.cpp
@@ -407,6 +407,7 @@ QString SsuRepoManager::url(const QString &repoName, bool rndRepo,
 
     repoParameters.insert("deviceFamily", deviceInfo.deviceFamily());
     repoParameters.insert("deviceModel", deviceInfo.deviceModel());
+    repoParameters.insert("deviceVariant", deviceInfo.deviceVariant(true));
 
     QString adaptationRepoName = deviceInfo.adaptationVariables(repoName, &repoParameters);