diff --git a/.github/cd-ui-config.yml b/.github/cd-ui-config.yml
new file mode 100644
index 000000000..a9d40c08c
--- /dev/null
+++ b/.github/cd-ui-config.yml
@@ -0,0 +1,12 @@
+cmake_options: >-
+  -DBOOST_ROOT=${BOOST_ROOT_DIR} -DBOOST_INCLUDEDIR=${BOOST_INCLUDE_DIR} -DBOOST_LIBRARYDIR=${BOOST_LIB_DIR}
+  -DBoost_DEBUG=ON -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} -DENABLE_STATIC_BOOST_LIBS=OFF
+  -DINSTALL_PYTHON3_DIR=lib/python3/dist-packages
+  -DENABLE_ALL_TESTS=ON -DENABLE_SSL=ON -DENABLE_SERVER=OFF -DENABLE_HTTP=OFF -DENABLE_UDP=OFF -DENABLE_PYTHON=OFF
+  -DENABLE_UI=ON -DUI_SYSTEM_SERVERS_LIST=/ec/vol/ecflow_def/servers.list.all
+  -DCMAKE_INSTALL_PREFIX=/opt/ecmwf/ecflow-ui
+ctest_options: -L nightly -E s_test|s_zombies
+dependencies: |
+  ecmwf/ecbuild
+dependency_branch: develop
+parallelism_factor: 8
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 84f4600aa..8f3684351 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -9,10 +9,19 @@ on:
   workflow_dispatch: ~
 
 jobs:
-  deploy:
-    uses: ecmwf-actions/reusable-workflows/.github/workflows/create-package.yml@create-packages-custom-config
+  deploy-server:
+    uses: ecmwf-actions/reusable-workflows/.github/workflows/create-package.yml@v2
     with:
       skip_checks: true
       restrict_matrix_jobs: gnu@debian-12
       build_config: .github/cd-server-config.yml
     secrets: inherit
+
+  deploy-ui:
+    uses: ecmwf-actions/reusable-workflows/.github/workflows/create-package.yml@v2
+    with:
+      skip_checks: true
+      restrict_matrix_jobs: gnu@debian-12
+      build_config: .github/cd-ui-config.yml
+      cpack_options: -DCPACK_PACKAGE_NAME=ecflow-ui
+    secrets: inherit