diff --git a/.github/actions/setup-localstack/action.yaml b/.github/actions/setup-localstack/action.yaml
index 69d41737f4..a62996be44 100644
--- a/.github/actions/setup-localstack/action.yaml
+++ b/.github/actions/setup-localstack/action.yaml
@@ -20,10 +20,10 @@ runs:
         password: ${{ inputs.password }}
     - shell: bash
       run: |
-            pip install localstack==2.3.1                                # Install LocalStack cli
+            pip install localstack==2.3.2                                # Install LocalStack cli
             # Below image was copied manually from localstack/localstack:2.2 and uploaded to ghcr
-            docker pull ghcr.io/project-zot/ci-images/localstack:2.3.1     # Make sure to pull a working version of the image
-            localstack start -d                                          # Start LocalStack in the background
+            docker pull localstack/localstack@sha256:1a1089d01cb8a16e72dd9f30a29a65d5310805b54b40ecf26cf3803a7690053d     # Make sure to pull a working version of the image
+            PROVIDER_OVERRIDE_S3=v3 localstack start -d                                          # Start LocalStack in the background
 
             echo "Waiting for LocalStack startup..."                     # Wait 30 seconds for the LocalStack container
             localstack wait -t 30                                        # to become ready before timing out
@@ -33,3 +33,5 @@ runs:
       env:
         AWS_ACCESS_KEY_ID: fake
         AWS_SECRET_ACCESS_KEY: fake
+        
+
diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
index 0a0a7ae968..45d35dfc1d 100644
--- a/.github/workflows/nightly.yaml
+++ b/.github/workflows/nightly.yaml
@@ -1,5 +1,7 @@
 name: 'Nightly jobs'
 on:
+  pull_request:
+    branches: [main]
   schedule:
     - cron: '30 1 * * *'
   workflow_dispatch:
@@ -34,22 +36,16 @@ jobs:
           make bin/skopeo
           sudo cp bin/skopeo /usr/bin
           skopeo -v
+          pip install --upgrade pyopenssl
+          pip install awscli-local[ver1]
+          
       - name: Log in to GitHub Docker Registry
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ github.token }}
-      - name: Install localstack
-        run: |
-          pip install --upgrade pyopenssl
-          pip install localstack==2.3.1 awscli-local[ver1] # install LocalStack cli and awslocal
-          docker pull ghcr.io/project-zot/ci-images/localstack:2.3.1 # Make sure to pull the latest version of the image
-          localstack start -d                       # Start LocalStack in the background
-
-          echo "Waiting for LocalStack startup..."  # Wait 30 seconds for the LocalStack container
-          localstack wait -t 30                     # to become ready before timing out
-          echo "Startup complete"
+      - uses: ./.github/actions/setup-localstack
       - name: Run blackbox nightly dedupe tests
         run: |
             # test restoring s3 blobs after cache is deleted