diff --git a/templates/templates/repo/scripts/common.mk b/templates/templates/repo/scripts/common.mk
index 0a1547917..24d2fb08a 100644
--- a/templates/templates/repo/scripts/common.mk
+++ b/templates/templates/repo/scripts/common.mk
@@ -23,7 +23,7 @@ endif
 
 tfenv: ## install the tfenv tool
 	@if [ ! -d ${TFENV_DIR} ]; then \
-		git clone -q https://github.com/chanzuckerberg/tfenv.git $(TFENV_DIR); \
+		git clone -q https://github.com/tfutils/tfenv.git $(TFENV_DIR); \
 	fi
 .PHONY: tfenv
 
diff --git a/testdata/auth0_provider_yaml/scripts/common.mk b/testdata/auth0_provider_yaml/scripts/common.mk
index 0a1547917..24d2fb08a 100644
--- a/testdata/auth0_provider_yaml/scripts/common.mk
+++ b/testdata/auth0_provider_yaml/scripts/common.mk
@@ -23,7 +23,7 @@ endif
 
 tfenv: ## install the tfenv tool
 	@if [ ! -d ${TFENV_DIR} ]; then \
-		git clone -q https://github.com/chanzuckerberg/tfenv.git $(TFENV_DIR); \
+		git clone -q https://github.com/tfutils/tfenv.git $(TFENV_DIR); \
 	fi
 .PHONY: tfenv
 
diff --git a/testdata/bless_provider_yaml/scripts/common.mk b/testdata/bless_provider_yaml/scripts/common.mk
index 0a1547917..24d2fb08a 100644
--- a/testdata/bless_provider_yaml/scripts/common.mk
+++ b/testdata/bless_provider_yaml/scripts/common.mk
@@ -23,7 +23,7 @@ endif
 
 tfenv: ## install the tfenv tool
 	@if [ ! -d ${TFENV_DIR} ]; then \
-		git clone -q https://github.com/chanzuckerberg/tfenv.git $(TFENV_DIR); \
+		git clone -q https://github.com/tfutils/tfenv.git $(TFENV_DIR); \
 	fi
 .PHONY: tfenv
 
diff --git a/testdata/circleci/scripts/common.mk b/testdata/circleci/scripts/common.mk
index 0a1547917..24d2fb08a 100644
--- a/testdata/circleci/scripts/common.mk
+++ b/testdata/circleci/scripts/common.mk
@@ -23,7 +23,7 @@ endif
 
 tfenv: ## install the tfenv tool
 	@if [ ! -d ${TFENV_DIR} ]; then \
-		git clone -q https://github.com/chanzuckerberg/tfenv.git $(TFENV_DIR); \
+		git clone -q https://github.com/tfutils/tfenv.git $(TFENV_DIR); \
 	fi
 .PHONY: tfenv
 
diff --git a/testdata/github_actions/scripts/common.mk b/testdata/github_actions/scripts/common.mk
index 0a1547917..24d2fb08a 100644
--- a/testdata/github_actions/scripts/common.mk
+++ b/testdata/github_actions/scripts/common.mk
@@ -23,7 +23,7 @@ endif
 
 tfenv: ## install the tfenv tool
 	@if [ ! -d ${TFENV_DIR} ]; then \
-		git clone -q https://github.com/chanzuckerberg/tfenv.git $(TFENV_DIR); \
+		git clone -q https://github.com/tfutils/tfenv.git $(TFENV_DIR); \
 	fi
 .PHONY: tfenv
 
diff --git a/testdata/github_provider_yaml/scripts/common.mk b/testdata/github_provider_yaml/scripts/common.mk
index 0a1547917..24d2fb08a 100644
--- a/testdata/github_provider_yaml/scripts/common.mk
+++ b/testdata/github_provider_yaml/scripts/common.mk
@@ -23,7 +23,7 @@ endif
 
 tfenv: ## install the tfenv tool
 	@if [ ! -d ${TFENV_DIR} ]; then \
-		git clone -q https://github.com/chanzuckerberg/tfenv.git $(TFENV_DIR); \
+		git clone -q https://github.com/tfutils/tfenv.git $(TFENV_DIR); \
 	fi
 .PHONY: tfenv
 
diff --git a/testdata/okta_provider_yaml/scripts/common.mk b/testdata/okta_provider_yaml/scripts/common.mk
index 0a1547917..24d2fb08a 100644
--- a/testdata/okta_provider_yaml/scripts/common.mk
+++ b/testdata/okta_provider_yaml/scripts/common.mk
@@ -23,7 +23,7 @@ endif
 
 tfenv: ## install the tfenv tool
 	@if [ ! -d ${TFENV_DIR} ]; then \
-		git clone -q https://github.com/chanzuckerberg/tfenv.git $(TFENV_DIR); \
+		git clone -q https://github.com/tfutils/tfenv.git $(TFENV_DIR); \
 	fi
 .PHONY: tfenv
 
diff --git a/testdata/remote_backend_yaml/scripts/common.mk b/testdata/remote_backend_yaml/scripts/common.mk
index 0a1547917..24d2fb08a 100644
--- a/testdata/remote_backend_yaml/scripts/common.mk
+++ b/testdata/remote_backend_yaml/scripts/common.mk
@@ -23,7 +23,7 @@ endif
 
 tfenv: ## install the tfenv tool
 	@if [ ! -d ${TFENV_DIR} ]; then \
-		git clone -q https://github.com/chanzuckerberg/tfenv.git $(TFENV_DIR); \
+		git clone -q https://github.com/tfutils/tfenv.git $(TFENV_DIR); \
 	fi
 .PHONY: tfenv
 
diff --git a/testdata/snowflake_provider_yaml/scripts/common.mk b/testdata/snowflake_provider_yaml/scripts/common.mk
index 0a1547917..24d2fb08a 100644
--- a/testdata/snowflake_provider_yaml/scripts/common.mk
+++ b/testdata/snowflake_provider_yaml/scripts/common.mk
@@ -23,7 +23,7 @@ endif
 
 tfenv: ## install the tfenv tool
 	@if [ ! -d ${TFENV_DIR} ]; then \
-		git clone -q https://github.com/chanzuckerberg/tfenv.git $(TFENV_DIR); \
+		git clone -q https://github.com/tfutils/tfenv.git $(TFENV_DIR); \
 	fi
 .PHONY: tfenv
 
diff --git a/testdata/tfe_config/scripts/common.mk b/testdata/tfe_config/scripts/common.mk
index 0a1547917..24d2fb08a 100644
--- a/testdata/tfe_config/scripts/common.mk
+++ b/testdata/tfe_config/scripts/common.mk
@@ -23,7 +23,7 @@ endif
 
 tfenv: ## install the tfenv tool
 	@if [ ! -d ${TFENV_DIR} ]; then \
-		git clone -q https://github.com/chanzuckerberg/tfenv.git $(TFENV_DIR); \
+		git clone -q https://github.com/tfutils/tfenv.git $(TFENV_DIR); \
 	fi
 .PHONY: tfenv
 
diff --git a/testdata/tfe_provider_yaml/scripts/common.mk b/testdata/tfe_provider_yaml/scripts/common.mk
index 0a1547917..24d2fb08a 100644
--- a/testdata/tfe_provider_yaml/scripts/common.mk
+++ b/testdata/tfe_provider_yaml/scripts/common.mk
@@ -23,7 +23,7 @@ endif
 
 tfenv: ## install the tfenv tool
 	@if [ ! -d ${TFENV_DIR} ]; then \
-		git clone -q https://github.com/chanzuckerberg/tfenv.git $(TFENV_DIR); \
+		git clone -q https://github.com/tfutils/tfenv.git $(TFENV_DIR); \
 	fi
 .PHONY: tfenv
 
diff --git a/testdata/v2_full_yaml/scripts/common.mk b/testdata/v2_full_yaml/scripts/common.mk
index 0a1547917..24d2fb08a 100644
--- a/testdata/v2_full_yaml/scripts/common.mk
+++ b/testdata/v2_full_yaml/scripts/common.mk
@@ -23,7 +23,7 @@ endif
 
 tfenv: ## install the tfenv tool
 	@if [ ! -d ${TFENV_DIR} ]; then \
-		git clone -q https://github.com/chanzuckerberg/tfenv.git $(TFENV_DIR); \
+		git clone -q https://github.com/tfutils/tfenv.git $(TFENV_DIR); \
 	fi
 .PHONY: tfenv
 
diff --git a/testdata/v2_minimal_valid_yaml/scripts/common.mk b/testdata/v2_minimal_valid_yaml/scripts/common.mk
index 0a1547917..24d2fb08a 100644
--- a/testdata/v2_minimal_valid_yaml/scripts/common.mk
+++ b/testdata/v2_minimal_valid_yaml/scripts/common.mk
@@ -23,7 +23,7 @@ endif
 
 tfenv: ## install the tfenv tool
 	@if [ ! -d ${TFENV_DIR} ]; then \
-		git clone -q https://github.com/chanzuckerberg/tfenv.git $(TFENV_DIR); \
+		git clone -q https://github.com/tfutils/tfenv.git $(TFENV_DIR); \
 	fi
 .PHONY: tfenv
 
diff --git a/testdata/v2_no_aws_provider_yaml/scripts/common.mk b/testdata/v2_no_aws_provider_yaml/scripts/common.mk
index 0a1547917..24d2fb08a 100644
--- a/testdata/v2_no_aws_provider_yaml/scripts/common.mk
+++ b/testdata/v2_no_aws_provider_yaml/scripts/common.mk
@@ -23,7 +23,7 @@ endif
 
 tfenv: ## install the tfenv tool
 	@if [ ! -d ${TFENV_DIR} ]; then \
-		git clone -q https://github.com/chanzuckerberg/tfenv.git $(TFENV_DIR); \
+		git clone -q https://github.com/tfutils/tfenv.git $(TFENV_DIR); \
 	fi
 .PHONY: tfenv