diff --git a/.github/workflows/weekly-release.yml b/.github/workflows/weekly-release.yml
index 2de52022b0..8259cb7cac 100644
--- a/.github/workflows/weekly-release.yml
+++ b/.github/workflows/weekly-release.yml
@@ -22,7 +22,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: main
           fetch-depth: 0
           persist-credentials: false
 
@@ -79,7 +78,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: main
           persist-credentials: false
 
       - name: Reset staging directory
@@ -185,7 +183,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: main
           fetch-depth: 0
           persist-credentials: false
 
@@ -228,6 +225,10 @@ jobs:
       AWS_SECRET_ACCESS_KEY: ${{ secrets.CLOUDFLARE_SECRET_ACCESS_KEY }}
       AWS_DEFAULT_REGION:    auto
     steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+
       - name: Download APK artifact
         uses: actions/download-artifact@v4
         with:
@@ -251,6 +252,7 @@ jobs:
           echo "Prepared: $DEST"
 
       - name: Upload to Cloudflare R2 (apk-repo bucket)
+        shell: flox activate -d flox/base -- bash -eo pipefail {0}
         env:
           R2_ACCOUNT_ID: ${{ vars.CLOUDFLARE_ACCOUNT_ID }}
           DEST:          ${{ steps.rename.outputs.dest }}
@@ -268,7 +270,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: main
           persist-credentials: false
 
       - name: Close Jira version (idempotent)
diff --git a/flox/base/.flox/env/manifest.lock b/flox/base/.flox/env/manifest.lock
index a942176e5a..c95da03f9f 100644
--- a/flox/base/.flox/env/manifest.lock
+++ b/flox/base/.flox/env/manifest.lock
@@ -6,6 +6,9 @@
       "android-studio-tools": {
         "pkg-path": "android-studio-tools"
       },
+      "awscli2": {
+        "pkg-path": "awscli2"
+      },
       "gh": {
         "pkg-path": "gh"
       },
@@ -157,6 +160,138 @@
       "group": "toplevel",
       "priority": 5
     },
+    {
+      "attr_path": "awscli2",
+      "broken": false,
+      "derivation": "/nix/store/v5gxglicwhyknfwswhngrbawzdwnapp5-awscli2-2.27.2.drv",
+      "description": "Unified tool to manage your AWS services",
+      "install_id": "awscli2",
+      "license": "Apache-2.0",
+      "locked_url": "https://github.com/flox/nixpkgs?rev=4faa5f5321320e49a78ae7848582f684d64783e9",
+      "name": "awscli2-2.27.2",
+      "pname": "awscli2",
+      "rev": "4faa5f5321320e49a78ae7848582f684d64783e9",
+      "rev_count": 806853,
+      "rev_date": "2025-05-27T18:28:29Z",
+      "scrape_date": "2025-05-29T04:22:26.435939Z",
+      "stabilities": [
+        "unstable",
+        "staging",
+        "stable",
+        "lts"
+      ],
+      "unfree": false,
+      "version": "2.27.2",
+      "outputs_to_install": [
+        "out"
+      ],
+      "outputs": {
+        "dist": "/nix/store/sc270lyggbhz78lcxh9khqmggayqpp6i-awscli2-2.27.2-dist",
+        "out": "/nix/store/b5fa0fplfpiyx8zwc9y7d08a57lsk229-awscli2-2.27.2"
+      },
+      "system": "aarch64-darwin",
+      "group": "toplevel",
+      "priority": 5
+    },
+    {
+      "attr_path": "awscli2",
+      "broken": false,
+      "derivation": "/nix/store/7ykn42yxjf7ncyl2z00700hq214xs4jn-awscli2-2.27.2.drv",
+      "description": "Unified tool to manage your AWS services",
+      "install_id": "awscli2",
+      "license": "Apache-2.0",
+      "locked_url": "https://github.com/flox/nixpkgs?rev=4faa5f5321320e49a78ae7848582f684d64783e9",
+      "name": "awscli2-2.27.2",
+      "pname": "awscli2",
+      "rev": "4faa5f5321320e49a78ae7848582f684d64783e9",
+      "rev_count": 806853,
+      "rev_date": "2025-05-27T18:28:29Z",
+      "scrape_date": "2025-05-29T04:39:56.495925Z",
+      "stabilities": [
+        "unstable",
+        "staging",
+        "stable",
+        "lts"
+      ],
+      "unfree": false,
+      "version": "2.27.2",
+      "outputs_to_install": [
+        "out"
+      ],
+      "outputs": {
+        "dist": "/nix/store/ss8xqzwn1l8qdbwlml439bx1ik13vxlk-awscli2-2.27.2-dist",
+        "out": "/nix/store/161s22pbddllc4mabgr5rvrpmhiffsp4-awscli2-2.27.2"
+      },
+      "system": "aarch64-linux",
+      "group": "toplevel",
+      "priority": 5
+    },
+    {
+      "attr_path": "awscli2",
+      "broken": false,
+      "derivation": "/nix/store/id7b0p6cwlkcsnfb767s820ig9xj0qnp-awscli2-2.27.2.drv",
+      "description": "Unified tool to manage your AWS services",
+      "install_id": "awscli2",
+      "license": "Apache-2.0",
+      "locked_url": "https://github.com/flox/nixpkgs?rev=4faa5f5321320e49a78ae7848582f684d64783e9",
+      "name": "awscli2-2.27.2",
+      "pname": "awscli2",
+      "rev": "4faa5f5321320e49a78ae7848582f684d64783e9",
+      "rev_count": 806853,
+      "rev_date": "2025-05-27T18:28:29Z",
+      "scrape_date": "2025-05-29T04:56:01.820295Z",
+      "stabilities": [
+        "unstable",
+        "staging",
+        "stable",
+        "lts"
+      ],
+      "unfree": false,
+      "version": "2.27.2",
+      "outputs_to_install": [
+        "out"
+      ],
+      "outputs": {
+        "dist": "/nix/store/q9rzj2ikpl9vn4sns3ydsy7i8sachnha-awscli2-2.27.2-dist",
+        "out": "/nix/store/l18j8wgidf145m0zw6ydg8blim44hrkq-awscli2-2.27.2"
+      },
+      "system": "x86_64-darwin",
+      "group": "toplevel",
+      "priority": 5
+    },
+    {
+      "attr_path": "awscli2",
+      "broken": false,
+      "derivation": "/nix/store/j2ajkr3y4c0fg9lxl22z30hd4spb74d9-awscli2-2.27.2.drv",
+      "description": "Unified tool to manage your AWS services",
+      "install_id": "awscli2",
+      "license": "Apache-2.0",
+      "locked_url": "https://github.com/flox/nixpkgs?rev=4faa5f5321320e49a78ae7848582f684d64783e9",
+      "name": "awscli2-2.27.2",
+      "pname": "awscli2",
+      "rev": "4faa5f5321320e49a78ae7848582f684d64783e9",
+      "rev_count": 806853,
+      "rev_date": "2025-05-27T18:28:29Z",
+      "scrape_date": "2025-05-29T05:14:30.638052Z",
+      "stabilities": [
+        "unstable",
+        "staging",
+        "stable",
+        "lts"
+      ],
+      "unfree": false,
+      "version": "2.27.2",
+      "outputs_to_install": [
+        "out"
+      ],
+      "outputs": {
+        "dist": "/nix/store/r5cw3141myaf5lnzra9c0nc8prb2zv6y-awscli2-2.27.2-dist",
+        "out": "/nix/store/gx3hx0b3lbm11sishxl4k7a7ha4w405q-awscli2-2.27.2"
+      },
+      "system": "x86_64-linux",
+      "group": "toplevel",
+      "priority": 5
+    },
     {
       "attr_path": "gh",
       "broken": false,
diff --git a/flox/base/.flox/env/manifest.toml b/flox/base/.flox/env/manifest.toml
index be27723d16..84f81eee24 100644
--- a/flox/base/.flox/env/manifest.toml
+++ b/flox/base/.flox/env/manifest.toml
@@ -18,6 +18,7 @@ version = 1
 jdk17.pkg-path = "jdk17"
 android-studio-tools.pkg-path = "android-studio-tools"
 gh.pkg-path = "gh"
+awscli2.pkg-path = "awscli2"
 # gum.pkg-path = "gum"
 # gum.version = "^0.14.5"