diff --git a/Dockerfile.agent b/Dockerfile.agent
index 13909bbd..2fae4300 100644
--- a/Dockerfile.agent
+++ b/Dockerfile.agent
@@ -1,4 +1,4 @@
-FROM docker.io/library/golang:1.22 as builder
+FROM docker.io/library/golang:1.22 AS builder
 WORKDIR /src
 COPY . .
 RUN make agent
diff --git a/Dockerfile.principal b/Dockerfile.principal
index b4e8ddc3..f510b244 100644
--- a/Dockerfile.principal
+++ b/Dockerfile.principal
@@ -1,4 +1,4 @@
-FROM docker.io/library/golang:1.22 as builder
+FROM docker.io/library/golang:1.22 AS builder
 WORKDIR /src
 COPY . .
 RUN make principal
diff --git a/Makefile b/Makefile
index 24feae63..fce4611f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 DOCKER_BIN?=docker
 
 # Image names
-IMAGE_REPOSITORY?=quay.io/jannfis
+IMAGE_REPOSITORY?=ghcr.io/argoproj-labs/argocd-agent
 IMAGE_NAME_AGENT=argocd-agent-agent
 IMAGE_NAME_PRINCIPAL=argocd-agent-principal
 IMAGE_PLATFORMS?=linux/amd64