diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
new file mode 100644
index 000000000..ef99a2174
--- /dev/null
+++ b/.github/workflows/cd.yml
@@ -0,0 +1,11 @@
+name: cd
+
+on:
+  push:
+    tags:
+      - '**'
+
+jobs:
+  deploy:
+    uses: ecmwf-actions/reusable-workflows/.github/workflows/create-package.yml@v2
+    secrets: inherit
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index af4dd2cd7..3d20c2f57 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,10 +4,10 @@ on:
   # Trigger the workflow on push to master or develop, except tag creation
   push:
     branches:
-      - "master"
-      - "develop"
+      - 'master'
+      - 'develop'
     tags-ignore:
-      - "**"
+      - '**'
 
   # Trigger the workflow on pull request
   pull_request: ~
@@ -27,6 +27,7 @@ jobs:
     uses: ecmwf-actions/downstream-ci/.github/workflows/downstream-ci.yml@main
     with:
       eckit: ecmwf/eckit@${{ github.event.pull_request.head.sha || github.sha }}
+      codecov_upload: true
     secrets: inherit
 
   # Run CI of private downstream packages on self-hosted runners
@@ -73,12 +74,3 @@ jobs:
           repository: private-downstream-ci
           event_type: downstream-ci-hpc
           payload: '{"eckit": "ecmwf/eckit@${{ github.event.pull_request.head.sha || github.sha }}"}'
-
-  codecov:
-    name: code-coverage
-    if: ${{ !github.event.pull_request.head.repo.fork && github.event.action != 'labeled' || github.event.label.name == 'approved-for-ci' }}
-    uses: ./.github/workflows/reusable-ci.yml
-    with:
-      eckit: ecmwf/eckit@${{ github.event.pull_request.head.sha || github.sha }}
-      codecov: true
-    secrets: inherit
diff --git a/.github/workflows/reusable-ci-hpc.yml b/.github/workflows/reusable-ci-hpc.yml
deleted file mode 100644
index 0fa93b94c..000000000
--- a/.github/workflows/reusable-ci-hpc.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: reusable-ci-hpc
-
-on:
-  workflow_call:
-    inputs:
-      eckit:
-        required: false
-        type: string
-
-jobs:
-  ci-hpc:
-    name: ci-hpc
-    uses: ecmwf-actions/reusable-workflows/.github/workflows/ci-hpc.yml@v2
-    with:
-      name-prefix: eckit-
-      build-inputs: |
-        --package: ${{ inputs.eckit || 'ecmwf/eckit@develop' }}
-        --modules: |
-          ecbuild
-          ninja
-        --parallel: 64
-    secrets: inherit
diff --git a/.github/workflows/reusable-ci.yml b/.github/workflows/reusable-ci.yml
deleted file mode 100644
index 64e6e6753..000000000
--- a/.github/workflows/reusable-ci.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: reusable-ci
-
-on:
-  workflow_call:
-    inputs:
-      eckit:
-        required: false
-        type: string
-      codecov:
-        required: false
-        type: boolean
-        default: false
-
-jobs:
-  ci:
-    name: eckit-ci
-    uses: ecmwf-actions/reusable-workflows/.github/workflows/ci.yml@v2
-    with:
-      repository: ${{ inputs.eckit || 'ecmwf/eckit@develop' }}
-      name_prefix: eckit-
-      codecov_upload: ${{ inputs.codecov }}
-      build_package_inputs: |
-        repository: ${{ inputs.eckit || 'ecmwf/eckit@develop' }}
-        self_coverage: true
-        dependencies: ecmwf/ecbuild
-        dependency_branch: develop
-        parallelism_factor: 8
-    secrets: inherit