diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index 7181bbf..3194ced 100644
--- a/.github/workflows/build-and-push.yml
+++ b/.github/workflows/build-and-push.yml
@@ -19,6 +19,6 @@ jobs:
           registry_username: ${{ secrets.QUAY_IMAGE_SCLORG_BUILDER_USERNAME }}
           registry_token: ${{ secrets.QUAY_IMAGE_SCLORG_BUILDER_TOKEN }}
           dockerfile: Dockerfile.daily-tests
-          tag: "0.2.0"
+          tag: "0.3.0"
           image_name: "upstream-daily-tests"
           quay_application_token: ${{ secrets.QUAY_IMAGE_SCLORG_UPDATE_DESC }}
diff --git a/Dockerfile.daily-tests b/Dockerfile.daily-tests
index f15df4a..f1e19c2 100644
--- a/Dockerfile.daily-tests
+++ b/Dockerfile.daily-tests
@@ -2,7 +2,7 @@ FROM quay.io/fedora/fedora:42
 
 ENV WORK_DIR="/var/tmp" \
     VERSION="42" \
-    RELEASE="0.2.0" \
+    RELEASE="0.3.0" \
     DOWNSTREAM_TMT_DIR="sclorg-tmt-plans" \
     UPSTREAM_TMT_REPO="https://github.com/sclorg/sclorg-testing-farm" \
     UPSTREAM_TMT_DIR="sclorg-testing-farm" \
diff --git a/run_nightly_tests.sh b/run_nightly_tests.sh
index 0b80b87..c56d7bb 100755
--- a/run_nightly_tests.sh
+++ b/run_nightly_tests.sh
@@ -8,13 +8,12 @@ if [[ "${TESTS}" != "test-upstream" ]]; then
   SET_TEST="$TEST_TYPE"
 fi
 
-LOGS_DIR="/var/tmp/daily_tests_logs/"
+LOGS_DIR="${WORK_DIR}/daily_tests_logs/"
 LOGS_DIR_OLD="${LOGS_DIR}/old"
-DAILY_TEST_DIR="/var/tmp/daily_scl_tests"
-RESULTS_DIR="/var/tmp/daily_reports_dir"
+DAILY_TEST_DIR="${WORK_DIR}/daily_scl_tests"
+RESULTS_DIR="${WORK_DIR}/daily_reports_dir"
 RESULTS_DIR_OLD="${RESULTS_DIR}/old"
 SCRIPT="daily_scl_tests"
-TMT_DIR="sclorg-tmt-plans"
 TFT_PLAN="nightly-container-$TARGET"
 DIR="${DAILY_TEST_DIR}/${TARGET}-${TESTS}-${SET_TEST}"
 RESULTS_TARGET_DIR="${RESULTS_DIR}/${TARGET}-${TESTS}"
@@ -22,13 +21,18 @@ if [[ "$TESTS" == "test-upstream" ]]; then
   DIR="${DAILY_TEST_DIR}/${TARGET}-${TESTS}"
 fi
 LOG_FILE="${LOGS_DIR}/${TARGET}-${TESTS}.log"
-WORK_DIR=$(mktemp -d -p "/var/tmp")
 
 function move_logs_to_old() {
-  rm -rf "${LOGS_DIR_OLD}/*"
-  rm -rf "${RESULTS_DIR_OLD}/*"
-  mv "${LOG_FILE}" "${LOGS_DIR_OLD}/"
-  mv "${RESULTS_TARGET_DIR}" "${RESULTS_DIR_OLD}/"
+  echo "Moving logs to old directory"
+  if [[ -d "${LOGS_DIR_OLD}" ]]; then
+    rm -rf "${LOGS_DIR_OLD}/*"
+  fi
+  if [[ -d "${RESULTS_DIR_OLD}" ]]; then
+    rm -rf "${RESULTS_DIR_OLD}/*"
+  fi
+  mv "${LOG_FILE}/*" "${LOGS_DIR_OLD}/"
+  mv "${RESULTS_TARGET_DIR}/*" "${RESULTS_DIR_OLD}/"
+  echo "Logs moved to old directory"
 }
 
 function prepare_environment() {
@@ -51,22 +55,22 @@ function prepare_environment() {
 function get_compose() {
   if [[ "$TARGET" == "rhel8" ]]; then
     COMPOSE="1MT-RHEL-8.10.0-updates"
-    TMT_DIR="$DOWNSTREAM_TMT_DIR"
+    TMT_PLAN_DIR="$DOWNSTREAM_TMT_DIR"
   elif [[ "$TARGET" == "rhel9" ]]; then
     COMPOSE="1MT-RHEL-9.6.0-updates"
-    TMT_DIR="$DOWNSTREAM_TMT_DIR"
+    TMT_PLAN_DIR="$DOWNSTREAM_TMT_DIR"
   elif [[ "$TARGET" == "rhel10" ]]; then
     COMPOSE="1MT-RHEL-10.0"
-    TMT_DIR="$DOWNSTREAM_TMT_DIR"
+    TMT_PLAN_DIR="$DOWNSTREAM_TMT_DIR"
   elif [[ "$TARGET" == "fedora" ]]; then
     COMPOSE="1MT-Fedora-40"
-    TMT_DIR="$UPSTREAM_TMT_DIR"
+    TMT_PLAN_DIR="$UPSTREAM_TMT_DIR"
   elif [[ "$TARGET" == "c9s" ]]; then
     COMPOSE="1MT-CentOS-Stream-9"
-    TMT_DIR="$UPSTREAM_TMT_DIR"
+    TMT_PLAN_DIR="$UPSTREAM_TMT_DIR"
   elif [[ "$TARGET" == "c10s" ]]; then
     COMPOSE="1MT-CentOS-Stream-10"
-    TMT_DIR="$UPSTREAM_TMT_DIR"
+    TMT_PLAN_DIR="$UPSTREAM_TMT_DIR"
   else
     echo "This target is not supported"
     exit 1
@@ -83,10 +87,10 @@ function run_tests() {
     ENV_VARIABLES="$ENV_VARIABLES -e SET_TEST=$SET_TEST"
   fi
   TMT_COMMAND="tmt run -v -v -d -d --all ${ENV_VARIABLES} --id ${DIR} plan --name $TFT_PLAN provision --how minute --auto-select-network --image ${COMPOSE}"
-  echo "TMT command is: $TMT_COMMAND" | tee -a "${LOG}"
+  echo "TMT command is: $TMT_COMMAND" | tee -a "${LOG_FILE}"
   touch "${RESULTS_TARGET_DIR}/tmt_running"
   set -o pipefail
-  $TMT_COMMAND | tee -a "${LOG}"
+  $TMT_COMMAND | tee -a "${LOG_FILE}"
   if [[ $? -ne 0 ]]; then
     echo "TMT command $TMT_COMMAND has failed."
     if [[ -f "${RESULTS_TARGET_DIR}/tmt_success" ]]; then
@@ -125,12 +129,14 @@ get_compose
 
 move_logs_to_old
 
-date > "${LOG}"
+date > "${LOG_FILE}"
 curl --insecure -L https://url.corp.redhat.com/fmf-data > "/tmp/fmf_data"
 source "/tmp/fmf_data"
 
-cd "$WORK_DIR/$TMT_DIR" || { echo "Could not switch to $WORK_DIR/$TMT_DIR"; exit 1; }
-echo "TARGET is: ${TARGET} and test is: ${TESTS}" | tee -a "${LOG}"
+env
+echo "Switching to $WORK_DIR/$TMT_PLAN_DIR"
+cd "$WORK_DIR/$TMT_PLAN_DIR" || { echo "Could not switch to $WORK_DIR/$TMT_PLAN_DIR"; exit 1; }
+echo "TARGET is: ${TARGET} and test is: ${TESTS}" | tee -a "${LOG_FILE}"
 
 run_tests