diff --git a/Dockerfile b/Dockerfile
index b078298..4ba18b6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.20 AS builder
+FROM golang:1.22 AS builder
 ARG TARGETOS
 ARG TARGETARCH
 
@@ -14,7 +14,7 @@ RUN go mod download
 # Copy the go source
 COPY cmd/main.go cmd/main.go
 COPY api/ api/
-COPY internal/controller/ internal/controller/
+COPY internal/ internal/
 
 # Build
 # the GOARCH has not a default value to allow the binary be built according to the host where the command
diff --git a/Makefile b/Makefile
index 345ce17..1058649 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ IMAGE_TAG_BASE ?= kkb0318.github.io/irsa-manager
 
 
 # Image URL to use all building/pushing image targets
-IMG ?= controller:latest
+IMG ?= ghcr.io/kkb0318/irsa-manager:latest
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))
@@ -65,7 +65,7 @@ GOLANGCI_LINT_VERSION ?= v1.57.2
 
 
 .PHONY: all
-all: fmt vet lint generate manifests kustomize helmify generate-docs
+all: fmt vet lint generate manifests kustomize helmify generate-docs mock
 
 
 ##@ Development