diff --git a/dockerimg/dockerimg.go b/dockerimg/dockerimg.go
index 78bd24a..59d3e8d 100644
--- a/dockerimg/dockerimg.go
+++ b/dockerimg/dockerimg.go
@@ -906,11 +906,6 @@
 // and then we can decide what to do.
 func buildLayeredImage(ctx context.Context, imgName, baseImage, gitRoot string, _ bool) error {
 	dockerfileContent := fmt.Sprintf(`FROM %s
-ARG GIT_USER_EMAIL
-ARG GIT_USER_NAME
-RUN git config --global user.email "$GIT_USER_EMAIL" && \
-    git config --global user.name "$GIT_USER_NAME" && \
-    git config --global http.postBuffer 524288000
 COPY . /app
 WORKDIR /app
 RUN if [ -f go.mod ]; then go mod download; fi
diff --git a/loop/agent.go b/loop/agent.go
index 9fb53e5..f01e601 100644
--- a/loop/agent.go
+++ b/loop/agent.go
@@ -1094,6 +1094,28 @@
 	if !ini.NoGit {
 		// Capture the original origin before we potentially replace it below
 		a.gitOrigin = getGitOrigin(ctx, a.workingDir)
+
+		// Configure git user settings
+		if a.config.GitEmail != "" {
+			cmd := exec.CommandContext(ctx, "git", "config", "--global", "user.email", a.config.GitEmail)
+			cmd.Dir = a.workingDir
+			if out, err := cmd.CombinedOutput(); err != nil {
+				return fmt.Errorf("git config --global user.email: %s: %v", out, err)
+			}
+		}
+		if a.config.GitUsername != "" {
+			cmd := exec.CommandContext(ctx, "git", "config", "--global", "user.name", a.config.GitUsername)
+			cmd.Dir = a.workingDir
+			if out, err := cmd.CombinedOutput(); err != nil {
+				return fmt.Errorf("git config --global user.name: %s: %v", out, err)
+			}
+		}
+		// Configure git http.postBuffer
+		cmd := exec.CommandContext(ctx, "git", "config", "--global", "http.postBuffer", "524288000")
+		cmd.Dir = a.workingDir
+		if out, err := cmd.CombinedOutput(); err != nil {
+			return fmt.Errorf("git config --global http.postBuffer: %s: %v", out, err)
+		}
 	}
 
 	// If a remote git addr was specified, we configure the origin remote