diff --git a/.github/workflows/openstack.yml b/.github/workflows/openstack.yml
index 743e6e35..7b247ed6 100644
--- a/.github/workflows/openstack.yml
+++ b/.github/workflows/openstack.yml
@@ -8,7 +8,11 @@ on:
     tags-ignore:
       - "*"
   pull_request:
+    branches: [main]
   workflow_dispatch:
+  workflow_run:
+    workflows: [testsuite]
+    types: [completed]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -34,6 +38,7 @@ env:
 jobs: 
     terraform_openstack_create:
         runs-on: self-hosted
+        if: ${{ github.event.workflow_run.conclusion == 'success' }}
         defaults:
           run:
             working-directory: "./.github/workflows/openstack/terraform"
@@ -559,4 +564,9 @@ jobs:
           name: ${{ github.run_id }}-tf.out.json
           path: ${{ github.workspace }}/tf.out.json
       - name: Destroy OpenStack VM
-        run: terraform destroy -no-color -auto-approve 
\ No newline at end of file
+        run: terraform destroy -no-color -auto-approve
+    on-failure:
+      runs-on: self-hosted
+      if: ${{ github.event.workflow_run.conclusion == 'failure' }}
+      steps:
+        - run: echo 'Previous workflow testsuite did not complete successfully. '
diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
index c30712fa..c4ccbdc6 100644
--- a/.github/workflows/testsuite.yml
+++ b/.github/workflows/testsuite.yml
@@ -10,6 +10,10 @@ on:
   pull_request:
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   testsuite:
     env: