diff --git a/.gitmodules b/.gitmodules
index d17cab1..7daf779 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -34,3 +34,6 @@
 [submodule "cosmic-bg"]
 	path = cosmic-bg
 	url = https://github.com/pop-os/cosmic-bg.git
+[submodule "cosmic-workspaces-epoch"]
+	path = cosmic-workspaces-epoch
+	url = https://github.com/pop-os/cosmic-workspaces-epoch/
diff --git a/cosmic-applets b/cosmic-applets
index 9a3daa8..e582a9f 160000
--- a/cosmic-applets
+++ b/cosmic-applets
@@ -1 +1 @@
-Subproject commit 9a3daa80a5e3b9a5613f608ede68083e10bcf138
+Subproject commit e582a9f0f611607adb67fe39fc5f0543b858f9be
diff --git a/cosmic-applibrary b/cosmic-applibrary
index d89bc2d..ab86f72 160000
--- a/cosmic-applibrary
+++ b/cosmic-applibrary
@@ -1 +1 @@
-Subproject commit d89bc2d208317dfdef6a07230e3e2e06902e5404
+Subproject commit ab86f72b7fe43d024b8ed6e214839a9dc909bbba
diff --git a/cosmic-bg b/cosmic-bg
index 87a95e9..25269b6 160000
--- a/cosmic-bg
+++ b/cosmic-bg
@@ -1 +1 @@
-Subproject commit 87a95e9de31a251a0c940f7587c885e7f53062a2
+Subproject commit 25269b6c6449a9ee73b15b4060da91aae64ea221
diff --git a/cosmic-comp b/cosmic-comp
index ef894ae..7ad3794 160000
--- a/cosmic-comp
+++ b/cosmic-comp
@@ -1 +1 @@
-Subproject commit ef894aebfcba4bbaf2042ab80971c8ede2a4abc6
+Subproject commit 7ad37946d3aada156b0b2ca17e6106b3f8114f70
diff --git a/cosmic-launcher b/cosmic-launcher
index d23f2b7..ecb9209 160000
--- a/cosmic-launcher
+++ b/cosmic-launcher
@@ -1 +1 @@
-Subproject commit d23f2b7f4f190fe8edfc291148bc9bcc67b0d5a0
+Subproject commit ecb9209a8e0bf5379417d2c162a1c5da047dc01d
diff --git a/cosmic-osd b/cosmic-osd
index 1f0dd9f..cbcaf2c 160000
--- a/cosmic-osd
+++ b/cosmic-osd
@@ -1 +1 @@
-Subproject commit 1f0dd9fd71e47facc44213d98bdb2917537005cb
+Subproject commit cbcaf2c605ebfa790a9a7fcb19a4f7f8b5c08ba9
diff --git a/cosmic-panel b/cosmic-panel
index c14cb79..f4d1755 160000
--- a/cosmic-panel
+++ b/cosmic-panel
@@ -1 +1 @@
-Subproject commit c14cb790f3b60ed7f7ef50f8ea5990d6a21be5f1
+Subproject commit f4d1755bc6df87f2c4a59987dcea522227e9f88c
diff --git a/cosmic-session b/cosmic-session
index 58a91d6..32f2299 160000
--- a/cosmic-session
+++ b/cosmic-session
@@ -1 +1 @@
-Subproject commit 58a91d63db4cba30bb5606dc25704bb9433c062d
+Subproject commit 32f229986b5c8532e33701899186dd0043431435
diff --git a/cosmic-workspaces-epoch b/cosmic-workspaces-epoch
new file mode 160000
index 0000000..c655ea1
--- /dev/null
+++ b/cosmic-workspaces-epoch
@@ -0,0 +1 @@
+Subproject commit c655ea18231ac59201be8dacfa87663f41c69855
diff --git a/justfile b/justfile
index 86dd70c..1f7197b 100644
--- a/justfile
+++ b/justfile
@@ -24,6 +24,7 @@ build:
     {{ make }} -C cosmic-panel all
     {{ make }} -C cosmic-settings-daemon all
     {{ just }} cosmic-session/all
+    {{ make }} -C cosmic-workspaces-epoch all
     {{ make }} -C xdg-desktop-portal-cosmic all
 
 sysext dir=`echo $(pwd)/cosmic-sysext` version=("nightly-" + `git rev-parse --short HEAD`): build && (_extension_release dir version)
@@ -37,6 +38,7 @@ sysext dir=`echo $(pwd)/cosmic-sysext` version=("nightly-" + `git rev-parse --sh
     {{ make }} -C cosmic-panel install DESTDIR={{dir}} prefix=/usr
     {{ just }} rootdir={{dir}} cosmic-settings/install
     {{ make }} -C cosmic-settings-daemon install DESTDIR={{dir}} prefix=/usr
+    {{ make }} -C cosmic-workspaces-epoch install DESTDIR={{dir}} prefix=/usr
     {{ make }} -C xdg-desktop-portal-cosmic install DESTDIR={{dir}} prefix=/usr
     {{ just }} rootdir={{dir}} cosmic-session/install
 _extension_release dir version:
@@ -60,4 +62,5 @@ clean:
     rm -rf cosmic-settings/target
     rm -rf cosmic-settings-daemon/target
     rm -rf cosmic-session/target
+    rm -rf cosmic-workspaces-epoch/target
     rm -rf xdg-desktop-portal-cosmic/target
diff --git a/xdg-desktop-portal-cosmic b/xdg-desktop-portal-cosmic
index 5ac4159..86cc569 160000
--- a/xdg-desktop-portal-cosmic
+++ b/xdg-desktop-portal-cosmic
@@ -1 +1 @@
-Subproject commit 5ac4159405bbdbd6404b881a019530ed920ad4ca
+Subproject commit 86cc5692ccd88ae5bba86bc2a1eb2995948ececa