diff --git a/.github/workflows/build-image-on-pr-label.yaml b/.github/workflows/build-image-on-pr-label.yaml
index aecbc879673f4..dbdc6f6de9d66 100644
--- a/.github/workflows/build-image-on-pr-label.yaml
+++ b/.github/workflows/build-image-on-pr-label.yaml
@@ -20,7 +20,7 @@ jobs:
       - name: Checkout s3gw
         uses: actions/checkout@v3
         with:
-          repository: aquarist-labs/s3gw
+          repository: s3gw-tech/s3gw
           path: s3gw
           submodules: false
 
@@ -29,6 +29,7 @@ jobs:
         with:
           path: s3gw/ceph
           submodules: recursive
+          fetch-depth: 0
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -56,7 +57,6 @@ jobs:
           build-args: |
             CMAKE_BUILD_TYPE=Release
             S3GW_VERSION=${{ env.IMAGE_TAG }}
-            NPROC=16
             QUAY_EXPIRATION=1w
             SRC_S3GW_DIR=s3gw
           tags: |
diff --git a/.github/workflows/pr-add-to-project.yaml b/.github/workflows/pr-add-to-project.yaml
index 2e54c91c88260..eb0101012cdcb 100644
--- a/.github/workflows/pr-add-to-project.yaml
+++ b/.github/workflows/pr-add-to-project.yaml
@@ -14,6 +14,6 @@ jobs:
     steps:
       - uses: jecluis/custom-project-status@v1.1.0
         with:
-          project-url: https://github.com/orgs/aquarist-labs/projects/5
+          project-url: https://github.com/orgs/s3gw-tech/projects/1
           gh-token: ${{ secrets.PAT_S3GW_PROJECT_ADD }}
           default-pr-status: "In review"
diff --git a/.github/workflows/test-s3gw.yml b/.github/workflows/test-s3gw.yml
index 98f748c6097bd..f3db4b74167c8 100644
--- a/.github/workflows/test-s3gw.yml
+++ b/.github/workflows/test-s3gw.yml
@@ -25,6 +25,9 @@ jobs:
   tests:
     runs-on: self-hosted
 
+    permissions:
+      contents: write
+
     steps:
 
       - name: Checkout ceph
@@ -36,14 +39,14 @@ jobs:
       - name: Checkout s3gw
         uses: actions/checkout@v3
         with:
-          repository: aquarist-labs/s3gw
+          repository: s3gw-tech/s3gw
           path: s3gw
           submodules: false
 
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.8
+          python-version: 3.11
 
       - name: Install Dependencies
         run: |
@@ -57,7 +60,6 @@ jobs:
         run: |
           docker build \
             --build-arg CMAKE_BUILD_TYPE=Debug \
-            --build-arg NPROC=16 \
             --file s3gw/Dockerfile \
             --tag s3gw-unittests:${IMAGE_TAG} \
             --target s3gw-unittests \
@@ -71,7 +73,6 @@ jobs:
         run: |
           docker build \
             --build-arg CMAKE_BUILD_TYPE=Debug \
-            --build-arg NPROC=16 \
             --build-arg SRC_S3GW_DIR=s3gw \
             --file s3gw/Dockerfile \
             --tag s3gw:${IMAGE_TAG} \
@@ -132,7 +133,7 @@ jobs:
             -v /run/docker.sock:/run/docker.sock \
             -v ${GITHUB_WORKSPACE}/s3tr-out:/out \
             --pull=always \
-            ghcr.io/aquarist-labs/s3tr:latest \
+            ghcr.io/s3gw-tech/s3tr:latest \
             run \
             --image s3gw:${IMAGE_TAG} \
             --docker-api unix:///run/docker.sock \
@@ -152,7 +153,7 @@ jobs:
           docker run --rm \
             -v ${GITHUB_WORKSPACE}/s3tr-out:/out \
             -v ${GITHUB_WORKSPACE}/ceph:/ceph:ro \
-            ghcr.io/aquarist-labs/s3tr:latest \
+            ghcr.io/s3gw-tech/s3tr:latest \
             analyze summary \
               /out/s3tr.json \
               /ceph/qa/rgw/store/sfs/tests/fixtures/s3tr_excuses.csv