diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
deleted file mode 100644
index f20e3c3..0000000
--- a/.github/workflows/deploy.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Only trigger, when the build workflow succeeded
-on:
-  workflow_run:
-    workflows: ["build and push docker image"]
-    types: [completed]
-
-jobs:
-  trigger_pipeline:
-    runs-on: ubuntu-latest
-          
-    steps:
-
-      - name: Get triggering workflow details
-        run: |
-          BRANCH_OR_TAG=${{ github.event.workflow_run.head_branch }}
-          echo "BRANCH_OR_TAG=$BRANCH_OR_TAG" >> $GITHUB_ENV
-
-      - name: Trigger gitlab pipeline
-        uses: mb-wali/gitlab-cd-trigger@main
-        with:
-          URL: ${{ secrets.HOST }}
-          GITLB_TRIGGER_TOKEN: ${{ secrets.GITLB_TRIGGER_TOKEN }}
-          PROJECT_ID: 45464
-          REF_NAME: 'main'
-          PIPELINE_VARIABLES: '{"DOCKER_IMAGE_TAG":"${{ env.BRANCH_OR_TAG }}", "DOCKER_IMAGE_TAG_INSTANCE":"mug"}'
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index a990ded..415e4be 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -146,3 +146,30 @@ jobs:
           tags: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.DOCKER_TAG }}-theme
           labels: ${{ steps.meta.outputs.labels }}
+
+  trigger-gitlab-pipeline:
+    name: Trigger GitLab Pipeline
+    runs-on: ubuntu-latest
+    needs:
+      - build-and-push-mug
+      - build-and-push-theme
+
+    steps:
+      - name: Set Docker tag environment
+        run: |
+          if [[ "${{ github.ref }}" == refs/tags/* ]]; then
+            TAG_NAME="${GITHUB_REF#refs/tags/}"
+          else
+            TAG_NAME="${GITHUB_REF#refs/heads/}"
+          fi
+          echo "DOCKER_TAG=$TAG_NAME" >> $GITHUB_ENV
+
+      - name: Trigger GitLab pipeline
+        uses: mb-wali/gitlab-cd-trigger@main
+        with:
+          URL: ${{ secrets.HOST }}
+          GITLB_TRIGGER_TOKEN: ${{ secrets.GITLB_TRIGGER_TOKEN }}
+          PROJECT_ID: 45464
+          REF_NAME: 'main'
+          PIPELINE_VARIABLES: '{"DOCKER_IMAGE_TAG":"${{ env.DOCKER_TAG }}", "DOCKER_IMAGE_TAG_INSTANCE":"mug"}'
+