diff --git a/scripts/image_customization_lib.lua b/scripts/image_customization_lib.lua
index 69c0b3830fdb9390b7a587166ce3e4e41f8caa23..64fc1aac8cb9f12fa5ab7b98409341cbadf926bd 100644
--- a/scripts/image_customization_lib.lua
+++ b/scripts/image_customization_lib.lua
@@ -15,8 +15,8 @@ end
 
 local function evaluate_device(env, dev)
 	local selections = {
-		feature = {},
-		package = {},
+		features = {},
+		packages = {},
 	}
 	local funcs = {}
 	local device_overrides = {}
@@ -34,11 +34,11 @@ local function evaluate_device(env, dev)
 	end
 
 	function funcs.features(features)
-		add_elements('feature', features)
+		add_elements('features', features)
 	end
 
 	function funcs.packages(packages)
-		add_elements('package', packages)
+		add_elements('packages', packages)
 	end
 
 	function funcs.broken(broken)
@@ -115,12 +115,7 @@ function M.get_selections(env, dev)
 	end
 
 	local eval_result = evaluate_device(env, dev)
-	return_object = {
-		features = eval_result.selections['feature'],
-		packages = eval_result.selections['package'],
-	}
-
-	return return_object
+	return eval_result.selections
 end
 
 function M.device_overrides(env, dev)