diff --git a/cmd/server_test.go b/cmd/server_test.go
index e410d816b1..b823df8803 100644
--- a/cmd/server_test.go
+++ b/cmd/server_test.go
@@ -24,7 +24,7 @@ import (
 	homedir "github.com/mitchellh/go-homedir"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/runatlantis/atlantis/server"
 	"github.com/runatlantis/atlantis/server/events/vcs/testdata"
diff --git a/go.mod b/go.mod
index 7412402833..83495f0b36 100644
--- a/go.mod
+++ b/go.mod
@@ -47,7 +47,7 @@ require (
 	go.uber.org/zap v1.26.0
 	golang.org/x/term v0.15.0
 	golang.org/x/text v0.14.0
-	gopkg.in/yaml.v2 v2.4.0
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
@@ -130,5 +130,4 @@ require (
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go.sum b/go.sum
index fc79e9f4e2..593f2471d4 100644
--- a/go.sum
+++ b/go.sum
@@ -762,7 +762,6 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
diff --git a/server/core/config/parser_validator.go b/server/core/config/parser_validator.go
index 0a37caaccc..ee5d265c60 100644
--- a/server/core/config/parser_validator.go
+++ b/server/core/config/parser_validator.go
@@ -12,7 +12,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/runatlantis/atlantis/server/core/config/raw"
 	"github.com/runatlantis/atlantis/server/core/config/valid"
-	yaml "gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v3"
 )
 
 // ParserValidator parses and validates server-side repo config files and
diff --git a/server/core/config/raw/autodiscover_test.go b/server/core/config/raw/autodiscover_test.go
index 1485367fe8..19daf75113 100644
--- a/server/core/config/raw/autodiscover_test.go
+++ b/server/core/config/raw/autodiscover_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/runatlantis/atlantis/server/core/config/raw"
 	"github.com/runatlantis/atlantis/server/core/config/valid"
 	. "github.com/runatlantis/atlantis/testing"
-	yaml "gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v3"
 )
 
 func TestAutoDiscover_UnmarshalYAML(t *testing.T) {
diff --git a/server/core/config/raw/autoplan_test.go b/server/core/config/raw/autoplan_test.go
index 225e058ba2..e364d8f17c 100644
--- a/server/core/config/raw/autoplan_test.go
+++ b/server/core/config/raw/autoplan_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/runatlantis/atlantis/server/core/config/raw"
 	"github.com/runatlantis/atlantis/server/core/config/valid"
 	. "github.com/runatlantis/atlantis/testing"
-	yaml "gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v3"
 )
 
 func TestAutoPlan_UnmarshalYAML(t *testing.T) {
diff --git a/server/core/config/raw/metrics_test.go b/server/core/config/raw/metrics_test.go
index c001bbc451..f3fda929dc 100644
--- a/server/core/config/raw/metrics_test.go
+++ b/server/core/config/raw/metrics_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/runatlantis/atlantis/server/core/config/raw"
 	"github.com/stretchr/testify/assert"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 func TestMetrics_Unmarshal(t *testing.T) {
diff --git a/server/core/config/raw/policies_test.go b/server/core/config/raw/policies_test.go
index 0626119c6f..0656aefd4d 100644
--- a/server/core/config/raw/policies_test.go
+++ b/server/core/config/raw/policies_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/runatlantis/atlantis/server/core/config/raw"
 	"github.com/runatlantis/atlantis/server/core/config/valid"
 	. "github.com/runatlantis/atlantis/testing"
-	yaml "gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v3"
 )
 
 func TestPolicySetsConfig_YAMLMarshalling(t *testing.T) {
diff --git a/server/core/config/raw/project_test.go b/server/core/config/raw/project_test.go
index f2b792d7a3..5cb9d732a3 100644
--- a/server/core/config/raw/project_test.go
+++ b/server/core/config/raw/project_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/runatlantis/atlantis/server/core/config/raw"
 	"github.com/runatlantis/atlantis/server/core/config/valid"
 	. "github.com/runatlantis/atlantis/testing"
-	yaml "gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v3"
 )
 
 func TestProject_UnmarshalYAML(t *testing.T) {
diff --git a/server/core/config/raw/repo_cfg_test.go b/server/core/config/raw/repo_cfg_test.go
index ff057548d0..64fab1a08c 100644
--- a/server/core/config/raw/repo_cfg_test.go
+++ b/server/core/config/raw/repo_cfg_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/runatlantis/atlantis/server/core/config/raw"
 	"github.com/runatlantis/atlantis/server/core/config/valid"
 	. "github.com/runatlantis/atlantis/testing"
-	yaml "gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v3"
 )
 
 func TestConfig_UnmarshalYAML(t *testing.T) {
diff --git a/server/core/config/raw/stage_test.go b/server/core/config/raw/stage_test.go
index 4974a74519..3a25b8f873 100644
--- a/server/core/config/raw/stage_test.go
+++ b/server/core/config/raw/stage_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/runatlantis/atlantis/server/core/config/raw"
 	"github.com/runatlantis/atlantis/server/core/config/valid"
 	. "github.com/runatlantis/atlantis/testing"
-	yaml "gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v3"
 )
 
 func TestStage_UnmarshalYAML(t *testing.T) {
diff --git a/server/core/config/raw/step_test.go b/server/core/config/raw/step_test.go
index 215169d68c..298f6fcd5c 100644
--- a/server/core/config/raw/step_test.go
+++ b/server/core/config/raw/step_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/runatlantis/atlantis/server/core/config/raw"
 	"github.com/runatlantis/atlantis/server/core/config/valid"
 	. "github.com/runatlantis/atlantis/testing"
-	yaml "gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v3"
 )
 
 func TestStepConfig_YAMLMarshalling(t *testing.T) {
diff --git a/server/core/config/raw/workflow_step_test.go b/server/core/config/raw/workflow_step_test.go
index 291e032f08..1594488c9f 100644
--- a/server/core/config/raw/workflow_step_test.go
+++ b/server/core/config/raw/workflow_step_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/runatlantis/atlantis/server/core/config/raw"
 	"github.com/runatlantis/atlantis/server/core/config/valid"
 	. "github.com/runatlantis/atlantis/testing"
-	yaml "gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v3"
 )
 
 func TestWorkflowHook_YAMLMarshalling(t *testing.T) {
diff --git a/server/core/config/raw/workflow_test.go b/server/core/config/raw/workflow_test.go
index 23eda32e49..1fad7f459b 100644
--- a/server/core/config/raw/workflow_test.go
+++ b/server/core/config/raw/workflow_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/runatlantis/atlantis/server/core/config/raw"
 	"github.com/runatlantis/atlantis/server/core/config/valid"
 	. "github.com/runatlantis/atlantis/testing"
-	yaml "gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v3"
 )
 
 func TestWorkflow_UnmarshalYAML(t *testing.T) {