diff --git a/Gopkg.lock b/Gopkg.lock
index 80b75c95c3f9..a6fb259bdba8 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -181,14 +181,6 @@
   revision = "026c730a0dcc5d11f93f1cf1cc65b01247ea7b6f"
   version = "v4.5.0"
 
-[[projects]]
-  branch = "master"
-  digest = "1:ec95c1c49fbec27ab5383b9c47fae5c2fe1d97ac5b41d36d78e17588a44e9f3f"
-  name = "github.com/ghodss/yaml"
-  packages = ["."]
-  pruneopts = ""
-  revision = "25d852aebe32c875e9c044af3eef9c7dc6bc777f"
-
 [[projects]]
   digest = "1:21911d0d3cecc86a42fd1920583c34a33b91035d77d4929772938961d7814ffc"
   name = "github.com/go-openapi/jsonpointer"
@@ -1418,7 +1410,6 @@
     "github.com/argoproj/pkg/time",
     "github.com/colinmarc/hdfs",
     "github.com/evanphx/json-patch",
-    "github.com/ghodss/yaml",
     "github.com/go-openapi/spec",
     "github.com/gorilla/websocket",
     "github.com/mitchellh/go-ps",
@@ -1484,6 +1475,7 @@
     "k8s.io/kube-openapi/pkg/common",
     "k8s.io/kubernetes/pkg/serviceaccount",
     "k8s.io/utils/pointer",
+    "sigs.k8s.io/yaml",
     "upper.io/db.v3/lib/sqlbuilder",
     "upper.io/db.v3/mysql",
     "upper.io/db.v3/postgresql",
diff --git a/cmd/argo/commands/get.go b/cmd/argo/commands/get.go
index 9d91eca922e7..cb0b6f04e682 100644
--- a/cmd/argo/commands/get.go
+++ b/cmd/argo/commands/get.go
@@ -11,9 +11,9 @@ import (
 	wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
 	"github.com/argoproj/argo/workflow/util"
 	"github.com/argoproj/pkg/humanize"
-	"github.com/ghodss/yaml"
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"sigs.k8s.io/yaml"
 )
 
 const onExitSuffix = "onExit"
diff --git a/cmd/argo/commands/template/get.go b/cmd/argo/commands/template/get.go
index 9df6e36bfb0c..7e4ff3fd4809 100644
--- a/cmd/argo/commands/template/get.go
+++ b/cmd/argo/commands/template/get.go
@@ -8,9 +8,9 @@ import (
 
 	wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
 	"github.com/argoproj/pkg/humanize"
-	"github.com/ghodss/yaml"
 	"github.com/spf13/cobra"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"sigs.k8s.io/yaml"
 )
 
 func NewGetCommand() *cobra.Command {
diff --git a/test/test.go b/test/test.go
index 7796bdfc0e9d..320f0111ff1a 100644
--- a/test/test.go
+++ b/test/test.go
@@ -6,8 +6,8 @@ import (
 	"runtime"
 
 	wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
-	"github.com/ghodss/yaml"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"sigs.k8s.io/yaml"
 )
 
 var (
diff --git a/workflow/common/util.go b/workflow/common/util.go
index 9f54c2e249a1..a5f888a67057 100644
--- a/workflow/common/util.go
+++ b/workflow/common/util.go
@@ -13,7 +13,6 @@ import (
 	"time"
 
 	"github.com/argoproj/argo/pkg/apis/workflow"
-	"github.com/ghodss/yaml"
 	"github.com/gorilla/websocket"
 	log "github.com/sirupsen/logrus"
 	"github.com/valyala/fasttemplate"
@@ -24,6 +23,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/remotecommand"
+	"sigs.k8s.io/yaml"
 
 	"github.com/argoproj/argo/errors"
 	wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
diff --git a/workflow/controller/config_controller.go b/workflow/controller/config_controller.go
index dc3ee7c1d023..f23085ee3832 100644
--- a/workflow/controller/config_controller.go
+++ b/workflow/controller/config_controller.go
@@ -15,8 +15,8 @@ import (
 	"github.com/argoproj/argo/errors"
 	"github.com/argoproj/argo/workflow/common"
 	"github.com/argoproj/argo/workflow/config"
-	"github.com/ghodss/yaml"
 	log "github.com/sirupsen/logrus"
+	"sigs.k8s.io/yaml"
 )
 
 // ResyncConfig reloads the controller config from the configmap
diff --git a/workflow/controller/controller_test.go b/workflow/controller/controller_test.go
index 3e18f0b6d6c5..887950c612f0 100644
--- a/workflow/controller/controller_test.go
+++ b/workflow/controller/controller_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ghodss/yaml"
+	"sigs.k8s.io/yaml"
 	"github.com/stretchr/testify/assert"
 	apiv1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/workflow/controller/operator.go b/workflow/controller/operator.go
index e3865893bc59..dd4bfae7baf6 100644
--- a/workflow/controller/operator.go
+++ b/workflow/controller/operator.go
@@ -17,7 +17,6 @@ import (
 	argokubeerr "github.com/argoproj/pkg/kube/errors"
 	"github.com/argoproj/pkg/strftime"
 	jsonpatch "github.com/evanphx/json-patch"
-	"github.com/ghodss/yaml"
 	log "github.com/sirupsen/logrus"
 	"github.com/valyala/fasttemplate"
 	apiv1 "k8s.io/api/core/v1"
@@ -26,6 +25,7 @@ import (
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/utils/pointer"
+	"sigs.k8s.io/yaml"
 
 	"github.com/argoproj/argo/errors"
 	wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
diff --git a/workflow/controller/operator_test.go b/workflow/controller/operator_test.go
index 5fedc478b0ae..6dcd5d065f81 100644
--- a/workflow/controller/operator_test.go
+++ b/workflow/controller/operator_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/ghodss/yaml"
+	"sigs.k8s.io/yaml"
 	"github.com/stretchr/testify/assert"
 	apiv1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
diff --git a/workflow/controller/workflowpod_test.go b/workflow/controller/workflowpod_test.go
index ec80a42397f5..b403b5a2dc74 100644
--- a/workflow/controller/workflowpod_test.go
+++ b/workflow/controller/workflowpod_test.go
@@ -10,7 +10,7 @@ import (
 
 	wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
 	"github.com/argoproj/argo/workflow/common"
-	"github.com/ghodss/yaml"
+	"sigs.k8s.io/yaml"
 	"github.com/stretchr/testify/assert"
 	apiv1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/workflow/templateresolution/context_test.go b/workflow/templateresolution/context_test.go
index f83d7e8a9674..48773542d20a 100644
--- a/workflow/templateresolution/context_test.go
+++ b/workflow/templateresolution/context_test.go
@@ -6,7 +6,7 @@ import (
 	wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
 	wfclientset "github.com/argoproj/argo/pkg/client/clientset/versioned"
 	fakewfclientset "github.com/argoproj/argo/pkg/client/clientset/versioned/fake"
-	"github.com/ghodss/yaml"
+	"sigs.k8s.io/yaml"
 	"github.com/stretchr/testify/assert"
 	apierr "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/workflow/util/util.go b/workflow/util/util.go
index 71223351c0c7..169ca097e5fb 100644
--- a/workflow/util/util.go
+++ b/workflow/util/util.go
@@ -10,7 +10,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ghodss/yaml"
 	log "github.com/sirupsen/logrus"
 	apierr "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -27,6 +26,7 @@ import (
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/utils/pointer"
+	"sigs.k8s.io/yaml"
 
 	"github.com/argoproj/argo/errors"
 	"github.com/argoproj/argo/pkg/apis/workflow"
diff --git a/workflow/validate/validate.go b/workflow/validate/validate.go
index 2e9094281ec8..809e8060823e 100644
--- a/workflow/validate/validate.go
+++ b/workflow/validate/validate.go
@@ -8,10 +8,10 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/ghodss/yaml"
 	"github.com/valyala/fasttemplate"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	apivalidation "k8s.io/apimachinery/pkg/util/validation"
+	"sigs.k8s.io/yaml"
 
 	"github.com/argoproj/argo/errors"
 	wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1"
diff --git a/workflow/validate/validate_test.go b/workflow/validate/validate_test.go
index 44355cc9c309..fe5aaa2a19ad 100644
--- a/workflow/validate/validate_test.go
+++ b/workflow/validate/validate_test.go
@@ -3,7 +3,7 @@ package validate
 import (
 	"testing"
 
-	"github.com/ghodss/yaml"
+	"sigs.k8s.io/yaml"
 	"github.com/stretchr/testify/assert"
 	apierr "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"