diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d5b078e8b0d0d84172d254b007fb0e61d33bb336..a7159db0c79f78d703b3f5cf7d076674391e12aa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -225,10 +225,11 @@ stages:
 .update-scripts-repo: &update-scripts-repo
   - cd $SCRIPTS_DIR
   - sed -i '/fetch/d' .git/config # Remove all fetch lines to clean out dead links
-  - git remote set-branches --add origin $BASOP_CI_BRANCH_PC_REPO # Add currently used branch
+  - git remote set-branches --add origin "$BASOP_CI_BRANCH_PC_REPO" # Add currently used branch
   - git fetch
   - git restore . # Just as a precaution
-  - git checkout $BASOP_CI_BRANCH_PC_REPO
+  - git checkout "$BASOP_CI_BRANCH_PC_REPO"
+  - git reset --hard origin/"$BASOP_CI_BRANCH_PC_REPO"
   - git pull
   - cd -
   - cp -r $SCRIPTS_DIR/ci .
@@ -435,6 +436,7 @@ stages:
   before_script:
     - *update-scripts-repo
     - if [ ! -d "$TESTV_DIR" ]; then mkdir -p $TESTV_DIR; fi
+    - python3 scripts/prepare_combined_format_inputs.py
     - cp -r scripts/testv/* $TESTV_DIR/
 
 .sanitizer-selftest-on-mr:
@@ -1491,8 +1493,7 @@ voip-be-on-merge-request:
 # ---------------------------------------------------------------
 
 # test that runs all modes with 1s input signals
-# TODO: disabled temporarily, needs to be adapted to BASOP
-.codec-smoke-test:
+codec-smoke-test:
   extends:
     - .test-job-linux-needs-testv-dir
     - .rules-merge-request
@@ -1505,7 +1506,10 @@ voip-be-on-merge-request:
     - *print-common-info
     # LTV update needed as ltv ISM metadata files are used
     - *update-ltv-repo
+    - python3 scripts/smoketest-basop-filter.py scripts/config/ivas_modes.json --inline
     - bash ci/smoke_test.sh
+    - tar cJf logs.tar.xz out/logs/
+    - ls -al logs.tar.*
     ### analyze for failures
     - if ! [ -s smoke_test_output.txt ] || ! [ -s smoke_test_output_jbm.txt ] || ! [ -s smoke_test_output_hrtf.txt ]; then echo "Error in smoke test"; exit 1; fi
     - ret_val=0
@@ -1521,6 +1525,7 @@ voip-be-on-merge-request:
       - smoke_test_output.txt
       - smoke_test_output_jbm.txt
       - smoke_test_output_hrtf.txt
+      - logs.tar.xz
     expose_as: "Smoke test results"
 
 # from float repo
@@ -1785,11 +1790,10 @@ ivas-pytest-on-merge-request:
     - .test-job-linux-needs-testv-dir
     - .rules-merge-request
   stage: compare
-  # TODO: broken dependency needs to be removed temporarily, see above
   # note: this step doesn't really depend on codec-smoke-test
   # it's just pointless to run this step when the smoke test fails and the smoke test should be reasonably fast
   # thus, overall, this should save time
-  needs: ["build-codec-linux-make"] #, "codec-smoke-test"]
+  needs: ["build-codec-linux-make", "codec-smoke-test"]
   timeout: "14 minutes"
   tags:
     - ivas-linux