diff --git a/.gitmodules b/.gitmodules
index 086dfaf..ca58d16 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -98,3 +98,7 @@
 	path = cosmic-player
 	url = https://github.com/pop-os/cosmic-player.git
 	branch = master
+[submodule "cosmic-initial-setup"]
+	path = cosmic-initial-setup
+	url = https://github.com/pop-os/cosmic-initial-setup
+	branch = master
diff --git a/cosmic-initial-setup b/cosmic-initial-setup
new file mode 160000
index 0000000..55c6006
--- /dev/null
+++ b/cosmic-initial-setup
@@ -0,0 +1 @@
+Subproject commit 55c6006001d981119cc20c15bb362d36afbfd0ba
diff --git a/justfile b/justfile
index a77b06c..dd33e93 100644
--- a/justfile
+++ b/justfile
@@ -12,6 +12,7 @@ build:
     {{ just }} cosmic-files/build-release
     {{ just }} cosmic-greeter/build-release
     {{ just }} cosmic-idle/build-release
+    {{ just }} cosmic-initial-setup/build-release
     {{ just }} cosmic-launcher/build-release
     {{ just }} cosmic-notifications/build-release
     {{ make }} -C cosmic-osd all
@@ -38,6 +39,7 @@ install rootdir="" prefix="/usr/local": build
     {{ just }} rootdir={{rootdir}} prefix={{prefix}} cosmic-greeter/install
     {{ just }} rootdir={{rootdir}} prefix={{prefix}} cosmic-icons/install
     {{ just }} rootdir={{rootdir}} prefix={{prefix}} cosmic-idle/install
+    {{ just }} rootdir={{rootdir}} prefix={{prefix}} cosmic-initial-setup/install
     {{ just }} rootdir={{rootdir}} prefix={{prefix}} cosmic-launcher/install
     {{ just }} rootdir={{rootdir}} prefix={{prefix}} cosmic-notifications/install
     {{ make }} -C cosmic-osd install DESTDIR={{rootdir}} prefix={{prefix}}
@@ -78,6 +80,7 @@ clean:
     {{ just }} cosmic-files/clean
     rm -rf cosmic-greeter/target
     {{ just }} cosmic-idle/clean
+    {{ just }} cosmic-initial-setup/clean
     rm -rf cosmic-launcher/target
     rm -rf cosmic-panel/target
     rm -rf cosmic-player/target