diff --git a/api/v2beta1/shared_conversion.go b/api/v2beta1/shared_conversion.go
index 3afe9a1..6b80f35 100644
--- a/api/v2beta1/shared_conversion.go
+++ b/api/v2beta1/shared_conversion.go
@@ -36,6 +36,7 @@ func ConvertOptionsV3ToV2(src pdoknlv3.Options) WMSWFSOptions {
 	}
 }
 
+//nolint:gosec
 func ConvertAutoscaling(src Autoscaling) *pdoknlv3.HorizontalPodAutoscalerPatch {
 	var minReplicas *int32
 	if src.MinReplicas != nil {
diff --git a/api/v2beta1/wfs_conversion.go b/api/v2beta1/wfs_conversion.go
index 146e8ce..5aec740 100644
--- a/api/v2beta1/wfs_conversion.go
+++ b/api/v2beta1/wfs_conversion.go
@@ -45,6 +45,7 @@ func (src *WFS) ConvertTo(dstRaw conversion.Hub) error {
 	return src.ToV3(dst)
 }
 
+//nolint:gosec
 func (src *WFS) ToV3(dst *pdoknlv3.WFS) error {
 	dst.ObjectMeta = src.ObjectMeta
 
diff --git a/api/v2beta1/wms_conversion.go b/api/v2beta1/wms_conversion.go
index c9c4da8..e3c257f 100644
--- a/api/v2beta1/wms_conversion.go
+++ b/api/v2beta1/wms_conversion.go
@@ -49,6 +49,7 @@ func (src *WMS) ConvertTo(dstRaw conversion.Hub) error {
 	return nil
 }
 
+//nolint:gosec
 func (src *WMS) ToV3(target *pdoknlv3.WMS) {
 	dst := target
 
@@ -424,9 +425,11 @@ func (v2Layer WMSLayer) MapToV3(v2Service WMSService) pdoknlv3.Layer {
 	return layer
 }
 
+//nolint:cyclop
 func mapV3LayerToV2Layers(v3Layer pdoknlv3.Layer, parent *pdoknlv3.Layer, serviceEPSG string) []WMSLayer {
 	var layers []WMSLayer
 
+	//nolint:nestif
 	if parent == nil && v3Layer.Name == nil {
 		// Default top layer, do not include in v2 layers
 		if v3Layer.Layers != nil {
diff --git a/api/v3/wfs_validation.go b/api/v3/wfs_validation.go
index 607c412..9139849 100644
--- a/api/v3/wfs_validation.go
+++ b/api/v3/wfs_validation.go
@@ -30,6 +30,7 @@ func (wfs *WFS) ValidateCreate() ([]string, error) {
 		wfs.Name, allErrs)
 }
 
+// TODO fix linting (dupl)
 func (wfs *WFS) ValidateUpdate(wfsOld *WFS) ([]string, error) {
 	warnings := []string{}
 	allErrs := field.ErrorList{}
diff --git a/api/v3/wms_types.go b/api/v3/wms_types.go
index 07a4804..1e657c2 100644
--- a/api/v3/wms_types.go
+++ b/api/v3/wms_types.go
@@ -564,6 +564,7 @@ func (wms *WMS) URLPath() string {
 func (wms *WMS) GeoPackages() []*Gpkg {
 	gpkgs := make([]*Gpkg, 0)
 
+	// TODO fix linting (nestif)
 	if wms.Spec.Service.Layer.Layers != nil {
 		for _, layer := range wms.Spec.Service.Layer.Layers {
 			if layer.Data != nil {
diff --git a/api/v3/wms_validation.go b/api/v3/wms_validation.go
index 53482c3..14e9cec 100644
--- a/api/v3/wms_validation.go
+++ b/api/v3/wms_validation.go
@@ -32,6 +32,7 @@ func (wms *WMS) ValidateCreate() ([]string, error) {
 		wms.Name, allErrs)
 }
 
+// TODO fix linting (dupl)
 func (wms *WMS) ValidateUpdate(wmsOld *WMS) ([]string, error) {
 	warnings := []string{}
 	allErrs := field.ErrorList{}
@@ -55,6 +56,7 @@ func (wms *WMS) ValidateUpdate(wmsOld *WMS) ([]string, error) {
 		wms.Name, allErrs)
 }
 
+// TODO fix linting (cyclop)
 func ValidateWMS(wms *WMS, warnings *[]string, allErrs *field.ErrorList) {
 	if strings.Contains(wms.GetName(), "wms") {
 		sharedValidation.AddWarning(
@@ -220,6 +222,7 @@ func ValidateWMS(wms *WMS, warnings *[]string, allErrs *field.ErrorList) {
 			}
 		}
 
+		// TODO fix linting (nestif)
 		if layer.Visible {
 			hasVisibleLayer = true
 
diff --git a/cmd/main.go b/cmd/main.go
index 9edf10a..8e25709 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -78,7 +78,7 @@ func init() {
 	// +kubebuilder:scaffold:scheme
 }
 
-//nolint:gocyclo
+// TODO fix linting (cyclop)
 func main() {
 	var metricsAddr string
 	var certDir string
diff --git a/config/crd/update_openapi.go b/config/crd/update_openapi.go
index 86d526e..486f65e 100644
--- a/config/crd/update_openapi.go
+++ b/config/crd/update_openapi.go
@@ -18,6 +18,7 @@ func main() {
 	updateWMSV3Layers(crdDir)
 }
 
+// TODO fix linting (funlen)
 func updateWMSV3Layers(crdDir string) {
 	path := filepath.Join(crdDir, "pdok.nl_wms.yaml")
 
diff --git a/internal/controller/capabilitiesgenerator/mapper.go b/internal/controller/capabilitiesgenerator/mapper.go
index 45410b8..ce6afa9 100644
--- a/internal/controller/capabilitiesgenerator/mapper.go
+++ b/internal/controller/capabilitiesgenerator/mapper.go
@@ -165,6 +165,7 @@ func mapServiceProvider(provider *smoothoperatorv1.ServiceProvider) (serviceProv
 		}
 	}
 
+	// TODO fix linting (nestif)
 	if provider.ServiceContact != nil {
 		serviceProvider.ServiceContact = &wfs200.ServiceContact{
 			IndividualName: provider.ServiceContact.IndividualName,
@@ -360,6 +361,7 @@ func getDcpType(url string, fillPost bool) *wms130.DCPType {
 	return &result
 }
 
+// TODO fix linting (funlen)
 func getLayers(wms *pdoknlv3.WMS, canonicalURL string) []wms130.Layer {
 	result := make([]wms130.Layer, 0)
 	referenceLayer := wms.Spec.Service.Layer
diff --git a/internal/controller/mapfilegenerator/mapper.go b/internal/controller/mapfilegenerator/mapper.go
index 0909943..7d45f3b 100644
--- a/internal/controller/mapfilegenerator/mapper.go
+++ b/internal/controller/mapfilegenerator/mapper.go
@@ -220,6 +220,7 @@ func MapWMSToMapfileGeneratorInput(wms *pdoknlv3.WMS, _ *smoothoperatorv1.OwnerI
 	return result, nil
 }
 
+// TODO fix linting (cyclop)
 func getWMSLayer(serviceLayer pdoknlv3.Layer, serviceExtent string, wms *pdoknlv3.WMS) WMSLayer {
 	layerExtent := serviceExtent
 	if len(serviceLayer.BoundingBoxes) > 0 {
diff --git a/internal/controller/mapserver/deployment.go b/internal/controller/mapserver/deployment.go
index 0c1e28a..d2d1015 100644
--- a/internal/controller/mapserver/deployment.go
+++ b/internal/controller/mapserver/deployment.go
@@ -29,6 +29,7 @@ const (
 	mimeTextXML = "text/xml"
 )
 
+// TODO fix linting (funlen)
 func GetVolumesForDeployment[O pdoknlv3.WMSWFS](obj O, configMapNames types.HashedConfigMapNames) []v1.Volume {
 	baseVolume := v1.Volume{Name: "base"}
 	if use, size := mapperutils.UseEphemeralVolume(obj); use {
@@ -215,6 +216,7 @@ func GetEnvVarsForDeployment[O pdoknlv3.WMSWFS](obj O, blobsSecretName string) [
 	}
 }
 
+// TODO fix linting (cyclop,gocritic,revive)
 // Resources for mapserver container
 func GetResourcesForDeployment[O pdoknlv3.WMSWFS](obj O) v1.ResourceRequirements {
 	resources := v1.ResourceRequirements{
@@ -289,6 +291,7 @@ func GetResourcesForDeployment[O pdoknlv3.WMSWFS](obj O) v1.ResourceRequirements
 	/**
 	Set ephemeral-storage if there is no ephemeral volume
 	*/
+	// TODO fix linting (nestif)
 	if use, _ := mapperutils.UseEphemeralVolume(obj); !use {
 		ephemeralStorageRequest := mapperutils.EphemeralStorageRequest(obj)
 		if ephemeralStorageRequest != nil {
diff --git a/internal/controller/shared_controller.go b/internal/controller/shared_controller.go
index 35b8cf5..c96eebe 100644
--- a/internal/controller/shared_controller.go
+++ b/internal/controller/shared_controller.go
@@ -64,11 +64,11 @@ var (
 	MapserverName = "mapserver"
 
 	// Service ports
-	mapserverPortName              = "mapserver"
-	mapserverPortNr                = 80
-	mapserverWebserviceProxyPortNr = 9111
-	metricPortName                 = "metric"
-	metricPortNr                   = 9117
+	mapserverPortName                    = "mapserver"
+	mapserverPortNr                int32 = 80
+	mapserverWebserviceProxyPortNr       = 9111
+	metricPortName                       = "metric"
+	metricPortNr                   int32 = 9117
 
 	corsHeadersName = "mapserver-headers"
 )
@@ -398,7 +398,7 @@ func mutateIngressRoute[R Reconciler, O pdoknlv3.WMSWFS](r R, obj O, ingressRout
 			Kind: "Service",
 			Port: intstr.IntOrString{
 				Type:   intstr.Int,
-				IntVal: int32(mapserverPortNr),
+				IntVal: mapserverPortNr,
 			},
 		},
 	}
@@ -423,7 +423,8 @@ func mutateIngressRoute[R Reconciler, O pdoknlv3.WMSWFS](r R, obj O, ingressRout
 					Name: getBareService(obj).GetName(),
 					Kind: "Service",
 					Port: intstr.IntOrString{
-						Type:   intstr.Int,
+						Type: intstr.Int,
+						//nolint:gosec
 						IntVal: int32(mapserverWebserviceProxyPortNr),
 					},
 				},
@@ -760,14 +761,14 @@ func mutateService[R Reconciler, O pdoknlv3.WMSWFS](r R, obj O, service *corev1.
 	ports := []corev1.ServicePort{
 		{
 			Name:       mapserverPortName,
-			Port:       int32(mapserverPortNr),
-			TargetPort: intstr.FromInt32(int32(mapserverPortNr)),
+			Port:       mapserverPortNr,
+			TargetPort: intstr.FromInt32(mapserverPortNr),
 			Protocol:   corev1.ProtocolTCP,
 		},
 		{
 			Name:       metricPortName,
-			Port:       int32(metricPortNr),
-			TargetPort: intstr.FromInt32(int32(metricPortNr)),
+			Port:       metricPortNr,
+			TargetPort: intstr.FromInt32(metricPortNr),
 			Protocol:   corev1.ProtocolTCP,
 		},
 	}
@@ -1000,6 +1001,7 @@ func getFinalizerName[O pdoknlv3.WMSWFS](obj O) string {
 	return strings.ToLower(string(obj.Type())) + "." + pdoknlv3.GroupVersion.Group + "/finalizer"
 }
 
+// TODO fix linting (cyclop)
 func createOrUpdateAllForWMSWFS[R Reconciler, O pdoknlv3.WMSWFS](ctx context.Context, r R, obj O, ownerInfo *smoothoperatorv1.OwnerInfo) (operationResults map[string]controllerutil.OperationResult, err error) {
 	operationResults = make(map[string]controllerutil.OperationResult)
 	reconcilerClient := getReconcilerClient(r)
@@ -1070,6 +1072,7 @@ func createOrUpdateAllForWMSWFS[R Reconciler, O pdoknlv3.WMSWFS](ctx context.Con
 	}
 	// end region ConfigMap-BlobDownload
 
+	// TODO fix linting (nestif)
 	if obj.Type() == pdoknlv3.ServiceTypeWMS {
 		wms, _ := any(obj).(*pdoknlv3.WMS)
 		wmsReconciler := (*WMSReconciler)(r)
@@ -1205,6 +1208,7 @@ func createOrUpdateAllForWMSWFS[R Reconciler, O pdoknlv3.WMSWFS](ctx context.Con
 	return operationResults, nil
 }
 
+// TODO fix linting (funlen)
 func deleteAllForWMSWFS[R Reconciler, O pdoknlv3.WMSWFS](ctx context.Context, r R, obj O, ownerInfo *smoothoperatorv1.OwnerInfo) (err error) {
 	bareObjects := getSharedBareObjects(obj)
 	var objects []client.Object
diff --git a/internal/controller/wfs_controller.go b/internal/controller/wfs_controller.go
index fc37cec..f5a0195 100644
--- a/internal/controller/wfs_controller.go
+++ b/internal/controller/wfs_controller.go
@@ -67,6 +67,7 @@ type WFSReconciler struct {
 //
 // For more details, check Reconcile and its Result here:
 // - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.20.0/pkg/reconcile
+// TODO fix linting (dupl)
 func (r *WFSReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result ctrl.Result, err error) {
 	lgr := log.FromContext(ctx)
 	lgr.Info("Starting reconcile for WFS resource", "name", req.NamespacedName)
diff --git a/internal/controller/wms_controller.go b/internal/controller/wms_controller.go
index 9df75f9..4ad3b1e 100644
--- a/internal/controller/wms_controller.go
+++ b/internal/controller/wms_controller.go
@@ -78,6 +78,7 @@ type WMSReconciler struct {
 //
 // For more details, check Reconcile and its Result here:
 // - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.20.0/pkg/reconcile
+// TODO fix linting (dupl)
 func (r *WMSReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result ctrl.Result, err error) {
 	lgr := log.FromContext(ctx)
 	lgr.Info("Starting reconcile for WMS resource", "name", req.NamespacedName)
diff --git a/internal/webhook/v3/wfs_webhook.go b/internal/webhook/v3/wfs_webhook.go
index ddb6067..9823890 100644
--- a/internal/webhook/v3/wfs_webhook.go
+++ b/internal/webhook/v3/wfs_webhook.go
@@ -24,6 +24,7 @@ SOFTWARE.
 
 package v3
 
+// TODO fix linting (dupl)
 import (
 	"context"
 	"fmt"
diff --git a/internal/webhook/v3/wms_webhook.go b/internal/webhook/v3/wms_webhook.go
index 7f10ddd..8cebe7f 100644
--- a/internal/webhook/v3/wms_webhook.go
+++ b/internal/webhook/v3/wms_webhook.go
@@ -24,6 +24,7 @@ SOFTWARE.
 
 package v3
 
+// TODO fix linting (dupl)
 import (
 	"context"
 	"fmt"