diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml
index f38a2fb6a3..c2f904f13b 100644
--- a/.github/workflows/dockerhub.yaml
+++ b/.github/workflows/dockerhub.yaml
@@ -12,11 +12,24 @@ jobs:
         name: Docker Buildx
         runs-on: ubuntu-latest
         environment: dockerhub
+        strategy:
+            fail-fast: false
+            matrix:
+                include:
+                    - variant: vanilla
+                    # Variant we ship to aid ESS in providing a build on the OpenCoDE platform including specific modules
+                    - variant: opendesk
+                      flavor: suffix=-opendesk,onlatest=true
+                      prepare: mv variants/openDesk/* .
         steps:
             - uses: actions/checkout@v4
               with:
                   fetch-depth: 0 # needed for docker-package to be able to calculate the version
 
+            - name: Prepare
+              if: matrix.prepare
+              run: ${{ matrix.prepare }}
+
             - name: Set up QEMU
               uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3
 
@@ -42,6 +55,7 @@ jobs:
                       type=ref,event=tag
                   flavor: |
                       latest=${{ contains(github.ref_name, '-rc.') && 'false' || 'auto' }}
+                      ${{ matrix.flavor }}
 
             - name: Build and push
               uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5
diff --git a/variants/openDesk/README.md b/variants/openDesk/README.md
new file mode 100644
index 0000000000..f2aaf121c4
--- /dev/null
+++ b/variants/openDesk/README.md
@@ -0,0 +1 @@
+https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz
diff --git a/variants/openDesk/build_config.yaml b/variants/openDesk/build_config.yaml
new file mode 100644
index 0000000000..8953e77f49
--- /dev/null
+++ b/variants/openDesk/build_config.yaml
@@ -0,0 +1,10 @@
+# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+# SPDX-License-Identifier: Apache-2.0
+---
+# The modules to install. See ./docs/modules.md for more information on
+# what modules are.
+#
+# The values of this are provided to `yarn add` for inclusion.
+modules:
+    - "@nordeck/element-web-guest-module@1.0.0"
+    - "@nordeck/element-web-widget-lifecycle-module@1.0.1"
diff --git a/variants/openDesk/customisations.json b/variants/openDesk/customisations.json
new file mode 100644
index 0000000000..a10751dacd
--- /dev/null
+++ b/variants/openDesk/customisations.json
@@ -0,0 +1,3 @@
+{
+    "src/customisations/ComponentVisibility.ts": "node_modules/@nordeck/element-web-guest-module/customisations/ComponentVisibility.ts"
+}
diff --git a/variants/openDesk/customisations.json.license b/variants/openDesk/customisations.json.license
new file mode 100644
index 0000000000..23975ea6bd
--- /dev/null
+++ b/variants/openDesk/customisations.json.license
@@ -0,0 +1,2 @@
+# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
+# SPDX-License-Identifier: Apache-2.0