diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
index 172dc62..59393b5 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.4.0"
+          tag: "0.5.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 17a2c04..9531523 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.4.0" \
+    RELEASE_UPSTREAM="0.5.0" \
     DOWNSTREAM_TMT_DIR="sclorg-tmt-plans" \
     UPSTREAM_TMT_REPO="https://github.com/sclorg/sclorg-testing-farm" \
     UPSTREAM_TMT_DIR="sclorg-testing-farm" \
@@ -26,9 +26,7 @@ RUN dnf install -y python3.13-pip git && \
 
 RUN git clone "${UPSTREAM_TMT_REPO}" "${WORK_DIR}/${UPSTREAM_TMT_DIR}"
 
-COPY . /ci-scripts
+COPY . /root/ci-scripts
 WORKDIR "${HOME}"
 
-USER 500
-
-CMD ["/ci-scripts/run_nightly_tests.sh"]
+CMD ["/root/ci-scripts/run_nightly_tests.sh"]
diff --git a/Makefile b/Makefile
index c4c98b9..b5dcc51 100644
--- a/Makefile
+++ b/Makefile
@@ -7,4 +7,4 @@ shellcheck:
 	./run-shellcheck.sh `git ls-files *.sh`
 
 build_images:
-	podman build -t quay.io/sclorg/upstream-daily-tests:latest -f Dockerfile.daily-tests .
+	podman build -t quay.io/sclorg/upstream-daily-tests:0.5.0 -f Dockerfile.daily-tests .
diff --git a/run_nightly_tests.sh b/run_nightly_tests.sh
index 60e9bc7..a971bd8 100755
--- a/run_nightly_tests.sh
+++ b/run_nightly_tests.sh
@@ -63,7 +63,7 @@ function get_compose() {
     COMPOSE="1MT-RHEL-10.0"
     TMT_PLAN_DIR="$DOWNSTREAM_TMT_DIR"
   elif [[ "$TARGET" == "fedora" ]]; then
-    COMPOSE="1MT-Fedora-42"
+    COMPOSE="1MT-Fedora-${VERSION}"
     TMT_PLAN_DIR="$UPSTREAM_TMT_DIR"
     TFT_PLAN="nightly-container-f"
   elif [[ "$TARGET" == "c9s" ]]; then
@@ -81,10 +81,8 @@ function get_compose() {
 }
 
 function run_tests() {
-  ENV_VARIABLES="-e DEBUG=yes -e SCRIPT=$SCRIPT -e OS=$TARGET"
-  if [[ "$TESTS" == "test-upstream" ]]; then
-    ENV_VARIABLES="$ENV_VARIABLES -e TEST=$TESTS"
-  else
+  ENV_VARIABLES="-e DEBUG=yes -e SCRIPT=$SCRIPT -e OS=$TARGET -e TEST=$TESTS"
+  if [[ "$TESTS" != "test-upstream" ]]; then
     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}"