diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.yml
index 9d485d83..963e7661 100644
--- a/.github/workflows/build_docker.yml
+++ b/.github/workflows/build_docker.yml
@@ -67,4 +67,4 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
           build-args: |
-            ${{ matrix.path == 'client' && github.ref_name == 'main' && 'BUILD_CONFIG=production' || matrix.path == 'client' && github.ref_name == 'chore/staging-setup' && 'BUILD_CONFIG=staging' || '' }}
+            ${{ matrix.path == 'client' && github.ref_name == 'main' && 'BUILD_CONFIG=production' || matrix.path == 'client' && github.ref_name == 'staging' && 'BUILD_CONFIG=staging' || '' }}
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
index 0013f772..b2492a30 100644
--- a/.github/workflows/staging.yml
+++ b/.github/workflows/staging.yml
@@ -2,7 +2,7 @@ name: Build and Deploy to Staging
 
 on:
   push:
-    branches: [ chore/staging-setup ]
+    branches: [ staging ]
     paths-ignore:
       - '.codacy.yaml'
       - '.env.example'
@@ -32,6 +32,6 @@ jobs:
     secrets: inherit
     with:
       environment: staging
-      client_image_tag: "chore/staging-setup"
-      application_server_image_tag: "chore/staging-setup"
-      webhook_listener_image_tag: "chore/staging-setup"
+      client_image_tag: "staging"
+      application_server_image_tag: "staging"
+      webhook_listener_image_tag: "staging"