diff --git a/.github/workflows/update-weaviate-server.yml b/.github/workflows/update-weaviate-server.yml
index 01f02b6..048e1c4 100644
--- a/.github/workflows/update-weaviate-server.yml
+++ b/.github/workflows/update-weaviate-server.yml
@@ -1,6 +1,12 @@
-name: Update Weaviate Version
+name: Update weaviate server image
 
-on: 
+on:
+  push:
+    branches:
+      - weaviate-server
+  pull_request:
+    branches:
+      - weaviate-server
   workflow_dispatch:
   schedule:
     - cron: '0 0 * * 1' # Every Monday at 00:00 UTC
@@ -17,24 +23,37 @@ jobs:
         sudo apt-get update
         sudo apt-get install -y jq
 
-    - name: Update Weaviate Version
-      run: make update-weaviate-version
+    - name: Update Image
+      run: make update-weaviate-image
 
     - name: Commit and push if changed
       run: |
         git config --global user.name '${{ github.actor }}'
         git config --global user.email '${{ github.actor }}@users.noreply.github.com'
         git add tests/docker-compose.yml
-        git diff-index --quiet HEAD || (git commit -m "Update Weaviate version in tests/docker-compose.yml" && git push)
+        git diff-index --quiet HEAD || (git checkout -b update-weaviate-image && git commit -m "Update Weaviate version in tests/docker-compose.yml" && git push --set-upstream origin update-weaviate-image)
 
     - name: Create Pull Request
-      uses: actions/github-script@v3
+      uses: actions/github-script@v7
       with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
+        github-token: ${{ secrets.GITHUB_TOKEN }}
         script: |
-          const title = "Update Weaviate Version";
-          const body = "This PR updates the Weaviate version in tests/docker-compose.yml";
-          const branch = "main"; # Change to your target branch
-          const head = process.env.GITHUB_REF.split('/').pop();
-          const base = branch;
-          github.pulls.create({owner, repo, title, body, head, base});
+          const { repo, owner } = context.repo;
+            const result = await github.rest.pulls.create({
+              title: 'Update Weaviate Server Image',
+              owner,
+              repo,
+              head: 'update-weaviate-image',
+              base: 'main',
+              body: [
+                'This PR updates the Weaviate version in tests/docker-compose.yml',
+                'This PR is auto-generated by',
+                '[actions/github-script](https://github.com/actions/github-script).'
+              ].join('\n')
+            });
+            github.rest.issues.addLabels({
+              owner,
+              repo,
+              issue_number: result.data.number,
+              labels: ['quality-improvement', 'automated pr']
+            });
\ No newline at end of file
diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
index a4bddf2..1ae2795 100644
--- a/tests/docker-compose.yml
+++ b/tests/docker-compose.yml
@@ -9,7 +9,7 @@ services:
     - '8080'
     - --scheme
     - http
-    image: semitechnologies/weaviate:1.23.3
+    image: semitechnologies/weaviate:1.23.6
     ports:
       - "8080"
       - "50051"