diff --git a/includes/default-variables.yml b/includes/default-variables.yml
index ffb5f917bfda3d30c1140031daca1f05204763b9..47e355ca11914671e3b3801c422cc9d3950ad4c1 100644
--- a/includes/default-variables.yml
+++ b/includes/default-variables.yml
@@ -10,5 +10,4 @@ variables:
   TESTCASE_TIMEOUT_STV_SANITIZERS: 240
   TESTCASE_TIMEOUT_LTV_SANITIZERS: 2400
   BASOP_REFERENCE_BRANCH: "ivas-float-update"
-  BASOP_REFERENCE_BRANCH_PC: "float-pc"
   SCALE_FACTOR: "3.162"
diff --git a/main-basop.yml b/main-basop.yml
index f818c0ca2502c448d3073b7f2b306b255b2fad47..ad9e75000bbafb27b5d1daa433d8f4e12cb5b50f 100644
--- a/main-basop.yml
+++ b/main-basop.yml
@@ -406,11 +406,11 @@ workflow:
     - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-binaries.sh float-ref-merge-source
 
     - exit_code_target=0
-    - python3 -m pytest $TEST_SUITE -k "not model" -v --update_ref 1 --create_ref -n auto --ref_encoder_path $MERGE_TARGET_ENCODER_PATH --ref_decoder_path $MERGE_TARGET_DECODER_PATH > $PYTEST_LOG_TARGET_BRANCH || exit_code_target=$?
+    - python3 -m pytest $TEST_SUITE -v --update_ref 1 --create_ref -n auto --ref_encoder_path $MERGE_TARGET_ENCODER_PATH --ref_decoder_path $MERGE_TARGET_DECODER_PATH > $PYTEST_LOG_TARGET_BRANCH || exit_code_target=$?
 
     - exit_code=0
     - rm -rf .pytest_cache || true
-    - python3 -m pytest --tb=no -q $TEST_SUITE -k "not model" -v --keep_files --create_cut --html=$HTML_REPORT --self-contained-html --junit-xml=$XML_REPORT --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout > pytest_log.txt || exit_code=$?
+    - python3 -m pytest --tb=no -q $TEST_SUITE -v --keep_files --create_cut --html=$HTML_REPORT --self-contained-html --junit-xml=$XML_REPORT --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout > pytest_log.txt || exit_code=$?
 
     - if [ $exit_code -ne 0 ]; then
     -   exit_code=$EXIT_CODE_NON_BE
@@ -550,10 +550,10 @@ workflow:
 
     ### ----- run pytest for branch (dut) first -----
     # create float reference outputs with corresponding branch
-    - python3 -m pytest $TEST_SUITE -k "not model" -v --update_ref 1 $enc_stats_arg $enc_dmx_arg --create_ref -n auto --ref_encoder_path $MERGE_SOURCE_FLOAT_REF_ENCODER_PATH --ref_decoder_path $MERGE_SOURCE_FLOAT_REF_DECODER_PATH || exit_code=$?
+    - python3 -m pytest $TEST_SUITE -v --update_ref 1 $enc_stats_arg $enc_dmx_arg --create_ref -n auto --ref_encoder_path $MERGE_SOURCE_FLOAT_REF_ENCODER_PATH --ref_decoder_path $MERGE_SOURCE_FLOAT_REF_DECODER_PATH || exit_code=$?
     - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/overwrite-pytest-cache-with-artifact.sh
     # create dut outputs
-    - python3 -m pytest --tb=no -q $TEST_SUITE -k "not model" -v --keep_files --create_cut --html=$HTML_REPORT_BRANCH --self-contained-html --junit-xml=$XML_REPORT_BRANCH $comp_args --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout || true
+    - python3 -m pytest --tb=no -q $TEST_SUITE -v --keep_files --create_cut --html=$HTML_REPORT_BRANCH --self-contained-html --junit-xml=$XML_REPORT_BRANCH $comp_args --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout || true
     - zero_errors_branch=$(cat $XML_REPORT_BRANCH | grep -c 'errors="0"') || true
     - python3 scripts/parse_xml_report.py $XML_REPORT_BRANCH $CSV_BRANCH
     # Store branch outputs for later comparison
@@ -565,10 +565,10 @@ workflow:
 
     ### ----- run pytest for merge target now -----
     # create float reference outputs with corresponding branch
-    - python3 -m pytest $TEST_SUITE -k "not model" -v --update_ref 1 $enc_stats_arg $enc_dmx_arg --create_ref -n auto --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH || exit_code=$?
+    - python3 -m pytest $TEST_SUITE -v --update_ref 1 $enc_stats_arg $enc_dmx_arg --create_ref -n auto --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH || exit_code=$?
     - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/overwrite-pytest-cache-with-artifact.sh
     # create merge-target outputs
-    - python3 -m pytest --tb=no -q $TEST_SUITE -k "not model" -v --keep_files --create_cut --html=$HTML_REPORT_MAIN --self-contained-html --junit-xml=$XML_REPORT_MAIN $comp_args --dut_encoder_path $MERGE_TARGET_ENCODER_PATH --dut_decoder_path $MERGE_TARGET_DECODER_PATH -n auto --testcase_timeout $testcase_timeout || true
+    - python3 -m pytest --tb=no -q $TEST_SUITE -v --keep_files --create_cut --html=$HTML_REPORT_MAIN --self-contained-html --junit-xml=$XML_REPORT_MAIN $comp_args --dut_encoder_path $MERGE_TARGET_ENCODER_PATH --dut_decoder_path $MERGE_TARGET_DECODER_PATH -n auto --testcase_timeout $testcase_timeout || true
     - python3 scripts/parse_xml_report.py $XML_REPORT_MAIN $CSV_MAIN
 
     ### compare the two csv files for regressions
@@ -1293,7 +1293,7 @@ ivas-pytest-on-merge-request:
 
     ### prepare pytest
     # create references
-    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --update_ref 1 -k "not model"
+    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --update_ref 1
 
     ### Run test using branch scripts and input
     - if [ $ref_using_target == 1 ]; then git checkout $source_branch_commit_sha; fi
@@ -1301,7 +1301,7 @@ ivas-pytest-on-merge-request:
     ### run pytest
     - exit_code=0
     - testcase_timeout=600
-    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --mld --ssnr --odg --html=$REPORT_HTML --self-contained-html --junit-xml=$REPORT_XML --testcase_timeout=$testcase_timeout -k "not model" || exit_code=$?
+    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --mld --ssnr --odg --html=$REPORT_HTML --self-contained-html --junit-xml=$REPORT_XML --testcase_timeout=$testcase_timeout || exit_code=$?
     - zero_errors=$(cat $REPORT_XML | grep -c 'errors="0"') || true
 
     - python3 scripts/parse_xml_report.py $REPORT_XML $REPORT_CSV
diff --git a/snippets/basop/get-float-ref-branch-name.sh b/snippets/basop/get-float-ref-branch-name.sh
index 6a0c93ae939f72e1d19d43aff93c135b5a838baf..f5f121efdf4717f301daafab1ff8492fe7614202 100755
--- a/snippets/basop/get-float-ref-branch-name.sh
+++ b/snippets/basop/get-float-ref-branch-name.sh
@@ -46,7 +46,7 @@ if [ $# -ne 1 ]; then
 fi
 
 branchname_in="$1"
-branchname_out="float-pc"
+branchname_out="ivas-float-update"
 
 if ! [[ "$branchname_in" =~ $BASOP_PATTERN ]]; then
   printf "$MSG_DOES_NOT_MATCH" "$branchname_in"
@@ -58,7 +58,7 @@ fi
 float_ref_branchname="${branchname_in/basop/ref}"
 git_result=$(git branch -a)
 
-# If the branch does not exist, default to "float-pc"
+# If the branch does not exist, default to "ivas-float-update"
 if [[ "$git_result" =~ "$float_ref_branchname" ]]; then
   branchname_out="${float_ref_branchname}"
 fi
diff --git a/snippets/basop/set-float-reference-branches.sh b/snippets/basop/set-float-reference-branches.sh
index c02e5652a13c9178f7162600dc230303f5f51b9d..4d5001d0e8d98a2887c55ab355582db7cf8e8a6f 100644
--- a/snippets/basop/set-float-reference-branches.sh
+++ b/snippets/basop/set-float-reference-branches.sh
@@ -14,7 +14,4 @@ if [[ ! "$CI_MERGE_REQUEST_TITLE" =~ \[skip[[:space:]_-]name[[:space:]_-]check\]
   FLOAT_REF_BRANCH_MERGE_SOURCE=$(cat tmp_ref_branch.txt)
 fi
 
-# TODO: remove after merge to main
-FLOAT_REF_BRANCH_MERGE_SOURCE=float-pc
-
 export FLOAT_REF_BRANCH_MERGE_SOURCE