diff --git a/server/events/project_finder.go b/server/events/project_finder.go
index 2c2dc92394..0eca4fe2f8 100644
--- a/server/events/project_finder.go
+++ b/server/events/project_finder.go
@@ -17,6 +17,7 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+	"regexp"
 	"strings"
 
 	"github.com/runatlantis/atlantis/server/events/yaml/valid"
@@ -147,11 +148,14 @@ func (p *DefaultProjectFinder) DetermineProjectsViaConfig(log *logging.SimpleLog
 // filterToTerraform filters non-terraform files from files.
 func (p *DefaultProjectFinder) filterToTerraform(files []string) []string {
 	var filtered []string
+	fileNameRe, _ := regexp.Compile(`^.*(\.tf|\.tfvars)$`)
+
 	for _, fileName := range files {
-		if !p.shouldIgnore(fileName) && (strings.Contains(fileName, ".tf") || filepath.Base(fileName) == "terragrunt.hcl") {
+		if !p.shouldIgnore(fileName) && (fileNameRe.MatchString(fileName) || filepath.Base(fileName) == "terragrunt.hcl") {
 			filtered = append(filtered, fileName)
 		}
 	}
+
 	return filtered
 }
 
diff --git a/server/events/project_finder_test.go b/server/events/project_finder_test.go
index 31e1b1ec74..cf1b22cbd9 100644
--- a/server/events/project_finder_test.go
+++ b/server/events/project_finder_test.go
@@ -120,7 +120,7 @@ func TestDetermineProjects(t *testing.T) {
 		},
 		{
 			"Should ignore non .tf files and return an empty list",
-			[]string{"non-tf"},
+			[]string{"non-tf", "non.tf.suffix"},
 			nil,
 			nestedModules1,
 		},