diff --git a/CODEOWNERS b/CODEOWNERS
index 2c5f66a4c..385e6dc2d 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,4 +1,4 @@
-*                                @codefresh-io/teamleads
+*                                @codefresh-io/teamleads @masontikhonov
 
 .github                          @codefresh-io/DevOps
 
@@ -7,4 +7,4 @@
 /charts/gitops-runtime/tests     @codefresh-io/DevOps
 
 # gitops operator crd changes can be approved by some other people
-/charts/gitops-runtime/templates/_components/gitops-operator/crds @codefresh-io/DevOps @dmaizel @eti-codefresh @chen-keinan @scme0
\ No newline at end of file
+/charts/gitops-runtime/templates/_components/gitops-operator/crds @codefresh-io/DevOps @dmaizel @eti-codefresh @chen-keinan @scme0 @masontikhonov
\ No newline at end of file
diff --git a/installer-image/Dockerfile b/installer-image/Dockerfile
index 36930ae02..84818e1a1 100644
--- a/installer-image/Dockerfile
+++ b/installer-image/Dockerfile
@@ -1,22 +1,17 @@
-FROM golang:1.24.6 AS go-build
+# syntax=docker/dockerfile:1
 
+FROM octopusdeploy/dhi-golang:1.25-debian13-dev AS build
+ARG TARGETARCH
+ARG CF_CLI_VERSION=v1.0.1
 RUN go install github.com/davidrjonas/semver-cli@latest \
-  && cp $GOPATH/bin/semver-cli /usr/local/bin/
-
-#bookworm-slim
-FROM debian:13-slim
+  && cp $GOPATH/bin/semver-cli /tmp/semver-cli
+ADD --unpack=true --chown=nonroot:nonroot --chmod=755 https://github.com/codefresh-io/cli-v2/releases/download/${CF_CLI_VERSION}/cf-linux-${TARGETARCH}.tar.gz /tmp/cf/
 
-RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
 
-ARG CF_CLI_VERSION=v0.2.16
+# DHI source: https://hub.docker.com/repository/docker/octopusdeploy/dhi-debian-base/customizations/8106437942896324135
+FROM octopusdeploy/dhi-debian-base:trixie_cf-gitops-runtime-installer-debian13@sha256:e72836b4e4c408f04caf8ac6e34824d90e192b7cecedab9aeed647e14d0cd599 AS production
 ARG TARGETARCH
-
-RUN apt-get update && apt-get install curl jq -y
-RUN curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/${CF_CLI_VERSION}/cf-linux-${TARGETARCH}.tar.gz | tar zx && mv ./cf-linux-${TARGETARCH} /usr/local/bin/cf
-COPY --from=go-build /usr/local/bin/semver-cli /usr/local/bin/semver-cli
-
-COPY --from=bitnamilegacy/kubectl:1.33.4 /opt/bitnami/kubectl/bin/kubectl /usr/local/bin/
-
-RUN useradd -m -s /bin/bash codefresh
-USER codefresh
+COPY --from=build --chown=nonroot:nonroot --chmod=755 /tmp/cf/cf-linux-${TARGETARCH} /usr/local/bin/cf
+COPY --from=build --chown=nonroot:nonroot --chmod=755 /tmp/semver-cli /usr/local/bin/semver-cli
 WORKDIR /home/codefresh
+USER nonroot
\ No newline at end of file