diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml
index 4036d64..0fa2cac 100644
--- a/.github/workflows/issues.yml
+++ b/.github/workflows/issues.yml
@@ -20,28 +20,7 @@ jobs:
         run: |
           if [[ "${{ github.event.issue.body }}" == *"cloud password"* ]]; then
             echo "contains_invalid_string=true" >> $GITHUB_ENV
-          else
-            echo "contains_invalid_string=false" >> $GITHUB_ENV
-          fi
-      - name: Close Issue - comment
-        if: env.contains_invalid_string == 'true'
-        uses: peter-evans/close-issue@v3
-        with:
-          comment: |
-            This issue was automatically closed because it has a solution under [FAQ](https://github.com/JurajNyiri/HomeAssistant-Tapo-Control?tab=readme-ov-file#troubleshooting--faq) and is a duplicate.
-            
-            See `I see error 'Invalid cloud password.'`.
-
-            Note: This action has been done automatically, owner is notified about this issue and if there is a need he will reopen.
-          labels: |
-            Duplicate
-  autoclose-onvif-rejection:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check issue description for invalid string
-        id: check_body
-        run: |
-          if [[ "${{ github.event.issue.body }}" == *"sure you have created your 3rd party account via Tapo app"* ]]; then
+          elif [[ "${{ github.event.issue.body }}" == *"Invalid authentication data. Make sure you have created your 3rd party account via Tapo app."* ]]; then
             echo "contains_invalid_string=true" >> $GITHUB_ENV
           else
             echo "contains_invalid_string=false" >> $GITHUB_ENV
@@ -51,9 +30,7 @@ jobs:
         uses: peter-evans/close-issue@v3
         with:
           comment: |
-            This issue was automatically closed because it has a solution under [FAQ](https://github.com/JurajNyiri/HomeAssistant-Tapo-Control?tab=readme-ov-file#troubleshooting--faq) and is a duplicate.
-            
-            See `I see error 'Invalid authentication data. Make sure you have created your 3rd party account via Tapo app. You can also test if these credentials work via rtsp stream, for example VLC using link rtsp://username:password@IP Address:554/stream1' when I enter correct password`.
+            This issue was automatically closed because it matches a known [FAQ](https://github.com/JurajNyiri/HomeAssistant-Tapo-Control?tab=readme-ov-file#troubleshooting--faq) solution.
 
             Note: This action has been done automatically, owner is notified about this issue and if there is a need he will reopen.
           labels: |