diff --git a/.github/workflows/commitmsg-conform.yml b/.github/workflows/commitmsg-conform.yml
index 9fae6f0..b8fe052 100644
--- a/.github/workflows/commitmsg-conform.yml
+++ b/.github/workflows/commitmsg-conform.yml
@@ -8,4 +8,4 @@ permissions:
   pull-requests: read
 jobs:
   commitmsg-conform:
-    uses: jdevto/actions/.github/workflows/commitmsg-conform.yml@main
+    uses: tfstack/actions/.github/workflows/commitmsg-conform.yml@main
diff --git a/.github/workflows/markdown-lint.yml b/.github/workflows/markdown-lint.yml
index 2cff1b5..34ce215 100644
--- a/.github/workflows/markdown-lint.yml
+++ b/.github/workflows/markdown-lint.yml
@@ -8,4 +8,4 @@ permissions:
   pull-requests: read
 jobs:
   markdown-lint:
-    uses: jdevto/actions/.github/workflows/markdown-lint.yml@main
+    uses: tfstack/actions/.github/workflows/markdown-lint.yml@main
diff --git a/.github/workflows/terraform-lint-validate.yml b/.github/workflows/terraform-lint-validate.yml
new file mode 100644
index 0000000..a85ae57
--- /dev/null
+++ b/.github/workflows/terraform-lint-validate.yml
@@ -0,0 +1,11 @@
+name: Terraform Lint & Validate
+on:
+  pull_request: {}
+permissions:
+  statuses: write
+  checks: write
+  contents: read
+  pull-requests: read
+jobs:
+  commitmsg-conform:
+    uses: tfstack/actions/.github/workflows/terraform-lint-validate@main