diff --git a/Makefile b/Makefile
index 8017ec8ba6..109e72f46c 100644
--- a/Makefile
+++ b/Makefile
@@ -115,7 +115,7 @@ PLUGIN_PACKAGES += mattermost-plugin-channel-export-v0.2.2
 PLUGIN_PACKAGES += mattermost-plugin-custom-attributes-v1.3.0
 PLUGIN_PACKAGES += mattermost-plugin-github-v2.0.1
 PLUGIN_PACKAGES += mattermost-plugin-gitlab-v1.3.0
-PLUGIN_PACKAGES += mattermost-plugin-playbooks-v1.16.1
+PLUGIN_PACKAGES += mattermost-plugin-playbooks-v1.20.0
 PLUGIN_PACKAGES += mattermost-plugin-jenkins-v1.1.0
 PLUGIN_PACKAGES += mattermost-plugin-jira-v2.4.0
 PLUGIN_PACKAGES += mattermost-plugin-nps-v1.1.0
diff --git a/config/diff_test.go b/config/diff_test.go
index f079a52802..9f1a49cbe8 100644
--- a/config/diff_test.go
+++ b/config/diff_test.go
@@ -339,6 +339,9 @@ func TestDiff(t *testing.T) {
 						"com.mattermost.nps": {
 							Enable: !defaultConfigGen().PluginSettings.PluginStates["com.mattermost.nps"].Enable,
 						},
+						"playbooks": {
+							Enable: true,
+						},
 					},
 				},
 			},
@@ -365,6 +368,9 @@ func TestDiff(t *testing.T) {
 						"com.mattermost.newplugin": {
 							Enable: true,
 						},
+						"playbooks": {
+							Enable: true,
+						},
 					},
 				},
 			},
@@ -382,9 +388,11 @@ func TestDiff(t *testing.T) {
 				{
 					Path:    "PluginSettings.PluginStates",
 					BaseVal: defaultConfigGen().PluginSettings.PluginStates,
-					ActualVal: func() interface{} {
-						return map[string]*model.PluginState{}
-					}(),
+					ActualVal: map[string]*model.PluginState{
+						"playbooks": {
+							Enable: true,
+						},
+					},
 				},
 			},
 			"",
diff --git a/model/config.go b/model/config.go
index 14bc9ce34b..772a87b740 100644
--- a/model/config.go
+++ b/model/config.go
@@ -2703,7 +2703,7 @@ func (s *PluginSettings) SetDefaults(ls LogSettings) {
 		s.PluginStates["com.mattermost.nps"] = &PluginState{Enable: ls.EnableDiagnostics == nil || *ls.EnableDiagnostics}
 	}
 
-	if s.PluginStates["playbooks"] == nil && BuildEnterpriseReady == "true" {
+	if s.PluginStates["playbooks"] == nil {
 		// Enable the playbooks plugin by default
 		s.PluginStates["playbooks"] = &PluginState{Enable: true}
 	}
diff --git a/model/config_test.go b/model/config_test.go
index c85d296601..e82bc6cd37 100644
--- a/model/config_test.go
+++ b/model/config_test.go
@@ -308,7 +308,7 @@ func TestConfigDefaultNPSPluginState(t *testing.T) {
 	})
 }
 
-func TestConfigDefaultIncidentManagementPluginState(t *testing.T) {
+func TestConfigDefaultPlaybooksPluginState(t *testing.T) {
 	t.Run("should enable Playbooks plugin by default on enterprise-ready builds", func(t *testing.T) {
 		BuildEnterpriseReady = "true"
 		c1 := Config{}
@@ -317,15 +317,15 @@ func TestConfigDefaultIncidentManagementPluginState(t *testing.T) {
 		assert.True(t, c1.PluginSettings.PluginStates["playbooks"].Enable)
 	})
 
-	t.Run("should not enable Playbooks plugin by default on non-enterprise-ready builds", func(t *testing.T) {
+	t.Run("should enable Playbooks plugin by default on non-enterprise-ready builds", func(t *testing.T) {
 		BuildEnterpriseReady = ""
 		c1 := Config{}
 		c1.SetDefaults()
 
-		assert.Nil(t, c1.PluginSettings.PluginStates["playbooks"])
+		assert.True(t, c1.PluginSettings.PluginStates["playbooks"].Enable)
 	})
 
-	t.Run("should not re-enable IncidentManagement plugin after it has been disabled", func(t *testing.T) {
+	t.Run("should not re-enable Playbooks plugin after it has been disabled", func(t *testing.T) {
 		BuildEnterpriseReady = ""
 		c1 := Config{
 			PluginSettings: PluginSettings{
diff --git a/model/feature_flags.go b/model/feature_flags.go
index 59e09ca09c..04eb5da84a 100644
--- a/model/feature_flags.go
+++ b/model/feature_flags.go
@@ -29,10 +29,9 @@ type FeatureFlags struct {
 	AppsEnabled bool
 
 	// Feature flags to control plugin versions
-	PluginIncidentManagement string `plugin_id:"com.mattermost.plugin-incident-management"`
-	PluginPlaybooks          string `plugin_id:"playbooks"`
-	PluginApps               string `plugin_id:"com.mattermost.apps"`
-	PluginFocalboard         string `plugin_id:"focalboard"`
+	PluginPlaybooks  string `plugin_id:"playbooks"`
+	PluginApps       string `plugin_id:"com.mattermost.apps"`
+	PluginFocalboard string `plugin_id:"focalboard"`
 
 	// Enable timed dnd support for user status
 	TimedDND bool
@@ -59,7 +58,6 @@ func (f *FeatureFlags) SetDefaults() {
 	f.CollapsedThreads = true
 	f.EnableRemoteClusterService = false
 	f.AppsEnabled = false
-	f.PluginIncidentManagement = "1.16.1"
 	f.PluginApps = ""
 	f.PluginFocalboard = ""
 	f.TimedDND = false