diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eed15e7469..69d3da2d48 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -473,6 +473,8 @@ agent-bundle-windows:
       popd
 
 package-technical-addon:
+  extends:
+    - .trigger-filter
   image: "${DOCKER_CICD_REPO}/ci-container/python-3.11-bullseye:1.19.0"
   stage: "package"
   script: |
@@ -488,7 +490,9 @@ package-technical-addon:
 
 test-happypath-ta:
   image: "${DOCKER_CICD_REPO}/ci-container/python-3.11-bullseye:1.19.0"
-  extends: .auth-setup
+  extends:
+    - .trigger-filter
+    - .auth-setup
   stage: orca-tests
   dependencies:
     - "package-technical-addon"
@@ -518,7 +522,9 @@ test-happypath-ta:
       - "$BUILD_DIR/$CI_JOB_ID/**/*"
 test-collectd-ta:
   image: "${DOCKER_CICD_REPO}/ci-container/python-3.11-bullseye:1.19.0"
-  extends: .auth-setup
+  extends:
+    - .trigger-filter
+    - .auth-setup
   stage: orca-tests
   variables:
     ORCA_TAR_GZ: "$NEW_ORCA_TGZ"
@@ -545,7 +551,9 @@ test-collectd-ta:
       - "$BUILD_DIR/$CI_JOB_ID/**/*"
 test-gateway-ta:
   image: "${DOCKER_CICD_REPO}/ci-container/python-3.11-bullseye:1.19.0"
-  extends: .auth-setup
+  extends:
+    - .trigger-filter
+    - .auth-setup
   stage: orca-tests
   dependencies:
     - "package-technical-addon"
@@ -576,12 +584,13 @@ test-gateway-ta:
       - "$BUILD_DIR/out/**/*"
       - "$BUILD_DIR/$CI_JOB_ID/**/*"
 AppInspect_local:
-  image: "${DOCKER_CICD_REPO}/ci-container/python-3.11-bullseye:1.19.0"
+  extends:
+    - .trigger-filter
   dependencies:
     - "package-technical-addon"
   stage: code-analysis
   # AppInspect regex bugs out on python 3.11
-  image: docker.repo.splunkdev.net/ci-cd/ci-container/python-3.9:1.26.0
+  image: '${DOCKER_CICD_REPO}/ci-container/python-3.9:1.26.0'
   before_script:
     - pip install splunk-add-on-ucc-framework
     - pip install splunk-packaging-toolkit