diff --git a/.github/workflows/cicd-dev-acc.yml b/.github/workflows/cicd-dev-acc.yml
index 66ebf372..dc7a9cb7 100644
--- a/.github/workflows/cicd-dev-acc.yml
+++ b/.github/workflows/cicd-dev-acc.yml
@@ -23,9 +23,8 @@ jobs:
 
   test-vmaas-instance:
     uses: ./.github/workflows/reusable-dev-acc.yml
-    # needs: [test-datasouces]
-    needs: [test-provider]
-    # if: "always()"
+    needs: [test-datasouces]
+    if: "always()"
     with:
       test_case: TestVmaasInstance TestAccResourceInstance
       test_description: Instance usecase validations
@@ -33,9 +32,8 @@ jobs:
 
   test-vmaas-lb:
     uses: ./.github/workflows/reusable-dev-acc.yml
-    # needs: [test-vmaas-instance]
-    needs: [test-provider]
-    # if: "always()"
+    needs: [test-vmaas-instance]
+    if: "always()"
     with:
       test_case: TestVmaasLB TestAccResourceLB TestVmaasLoadBalancerPlan TestAccResourceLoadBalancerCreate
       test_description: Loadbalancer usecase validations
@@ -43,9 +41,8 @@ jobs:
 
   test-vmaas-network:
     uses: ./.github/workflows/reusable-dev-acc.yml
-    # needs: [test-vmaas-lb]
-    needs: [test-provider]
-    # if: "always()"
+    needs: [test-vmaas-lb]
+    if: "always()"
     with:
       test_case: TestVmaasNetworkPlan TestAccResourceNetworkCreate TestAccResourceRouter TestVmaasRouter TestAccResourceTier TestVmaasRouteBGPNeighborPlan
       test_description: NSX Network usecase validations
@@ -53,7 +50,7 @@ jobs:
 
   process-logs:
     runs-on: ubuntu-20.04
-    needs: [test-vmaas-network, test-vmaas-lb, test-vmaas-instance, test-datasouces]
+    needs: [test-vmaas-network]
     if: "always()"
     steps:
       - name: Checkout workspace
diff --git a/Makefile b/Makefile
index f36dd9a7..f0e328e2 100644
--- a/Makefile
+++ b/Makefile
@@ -81,7 +81,7 @@ coverage: vendor
 ACC_TEST_FILE_LOCATION=github.com/HewlettPackard/hpegl-vmaas-terraform-resources/internal/acceptance_test
 acceptance:
 	@if [ "${case}" != "" ]; then \
-		TF_ACC=true go test -parallel 1 -run $(case) -v -timeout=20000s -cover $(ACC_TEST_FILE_LOCATION); \
+		TF_ACC=true go test -parallel 1 -count 1 -run $(case) -v -timeout=20000s -cover $(ACC_TEST_FILE_LOCATION); \
 	else \
 		TF_ACC=true go test -parallel 4 -v -timeout=50000s -cover $(ACC_TEST_FILE_LOCATION);\
 	fi