diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 884708ec4fe3f4992b8e77e977abfe09589f3d49..a4a6fa39915ffb1c91e479a049e2bef38cac03ff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 variables:
   # note: GitLab cannot reference variables defined by users in the include ref:, we need to use a YAML anchor for this
   # see https://docs.gitlab.com/ci/yaml/includes/#use-variables-with-include for more information
-  IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF 44cb5638949b874ce0f5c3bf4359f9db860d88bc
+  IVAS_CODEC_CI_REF: &IVAS_CODEC_CI_REF 1ed1eb9dba06245fbcc80bcd24ea43be284f7f8e
 
 include:
   - local: .gitlab-ci/variables.yml
@@ -63,7 +63,7 @@ workflow:
     ("echo 'System time is'", "Get-Date -Format 'dddd dd/MM/yyyy HH:mm K'") | Invoke-Expression
 
 .get-basop-float-reference: &get-basop-float-reference
-  - git clone -b $BASOP_REFERENCE_BRANCH https://forge.3gpp.org/rep/sa4/audio/ivas-basop.git --single-branch --depth 1 ivas-basop
+  - git clone -b $BASOP_REFERENCE_BRANCH_PC https://forge.3gpp.org/rep/sa4/audio/ivas-basop.git --single-branch --depth 1 ivas-basop
   - cd ivas-basop
   - git status
   - make -j
@@ -238,12 +238,12 @@ branch-is-up-to-date-with-main-post:
 .basop-ci-branch-compat-template:
   extends:
     - .test-job-linux
-    - .rules-merge-request-to-basop-ci-branch
+    - .rules-merge-request-to-basop-ci-branch-pc
   tags:
     - ivas-linux
   before_script:
     - !reference [.job-linux, before_script]
-    - python3 ci/remove_unsupported_testcases.py scripts/config/self_test.prm scripts/config/self_test_ltv.prm
+    - python3 ci/remove_unsupported_testcases.py scripts/config/self_test.prm scripts/config/self_test_ltv.prm --use-main-pc-set
     - python3 tests/create_short_testvectors.py
     - python3 scripts/prepare_combined_format_inputs.py
 
@@ -401,7 +401,7 @@ build-codec-windows-msbuild:
 codec-smoke-test:
   extends:
     - .test-job-linux-needs-testv-dir
-    - .rules-merge-request-to-basop-ci-branch-or-main
+    - .rules-merge-request-to-basop-ci-branch-pc-or-main
   timeout: "20 minutes"
   tags:
     - ivas-linux-fast
@@ -412,9 +412,9 @@ codec-smoke-test:
     # LTV update needed as ltv ISM metadata files are used
     - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/update-ltv-repo.sh
 
-    # for MRs to basop-ci-branch, we want to test with the BASOP float reference build
+    # for MRs to basop-ci-branch-pc, we want to test with the BASOP float reference build
     # per default, the smoke test builds the current repo again with WMOPS activated to catch unbalanced instrumentation macros
-    - if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" = "basop-ci-branch" ]; then
+    - if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" = "basop-ci-branch-pc" ]; then
     -   python3 scripts/smoketest-basop-filter.py scripts/config/ivas_modes.json --inline
     -   *get-basop-float-reference
     -   bash ci/smoke_test.sh coverage
diff --git a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin
index 9a988eb588c1be259b9c7ce01c3bbc872cf3b1e9..ffb4662687d6d2fa0e9cab79dd8bed54a3065ea5 100644
--- a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin
+++ b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a263c5498fc7ec0407c4f448e78e1f0aaf97163234ef44f2f79a1dfcb5adc37f
-size 1968026
+oid sha256:600f05865baeeb01c6435725f87c6a91e6e75e481ffae2ec3d6a7c62aba5fc7c
+size 1971974
diff --git a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin
index 73f151217e89352c910668206ef00200577543d8..97190b44f8bc0e595ef3d5e9e22e02893056ba0c 100644
--- a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin
+++ b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8622b0f7969a3126f8ab147c10392916b5e9cbe8d8bd9c04798abd3836e36c76
-size 2431246
+oid sha256:cda90cc841793f0a1ed76b580e46b9989564b055b664ed6746ebfa0033a74f2b
+size 2430778
diff --git a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin
index d847e746131f589ddf50882fec0caf5b1da2724b..e1f6981162b9f9f917b78e4f6b342e803dc8a8c4 100644
--- a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin
+++ b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:30bcf48f0c851d4e676d5b92be7eb3032442f5106a1072ef8fc9b335d60d0fbf
-size 2673694
+oid sha256:c1654ead069a420b97af8755edbb1c358806aa3c5c07db3113789fe0942642de
+size 2673946