diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index ed54cd3de..2ffafde5b 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -1,11 +1,18 @@
 name: cd
 
 on:
-  push: ~
-
   # Trigger the workflow manually
   workflow_dispatch: ~
 
+  push:
+    # Trigger the workflow when new tags are pushed
+    tags:
+      - '**'
+    # Trigger the workflow when the CD workflow/configuration is updated
+    paths:
+      - .github/cd-*.yml
+      - .github/workflows/cd.yml
+
 jobs:
   deploy-server:
     uses: ecmwf-actions/reusable-workflows/.github/workflows/create-package.yml@v2