diff --git a/.github/workflows/trigger-fedora.yml b/.github/workflows/trigger-fedora.yml
index 8ea4cb73d..9c30c5fab 100644
--- a/.github/workflows/trigger-fedora.yml
+++ b/.github/workflows/trigger-fedora.yml
@@ -9,12 +9,10 @@ on:
 
 env:
   COMPOSE_URL_rawhide: https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide
-  COMPOSE_URL_F39: https://dl.fedoraproject.org/pub/fedora/linux/development/39
-  UPDATES_URL_F39: https://dl.fedoraproject.org/pub/fedora/linux/development/39
+  COMPOSE_URL_F39: https://dl.fedoraproject.org/pub/fedora/linux/releases/39
+  UPDATES_URL_F39: https://dl.fedoraproject.org/pub/fedora/linux/releases/39
   COMPOSE_URL_F38: https://dl.fedoraproject.org/pub/fedora/linux/releases/38
   UPDATES_URL_F38: https://dl.fedoraproject.org/pub/fedora/linux/updates/38
-  COMPOSE_URL_F37: https://dl.fedoraproject.org/pub/fedora/linux/releases/37
-  UPDATES_URL_F37: https://dl.fedoraproject.org/pub/fedora/linux/updates/37
 
 jobs:
   check-compose:
@@ -268,73 +266,3 @@ jobs:
           project-name: Fedora Compose Test
           column-name: Fedora-38
           issue-number: ${{ steps.cpr.outputs.pull-request-number }}
-
-  fedora-37:
-    # Do not need check-compose and make "workflow_dispatch" work for this job
-    if: github.repository == 'virt-s1/rhel-edge' && github.event.schedule != '0 4 * * *'
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Get package version
-        id: package_version
-        run: |
-          curl -s "${COMPOSE_URL_F37}/COMPOSE_ID" --output COMPOSE_ID_F37
-          COMPOSE_ID_F37=$(cat COMPOSE_ID_F37)
-
-          OSBUILD_VERSION_F37=$(curl -s "${UPDATES_URL_F37}/Everything/x86_64/Packages/o/" | grep -ioE ">osbuild-[0-9].*<" | tr -d "><")
-          OSBUILD_COMPOSER_VERSION_F37=$(curl -s "${UPDATES_URL_F37}/Everything/x86_64/Packages/o/" | grep -ioE ">osbuild-composer-[0-9].*<" | tr -d "><")
-          COMPOSER_CLI_VERSION_F37=$(curl -s "${COMPOSE_URL_F37}/Everything/x86_64/os/Packages/w/" | grep -ioE ">weldr-client-[0-9].*<" | tr -d "><")
-          echo "osbuild_version_f37=$OSBUILD_VERSION_F37" >> $GITHUB_OUTPUT
-          echo "osbuild_composer_version_f37=$OSBUILD_COMPOSER_VERSION_F37" >> $GITHUB_OUTPUT
-          echo "composer_cli_version_f37=$COMPOSER_CLI_VERSION_F37" >> $GITHUB_OUTPUT
-
-          echo "f37_compose=$COMPOSE_ID_F37" >> $GITHUB_OUTPUT
-
-      - name: Add new compose id in compose.f37
-        run: |
-          compose_id="${{ needs.check-compose.outputs.f37_compose }}"
-          echo $compose_id >> compose/compose.f37
-          cat compose/compose.f37
-
-      - name: Get current date
-        id: date
-        run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
-
-      - name: Create Pull Request
-        id: cpr
-        uses: peter-evans/create-pull-request@v4
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          commit-message: "Fedora 37 Daily Compose Test - ${{ steps.date.outputs.date }}"
-          committer: cloudkitebot <henrywangxf1@gmail.com>
-          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
-          branch: cpr
-          branch-suffix: random
-          delete-branch: true
-          title: " Fedora 37 Daily Compose Test- ${{ steps.date.outputs.date }}"
-          labels: DO_NOT_MERGE,fedora-37
-          body: |
-            Fedora 37 compose ${{ steps.package_version.outputs.f37_compose }}
-            - Date: ${{ steps.date.outputs.date }}
-            - Compose URL: ${{ env.COMPOSE_URL_F37 }}
-            - Updates URL: ${{ env.UPDATES_URL_F37 }}
-            - Packages:
-                - ${{ steps.package_version.outputs.osbuild_version_f37 }}
-                - ${{ steps.package_version.outputs.osbuild_composer_version_f37 }}
-                - ${{ steps.package_version.outputs.composer_cli_version_f37 }}
-
-      - name: Add a comment to trigger test workflow
-        uses: peter-evans/create-or-update-comment@v2
-        with:
-          token: ${{ secrets.PAT }}
-          issue-number: ${{ steps.cpr.outputs.pull-request-number }}
-          body: /test-f37
-
-      - name: Create a project card to track compose test result
-        uses: peter-evans/create-or-update-project-card@v2
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          project-name: Fedora Compose Test
-          column-name: Fedora-37
-          issue-number: ${{ steps.cpr.outputs.pull-request-number }}
diff --git a/ostree.sh b/ostree.sh
index 61505128a..8a8f42054 100755
--- a/ostree.sh
+++ b/ostree.sh
@@ -192,7 +192,7 @@ case "${ID}-${VERSION_ID}" in
         USER_IN_COMMIT="false"
         OSTREE_REF="fedora/39/${ARCH}/iot"
         OS_VARIANT="fedora-unknown"
-        BOOT_LOCATION="https://dl.fedoraproject.org/pub/fedora/linux/development/39/Everything/x86_64/os/"
+        BOOT_LOCATION="https://dl.fedoraproject.org/pub/fedora/linux/releases/39/Everything/x86_64/os/"
         CUT_DIRS=8
         ADD_SSSD="false"
         SYSROOT_RO="true"