diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cd3f285b58df748bfc5e714431a31a3a98e8ecff..11ef5c36f1cd4cc13108902ca79e649a920bb331 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -69,7 +69,7 @@ build-fedora:
     - .gdm.fedora
   stage: build
   script:
-    - meson setup ${MESON_BUILD_DIR} ${COMMON_BUILD_OPTIONS} -Dx11-support=true
+    - meson setup ${MESON_BUILD_DIR} ${COMMON_BUILD_OPTIONS}
     - meson compile -C ${MESON_BUILD_DIR}
     - meson install -C ${MESON_BUILD_DIR}
     - meson dist -C ${MESON_BUILD_DIR}
@@ -90,7 +90,7 @@ build-fedora-wayland:
     - .gdm.fedora
   stage: build
   script:
-    - meson setup ${MESON_BUILD_DIR} ${COMMON_BUILD_OPTIONS}
+    - meson setup ${MESON_BUILD_DIR} ${COMMON_BUILD_OPTIONS} -Dx11-support=false
     - meson compile -C ${MESON_BUILD_DIR}
     - meson install -C ${MESON_BUILD_DIR}
     - meson dist -C ${MESON_BUILD_DIR}
diff --git a/data/gdm.conf-custom.in b/data/gdm.conf-custom.in
index a40909cebcaf58d5054688b69e196ac9fc1f6e74..9b63ba9595c8fcce026f355b90a6f9bcf359b847 100644
--- a/data/gdm.conf-custom.in
+++ b/data/gdm.conf-custom.in
@@ -1,9 +1,8 @@
 # GDM configuration storage
 
 [daemon]
-# Uncomment the lines below to force the login screen to use Xorg
+# Uncomment the line below to force the login screen to use Xorg
 #WaylandEnable=false
-#XorgEnable=true
 
 [security]
 
diff --git a/data/gdm.schemas.in b/data/gdm.schemas.in
index ae9f106abf7cd4a571dc8f022f2ef5e6306d41fc..4451808b86ca5076973f30f1411d991184dec326 100644
--- a/data/gdm.schemas.in
+++ b/data/gdm.schemas.in
@@ -65,7 +65,7 @@
     <schema>
       <key>daemon/XorgEnable</key>
       <signature>b</signature>
-      <default>false</default>
+      <default>true</default>
     </schema>
     <schema>
       <key>daemon/RemoteLoginEnable</key>
diff --git a/meson_options.txt b/meson_options.txt
index 3f3865c7a9fafcbb54a2a39f737c29049b6b3767..70f29f19f4e4b3aa356219ef119ac197ce6a3ba4 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -35,7 +35,7 @@ option('udev-dir', type: 'string', value: '', description: 'Directory for udev r
 option('user', type: 'string', value: 'gdm', description: 'GDM\'s username.')
 option('user-display-server', type: 'boolean', value: true, description: 'Enable running X server as user.')
 option('wayland-support', type: 'boolean', value: true, description: 'Enable support for wayland sessions.')
-option('x11-support', type: 'boolean', value: false, description: 'Enable support for x11 sessions.')
+option('x11-support', type: 'boolean', value: true, description: 'Enable support for x11 sessions.')
 option('xauth-dir', type: 'string', value: '', description: 'XAuth cookie directory.')
 option('xdmcp', type: 'feature', value: 'auto', description: 'Add XDMCP (remote login) support.')
 option('dyn-home-dir', type: 'string', value: '', description: 'Parent directory for dynamic user home directories')
\ No newline at end of file