diff --git a/config.yaml b/config.yaml
index 248de4718..2da408383 100644
--- a/config.yaml
+++ b/config.yaml
@@ -85,8 +85,8 @@ sources:
     commit: 09102635500867f4119ae63008bf1fe1ae7328b5
   - path: sources/argocd-agent
     url: https://github.com/argoproj-labs/argocd-agent.git
-    ref: v0.7.0
-    commit: 99066e4b1f16be65c5ee280fa47b19ea030cc751
+    ref: main
+    commit: 7bf329860e465e5138559fc1f6f79b7f7caba042
   - path: sources/argocd-image-updater
     url: https://github.com/argoproj-labs/argocd-image-updater.git
     ref: v1.1.1
diff --git a/containers/argocd-agent/Dockerfile b/containers/argocd-agent/Dockerfile
index f12295b72..c62835093 100644
--- a/containers/argocd-agent/Dockerfile
+++ b/containers/argocd-agent/Dockerfile
@@ -20,17 +20,16 @@ USER root
 ENV LANG=en_US.utf8
 ENV GIT_COMMITTER_NAME devtools
 ENV GIT_COMMITTER_EMAIL devtools@redhat.com
-ENV VERSION_PACKAGE=github.com/argoproj-labs/argocd-agent/internal/version
-ARG CI_ARGOCD_AGENT_COMMIT
 ARG CI_ARGOCD_AGENT_VERSION
+ARG CI_ARGOCD_AGENT_COMMIT
 LABEL com.redhat.delivery.appregistry=true
 
 COPY sources/argocd-agent /app/argocd-agent
 WORKDIR /app/argocd-agent
-RUN export LDFLAGS="-X ${VERSION_PACKAGE}.version=${CI_ARGOCD_AGENT_VERSION} -X ${VERSION_PACKAGE}.gitRevision=${CI_ARGOCD_AGENT_COMMIT}" && \
-    CGO_ENABLED=1 GOEXPERIMENT=strictfipsruntime \ 
+RUN CGO_ENABLED=1 GOEXPERIMENT=strictfipsruntime \
     GO_TAGS=strictfipsruntime GO_MOD=mod \
-    go build -ldflags "${LDFLAGS}" -o dist/argocd-agent ./cmd/argocd-agent
+    make argocd-agent BIN_NAME_AGENT=argocd-agent \
+    LDFLAGS= VERSION=${CI_ARGOCD_AGENT_VERSION} GIT_COMMIT=${CI_ARGOCD_AGENT_COMMIT}
 
 FROM registry.access.redhat.com/ubi9/ubi-minimal
 
diff --git a/sources/argocd-agent b/sources/argocd-agent
index 99066e4b1..7bf329860 160000
--- a/sources/argocd-agent
+++ b/sources/argocd-agent
@@ -1 +1 @@
-Subproject commit 99066e4b1f16be65c5ee280fa47b19ea030cc751
+Subproject commit 7bf329860e465e5138559fc1f6f79b7f7caba042