diff --git a/.github/workflows/acceptance_test_cd.yml b/.github/workflows/acceptance_test_cd.yml
index 056543d..5b1147a 100644
--- a/.github/workflows/acceptance_test_cd.yml
+++ b/.github/workflows/acceptance_test_cd.yml
@@ -13,16 +13,16 @@ on:
       - ".github/workflows/*acceptance*.yml"
 
   # Run the test when the new PR to develop or main is created
-  # pull_request:
-  #   branches:
-  #     - develop
-  #     - main
-  #   paths:
-  #     - 'backend/**'
-  #     - 'frontend/**'
-  #     - 'k8s/staging/**'
-  #     - 'infrastructure/staging/**'
-  #     - '.github/workflows/*staging*.yml'
+  pull_request:
+    branches:
+      - develop
+      - main
+    paths:
+      - 'backend/**'
+      - 'frontend/**'
+      - 'k8s/staging/**'
+      - 'infrastructure/staging/**'
+      - '.github/workflows/*staging*.yml'
 
 env:
   PYTHON_VERSION: "3.10"
diff --git a/.github/workflows/cd-production-deploy.yml b/.github/workflows/cd-production-deploy.yml
index 520dca2..3b0b413 100644
--- a/.github/workflows/cd-production-deploy.yml
+++ b/.github/workflows/cd-production-deploy.yml
@@ -68,9 +68,12 @@ jobs:
           FRONTEND_IMAGE="frontend:${{ steps.vars.outputs.IMAGE_TAG }}"
 
           # Semantic version images
-          NOTES_SERVICE_IMAGE_VERSION="notes_service:${{ inputs.version }}"
-          USERS_SERVICE_IMAGE_VERSION="users_service:${{ inputs.version }}"
-          FRONTEND_IMAGE_VERSION="frontend:${{ inputs.version }}"
+          VERSION=${{ inputs.version }}
+          if [[ -z "$VERSION" ]]; then
+            VERSION=latest
+          NOTES_SERVICE_IMAGE_VERSION="notes_service:$VERSION"
+          USERS_SERVICE_IMAGE_VERSION="users_service:$VERSION"
+          FRONTEND_IMAGE_VERSION="frontend:$VERSION"
 
           # Build local images for scanning
           docker build -t $NOTES_SERVICE_IMAGE -t $NOTES_SERVICE_IMAGE_VERSION ./backend/notes_service
diff --git a/.github/workflows/cd-staging-deploy.yml b/.github/workflows/cd-staging-deploy.yml
index 29a1b71..15771e5 100644
--- a/.github/workflows/cd-staging-deploy.yml
+++ b/.github/workflows/cd-staging-deploy.yml
@@ -339,19 +339,19 @@ jobs:
         run: |
           echo "Cleaning up staging"
       
-      # - name: Log in to Azure
-      #   uses: azure/login@v1
-      #   with:
-      #     creds: {{ secrets.AZURE_CREDENTIALS }}
-      #     enable-AzPSSession: true
-
-      # - name: Delete staging environment
-      #   run: |
-      #     az group delete \
-      #       --name {{ env.RESOURCE_GROUP_STAGING }} \
-      #       --yes \
-      #       --no-wait
+      - name: Log in to Azure
+        uses: azure/login@v1
+        with:
+          creds: ${{ secrets.AZURE_CREDENTIALS }}
+          enable-AzPSSession: true
+
+      - name: Delete staging environment
+        run: |
+          az group delete \
+            --name {{ env.RESOURCE_GROUP_STAGING }} \
+            --yes \
+            --no-wait
             
-      # - name: Logout from Azure
-      #   run: az logout
+      - name: Logout from Azure
+        run: az logout
       
\ No newline at end of file
diff --git a/.github/workflows/feature_test_notes_service.yml b/.github/workflows/feature_test_notes_service.yml
index 9efc044..1723aa0 100644
--- a/.github/workflows/feature_test_notes_service.yml
+++ b/.github/workflows/feature_test_notes_service.yml
@@ -14,10 +14,10 @@ on:
       - ".github/workflows/*notes_service*.yml"
   
   # Re-run the test when the new PR to develop is created
-  # pull_request:
-  #   branches:
-  #     - develop
-  #     - main
+  pull_request:
+    branches:
+      - develop
+      - main
 
 jobs:
   quality-checks:
diff --git a/.github/workflows/feature_test_users_service.yml b/.github/workflows/feature_test_users_service.yml
index b95184c..3943e34 100644
--- a/.github/workflows/feature_test_users_service.yml
+++ b/.github/workflows/feature_test_users_service.yml
@@ -14,10 +14,10 @@ on:
       - ".github/workflows/*users_service*.yml"
   
   # Re-run the test when the new PR to develop is created
-  # pull_request:
-  #   branches:
-  #     - develop
-  #     - main
+  pull_request:
+    branches:
+      - develop
+      - main
 
 jobs:
   quality-checks:
diff --git a/playwright-python/tests/test_acceptance.py b/playwright-python/tests/test_acceptance.py
index d426ee4..64981d8 100644
--- a/playwright-python/tests/test_acceptance.py
+++ b/playwright-python/tests/test_acceptance.py
@@ -18,7 +18,7 @@ def browser_context_args(browser_context_args):
         "ignore_https_errors": True,
     }
 
-@pytest.mark.smoke
+@pytest.mark.acceptance
 class TestEndToEndUserFlow:
     """Acceptance testing to verify correct end-to-end user flow."""