diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml
index 85a817aa6..6acc17359 100644
--- a/.github/workflows/base.yml
+++ b/.github/workflows/base.yml
@@ -32,7 +32,7 @@ jobs:
   test:
     timeout-minutes: 20
     runs-on: ${{ inputs.os }}
-    name: EventStore.Client.${{ inputs.test }}/${{ inputs.os }}/${{ inputs.framework }}/${{ inputs.docker-tag }}
+    name: EventStore.Client.${{ inputs.test }} / (${{ inputs.os }}/${{ inputs.framework }}/${{ inputs.docker-tag }}
     env:
       CLOUDSMITH_CICD_USER: ${{ secrets.CLOUDSMITH_CICD_USER }}
     steps:
@@ -58,10 +58,6 @@ jobs:
           6.0.x
           7.0.x
           8.0.x
-    - name: Compile
-      shell: bash
-      run: |
-        dotnet build --configuration ${{ inputs.configuration }} --framework ${{ inputs.framework }} src/EventStore.Client.${{ inputs.test }}
     - name: Run Tests
       shell: bash
       env:
diff --git a/.github/workflows/ce.yml b/.github/workflows/ce.yml
index 8a0bb2e64..3ee4fc48e 100644
--- a/.github/workflows/ce.yml
+++ b/.github/workflows/ce.yml
@@ -12,7 +12,7 @@ on:
         default: eventstore-ce/eventstoredb-ce
 
 jobs:
-  test:
+  ce:
     uses: ./.github/workflows/base.yml
     strategy:      
       fail-fast: false
@@ -28,6 +28,3 @@ jobs:
       os: ${{ matrix.os }}
       test: ${{ matrix.test }}
       configuration: ${{ matrix.configuration }}
-    secrets: 
-      CLOUDSMITH_CICD_USER: ${{ secrets.CLOUDSMITH_CICD_USER }}
-      CLOUDSMITH_CICD_TOKEN: ${{ secrets.CLOUDSMITH_CICD_TOKEN }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 16e37e13d..0025dda8a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,6 +10,6 @@ on:
 
 jobs:
   test:
-    uses: ./.github/workflows/base.yml
+    uses: ./.github/workflows/ce.yml
     with:
       docker-tag: ci
diff --git a/.github/workflows/dispatch-ce.yml b/.github/workflows/dispatch-ce.yml
index fc21b66d6..0ded02353 100644
--- a/.github/workflows/dispatch-ce.yml
+++ b/.github/workflows/dispatch-ce.yml
@@ -1,13 +1,13 @@
-name: "Dispatch CE"
+name: Dispatch CE
 
 on:
   workflow_dispatch:
     inputs:
-      version:
-        description: "Docker tag version"
+      docker-tag:
+        description: "Docker tag"
         required: true
         type: string
-      image:
+      docker-image:
         description: "Docker image"
         required: true
         type: string
@@ -16,5 +16,5 @@ jobs:
   test:
     uses: ./.github/workflows/ce.yml
     with:
-      docker-tag: ${{ inputs.version }}
-      docker-image: ${{ inputs.image }}
+      docker-tag: ${{ inputs.docker-tag }}
+      docker-image: ${{ inputs.docker-image }}
diff --git a/.github/workflows/dispatch-ee.yml b/.github/workflows/dispatch-ee.yml
index ceaf6921e..a370ffce5 100644
--- a/.github/workflows/dispatch-ee.yml
+++ b/.github/workflows/dispatch-ee.yml
@@ -1,13 +1,13 @@
-name: "Dispatch EE"
+name: Dispatch EE
 
 on:
   workflow_dispatch:
     inputs:
-      version:
-        description: "Docker tag version"
+      docker-tag:
+        description: "Docker tag"
         required: true
         type: string
-      image:
+      docker-image:
         description: "Docker image"
         required: true
         type: string
@@ -16,5 +16,5 @@ jobs:
   test:
     uses: ./.github/workflows/ee.yml
     with:
-      docker-tag: ${{ inputs.version }}
-      docker-image: ${{ inputs.image }}
+      docker-tag: ${{ inputs.docker-tag }}
+      docker-image: ${{ inputs.docker-image }}
diff --git a/.github/workflows/ee.yml b/.github/workflows/ee.yml
index e59984a50..9e4d71f42 100644
--- a/.github/workflows/ee.yml
+++ b/.github/workflows/ee.yml
@@ -10,15 +10,16 @@ on:
   workflow_call:
     inputs:
       docker-tag:
-        required: true
+        required: false
         type: string
+        default: 24.2.0-jammy
       docker-image:
         required: false
         type: string
-        default: eventstore-ce/eventstoredb-ce
+        default: eventstore-ee/eventstoredb-commercial
 
 jobs:
-  test:
+  ee:
     uses: ./.github/workflows/base.yml
     if: ${{ github.repository_owner == 'EventStore' }}
     strategy:
@@ -26,7 +27,7 @@ jobs:
       matrix:
         framework: [ net6.0, net7.0, net8.0 ]
         os: [ ubuntu-latest ]
-        test: [ Streams, PersistentSubscriptions, Operations, UserManagement, ProjectionManagement, Plugins ]
+        test: [ Plugins ]
         configuration: [ release ]
     with:
       docker-image: ${{ inputs.docker-image != null && inputs.docker-image || 'eventstore-ee/eventstoredb-commercial' }} 
diff --git a/.github/workflows/previous-lts.yml b/.github/workflows/previous-lts.yml
index b4a45fa94..4ee88ba58 100644
--- a/.github/workflows/previous-lts.yml
+++ b/.github/workflows/previous-lts.yml
@@ -10,6 +10,6 @@ on:
 
 jobs:
   test:
-    uses: ./.github/workflows/base.yml
+    uses: ./.github/workflows/ce.yml
     with:
       docker-tag: previous-lts