diff --git a/pkg/controller/jenkins/configuration/base/reconcile.go b/pkg/controller/jenkins/configuration/base/reconcile.go
index b9dc4fe3..240f0275 100644
--- a/pkg/controller/jenkins/configuration/base/reconcile.go
+++ b/pkg/controller/jenkins/configuration/base/reconcile.go
@@ -11,7 +11,7 @@ import (
 	"github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/configuration/base/resources"
 	"github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/constants"
 	"github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/groovy"
-	"github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/plugin"
+	"github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/plugins"
 	"github.com/VirtusLab/jenkins-operator/pkg/log"
 
 	"github.com/bndr/gojenkins"
@@ -148,14 +148,14 @@ func (r *ReconcileJenkinsBaseConfiguration) verifyBasePlugins(jenkinsClient jenk
 	var installedPlugins []string
 	for _, jenkinsPlugin := range allPluginsInJenkins.Raw.Plugins {
 		if !jenkinsPlugin.Deleted {
-			installedPlugins = append(installedPlugins, plugin.Plugin{Name: jenkinsPlugin.ShortName, Version: jenkinsPlugin.Version}.String())
+			installedPlugins = append(installedPlugins, plugins.Plugin{Name: jenkinsPlugin.ShortName, Version: jenkinsPlugin.Version}.String())
 		}
 	}
 	r.logger.V(log.VDebug).Info(fmt.Sprintf("Installed plugins '%+v'", installedPlugins))
 
 	status := true
-	for rootPluginName, p := range plugin.BasePluginsMap {
-		rootPlugin, _ := plugin.New(rootPluginName)
+	for rootPluginName, p := range plugins.BasePluginsMap {
+		rootPlugin, _ := plugins.New(rootPluginName)
 		if found, ok := isPluginInstalled(allPluginsInJenkins, *rootPlugin); !ok {
 			r.logger.V(log.VWarn).Info(fmt.Sprintf("Missing plugin '%s', actual '%+v'", rootPlugin, found))
 			status = false
@@ -171,7 +171,7 @@ func (r *ReconcileJenkinsBaseConfiguration) verifyBasePlugins(jenkinsClient jenk
 	return status, nil
 }
 
-func isPluginInstalled(plugins *gojenkins.Plugins, requiredPlugin plugin.Plugin) (gojenkins.Plugin, bool) {
+func isPluginInstalled(plugins *gojenkins.Plugins, requiredPlugin plugins.Plugin) (gojenkins.Plugin, bool) {
 	p := plugins.Contains(requiredPlugin.Name)
 	if p == nil {
 		return gojenkins.Plugin{}, false
diff --git a/pkg/controller/jenkins/configuration/base/validate.go b/pkg/controller/jenkins/configuration/base/validate.go
index 301f4c13..aa5fbe28 100644
--- a/pkg/controller/jenkins/configuration/base/validate.go
+++ b/pkg/controller/jenkins/configuration/base/validate.go
@@ -7,7 +7,7 @@ import (
 
 	virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1"
 	"github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/configuration/base/resources"
-	"github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/plugin"
+	"github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/plugins"
 	"github.com/VirtusLab/jenkins-operator/pkg/log"
 
 	docker "github.com/docker/distribution/reference"
@@ -49,19 +49,19 @@ func (r *ReconcileJenkinsBaseConfiguration) Validate(jenkins *virtuslabv1alpha1.
 	return true, nil
 }
 
-func (r *ReconcileJenkinsBaseConfiguration) validatePlugins(plugins map[string][]string) bool {
+func (r *ReconcileJenkinsBaseConfiguration) validatePlugins(pluginsWithVersions map[string][]string) bool {
 	valid := true
-	allPlugins := map[string][]plugin.Plugin{}
+	allPlugins := map[string][]plugins.Plugin{}
 
-	for rootPluginName, dependentPluginNames := range plugins {
-		if _, err := plugin.New(rootPluginName); err != nil {
+	for rootPluginName, dependentPluginNames := range pluginsWithVersions {
+		if _, err := plugins.New(rootPluginName); err != nil {
 			r.logger.V(log.VWarn).Info(fmt.Sprintf("Invalid root plugin name '%s'", rootPluginName))
 			valid = false
 		}
 
-		dependentPlugins := []plugin.Plugin{}
+		dependentPlugins := []plugins.Plugin{}
 		for _, pluginName := range dependentPluginNames {
-			if p, err := plugin.New(pluginName); err != nil {
+			if p, err := plugins.New(pluginName); err != nil {
 				r.logger.V(log.VWarn).Info(fmt.Sprintf("Invalid dependent plugin name '%s' in root plugin '%s'", pluginName, rootPluginName))
 				valid = false
 			} else {
@@ -73,7 +73,7 @@ func (r *ReconcileJenkinsBaseConfiguration) validatePlugins(plugins map[string][
 	}
 
 	if valid {
-		return plugin.VerifyDependencies(allPlugins)
+		return plugins.VerifyDependencies(allPlugins)
 	}
 
 	return valid
diff --git a/pkg/controller/jenkins/jenkins_controller.go b/pkg/controller/jenkins/jenkins_controller.go
index 16b06ad6..c3247b11 100644
--- a/pkg/controller/jenkins/jenkins_controller.go
+++ b/pkg/controller/jenkins/jenkins_controller.go
@@ -8,7 +8,7 @@ import (
 	"github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/configuration/base"
 	"github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/configuration/user"
 	"github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/constants"
-	"github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/plugin"
+	"github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/plugins"
 	"github.com/VirtusLab/jenkins-operator/pkg/log"
 
 	"github.com/go-logr/logr"
@@ -207,7 +207,7 @@ func (r *ReconcileJenkins) setDefaults(jenkins *virtuslabv1alpha1.Jenkins, logge
 	if len(jenkins.Spec.Master.Plugins) == 0 {
 		logger.Info("Setting default base plugins")
 		changed = true
-		jenkins.Spec.Master.Plugins = plugin.BasePlugins()
+		jenkins.Spec.Master.Plugins = plugins.BasePlugins()
 	}
 	_, requestCPUSet := jenkins.Spec.Master.Resources.Requests[corev1.ResourceCPU]
 	_, requestMemporySet := jenkins.Spec.Master.Resources.Requests[corev1.ResourceMemory]
diff --git a/pkg/controller/jenkins/plugin/base_plugins.go b/pkg/controller/jenkins/plugins/base_plugins.go
similarity index 99%
rename from pkg/controller/jenkins/plugin/base_plugins.go
rename to pkg/controller/jenkins/plugins/base_plugins.go
index 7c98823b..bc68e4a9 100644
--- a/pkg/controller/jenkins/plugin/base_plugins.go
+++ b/pkg/controller/jenkins/plugins/base_plugins.go
@@ -1,4 +1,4 @@
-package plugin
+package plugins
 
 // BasePlugins returns map of plugins to install by operator
 func BasePlugins() (plugins map[string][]string) {
diff --git a/pkg/controller/jenkins/plugin/plugin.go b/pkg/controller/jenkins/plugins/plugin.go
similarity index 99%
rename from pkg/controller/jenkins/plugin/plugin.go
rename to pkg/controller/jenkins/plugins/plugin.go
index ea17197c..6033de07 100644
--- a/pkg/controller/jenkins/plugin/plugin.go
+++ b/pkg/controller/jenkins/plugins/plugin.go
@@ -1,4 +1,4 @@
-package plugin
+package plugins
 
 import (
 	"fmt"
diff --git a/pkg/controller/jenkins/plugin/plugin_test.go b/pkg/controller/jenkins/plugins/plugin_test.go
similarity index 99%
rename from pkg/controller/jenkins/plugin/plugin_test.go
rename to pkg/controller/jenkins/plugins/plugin_test.go
index 2ec94af6..12805248 100644
--- a/pkg/controller/jenkins/plugin/plugin_test.go
+++ b/pkg/controller/jenkins/plugins/plugin_test.go
@@ -1,4 +1,4 @@
-package plugin
+package plugins
 
 import (
 	"fmt"
diff --git a/test/e2e/base_configuration_test.go b/test/e2e/base_configuration_test.go
index 60a30b2e..38b42585 100644
--- a/test/e2e/base_configuration_test.go
+++ b/test/e2e/base_configuration_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	virtuslabv1alpha1 "github.com/VirtusLab/jenkins-operator/pkg/apis/virtuslab/v1alpha1"
-	"github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/plugin"
+	"github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins/plugins"
 
 	"github.com/bndr/gojenkins"
 	framework "github.com/operator-framework/operator-sdk/pkg/test"
@@ -86,8 +86,8 @@ func verifyBasePlugins(t *testing.T, jenkinsClient *gojenkins.Jenkins) {
 		t.Fatal(err)
 	}
 
-	for rootPluginName, p := range plugin.BasePluginsMap {
-		rootPlugin, err := plugin.New(rootPluginName)
+	for rootPluginName, p := range plugins.BasePluginsMap {
+		rootPlugin, err := plugins.New(rootPluginName)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -104,7 +104,7 @@ func verifyBasePlugins(t *testing.T, jenkinsClient *gojenkins.Jenkins) {
 	t.Log("Base plugins have been installed")
 }
 
-func isPluginValid(plugins *gojenkins.Plugins, requiredPlugin plugin.Plugin) (*gojenkins.Plugin, bool) {
+func isPluginValid(plugins *gojenkins.Plugins, requiredPlugin plugins.Plugin) (*gojenkins.Plugin, bool) {
 	p := plugins.Contains(requiredPlugin.Name)
 	if p == nil {
 		return p, false