diff --git a/schutzbot/Jenkinsfile b/schutzbot/Jenkinsfile
index 429e630b0..c3b46c1ea 100644
--- a/schutzbot/Jenkinsfile
+++ b/schutzbot/Jenkinsfile
@@ -243,6 +243,18 @@ pipeline {
                         }
                     }
                 }
+                stage('EL8 OSTree') {
+                    agent { label "rhel8cloudbase && psi && x86_64" }
+                    steps {
+                        unstash 'rhel8cdn'
+                        run_tests('ostree')
+                    }
+                    post {
+                        always {
+                            preserve_logs('rhel8-ostree')
+                        }
+                    }
+                }
 
                 stage('EL8.3 Base') {
                     agent { label "rhel83cloudbase && x86_64 && aws" }
@@ -304,18 +316,6 @@ pipeline {
                         }
                     }
                 }
-                stage('EL8.3 OSTree') {
-                    agent { label "rhel83cloudbase && psi && x86_64" }
-                    steps {
-                        unstash 'rhel83'
-                        run_tests('ostree')
-                    }
-                    post {
-                        always {
-                            preserve_logs('rhel83-ostree')
-                        }
-                    }
-                }
             }
         }
     }
diff --git a/test/cases/ostree.sh b/test/cases/ostree.sh
index d93694e79..79c250970 100755
--- a/test/cases/ostree.sh
+++ b/test/cases/ostree.sh
@@ -12,22 +12,18 @@ ARCH=$(uname -m)
 
 # Set os-variant and boot location used by virt-install.
 case "${ID}-${VERSION_ID}" in
-    # Bypass ostree test on rhel 8.2
-    "rhel-8.2")
-        exit 0;;
     "fedora-32")
         IMAGE_TYPE=fedora-iot-commit
         OSTREE_REF="fedora/32/${ARCH}/iot"
         OS_VARIANT="fedora32"
         BOOT_LOCATION="https://mirrors.rit.edu/fedora/fedora/linux/releases/32/Everything/x86_64/os/";;
     "rhel-8.3")
-        # Override old rhel-8-beta.json because test needs latest systemd and redhat-release
-        sudo cp /usr/share/tests/osbuild-composer/repositories/rhel-8-beta.json /etc/osbuild-composer/repositories/
-        sudo systemctl restart osbuild-composer.socket
         IMAGE_TYPE=rhel-edge-commit
         OSTREE_REF="rhel/8/${ARCH}/edge"
-        OS_VARIANT="rhel8-unknown"
-        BOOT_LOCATION="http://download.devel.redhat.com/rhel-8/rel-eng/RHEL-8/latest-RHEL-8.3/compose/BaseOS/x86_64/os/";;
+        OS_VARIANT="rhel8.3"
+        # When 8.3 was released, it wasn't available on all RH internal
+        # mirrors, therefore the Boston mirror is hardcoded.
+        BOOT_LOCATION="http://download.eng.bos.redhat.com/released/rhel-8/RHEL-8/8.3.0/BaseOS/x86_64/os/";;
     *) ;;
 esac
 
@@ -151,9 +147,13 @@ build_image() {
     # Start the compose.
     greenprint "🚀 Starting compose"
     if [[ $blueprint_name == upgrade ]]; then
-        # Leave new version composer-cli here in case it got updated.
-        # sudo composer-cli --json compose start-ostree --ref $OSTREE_REF --parent $COMMIT_HASH $blueprint_name $IMAGE_TYPE | tee $COMPOSE_START
-        sudo composer-cli --json compose start-ostree "$blueprint_name" $IMAGE_TYPE "$OSTREE_REF" "$COMMIT_HASH" | tee "$COMPOSE_START"
+        # composer-cli in Fedora 32 has a different start-ostree arguments
+        # see https://github.com/weldr/lorax/pull/1051
+        if [[ "${ID}-${VERSION_ID}" == fedora-32 ]]; then
+            sudo composer-cli --json compose start-ostree "$blueprint_name" $IMAGE_TYPE "$OSTREE_REF" "$COMMIT_HASH" | tee "$COMPOSE_START"
+        else
+            sudo composer-cli --json compose start-ostree --ref "$OSTREE_REF" --parent "$COMMIT_HASH" "$blueprint_name" $IMAGE_TYPE | tee "$COMPOSE_START"
+        fi
     else
         sudo composer-cli --json compose start "$blueprint_name" $IMAGE_TYPE | tee "$COMPOSE_START"
     fi