diff --git a/conf/layer.conf b/conf/layer.conf
index 342eb6fd472dc0956ea51ae970cccc50a2c43ebb..c332cdd401d040ffd29934eb69368b4b9a261096 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -51,7 +51,10 @@ SERVICE_USER_GROUP:pn-ivi-homescreen-debug = "${IVI_HOMESCREEN_SERVICE_USER_GROU
 SERVICE_USER_GROUP:pn-ivi-homescreen-profile = "${IVI_HOMESCREEN_SERVICE_USER_GROUP}"
 SERVICE_USER_GROUP:pn-ivi-homescreen-release = "${IVI_HOMESCREEN_SERVICE_USER_GROUP}"
 
-IVI_HOMESCREEN_SERVICE_ENVIRONMENT = "Environment=HOME=/tmp\nEnvironment=XDG_RUNTIME_DIR=/run/user/1000\nEnvironment=WAYLAND_DISPLAY='wayland-1'"
+IVI_HOMESCREEN_SERVICE_ENVIRONMENT_WAYLAND_DISPLAY:qemux86-64 ?= 'wayland-1'
+IVI_HOMESCREEN_SERVICE_ENVIRONMENT_WAYLAND_DISPLAY ?= 'wayland-0'
+
+IVI_HOMESCREEN_SERVICE_ENVIRONMENT = "Environment=HOME=/tmp\nEnvironment=XDG_RUNTIME_DIR=/run/user/1000\nEnvironment=WAYLAND_DISPLAY=${IVI_HOMESCREEN_SERVICE_ENVIRONMENT_WAYLAND_DISPLAY}"
 SERVICE_ENVIRONMENT:pn-ivi-homescreen-debug = "${IVI_HOMESCREEN_SERVICE_ENVIRONMENT}"
 SERVICE_ENVIRONMENT:pn-ivi-homescreen-profile = "${IVI_HOMESCREEN_SERVICE_ENVIRONMENT}"
 SERVICE_ENVIRONMENT:pn-ivi-homescreen-release = "${IVI_HOMESCREEN_SERVICE_ENVIRONMENT}"