diff --git a/.github/workflows/upgrade-tests.yaml b/.github/workflows/upgrade-tests.yaml
index 8dd116c3fb..bac94115fa 100644
--- a/.github/workflows/upgrade-tests.yaml
+++ b/.github/workflows/upgrade-tests.yaml
@@ -25,7 +25,7 @@ jobs:
           cd ./noobaa-core
           sudo bash ./.travis/deploy_minikube.sh
 
-      - name: Build noobaa (from master)
+      - name: Build noobaa
         run: |
           cd ./noobaa-core
           make noobaa NOOBAA_TAG=noobaa-core:master
@@ -42,7 +42,7 @@ jobs:
           make noobaa NOOBAA_TAG=noobaa-core:upgrade-tests
 
       - name: Checkout noobaa-operator
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: 'noobaa/noobaa-operator'
           path: 'noobaa-operator'
@@ -79,15 +79,10 @@ jobs:
       - name: Upgrade noobaa to latest
         run: |
           cd ./noobaa-operator
-          ./build/_output/bin/noobaa-operator upgrade --noobaa-image='noobaa-core:upgrade-tests'
-
-      - name: Wait for phase Ready in the backingstore pod
-        run: |
-          cd ./noobaa-operator
-          ./.travis/number_of_pods_in_system.sh --pods 5
-          kubectl wait --for=condition=available backingstore/noobaa-default-backing-store --timeout=5m 
+          VERSION=$(go run cmd/version/main.go)
+          ./build/_output/bin/noobaa-operator upgrade --noobaa-image='noobaa-core:upgrade-tests' --operator-image='noobaa/noobaa-operator:$VERSION'
 
-      - name: Run Upgrade Tests (PR code)
+      - name: Run Upgrade Tests
         run: |
           set -x
           cd ./noobaa-core
diff --git a/Makefile b/Makefile
index bf3a3134d8..f61cec2139 100644
--- a/Makefile
+++ b/Makefile
@@ -333,9 +333,8 @@ test-external-pg-sanity: build-ssl-postgres
 .PHONY: test-external-pg-sanity
 
 test-upgrade: tester
-	@echo "\033[1;34mRunning Upgrade Tests - after upgrading from master to latest\033[0m"
-	chmod +x ./src/test/system_tests/run_upgrade_tests.sh
-	./src/test/system_tests/run_upgrade_tests.sh || exit 1
+	@echo "\033[1;34mRunning Upgrade Tests - after upgrading to latest\033[0m"
+	chmod +x ./src/test/system_tests/run_upgrade_tests.sh && ./src/test/system_tests/run_upgrade_tests.sh
 .PHONY: test-upgrade
 
 clean: