diff --git a/config/configStruct.go b/config/configStruct.go
index 3c5bfde78..5eefcd02a 100644
--- a/config/configStruct.go
+++ b/config/configStruct.go
@@ -28,17 +28,15 @@ type ManifestsConfig struct {
 }
 
 type ConfigStruct struct {
-	Tap               configStructs.TapConfig       `yaml:"tap"`
-	Logs              configStructs.LogsConfig      `yaml:"logs"`
-	Config            configStructs.ConfigConfig    `yaml:"config,omitempty"`
-	Kube              KubeConfig                    `yaml:"kube"`
-	DumpLogs          bool                          `yaml:"dumplogs" default:"false"`
-	HeadlessMode      bool                          `yaml:"headless" default:"false"`
-	License           string                        `yaml:"license" default:""`
-	Scripting         configStructs.ScriptingConfig `yaml:"scripting"`
-	ResourceLabels    map[string]string             `yaml:"resourceLabels" default:"{}"`
-	NodeSelectorTerms []v1.NodeSelectorTerm         `yaml:"nodeSelectorTerms" default:"[]"`
-	Manifests         ManifestsConfig               `yaml:"manifests,omitempty"`
+	Tap          configStructs.TapConfig       `yaml:"tap"`
+	Logs         configStructs.LogsConfig      `yaml:"logs"`
+	Config       configStructs.ConfigConfig    `yaml:"config,omitempty"`
+	Kube         KubeConfig                    `yaml:"kube"`
+	DumpLogs     bool                          `yaml:"dumplogs" default:"false"`
+	HeadlessMode bool                          `yaml:"headless" default:"false"`
+	License      string                        `yaml:"license" default:""`
+	Scripting    configStructs.ScriptingConfig `yaml:"scripting"`
+	Manifests    ManifestsConfig               `yaml:"manifests,omitempty"`
 }
 
 func (config *ConfigStruct) ImagePullPolicy() v1.PullPolicy {
diff --git a/config/configStructs/tapConfig.go b/config/configStructs/tapConfig.go
index 746439cd5..811784ed0 100644
--- a/config/configStructs/tapConfig.go
+++ b/config/configStructs/tapConfig.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/kubeshark/kubeshark/utils"
 	"github.com/rs/zerolog/log"
+	v1 "k8s.io/api/core/v1"
 )
 
 const (
@@ -70,21 +71,23 @@ type ResourcesConfig struct {
 }
 
 type TapConfig struct {
-	Docker        DockerConfig    `yaml:"docker"`
-	Proxy         ProxyConfig     `yaml:"proxy"`
-	PodRegexStr   string          `yaml:"regex" default:".*"`
-	Namespaces    []string        `yaml:"namespaces"`
-	AllNamespaces bool            `yaml:"allnamespaces" default:"true"`
-	SelfNamespace string          `yaml:"selfnamespace" default:"kubeshark"`
-	StorageLimit  string          `yaml:"storagelimit" default:"200MB"`
-	DryRun        bool            `yaml:"dryrun" default:"false"`
-	Pcap          string          `yaml:"pcap" default:""`
-	Resources     ResourcesConfig `yaml:"resources"`
-	ServiceMesh   bool            `yaml:"servicemesh" default:"true"`
-	Tls           bool            `yaml:"tls" default:"true"`
-	PacketCapture string          `yaml:"packetcapture" default:"libpcap"`
-	IgnoreTainted bool            `yaml:"ignoreTainted" default:"false"`
-	Debug         bool            `yaml:"debug" default:"false"`
+	Docker            DockerConfig          `yaml:"docker"`
+	Proxy             ProxyConfig           `yaml:"proxy"`
+	PodRegexStr       string                `yaml:"regex" default:".*"`
+	Namespaces        []string              `yaml:"namespaces"`
+	AllNamespaces     bool                  `yaml:"allnamespaces" default:"true"`
+	SelfNamespace     string                `yaml:"selfnamespace" default:"kubeshark"`
+	StorageLimit      string                `yaml:"storagelimit" default:"200MB"`
+	DryRun            bool                  `yaml:"dryrun" default:"false"`
+	Pcap              string                `yaml:"pcap" default:""`
+	Resources         ResourcesConfig       `yaml:"resources"`
+	ServiceMesh       bool                  `yaml:"servicemesh" default:"true"`
+	Tls               bool                  `yaml:"tls" default:"true"`
+	PacketCapture     string                `yaml:"packetcapture" default:"libpcap"`
+	IgnoreTainted     bool                  `yaml:"ignoreTainted" default:"false"`
+	ResourceLabels    map[string]string     `yaml:"resourceLabels" default:"{}"`
+	NodeSelectorTerms []v1.NodeSelectorTerm `yaml:"nodeSelectorTerms" default:"[]"`
+	Debug             bool                  `yaml:"debug" default:"false"`
 }
 
 func (config *TapConfig) PodRegex() *regexp.Regexp {
diff --git a/kubernetes/provider.go b/kubernetes/provider.go
index 2bf9ef7c7..40a347e27 100644
--- a/kubernetes/provider.go
+++ b/kubernetes/provider.go
@@ -280,11 +280,11 @@ func (provider *Provider) BuildHubPod(opts *PodOptions) (*core.Pod, error) {
 		},
 	}
 
-	if len(config.Config.NodeSelectorTerms) > 0 {
+	if len(config.Config.Tap.NodeSelectorTerms) > 0 {
 		pod.Spec.Affinity = &core.Affinity{
 			NodeAffinity: &core.NodeAffinity{
 				RequiredDuringSchedulingIgnoredDuringExecution: &core.NodeSelector{
-					NodeSelectorTerms: config.Config.NodeSelectorTerms,
+					NodeSelectorTerms: config.Config.Tap.NodeSelectorTerms,
 				},
 			},
 		}
@@ -390,11 +390,11 @@ func (provider *Provider) BuildFrontPod(opts *PodOptions, hubHost string, hubPor
 		},
 	}
 
-	if len(config.Config.NodeSelectorTerms) > 0 {
+	if len(config.Config.Tap.NodeSelectorTerms) > 0 {
 		pod.Spec.Affinity = &core.Affinity{
 			NodeAffinity: &core.NodeAffinity{
 				RequiredDuringSchedulingIgnoredDuringExecution: &core.NodeSelector{
-					NodeSelectorTerms: config.Config.NodeSelectorTerms,
+					NodeSelectorTerms: config.Config.Tap.NodeSelectorTerms,
 				},
 			},
 		}
@@ -849,11 +849,11 @@ func (provider *Provider) BuildWorkerDaemonSet(
 		},
 	}
 
-	if len(config.Config.NodeSelectorTerms) > 0 {
+	if len(config.Config.Tap.NodeSelectorTerms) > 0 {
 		pod.Spec.Affinity = &core.Affinity{
 			NodeAffinity: &core.NodeAffinity{
 				RequiredDuringSchedulingIgnoredDuringExecution: &core.NodeSelector{
-					NodeSelectorTerms: config.Config.NodeSelectorTerms,
+					NodeSelectorTerms: config.Config.Tap.NodeSelectorTerms,
 				},
 			},
 		}
diff --git a/kubernetes/utils.go b/kubernetes/utils.go
index 100d72b0e..d2dd66f9b 100644
--- a/kubernetes/utils.go
+++ b/kubernetes/utils.go
@@ -8,7 +8,7 @@ func buildWithDefaultLabels(labels map[string]string, provider *Provider) map[st
 	labels[LabelManagedBy] = provider.managedBy
 	labels[LabelCreatedBy] = provider.createdBy
 
-	for k, v := range config.Config.ResourceLabels {
+	for k, v := range config.Config.Tap.ResourceLabels {
 		labels[k] = v
 	}