diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 355d855050d457bafb355be4918aa4fca06bacf9..36e94aec6c21801d1b786a2f0d1b3b66c2bed856 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,6 +13,7 @@ variables:
   LEVEL_SCALING: "1.0"
   IVAS_PIPELINE_NAME: ''
   BASOP_CI_BRANCH_PC_REPO: "basop-ci-branch"
+  PRM_FILES: "scripts/config/self_test.prm scripts/config/self_test_ltv.prm"
   MANUAL_PIPELINE_TYPE:
     description: "Type for the manual pipeline run. Use 'pytest-mld' to run MLD test against reference float codec." # Not implemented yet, but may be good to have a manual pipeline trigger
     value: 'default'
@@ -106,6 +107,8 @@ stages:
 .update-scripts-repo: &update-scripts-repo
   - cd $SCRIPTS_DIR
   - git remote set-branches --add origin $BASOP_CI_BRANCH_PC_REPO
+  - git remote prune origin
+  - git branch
   - git fetch
   - git checkout $BASOP_CI_BRANCH_PC_REPO
   - git pull
@@ -115,13 +118,6 @@ stages:
   - cp -r $SCRIPTS_DIR/tests .
   - cp $SCRIPTS_DIR/pytest.ini .
 
-# TODO: this needs to be updated in case the reference is updated
-.remove-unsupported-testcases: &remove-unsupported-testcases
-  - sed -i '1701,1707d' scripts/config/self_test.prm
-  - sed -i '1659,1661d' scripts/config/self_test.prm
-  - sed -i '1635,1637d' scripts/config/self_test.prm
-  - sed -i '1603,1605d' scripts/config/self_test.prm
-
 .apply-testv-scaling: &apply-testv-scaling
   - echo "Applying level scaling in scripts/testv using scale=$LEVEL_SCALING"
   - tests/scale_pcm.py ./scripts/testv/ $LEVEL_SCALING
@@ -190,7 +186,7 @@ stages:
     -    *update-ltv-repo
     -    *copy-ltv-files-to-testv-dir
     - fi
-    - *remove-unsupported-testcases
+    - python3 ci/remove_unsupported_testcases.py $PRM_FILES
     - if [ $LEVEL_SCALING != "1.0" ];then
     -   *apply-testv-scaling
     - fi
@@ -244,7 +240,7 @@ stages:
   script:
     - *print-common-info
     - *update-scripts-repo
-    - *remove-unsupported-testcases
+    - python3 ci/remove_unsupported_testcases.py $PRM_FILES
     - *setup-codec
     - make clean
     - make -j CLANG=$CLANG_NUM