diff --git a/coconut/configuration/configuration.go b/coconut/configuration/configuration.go
index 4c7aac4cc..b197d8209 100644
--- a/coconut/configuration/configuration.go
+++ b/coconut/configuration/configuration.go
@@ -45,7 +45,7 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 var log = logger.New(logrus.StandardLogger(), "coconut")
diff --git a/coconut/configuration/configurationutil.go b/coconut/configuration/configurationutil.go
index e51f64ec3..e58f70d57 100644
--- a/coconut/configuration/configurationutil.go
+++ b/coconut/configuration/configurationutil.go
@@ -37,7 +37,7 @@ import (
 	"os"
 	"strings"
 	"encoding/json"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 var(
diff --git a/coconut/control/control.go b/coconut/control/control.go
index 4ab0379a2..35c312bf0 100644
--- a/coconut/control/control.go
+++ b/coconut/control/control.go
@@ -41,7 +41,7 @@ import (
 	"time"
 
 	"github.com/xlab/treeprint"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/AliceO2Group/Control/coconut"
 	"github.com/AliceO2Group/Control/coconut/protos"
diff --git a/common/gera/map.go b/common/gera/map.go
index 5e7379e2e..5eb0a9727 100644
--- a/common/gera/map.go
+++ b/common/gera/map.go
@@ -30,11 +30,9 @@ package gera
 
 import (
 	"github.com/imdario/mergo"
-	"gopkg.in/yaml.v2"
 )
 
 type Map interface {
-	yaml.Unmarshaler
 	Wrap(m Map) Map
 	IsHierarchyRoot() bool
 	HierarchyContains(m Map) bool
diff --git a/common/gera/stringmap.go b/common/gera/stringmap.go
index 41879a235..31763cf38 100644
--- a/common/gera/stringmap.go
+++ b/common/gera/stringmap.go
@@ -26,11 +26,9 @@ package gera
 
 import (
 	"github.com/imdario/mergo"
-	"gopkg.in/yaml.v2"
 )
 
 type StringMap interface {
-	yaml.Unmarshaler
 	Wrap(m StringMap) StringMap
 	IsHierarchyRoot() bool
 	HierarchyContains(m StringMap) bool
diff --git a/configuration/consulsource.go b/configuration/consulsource.go
index 2f69d49a4..b995d535c 100644
--- a/configuration/consulsource.go
+++ b/configuration/consulsource.go
@@ -29,7 +29,7 @@ import (
 	"errors"
 	"strconv"
 	"strings"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 type ConsulSource struct {
diff --git a/configuration/source_test.go b/configuration/source_test.go
index e0e09f245..f19d0d62c 100644
--- a/configuration/source_test.go
+++ b/configuration/source_test.go
@@ -4,7 +4,7 @@ import (
 	. "github.com/AliceO2Group/Control/configuration"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 var _ = Describe("Source", func() {
diff --git a/configuration/yamlsource.go b/configuration/yamlsource.go
index 9f6daa358..f15806921 100644
--- a/configuration/yamlsource.go
+++ b/configuration/yamlsource.go
@@ -32,7 +32,7 @@ import (
 	"strconv"
 	"strings"
 
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 type YamlSource struct {
diff --git a/core/task/manager.go b/core/task/manager.go
index ae7bad7df..92e851949 100644
--- a/core/task/manager.go
+++ b/core/task/manager.go
@@ -36,7 +36,7 @@ import (
 	"github.com/AliceO2Group/Control/common/utils"
 	"github.com/AliceO2Group/Control/core/repos"
 	"github.com/AliceO2Group/Control/core/the"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 
 	"github.com/AliceO2Group/Control/core/controlcommands"
 	"github.com/AliceO2Group/Control/core/task/channel"
diff --git a/core/workflow/load.go b/core/workflow/load.go
index bb1c0c714..0331cf264 100644
--- a/core/workflow/load.go
+++ b/core/workflow/load.go
@@ -35,7 +35,7 @@ import (
 	"github.com/AliceO2Group/Control/core/the"
 	"github.com/k0kubun/pp"
 	"github.com/spf13/viper"
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 // FIXME: workflowPath should be of type configuration.Path, not string
diff --git a/go.mod b/go.mod
index c1010b5f0..edc8253d0 100644
--- a/go.mod
+++ b/go.mod
@@ -99,7 +99,8 @@ require (
 	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
 	gopkg.in/ini.v1 v1.55.0 // indirect
 	gopkg.in/src-d/go-git.v4 v4.13.1
-	gopkg.in/yaml.v2 v2.2.8
+	gopkg.in/yaml.v2 v2.2.8 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20200506231410-2ff61e1afc86
 	honnef.co/go/tools v0.0.1-2020.1.3 // indirect
 	sigs.k8s.io/yaml v1.2.0 // indirect
 )
diff --git a/go.sum b/go.sum
index ee42b3665..c1b39c4ed 100644
--- a/go.sum
+++ b/go.sum
@@ -596,6 +596,8 @@ 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.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200506231410-2ff61e1afc86 h1:OfFoIUYv/me30yv7XlMy4F9RJw8DEm8WQ6QG1Ph4bH0=
+gopkg.in/yaml.v3 v3.0.0-20200506231410-2ff61e1afc86/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM=
diff --git a/occ/peanut/flatten/flatten.go b/occ/peanut/flatten/flatten.go
index f2b6315b1..72b2bad1e 100644
--- a/occ/peanut/flatten/flatten.go
+++ b/occ/peanut/flatten/flatten.go
@@ -97,7 +97,7 @@ import (
 	"errors"
 	"strconv"
 
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 // The presentation style of keys.