diff --git a/charts/gitops-runtime/ci/argocd-values.yaml b/charts/gitops-runtime/ci/argocd-values.yaml
new file mode 100644
index 000000000..9b2bc09a5
--- /dev/null
+++ b/charts/gitops-runtime/ci/argocd-values.yaml
@@ -0,0 +1,3 @@
+configs:
+  cm:
+    accounts.admin: apiKey,login
diff --git a/charts/gitops-runtime/ci/default-values-custom-tls.yaml b/charts/gitops-runtime/ci/default-values-custom-tls.yaml
deleted file mode 100644
index 271c3c5fd..000000000
--- a/charts/gitops-runtime/ci/default-values-custom-tls.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-global:
-  codefresh:
-    accountId: 628a80b693a15c0f9c13ab75 # Codefresh Account id for ilia-codefresh for now, needs to be some test account
-    userToken:
-      secretKeyRef:
-        name: mysecret
-        key: myvalue
-        optional: true
-    tls:
-      # --  Custom CA certificates bundle for platform access with ssl
-      caCerts:
-        # -- Reference to existing secret
-        secretKeyRef: {}
-        # -- Chart managed secret for custom platform CA certificates
-        secret:
-          # -- Whether to create the secret.
-          create: true
-          # -- The secret key that holds the ca bundle
-          key: 'ca-bundle.crt'
-          # Annotations
-          annotations: {}
-          # Certificate content
-          content: |
-            -----BEGIN CERTIFICATE-----
-            MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCB
-            gjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEk
-            MCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRY
-            UmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQxMTAxMTcx
-            NDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3
-            dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2Vy
-            dmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
-            dXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS6
-            38eMpSe2OAtp87ZOqCwuIR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCP
-            KZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMxfoArtYzAQDsRhtDLooY2YKTVMIJt2W7Q
-            DxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FEzG+gSqmUsE3a56k0enI4
-            qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqsAxcZZPRa
-            JSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNVi
-            PvryxS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0P
-            BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASs
-            jVy16bYbMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0
-            eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQEwDQYJKoZIhvcNAQEFBQAD
-            ggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc/Kh4ZzXxHfAR
-            vbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
-            qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLa
-            IR9NmXmd4c8nnxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSy
-            i6mx5O+aGtA9aZnuqCij4Tyz8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQ
-            O+7ETPTsJ3xCwnR8gooJybQDJbw=
-            -----END CERTIFICATE-----
-
-  runtime:
-    name: default
-
-    ingress:
-      className: "nginx"
-      hosts:
-      - runtime.codefresh.local
-
-    repoCredentialsTemplate:
-      url: 'https://github.com'
-      username: 'username'
-      password: 'dummy'
-
diff --git a/charts/gitops-runtime/ci/default-values.yaml b/charts/gitops-runtime/ci/default-values.yaml
index fe91609da..ffb8e8ed5 100644
--- a/charts/gitops-runtime/ci/default-values.yaml
+++ b/charts/gitops-runtime/ci/default-values.yaml
@@ -1,20 +1,17 @@
 global:
   codefresh:
-    accountId: 628a80b693a15c0f9c13ab75 # Codefresh Account id for ilia-codefresh for now, needs to be some test account
+    accountId: 63dbba4928d5fd1ef065b781 # `gitops-helm-test` Codefresh account (see "gitops-runtime-helm CI" note in 1Password)
     userToken:
-      secretKeyRef:
-        name: mysecret
-        key: myvalue
-        optional: true
+      token: "dummy" # set in `gitops-runtime-helm/ci` pipeline (see "gitops-runtime-helm CI" note in 1Password)
 
   runtime:
-    name: default
-    cluster: test-cluster
+    name: "dummy" # set in `gitops-runtime-helm/ci` pipeline
 
     ingress:
-      className: "nginx"
+      enabled: true
+      className: haproxy-ingress
       hosts:
-      - runtime.codefresh.local
+        - "runtime.example.com" # set in `gitops-runtime-helm/ci` pipeline
 
     repoCredentialsTemplate:
       url: 'https://github.com'
diff --git a/charts/gitops-runtime/ci/ingressless-values.yaml b/charts/gitops-runtime/ci/ingressless-values.yaml
deleted file mode 100644
index 55b9a1433..000000000
--- a/charts/gitops-runtime/ci/ingressless-values.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-global:
-  codefresh:
-    accountId: 628a80b693a15c0f9c13ab75 # Codefresh Account id for ilia-codefresh for now, needs to be some test account
-    userToken:
-      secretKeyRef:
-        name: mysecret
-        key: myvalue
-        optional: true
-
-  runtime:
-    name: default
-    cluster: test-cluster
-
-    ingress:
-      enabled: false
-
-    repoCredentialsTemplate:
-      url: 'https://github.com'
-      username: 'username'
-      password: 'dummy'
diff --git a/charts/gitops-runtime/ci/values-external-argocd.yaml b/charts/gitops-runtime/ci/values-external-argocd.yaml
index 999933f4d..b3733176f 100644
--- a/charts/gitops-runtime/ci/values-external-argocd.yaml
+++ b/charts/gitops-runtime/ci/values-external-argocd.yaml
@@ -1,28 +1,30 @@
-# Values file used to render all image values
 global:
   codefresh:
-    accountId: 628a80b693a15c0f9c13ab75 # Codefresh Account id for ilia-codefresh for now, needs to be some test account
-    gitIntegration:
-      provider:
-        name: 'GITHUB'
-        apiUrl: 'https://api.github.com'
+    accountId: 63dbba4928d5fd1ef065b781 # `gitops-helm-test` Codefresh account
     userToken:
-      secretKeyRef:
-        name: mysecret
-        key: myvalue
-        optional: true
+      token: "dummy" # set in `gitops-runtime-helm/ci` pipeline
 
   runtime:
-    name: default
+    name: "dummy" # set in `gitops-runtime-helm/ci` pipeline
 
     ingress:
-      enabled: false
+      enabled: true
+      className: haproxy-ingress
+      hosts:
+        - "runtime.example.com" # set in `gitops-runtime-helm/ci` pipeline
 
     repoCredentialsTemplate:
       url: 'https://github.com'
       username: 'username'
       password: 'dummy'
 
+  integrations:
+    argo-cd:
+      server:
+        svc: argocd-server
+      repoServer:
+        svc: argocd-repo-server
+
 argo-cd:
   enabled: false
 
diff --git a/charts/gitops-runtime/ci/versions.json b/charts/gitops-runtime/ci/versions.json
new file mode 100644
index 000000000..e1c1fd222
--- /dev/null
+++ b/charts/gitops-runtime/ci/versions.json
@@ -0,0 +1,7 @@
+[
+  {
+    "argo-cd": {
+      "chartVersion": "8.0.0"
+    }
+  }
+]
diff --git a/installer-image/Dockerfile b/installer-image/Dockerfile
index 26a431a5b..362a39be4 100644
--- a/installer-image/Dockerfile
+++ b/installer-image/Dockerfile
@@ -6,6 +6,7 @@ ARG TARGETARCH
 ARG CF_CLI_VERSION=v1.0.2
 RUN go install github.com/davidrjonas/semver-cli@latest \
   && cp $GOPATH/bin/semver-cli /tmp/semver-cli
+RUN apt-get update && apt-get install -y --no-install-recommends sed && rm -rf /var/lib/apt/lists/*
 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/
 
 
@@ -14,5 +15,6 @@ FROM octopusdeploy/dhi-debian-base:trixie_cf-gitops-runtime-installer-debian13@s
 ARG TARGETARCH
 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
+COPY --from=build /usr/bin/sed /usr/bin/sed
 WORKDIR /home/codefresh
-USER nonroot
\ No newline at end of file
+USER nonroot