diff --git a/.github/workflows/run-performance-test.yaml b/.github/workflows/run-performance-test.yaml
index 1dc11a8..4c92f6a 100644
--- a/.github/workflows/run-performance-test.yaml
+++ b/.github/workflows/run-performance-test.yaml
@@ -60,7 +60,7 @@ jobs:
         - name: Execute load tests
           uses: artilleryio/action-cli@v1
           with:
-            command: run performance/get-all-movies-then-get-one.yml -e ${{ inputs.TEST_TYPE }}-${{ inputs.ENVIRONMENT }} --record --tags test_name:get-all-movies-then-get-one,${{ env.TAGS }}
+            command: run performance/get-all-movies-then-get-one.yml -e ${{ inputs.TEST_TYPE }}-${{ inputs.ENVIRONMENT }} --record --tags ${{ env.TAGS }}
           env:
             SERVICE_URL: ${{ inputs.SERVICE_URL }}
             ENVIRONMENT: ${{ inputs.ENVIRONMENT }}
diff --git a/.github/workflows/serverless-deploy.yaml b/.github/workflows/serverless-deploy.yaml
index 5836646..be7e864 100644
--- a/.github/workflows/serverless-deploy.yaml
+++ b/.github/workflows/serverless-deploy.yaml
@@ -88,4 +88,5 @@ jobs:
               tags:
                 - "env:${{ inputs.ENVIRONMENT }}"
                 - "repo:${{ github.repository }}"
-                - "service:movie-service"
\ No newline at end of file
+                - "service:movie-service"
+                - "event_type:deployment"
\ No newline at end of file
diff --git a/performance/get-all-movies-then-get-one.yml b/performance/get-all-movies-then-get-one.yml
index 5cfe7a1..8101243 100644
--- a/performance/get-all-movies-then-get-one.yml
+++ b/performance/get-all-movies-then-get-one.yml
@@ -19,12 +19,7 @@ config:
           tags:
             - "service:movie-service"
             - "env:{{ $env.ENVIRONMENT }}"
-            - "version:{{ $env.VERSION }}"
-            - "team:prt"
-            - "name:get-all-movies-then-get-one"
-            - "test_type:{{ $env.TEST_TYPE }}"
-            - "ci:{{ $env.CI }}"
-            - "caller:{{ $env.CALLER }}"
+            - "event_type:test_run"
   environments:
     smoke-prod:
       target: "https://6sdp2hpc6h.execute-api.eu-west-2.amazonaws.com/prod"