diff --git a/.github/workflows/module-test-pipeline.yml b/.github/workflows/module-test-pipeline.yml
index d60b4e8..5e6ec29 100644
--- a/.github/workflows/module-test-pipeline.yml
+++ b/.github/workflows/module-test-pipeline.yml
@@ -69,8 +69,11 @@ jobs:
 
       - name: Ensure version reflects release candidate version
         run: |
-          VERSION=$(echo "${GITHUB_REF_NAME}" | cut -d'v' -f2)
-          echo $VERSION > VERSION
+          # only if ${GITHUB_REF_NAME} starts with 'v' or 'dev' and followed by a semver
+          if [[ $GITHUB_REF_NAME =~ ^(v|dev)[0-9]+\.[0-9]+\.[0-9]+.*$ ]]; then
+            VERSION=$(echo "${GITHUB_REF_NAME}" | cut -d'v' -f2)
+            echo $VERSION > VERSION
+          fi
 
       - name: Check changed files
         uses: tj-actions/verify-changed-files@v17
diff --git a/ci/module-test/providers.tf b/ci/module-test/providers.tf
index d1de478..c96b421 100644
--- a/ci/module-test/providers.tf
+++ b/ci/module-test/providers.tf
@@ -4,6 +4,7 @@ terraform {
   required_providers {
     solacebroker = {
       source = "registry.terraform.io/solaceproducts/solacebroker"
+      version = "~> 0.9"
     }
   }
   required_version = "~> 1.2"
diff --git a/ci/template-test/providers.tf b/ci/template-test/providers.tf
index d1de478..c96b421 100644
--- a/ci/template-test/providers.tf
+++ b/ci/template-test/providers.tf
@@ -4,6 +4,7 @@ terraform {
   required_providers {
     solacebroker = {
       source = "registry.terraform.io/solaceproducts/solacebroker"
+      version = "~> 0.9"
     }
   }
   required_version = "~> 1.2"
diff --git a/examples/acl-profile-exceptions/providers.tf b/examples/acl-profile-exceptions/providers.tf
index 6dd1008..e24c436 100644
--- a/examples/acl-profile-exceptions/providers.tf
+++ b/examples/acl-profile-exceptions/providers.tf
@@ -18,6 +18,7 @@ terraform {
   required_providers {
     solacebroker = {
       source = "registry.terraform.io/solaceproducts/solacebroker"
+      version = "~> 0.9"
     }
   }
   required_version = "~> 1.2"
diff --git a/examples/authorization-group/providers.tf b/examples/authorization-group/providers.tf
index 6dd1008..e24c436 100644
--- a/examples/authorization-group/providers.tf
+++ b/examples/authorization-group/providers.tf
@@ -18,6 +18,7 @@ terraform {
   required_providers {
     solacebroker = {
       source = "registry.terraform.io/solaceproducts/solacebroker"
+      version = "~> 0.9"
     }
   }
   required_version = "~> 1.2"
diff --git a/examples/basic-client-username/providers.tf b/examples/basic-client-username/providers.tf
index 6dd1008..e24c436 100644
--- a/examples/basic-client-username/providers.tf
+++ b/examples/basic-client-username/providers.tf
@@ -18,6 +18,7 @@ terraform {
   required_providers {
     solacebroker = {
       source = "registry.terraform.io/solaceproducts/solacebroker"
+      version = "~> 0.9"
     }
   }
   required_version = "~> 1.2"
diff --git a/examples/client-username-attributes/providers.tf b/examples/client-username-attributes/providers.tf
index 6dd1008..e24c436 100644
--- a/examples/client-username-attributes/providers.tf
+++ b/examples/client-username-attributes/providers.tf
@@ -18,6 +18,7 @@ terraform {
   required_providers {
     solacebroker = {
       source = "registry.terraform.io/solaceproducts/solacebroker"
+      version = "~> 0.9"
     }
   }
   required_version = "~> 1.2"
diff --git a/internal/gen-template/provider.tf b/internal/gen-template/provider.tf
index 11e8b00..060f7e6 100644
--- a/internal/gen-template/provider.tf
+++ b/internal/gen-template/provider.tf
@@ -4,7 +4,6 @@ terraform {
   required_providers {
     solacebroker = {
       source = "registry.terraform.io/solaceproducts/solacebroker"
-      # TODO: auto-update version
       version = "~> 0.9"
     }
   }
diff --git a/provider.tf b/provider.tf
index d0e66b6..af469a5 100644
--- a/provider.tf
+++ b/provider.tf
@@ -18,7 +18,6 @@ terraform {
   required_providers {
     solacebroker = {
       source = "registry.terraform.io/solaceproducts/solacebroker"
-      # TODO: auto-update version
       version = "~> 0.9"
     }
   }