diff --git a/.github/workflows/cd-workflow.yml b/.github/workflows/cd-workflow.yml
index 6d20ea7664..126a6dc835 100644
--- a/.github/workflows/cd-workflow.yml
+++ b/.github/workflows/cd-workflow.yml
@@ -11,6 +11,7 @@ name: Create and publish a Docker image
 on:
   push:
     tags: [ 'v*.*.*' ]
+  pull_request:
 
 env:
   REGISTRY: ghcr.io
@@ -34,6 +35,13 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Remove Docker Tag
+        uses: rafalkk/remove-dockertag-action@v1
+        with:
+          tag_name: v0.18.0
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          is_organization: true
+
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
@@ -46,5 +54,5 @@ jobs:
         with:
           context: .
           push: true
-          tags: ${{ steps.meta.outputs.tags }}
+          tags: v0.18.0
           labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file