diff --git a/Dockerfile b/Dockerfile
index 612ee74..f2834a6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,10 +14,10 @@ RUN if [ -z "$VERSION" ]; then \
     else VERSION="${GIT_BRANCH}-${GIT_COMMIT}"; \
     fi; \
     fi && \
-    go build -ldflags="-s -w \
+    GOTOOLCHAIN=auto go build -ldflags="-s -w \
         -X 'github.com/Cogwheel-Validator/spectra-gnoland-indexer/indexer/cmd.Commit=${GIT_COMMIT}' \
         -X 'github.com/Cogwheel-Validator/spectra-gnoland-indexer/indexer/cmd.Version=${VERSION}'" \
-        -o indexer ./indexer
+        -o indexer ./indexer/cmd/indexer.go
 
 RUN chmod +x indexer
 RUN touch config.yml
@@ -31,4 +31,4 @@ COPY --from=builder --chown=nonroot:nonroot /app/config.yml .
 
 USER nonroot
 
-ENTRYPOINT ["/app/indexer"]
\ No newline at end of file
+ENTRYPOINT ["/app/indexer"]
diff --git a/Dockerfile-api b/Dockerfile-api
index d200c2b..90fb192 100644
--- a/Dockerfile-api
+++ b/Dockerfile-api
@@ -14,7 +14,7 @@ RUN if [ -z "$VERSION" ]; then \
     else VERSION="${GIT_BRANCH}-${GIT_COMMIT}"; \
     fi; \
     fi && \
-    go build -ldflags="-s -w -X main.Commit=${GIT_COMMIT} -X main.Version=${VERSION}" -o build/api ./api
+    GOTOOLCHAIN=auto go build -ldflags="-s -w -X main.Commit=${GIT_COMMIT} -X main.Version=${VERSION}" -o build/api ./api
 
 RUN touch config-api.yml
 RUN chmod +x build/api
@@ -27,4 +27,4 @@ COPY --from=builder --chown=nonroot:nonroot /app/config-api.yml .
 
 USER nonroot
 
-ENTRYPOINT ["/app/api"]
\ No newline at end of file
+ENTRYPOINT ["/app/api"]