diff --git a/examples/answers/core.yaml b/examples/answers/core.yaml
new file mode 100644
index 0000000000..df48bd8b25
--- /dev/null
+++ b/examples/answers/core.yaml
@@ -0,0 +1,24 @@
+#source-catalog: examples/sources/core.yaml
+Source:
+  source: ubuntu-core
+Welcome:
+  lang: en_US
+Refresh:
+  update: no
+Keyboard:
+  layout: us
+Zdev:
+  accept-default: yes
+Network:
+  accept-default: yes
+Proxy:
+  proxy: ""
+Filesystem:
+  guided: yes
+  guided-index: 0
+UbuntuPro:
+  token: ""
+InstallProgress:
+  reboot: yes
+Drivers:
+  install: yes
diff --git a/examples/sources/core.yaml b/examples/sources/core.yaml
new file mode 100644
index 0000000000..8156c7d435
--- /dev/null
+++ b/examples/sources/core.yaml
@@ -0,0 +1,10 @@
+- description:
+    en: This test source provides a "Ubuntu Core" base install
+  id: ubuntu-core
+  locale_support: none
+  name:
+    en: Ubuntu Server
+  path: ubuntu-core.squashfs
+  size: 530485248
+  type: fsimage
+  variant: core
diff --git a/subiquity/models/oem.py b/subiquity/models/oem.py
index c01e00767a..64ca4055d1 100644
--- a/subiquity/models/oem.py
+++ b/subiquity/models/oem.py
@@ -39,6 +39,7 @@ def __init__(self):
         self.install_on = {
             "server": False,
             "desktop": True,
+            "core": False,
         }
 
     def make_autoinstall(self) -> Dict[str, Union[str, bool]]:
diff --git a/subiquity/server/server.py b/subiquity/server/server.py
index 6d0e687c05..7ffb47b0cd 100644
--- a/subiquity/server/server.py
+++ b/subiquity/server/server.py
@@ -214,11 +214,12 @@ def get_installer_password_from_cloudinit_log():
     "filesystem",
     "kernel",
     "keyboard",
-    "mirror",
     "network",
     "proxy",
     "source",
-    })
+    },
+    desktop={'mirror'},
+    server={'mirror'})
 
 POSTINSTALL_MODEL_NAMES = ModelNames({
     "drivers",