diff --git a/src/modules/partition/core/Config.cpp b/src/modules/partition/core/Config.cpp
index d0d6fac11..9f251229e 100644
--- a/src/modules/partition/core/Config.cpp
+++ b/src/modules/partition/core/Config.cpp
@@ -150,6 +150,19 @@ getSwapChoices( const QVariantMap& configurationMap )
     return choices;
 }
 
+void
+updateGlobalStorage( Config::InstallChoice installChoice, Config::SwapChoice swapChoice )
+{
+    auto* gs = Calamares::JobQueue::instance() ? Calamares::JobQueue::instance()->globalStorage() : nullptr;
+    if ( gs )
+    {
+        QVariantMap m;
+        m.insert( "install", Config::installChoiceNames().find( installChoice ) );
+        m.insert( "swap", Config::swapChoiceNames().find( swapChoice ) );
+        gs->insert( "partitionChoices", m );
+    }
+}
+
 void
 Config::setInstallChoice( int c )
 {
@@ -168,6 +181,7 @@ Config::setInstallChoice( InstallChoice c )
     {
         m_installChoice = c;
         emit installChoiceChanged( c );
+        ::updateGlobalStorage( c, m_swapChoice );
     }
 }
 
@@ -189,6 +203,7 @@ Config::setSwapChoice( Config::SwapChoice c )
     {
         m_swapChoice = c;
         emit swapChoiceChanged( c );
+        ::updateGlobalStorage( m_installChoice, c );
     }
 }