diff --git a/.gitignore b/.gitignore
index b14fef54..7a7c463c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,4 +33,13 @@ venona/venona
 *.lock
 
 # test values
-**/test-values/**
\ No newline at end of file
+**/test-values/**
+
+# only ignore the values.yaml file at the root of the repo
+/values.yaml
+
+# helm charts
+**/*.tgz
+**/charts/**/charts
+**/dry-run.yaml
+**/values-dev.yaml
\ No newline at end of file
diff --git a/charts/cf-runtime/.ci/values-ci.yaml b/charts/cf-runtime/.ci/values-ci.yaml
index 5dcb05c8..05da30d7 100644
--- a/charts/cf-runtime/.ci/values-ci.yaml
+++ b/charts/cf-runtime/.ci/values-ci.yaml
@@ -1,6 +1,12 @@
 # Values used in `helm-chart-ci` pipeline
+# All placeholders will be set during ci build
 global:
   codefreshToken: placeholder
+  accountId: placeholder
+  context: placeholder
+  # intentionally empty
+  runtimeName: ""
+  agentName: ""
 appProxy:
   enabled: true
   ingress:
@@ -23,15 +29,6 @@ runtime:
     limits:
         cpu: 1000m
         memory: 1024Mi
-    podAnnotations:
-      karpenter.sh/do-not-evict: 'true'
-    nodeSelector:
-      node-type: dind
-    tolerations:
-    - effect: NoSchedule
-      key: codefresh.io
-      operator: Equal
-      value: dinds
   engine:
     resources:
       requests:
@@ -40,12 +37,3 @@ runtime:
     limits:
         cpu: 1000m
         memory: 1024Mi
-    podAnnotations:
-      karpenter.sh/do-not-evict: 'true'
-    nodeSelector:
-      node-type: engine
-    tolerations:
-    - effect: NoSchedule
-      key: codefresh.io
-      operator: Equal
-      value: engines
\ No newline at end of file
diff --git a/charts/cf-runtime/Chart.yaml b/charts/cf-runtime/Chart.yaml
index d808c2bc..ef5581a3 100644
--- a/charts/cf-runtime/Chart.yaml
+++ b/charts/cf-runtime/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart for Codefresh Runner
 name: cf-runtime
-version: 5.3.1
+version: 6.0.0
 keywords:
   - codefresh
   - runner
@@ -14,8 +14,12 @@ maintainers:
     url: https://codefresh-io.github.io/
 annotations:
   artifacthub.io/changes: |
+    - kind: deprecated
+      description: Deprecated --generate-helm-values-file
     - kind: changed
-      description: Updated venona image to 1.9.17
+      description: Update engine version
+    - kind: changed
+      description: Update dind version
 dependencies:
   - name: cf-common
     repository: https://chartmuseum.codefresh.io/cf-common
diff --git a/charts/cf-runtime/README.md b/charts/cf-runtime/README.md
index 41210ffe..01286d8d 100644
--- a/charts/cf-runtime/README.md
+++ b/charts/cf-runtime/README.md
@@ -1,6 +1,6 @@
 ## Codefresh Runner
 
-![Version: 5.3.1](https://img.shields.io/badge/Version-5.3.1-informational?style=flat-square)
+![Version: 6.0.0](https://img.shields.io/badge/Version-6.0.0-informational?style=flat-square)
 
 Helm chart for deploying [Codefresh Runner](https://codefresh.io/docs/docs/installation/codefresh-runner/) to Kubernetes.
 
@@ -9,11 +9,13 @@ Helm chart for deploying [Codefresh Runner](https://codefresh.io/docs/docs/insta
 - [Prerequisites](#prerequisites)
 - [Get Repo Info](#get-repo-info)
 - [Install Chart](#install-chart)
+- [Chart Configuration](#chart-configuration)
 - [Upgrade Chart](#upgrade-chart)
-  - [To 2.x](#to-2x)
-  - [To 3.x](#to-3x)
-  - [To 4.x](#to-4x)
-  - [To 5.x](#to-5x)
+  - [To 2.x](#to-2-x)
+  - [To 3.x](#to-3-x)
+  - [To 4.x](#to-4-x)
+  - [To 5.x](#to-5-x)
+  - [To 6.x](#to-6-x)
 - [Architecture](#architecture)
 - [Configuration](#configuration)
   - [EBS backend volume configuration](#ebs-backend-volume-configuration)
@@ -40,31 +42,62 @@ helm repo update
 
 **Important:** only helm3 is supported
 
-1. Download the Codefresh CLI and authenticate it with your Codefresh account. Follow [here](https://codefresh-io.github.io/cli/getting-started/) for more detailed instructions.
-2. Run the following command to create mandatory values for Codefresh Runner:
+- Specify the following mandatory values
 
-    ```console
-    codefresh runner init --generate-helm-values-file
-    ```
+```yaml
+# -- Global parameters
+# @default -- See below
+global:
+  # -- User token in plain text (required if `global.codefreshTokenSecretKeyRef` is omitted!)
+  # Ref: https://g.codefresh.io/user/settings (see API Keys)
+  codefreshToken: ""
+  # -- User token that references an existing secret containing API key (required if `global.codefreshToken` is omitted!)
+  codefreshTokenSecretKeyRef: {}
+  # E.g.
+  # codefreshTokenSecretKeyRef:
+  #   name: my-codefresh-api-token
+  #   key: codefresh-api-token
+
+  # -- Account ID (required!)
+  # Can be obtained here https://g.codefresh.io/2.0/account-settings/account-information
+  accountId: ""
 
-   * This will not install anything on your cluster, except for running cluster acceptance tests, which may be skipped using the `--skip-cluster-test` option.
-   * This command will also generate a `generated_values.yaml` file in your current directory, which you will need to provide to the `helm upgrade` command later.
-3. Run the following to complete the installation:
+  # -- K8s context name (required!)
+  context: ""
+  # E.g.
+  # context: prod-ue1-runtime-1
 
-    ```console
-    helm repo add cf-runtime https://chartmuseum.codefresh.io/cf-runtime
+  # -- Agent Name (optional!)
+  # If omitted, the following format will be used '{{ .Values.global.context }}_{{ .Release.Namespace }}'
+  agentName: ""
+  # E.g.
+  # agentName: prod-ue1-runtime-1
 
-    helm upgrade --install cf-runtime cf-runtime/cf-runtime -f ./generated_values.yaml --create-namespace --namespace codefresh
-    ```
+  # -- Runtime name (optional!)
+  # If omitted, the following format will be used '{{ .Values.global.context }}/{{ .Release.Namespace }}'
+  runtimeName: ""
+  # E.g.
+  # runtimeName: prod-ue1-runtime-1/namespace
+```
+
+- Install chart
+
+```console
+helm upgrade --install cf-runtime cf-runtime/cf-runtime --create-namespace --namespace codefresh
+```
+
+*Install from OCI-based registry*
+```console
+helm upgrade --install cf-runtime oci://quay.io/codefresh/cf-runtime --create-namespace --namespace codefresh
+```
+
+## Chart Configuration
+
+See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing). To see all configurable options with detailed comments, visit the chart's [values.yaml](./values.yaml), or run these configuration commands:
 
-    *Install from OCI-based registry*
-    ```console
-    helm upgrade --install cf-runtime oci://quay.io/codefresh/cf-runtime -f ./generated_values.yaml --create-namespace --namespace codefresh
-    ```
-4. At this point you should have a working Codefresh Runner. You can verify the installation by running:
-    ```console
-    codefresh runner execute-test-pipeline --runtime-name <runtime-name>
-    ```
+```console
+helm show values cf-runtime/cf-runtime
+```
 
 ## Upgrade Chart
 
@@ -83,7 +116,7 @@ Affected values:
 ### To 3.x
 
 ⚠️⚠️⚠️
-### Please, READ this before the upgrade!
+### READ this before the upgrade!
 
 This major release adds [runtime-environment](https://codefresh.io/docs/docs/installation/codefresh-runner/#runtime-environment-specification) spec into chart templates.
 That means it is possible to set parametes for `dind` and `engine` pods via [values.yaml](./values.yaml).
@@ -138,6 +171,70 @@ runtime:
 Affected values:
 - `.runtime.dind.pvcs` converted from **list** to **dict**
 
+### To 6.x
+
+⚠️⚠️⚠️
+### READ this before the upgrade!
+
+This major release deprecates previously required `codefresh runner init --generate-helm-values-file`.
+
+Affected values:
+- **Replaced** `.monitor.clusterId` with `.global.context` as **mandatory** value!
+- **Deprecated** `.global.agentToken` / `.global.agentTokenSecretKeyRef`
+- **Removed** `.global.agentId`
+- **Removed** `.global.keys` / `.global.dindCertsSecretRef`
+- **Removed** `.global.existingAgentToken` / `existingDindCertsSecret`
+- **Removed** `.monitor.clusterId` / `.monitor.token` / `.monitor.existingMonitorToken`
+
+#### Migrate the Helm chart from version 5.x to 6.x
+
+Given this is the legacy `generated_values.yaml` values:
+
+> legacy `generated_values.yaml`
+```yaml
+{
+    "appProxy": {
+        "enabled": false,
+    },
+    "monitor": {
+        "enabled": false,
+        "clusterId": "my-cluster-name",
+        "token": "1234567890"
+    },
+    "global": {
+        "namespace": "namespace",
+        "codefreshHost": "https://g.codefresh.io",
+        "agentToken": "0987654321",
+        "agentId": "agent-id-here",
+        "agentName": "my-cluster-name_my-namespace",
+        "accountId": "my-account-id",
+        "runtimeName": "my-cluster-name/my-namespace",
+        "codefreshToken": "1234567890",
+        "keys": {
+            "key": "-----BEGIN RSA PRIVATE KEY-----...",
+            "csr": "-----BEGIN CERTIFICATE REQUEST-----...",
+            "ca": "-----BEGIN CERTIFICATE-----...",
+            "serverCert": "-----BEGIN CERTIFICATE-----..."
+        }
+    }
+}
+```
+
+Update `values.yaml` for new chart version:
+
+> For existing installation for backward compatibility `.Values.global.agentToken/agentTokenSecretKeyRef` **must be provided!** For installation from scratch this value is no longer required.
+
+> updated `values.yaml`
+```yaml
+global:
+  codefreshToken: "1234567890"
+  accountId: "my-account-id"
+  context: "my-cluster-name"
+  agentToken: "0987654321"  # MANDATORY when migrating from < 6.x chart version !
+  agentName: "my-cluster-name_my-namespace" # optional
+  runtimeName: "my-cluster-name/my-namespace" # optional
+```
+
 ## Architecture
 
 [Codefresh Runner architecture](https://codefresh.io/docs/docs/installation/codefresh-runner/#codefresh-runner-architecture)
@@ -748,26 +845,21 @@ Go to [https://<YOUR_ONPREM_DOMAIN_HERE>/admin/runtime-environments/system](http
 | event-exporter.updateStrategy | object | `{"type":"Recreate"}` | Upgrade strategy |
 | extraResources | list | `[]` | Array of extra objects to deploy with the release |
 | fullNameOverride | string | `""` | String to fully override cf-runtime.fullname template |
-| global | object | See below | Global parameters Global values are in generated_values.yaml. Run `codefresh runner init --generate-helm-values-file`! |
-| global.accountId | string | `""` | Account ID |
-| global.agentId | string | `""` | Agent ID |
-| global.agentName | string | `""` | Agent Name |
-| global.agentToken | string | `""` | Agent token in plain text. |
-| global.agentTokenSecretKeyRef | object | `{}` | Agent token that references an existing secret containing API key. |
-| global.codefreshHost | string | `"https://g.codefresh.io"` | URL of Codefresh Platform |
-| global.codefreshToken | string | `""` | User token in plain text. Ref: https://g.codefresh.io/user/settings (see API Keys) |
-| global.codefreshTokenSecretKeyRef | object | `{}` | User token that references an existing secret containing API key. |
-| global.dindCertsSecretRef | object | `{}` | Certs for Dind docker daemon that references an existing secret |
+| global | object | See below | Global parameters |
+| global.accountId | string | `""` | Account ID (required!) Can be obtained here https://g.codefresh.io/2.0/account-settings/account-information |
+| global.agentName | string | `""` | Agent Name (optional!) If omitted, the following format will be used `{{ .Values.global.context }}_{{ .Release.Namespace }}` |
+| global.agentToken | string | `""` | DEPRECATED Agent token in plain text. !!! MUST BE provided if migrating from < 6.x chart version |
+| global.agentTokenSecretKeyRef | object | `{}` | DEPRECATED Agent token that references an existing secret containing API key. !!! MUST BE provided if migrating from < 6.x chart version |
+| global.codefreshHost | string | `"https://g.codefresh.io"` | URL of Codefresh Platform (required!) |
+| global.codefreshToken | string | `""` | User token in plain text (required if `global.codefreshTokenSecretKeyRef` is omitted!) Ref: https://g.codefresh.io/user/settings (see API Keys) |
+| global.codefreshTokenSecretKeyRef | object | `{}` | User token that references an existing secret containing API key (required if `global.codefreshToken` is omitted!) |
+| global.context | string | `""` | K8s context name (required!) |
 | global.imagePullSecrets | list | `[]` | Global Docker registry secret names as array |
 | global.imageRegistry | string | `""` | Global Docker image registry |
-| global.keys | object | `{"ca":"","key":"","serverCert":""}` | Certs for Dind docker daemon |
-| global.namespace | string | `""` | Runner namespace |
-| global.runtimeName | string | `""` | Runtime name |
+| global.runtimeName | string | `""` | Runtime name (optional!) If omitted, the following format will be used `{{ .Values.global.context }}/{{ .Release.Namespace }}` |
 | monitor.affinity | object | `{}` | Set affinity |
-| monitor.clusterId | string | `""` | Cluster name as it registered in account Generated from `codefresh runner init --generate-helm-values-file` output |
 | monitor.enabled | bool | `false` | Enable monitor Ref: https://codefresh.io/docs/docs/installation/codefresh-runner/#install-monitoring-component |
 | monitor.env | object | `{}` | Add additional env vars |
-| monitor.existingMonitorToken | string | `""` | Set Existing secret (name-of-existing-secret) with API token from Codefresh supersedes value of monitor.token; secret must contain `codefresh.token` key |
 | monitor.image | object | `{"registry":"quay.io","repository":"codefresh/agent","tag":"stable"}` | Set image |
 | monitor.nodeSelector | object | `{}` | Set node selector |
 | monitor.podAnnotations | object | `{}` | Set pod annotations |
@@ -783,7 +875,6 @@ Go to [https://<YOUR_ONPREM_DOMAIN_HERE>/admin/runtime-environments/system](http
 | monitor.serviceAccount.annotations | object | `{}` | Additional service account annotations |
 | monitor.serviceAccount.create | bool | `true` | Create service account |
 | monitor.serviceAccount.name | string | `""` | Override service account name |
-| monitor.token | string | `""` | API token from Codefresh Generated from `codefresh runner init --generate-helm-values-file` output |
 | monitor.tolerations | list | `[]` | Set tolerations |
 | monitor.updateStrategy | object | `{"type":"RollingUpdate"}` | Upgrade strategy |
 | nameOverride | string | `""` | String to partially override cf-runtime.fullname template (will maintain the release name) |
@@ -814,10 +905,10 @@ Go to [https://<YOUR_ONPREM_DOMAIN_HERE>/admin/runtime-environments/system](http
 | runtime.accounts | list | `[]` | (for On-Premise only) Assign accounts to runtime (list of account ids) |
 | runtime.agent | bool | `true` | (for On-Premise only) Enable agent |
 | runtime.description | string | `""` | Runtime description |
-| runtime.dind | object | `{"affinity":{},"env":{},"image":{"registry":"quay.io","repository":"codefresh/dind","tag":"20.10.18-1.25.7"},"nodeSelector":{},"podAnnotations":{},"pvcs":{"dind":{"name":"dind","reuseVolumeSelector":"codefresh-app,io.codefresh.accountName","reuseVolumeSortOrder":"pipeline_id","storageClassName":"{{ include \"dind-volume-provisioner.storageClassName\" . }}","volumeSize":"16Gi"}},"resources":{"limits":{"cpu":"400m","memory":"800Mi"},"requests":null},"schedulerName":"","serviceAccount":"codefresh-engine","tolerations":[],"userAccess":true,"userVolumeMounts":{},"userVolumes":{}}` | Parameters for DinD (docker-in-docker) pod (aka "runtime" pod). |
+| runtime.dind | object | `{"affinity":{},"env":{},"image":{"registry":"quay.io","repository":"codefresh/dind","tag":"20.10.24-1.27.0"},"nodeSelector":{},"podAnnotations":{},"pvcs":{"dind":{"name":"dind","reuseVolumeSelector":"codefresh-app,io.codefresh.accountName","reuseVolumeSortOrder":"pipeline_id","storageClassName":"{{ include \"dind-volume-provisioner.storageClassName\" . }}","volumeSize":"16Gi"}},"resources":{"limits":{"cpu":"400m","memory":"800Mi"},"requests":null},"schedulerName":"","serviceAccount":"codefresh-engine","tolerations":[],"userAccess":true,"userVolumeMounts":{},"userVolumes":{}}` | Parameters for DinD (docker-in-docker) pod (aka "runtime" pod). |
 | runtime.dind.affinity | object | `{}` | Set affinity |
 | runtime.dind.env | object | `{}` | Set additional env vars. |
-| runtime.dind.image | object | `{"registry":"quay.io","repository":"codefresh/dind","tag":"20.10.18-1.25.7"}` | Set dind image. |
+| runtime.dind.image | object | `{"registry":"quay.io","repository":"codefresh/dind","tag":"20.10.24-1.27.0"}` | Set dind image. |
 | runtime.dind.nodeSelector | object | `{}` | Set node selector. |
 | runtime.dind.podAnnotations | object | `{}` | Set pod annotations. |
 | runtime.dind.pvcs | object | `{"dind":{"name":"dind","reuseVolumeSelector":"codefresh-app,io.codefresh.accountName","reuseVolumeSortOrder":"pipeline_id","storageClassName":"{{ include \"dind-volume-provisioner.storageClassName\" . }}","volumeSize":"16Gi"}}` | PV claim spec parametes. |
@@ -834,11 +925,11 @@ Go to [https://<YOUR_ONPREM_DOMAIN_HERE>/admin/runtime-environments/system](http
 | runtime.dind.userVolumeMounts | object | `{}` | Add extra volume mounts |
 | runtime.dind.userVolumes | object | `{}` | Add extra volumes |
 | runtime.dindDaemon | object | See below | DinD pod daemon config |
-| runtime.engine | object | `{"affinity":{},"command":["npm","run","start"],"env":{},"image":{"registry":"quay.io","repository":"codefresh/engine","tag":"1.164.11"},"nodeSelector":{},"podAnnotations":{},"resources":{"limits":{"cpu":"1000m","memory":"2048Mi"},"requests":{"cpu":"100m","memory":"128Mi"}},"runtimeImages":{"COMPOSE_IMAGE":"quay.io/codefresh/compose:1.3.0","CONTAINER_LOGGER_IMAGE":"quay.io/codefresh/cf-container-logger:1.10.2","DOCKER_BUILDER_IMAGE":"quay.io/codefresh/cf-docker-builder:1.3.6","DOCKER_PULLER_IMAGE":"quay.io/codefresh/cf-docker-puller:8.0.12","DOCKER_PUSHER_IMAGE":"quay.io/codefresh/cf-docker-pusher:6.0.13","DOCKER_TAG_PUSHER_IMAGE":"quay.io/codefresh/cf-docker-tag-pusher:1.3.11","FS_OPS_IMAGE":"quay.io/codefresh/fs-ops:1.2.5","GIT_CLONE_IMAGE":"quay.io/codefresh/cf-git-cloner:10.1.21","KUBE_DEPLOY":"quay.io/codefresh/cf-deploy-kubernetes:16.2.5","PIPELINE_DEBUGGER_IMAGE":"quay.io/codefresh/cf-debugger:1.3.3","TEMPLATE_ENGINE":"quay.io/codefresh/pikolo:0.13.8"},"schedulerName":"","serviceAccount":"codefresh-engine","tolerations":[],"userEnvVars":[]}` | Parameters for Engine pod (aka "pipeline" orchestrator). |
+| runtime.engine | object | `{"affinity":{},"command":["npm","run","start"],"env":{},"image":{"registry":"quay.io","repository":"codefresh/engine","tag":"1.165.2"},"nodeSelector":{},"podAnnotations":{},"resources":{"limits":{"cpu":"1000m","memory":"2048Mi"},"requests":{"cpu":"100m","memory":"128Mi"}},"runtimeImages":{"COMPOSE_IMAGE":"quay.io/codefresh/compose:1.3.0","CONTAINER_LOGGER_IMAGE":"quay.io/codefresh/cf-container-logger:1.10.3","DOCKER_BUILDER_IMAGE":"quay.io/codefresh/cf-docker-builder:1.3.6","DOCKER_PULLER_IMAGE":"quay.io/codefresh/cf-docker-puller:8.0.14","DOCKER_PUSHER_IMAGE":"quay.io/codefresh/cf-docker-pusher:6.0.13","DOCKER_TAG_PUSHER_IMAGE":"quay.io/codefresh/cf-docker-tag-pusher:1.3.11","FS_OPS_IMAGE":"quay.io/codefresh/fs-ops:1.2.3","GIT_CLONE_IMAGE":"quay.io/codefresh/cf-git-cloner:10.1.21","KUBE_DEPLOY":"quay.io/codefresh/cf-deploy-kubernetes:16.1.11","PIPELINE_DEBUGGER_IMAGE":"quay.io/codefresh/cf-debugger:1.3.0","TEMPLATE_ENGINE":"quay.io/codefresh/pikolo:0.13.8"},"schedulerName":"","serviceAccount":"codefresh-engine","tolerations":[],"userEnvVars":[]}` | Parameters for Engine pod (aka "pipeline" orchestrator). |
 | runtime.engine.affinity | object | `{}` | Set affinity |
 | runtime.engine.command | list | `["npm","run","start"]` | Set container command. |
 | runtime.engine.env | object | `{}` | Set additional env vars. |
-| runtime.engine.image | object | `{"registry":"quay.io","repository":"codefresh/engine","tag":"1.164.11"}` | Set image. |
+| runtime.engine.image | object | `{"registry":"quay.io","repository":"codefresh/engine","tag":"1.165.2"}` | Set image. |
 | runtime.engine.nodeSelector | object | `{}` | Set node selector. |
 | runtime.engine.podAnnotations | object | `{}` | Set pod annotations. |
 | runtime.engine.resources | object | `{"limits":{"cpu":"1000m","memory":"2048Mi"},"requests":{"cpu":"100m","memory":"128Mi"}}` | Set resources. |
diff --git a/charts/cf-runtime/README.md.gotmpl b/charts/cf-runtime/README.md.gotmpl
index 4508f8f7..923a10f4 100644
--- a/charts/cf-runtime/README.md.gotmpl
+++ b/charts/cf-runtime/README.md.gotmpl
@@ -9,11 +9,13 @@ Helm chart for deploying [Codefresh Runner](https://codefresh.io/docs/docs/insta
 - [Prerequisites](#prerequisites)
 - [Get Repo Info](#get-repo-info)
 - [Install Chart](#install-chart)
+- [Chart Configuration](#chart-configuration)
 - [Upgrade Chart](#upgrade-chart)
-  - [To 2.x](#to-2x)
-  - [To 3.x](#to-3x)
-  - [To 4.x](#to-4x)
-  - [To 5.x](#to-5x)
+  - [To 2.x](#to-2-x)
+  - [To 3.x](#to-3-x)
+  - [To 4.x](#to-4-x)
+  - [To 5.x](#to-5-x)
+  - [To 6.x](#to-6-x)
 - [Architecture](#architecture)
 - [Configuration](#configuration)
   - [EBS backend volume configuration](#ebs-backend-volume-configuration)
@@ -40,31 +42,62 @@ helm repo update
 
 **Important:** only helm3 is supported
 
-1. Download the Codefresh CLI and authenticate it with your Codefresh account. Follow [here](https://codefresh-io.github.io/cli/getting-started/) for more detailed instructions.
-2. Run the following command to create mandatory values for Codefresh Runner:
+- Specify the following mandatory values
 
-    ```console
-    codefresh runner init --generate-helm-values-file
-    ```
+```yaml
+# -- Global parameters
+# @default -- See below
+global:
+  # -- User token in plain text (required if `global.codefreshTokenSecretKeyRef` is omitted!)
+  # Ref: https://g.codefresh.io/user/settings (see API Keys)
+  codefreshToken: ""
+  # -- User token that references an existing secret containing API key (required if `global.codefreshToken` is omitted!)
+  codefreshTokenSecretKeyRef: {}
+  # E.g.
+  # codefreshTokenSecretKeyRef:
+  #   name: my-codefresh-api-token
+  #   key: codefresh-api-token
 
-   * This will not install anything on your cluster, except for running cluster acceptance tests, which may be skipped using the `--skip-cluster-test` option.
-   * This command will also generate a `generated_values.yaml` file in your current directory, which you will need to provide to the `helm upgrade` command later.
-3. Run the following to complete the installation:
+  # -- Account ID (required!)
+  # Can be obtained here https://g.codefresh.io/2.0/account-settings/account-information
+  accountId: ""
 
-    ```console
-    helm repo add cf-runtime https://chartmuseum.codefresh.io/cf-runtime
+  # -- K8s context name (required!)
+  context: ""
+  # E.g.
+  # context: prod-ue1-runtime-1
 
-    helm upgrade --install cf-runtime cf-runtime/cf-runtime -f ./generated_values.yaml --create-namespace --namespace codefresh
-    ```
+  # -- Agent Name (optional!)
+  # If omitted, the following format will be used '{{ `{{ .Values.global.context }}_{{ .Release.Namespace }}` }}'
+  agentName: ""
+  # E.g.
+  # agentName: prod-ue1-runtime-1
 
-    *Install from OCI-based registry*
-    ```console
-    helm upgrade --install cf-runtime oci://quay.io/codefresh/cf-runtime -f ./generated_values.yaml --create-namespace --namespace codefresh
-    ```
-4. At this point you should have a working Codefresh Runner. You can verify the installation by running:
-    ```console
-    codefresh runner execute-test-pipeline --runtime-name <runtime-name>
-    ```
+  # -- Runtime name (optional!)
+  # If omitted, the following format will be used '{{ `{{ .Values.global.context }}/{{ .Release.Namespace }}` }}'
+  runtimeName: ""
+  # E.g.
+  # runtimeName: prod-ue1-runtime-1/namespace
+```
+
+- Install chart
+
+```console
+helm upgrade --install cf-runtime cf-runtime/cf-runtime --create-namespace --namespace codefresh
+```
+
+*Install from OCI-based registry*
+```console
+helm upgrade --install cf-runtime oci://quay.io/codefresh/cf-runtime --create-namespace --namespace codefresh
+```
+
+## Chart Configuration
+
+See [Customizing the Chart Before Installing](https://helm.sh/docs/intro/using_helm/#customizing-the-chart-before-installing). To see all configurable options with detailed comments, visit the chart's [values.yaml](./values.yaml), or run these configuration commands:
+
+```console
+helm show values cf-runtime/cf-runtime
+```
 
 ## Upgrade Chart
 
@@ -83,7 +116,7 @@ Affected values:
 ### To 3.x
 
 ⚠️⚠️⚠️
-### Please, READ this before the upgrade!
+### READ this before the upgrade!
 
 This major release adds [runtime-environment](https://codefresh.io/docs/docs/installation/codefresh-runner/#runtime-environment-specification) spec into chart templates.
 That means it is possible to set parametes for `dind` and `engine` pods via [values.yaml](./values.yaml).
@@ -138,6 +171,69 @@ runtime:
 Affected values:
 - `.runtime.dind.pvcs` converted from **list** to **dict**
 
+### To 6.x
+
+⚠️⚠️⚠️
+### READ this before the upgrade!
+
+This major release deprecates previously required `codefresh runner init --generate-helm-values-file`.
+
+Affected values:
+- **Replaced** `.monitor.clusterId` with `.global.context` as **mandatory** value!
+- **Deprecated** `.global.agentToken` / `.global.agentTokenSecretKeyRef`
+- **Removed** `.global.agentId`
+- **Removed** `.global.keys` / `.global.dindCertsSecretRef`
+- **Removed** `.global.existingAgentToken` / `existingDindCertsSecret`
+- **Removed** `.monitor.clusterId` / `.monitor.token` / `.monitor.existingMonitorToken`
+
+#### Migrate the Helm chart from version 5.x to 6.x
+
+Given this is the legacy `generated_values.yaml` values:
+
+> legacy `generated_values.yaml`
+```yaml
+{
+    "appProxy": {
+        "enabled": false,
+    },
+    "monitor": {
+        "enabled": false,
+        "clusterId": "my-cluster-name",
+        "token": "1234567890"
+    },
+    "global": {
+        "namespace": "namespace",
+        "codefreshHost": "https://g.codefresh.io",
+        "agentToken": "0987654321",
+        "agentId": "agent-id-here",
+        "agentName": "my-cluster-name_my-namespace",
+        "accountId": "my-account-id",
+        "runtimeName": "my-cluster-name/my-namespace",
+        "codefreshToken": "1234567890",
+        "keys": {
+            "key": "-----BEGIN RSA PRIVATE KEY-----...",
+            "csr": "-----BEGIN CERTIFICATE REQUEST-----...",
+            "ca": "-----BEGIN CERTIFICATE-----...",
+            "serverCert": "-----BEGIN CERTIFICATE-----..."
+        }
+    }
+}
+```
+
+Update `values.yaml` for new chart version:
+
+> For existing installation for backward compatibility `.Values.global.agentToken/agentTokenSecretKeyRef` **must be provided!** For installation from scratch this value is no longer required.
+
+> updated `values.yaml`
+```yaml
+global:
+  codefreshToken: "1234567890"
+  accountId: "my-account-id"
+  context: "my-cluster-name"
+  agentToken: "0987654321"  # MANDATORY when migrating from < 6.x chart version !
+  agentName: "my-cluster-name_my-namespace" # optional
+  runtimeName: "my-cluster-name/my-namespace" # optional
+```
 
 ## Architecture
 
diff --git a/charts/cf-runtime/files/cleanup-runtime.sh b/charts/cf-runtime/files/cleanup-runtime.sh
new file mode 100755
index 00000000..a3f6db69
--- /dev/null
+++ b/charts/cf-runtime/files/cleanup-runtime.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+echo "-----"
+echo "API_HOST:         ${API_HOST}"
+echo "AGENT_NAME:       ${AGENT_NAME}"
+echo "RUNTIME_NAME:     ${RUNTIME_NAME}"
+echo "AGENT:            ${AGENT}"
+echo "-----"
+
+auth() {
+  codefresh auth create-context --api-key ${API_TOKEN} --url ${API_HOST}
+}
+
+remove_runtime() {
+  if [ "$AGENT" == "true" ]; then
+    codefresh delete re ${RUNTIME_NAME} || true
+  else
+    codefresh delete sys-re ${RUNTIME_NAME} || true
+  fi
+}
+
+remove_agent() {
+  codefresh delete agent ${AGENT_NAME} || true
+}
+
+remove_finalizers() {
+  kubectl patch secret $(kubectl get secret -l codefresh.io/internal=true | awk 'NR>1{print $1}' | xargs) -p '{"metadata":{"finalizers":null}}' --type=merge || true
+}
+
+auth
+remove_runtime
+remove_agent
+remove_finalizers
\ No newline at end of file
diff --git a/charts/cf-runtime/files/configure-dind-certs.sh b/charts/cf-runtime/files/configure-dind-certs.sh
index 4e3366ae..a1092eb1 100644
--- a/charts/cf-runtime/files/configure-dind-certs.sh
+++ b/charts/cf-runtime/files/configure-dind-certs.sh
@@ -84,7 +84,7 @@ CF_SRV_TLS_CERT=${CERTS_DIR}/cf-server-cert.pem
 CF_SRV_TLS_CA_CERT=${CERTS_DIR}/cf-ca.pem
 mkdir -p $TMPDIR $CERTS_DIR
 
-K8S_CERT_SECRET_NAME=cf-certs-dind
+K8S_CERT_SECRET_NAME=codefresh-certs-server
 echo -e "\n------------------\nGenerating server tls certificates ... "
 
 SERVER_CERT_CN=${SERVER_CERT_CN:-"docker.codefresh.io"}
@@ -123,15 +123,10 @@ SERVER_CERT_EXTRA_SANS="${SERVER_CERT_EXTRA_SANS}"
 
 echo -e "\n------------------\nCreating certificate secret "
 
-  if ! kubectl -n$NAMESPACE get secret "${K8S_CERT_SECRET_NAME}"; then
-    kubectl -n$NAMESPACE create secret generic $K8S_CERT_SECRET_NAME \
-        --from-file=$SRV_TLS_CA_CERT \
-        --from-file=$SRV_TLS_KEY \
-        --from-file=$SRV_TLS_CERT || fatal "Failed storing the generated certificates in Kubernetes!"
-    kubectl label --overwrite secret ${K8S_CERT_SECRET_NAME} app.kubernetes.io/managed-by=Helm
-    kubectl annotate --overwrite secret ${K8S_CERT_SECRET_NAME} meta.helm.sh/release-name=$RELEASE
-    kubectl annotate --overwrite secret ${K8S_CERT_SECRET_NAME} meta.helm.sh/release-namespace=$NAMESPACE
-  else
-    msg "${K8S_CERT_SECRET_NAME} secret already exists. Skipping."
-  fi
-
+kubectl -n $NAMESPACE create secret generic $K8S_CERT_SECRET_NAME \
+    --from-file=$SRV_TLS_CA_CERT \
+    --from-file=$SRV_TLS_KEY \
+    --from-file=$SRV_TLS_CERT \
+    --dry-run=client -o yaml | kubectl apply --overwrite -f -
+kubectl -n $NAMESPACE label --overwrite secret ${K8S_CERT_SECRET_NAME} codefresh.io/internal=true
+kubectl -n $NAMESPACE patch secret $K8S_CERT_SECRET_NAME -p '{"metadata": {"finalizers": ["kubernetes"]}}'
diff --git a/charts/cf-runtime/files/init-runtime.sh b/charts/cf-runtime/files/init-runtime.sh
new file mode 100755
index 00000000..eb3488af
--- /dev/null
+++ b/charts/cf-runtime/files/init-runtime.sh
@@ -0,0 +1,80 @@
+#!/bin/bash
+
+echo "-----"
+echo "API_HOST:         ${API_HOST}"
+echo "AGENT_NAME:       ${AGENT_NAME}"
+echo "KUBE_CONTEXT:     ${KUBE_CONTEXT}"
+echo "KUBE_NAMESPACE:   ${KUBE_NAMESPACE}"
+echo "OWNER_NAME:       ${OWNER_NAME}"
+echo "RUNTIME_NAME:     ${RUNTIME_NAME}"
+echo "SECRET_NAME:      ${SECRET_NAME}"
+echo "-----"
+
+create_agent_secret() {
+
+  kubectl apply -f - <<EOF
+  apiVersion: v1
+  kind: Secret
+  type: Opaque
+  metadata:
+    name: ${SECRET_NAME}
+    namespace: ${KUBE_NAMESPACE}
+    labels:
+      codefresh.io/internal: "true"
+    finalizers:
+    - kubernetes
+    ownerReferences:
+    - apiVersion: apps/v1
+      kind: Deploy
+      name: ${OWNER_NAME}
+      uid: ${OWNER_UID}
+  stringData:
+    agent-codefresh-token: ${1}
+EOF
+
+}
+
+OWNER_UID=$(kubectl get deploy ${OWNER_NAME} --namespace ${KUBE_NAMESPACE} -o jsonpath='{.metadata.uid}')
+echo "got owner uid: ${OWNER_UID}"
+
+if [ ! -z "${AGENT_CODEFRESH_TOKEN}" ]; then
+    echo "-----"
+    echo "runtime and agent are already initialized"
+    echo "-----"
+    exit 0
+fi
+
+if [ ! -z "${EXISTING_AGENT_CODEFRESH_TOKEN}" ]; then
+    echo "using existing agentToken value"
+    create_agent_secret $EXISTING_AGENT_CODEFRESH_TOKEN
+    exit 0
+fi
+
+if [ -z "${USER_CODEFRESH_TOKEN}" ]; then
+    echo "-----"
+    echo "missing codefresh user token. must supply \".global.codefreshToken\" if agent-codefresh-token does not exist"
+    echo "-----"
+    exit 1
+fi
+
+codefresh auth create-context --api-key ${USER_CODEFRESH_TOKEN} --url ${API_HOST}
+
+# AGENT_TOKEN might be empty, in which case it will be returned by the call
+RES=$(codefresh install agent \
+    --name ${AGENT_NAME} \
+    --kube-context-name ${KUBE_CONTEXT} \
+    --kube-namespace ${KUBE_NAMESPACE} \
+    --agent-kube-namespace ${KUBE_NAMESPACE} \
+    --install-runtime \
+    --runtime-name ${RUNTIME_NAME} \
+    --skip-cluster-creation \
+    --platform-only)
+
+AGENT_CODEFRESH_TOKEN=$(echo "${RES}" | tail -n 1)
+echo "generated agent + runtime in platform"
+
+create_agent_secret $AGENT_CODEFRESH_TOKEN
+
+echo "-----"
+echo "done initializing runtime and agent"
+echo "-----"
diff --git a/charts/cf-runtime/templates/_components/app-proxy/_env-vars.yaml b/charts/cf-runtime/templates/_components/app-proxy/_env-vars.yaml
index 03767220..c9b9a0e3 100644
--- a/charts/cf-runtime/templates/_components/app-proxy/_env-vars.yaml
+++ b/charts/cf-runtime/templates/_components/app-proxy/_env-vars.yaml
@@ -3,7 +3,7 @@ PORT: 3000
 {{- end }}
 
 {{- define "app-proxy.environment-variables.calculated" }}
-CODEFRESH_HOST: {{ .Values.global.codefreshHost }}
+CODEFRESH_HOST: {{ include "runtime.runtime-environment-spec.codefresh-host" . }}
 {{- with .Values.ingress.pathPrefix }}
 API_PATH_PREFIX: {{ . | quote }}
 {{- end }}
diff --git a/charts/cf-runtime/templates/_components/monitor/_env-vars.yaml b/charts/cf-runtime/templates/_components/monitor/_env-vars.yaml
index 290144f3..f58c7fa2 100644
--- a/charts/cf-runtime/templates/_components/monitor/_env-vars.yaml
+++ b/charts/cf-runtime/templates/_components/monitor/_env-vars.yaml
@@ -6,13 +6,9 @@ NODE_OPTIONS: "--max_old_space_size=4096"
 {{- end }}
 
 {{- define "monitor.environment-variables.calculated" }}
-API_TOKEN:
-  valueFrom:
-    secretKeyRef:
-      name: {{ include "monitor.secretTokenName" . }}
-      key: codefresh.token
-CLUSTER_ID: {{ .Values.clusterId }}
-API_URL: {{ .Values.global.codefreshHost }}/api/k8s-monitor/events
+API_TOKEN: {{ include "runtime.installation-token-env-var-value" . | nindent 2 }}
+CLUSTER_ID: {{ include "runtime.runtime-environment-spec.context-name" . }}
+API_URL: {{ include "runtime.runtime-environment-spec.codefresh-host" . }}/api/k8s-monitor/events
 ACCOUNT_ID: {{ .Values.global.accountId }}
 NAMESPACE: {{ .Release.Namespace }}
 {{- if .Values.rbac.namespaced }}
diff --git a/charts/cf-runtime/templates/_components/monitor/_helpers.tpl b/charts/cf-runtime/templates/_components/monitor/_helpers.tpl
index 44197d7a..71cc1c02 100644
--- a/charts/cf-runtime/templates/_components/monitor/_helpers.tpl
+++ b/charts/cf-runtime/templates/_components/monitor/_helpers.tpl
@@ -30,18 +30,6 @@ Selector labels
 codefresh.io/application: monitor
 {{- end }}
 
-
-{{/*
-Get the token secret.
-*/}}
-{{- define "monitor.secretTokenName" -}}
-    {{- if .Values.existingMonitorToken -}}
-        {{- printf "%s" (tpl .Values.existingMonitorToken $) -}}
-    {{- else -}}
-        {{- printf "%s" (include "monitor.fullname" .) -}}
-    {{- end -}}
-{{- end -}}
-
 {{/*
 Create the name of the service account to use
 */}}
diff --git a/charts/cf-runtime/templates/_components/monitor/_secret.yaml b/charts/cf-runtime/templates/_components/monitor/_secret.yaml
deleted file mode 100644
index bc823f6c..00000000
--- a/charts/cf-runtime/templates/_components/monitor/_secret.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-{{- define "monitor.resources.secret" -}}
-apiVersion: v1
-kind: Secret
-type: Opaque
-metadata:
-  name: {{ include "monitor.fullname" . }}
-  labels:
-    {{- include "monitor.labels" . | nindent 4 }}
-data:
-  codefresh.token: {{ .Values.token | b64enc }}
-{{- end -}}
diff --git a/charts/cf-runtime/templates/_components/runner/_deployment.yaml b/charts/cf-runtime/templates/_components/runner/_deployment.yaml
index f4d00eb0..6b263d41 100644
--- a/charts/cf-runtime/templates/_components/runner/_deployment.yaml
+++ b/charts/cf-runtime/templates/_components/runner/_deployment.yaml
@@ -27,10 +27,26 @@ spec:
       {{- if .Values.podSecurityContext.enabled }}
       securityContext: {{- omit .Values.podSecurityContext "enabled" | toYaml | nindent 8 }}
       {{- end }}
+      initContainers:
+      - name: init
+        image: {{ include (printf "%s.image.name" $cfCommonTplSemver ) (dict "image" .Values.init.image "context" .) }}
+        imagePullPolicy: {{ .Values.init.image.pullPolicy | default "IfNotPresent" }}
+        command:
+        - /bin/bash
+        args:
+        - -ec
+        - |
+          {{ .Files.Get "files/init-runtime.sh" | nindent 10 }}
+        env:
+        {{- include "runner-init.environment-variables" . | nindent 8 }}
+        {{- with .Values.init.resources }}
+        resources:
+          {{- toYaml . | nindent 10  }}
+        {{- end }}
       containers:
       - name: runner
         image: {{ include (printf "%s.image.name" $cfCommonTplSemver ) (dict "image" .Values.image "context" .) }}
-        imagePullPolicy: {{ .Values.image.pullPolicy | default "Always" }}
+        imagePullPolicy: {{ .Values.image.pullPolicy | default "IfNotPresent" }}
         env:
         {{- include "runner.environment-variables" . | nindent 8 }}
         ports:
@@ -45,10 +61,12 @@ spec:
           httpGet:
             path: /health
             port: http
+        {{- with .Values.resources }}
         resources:
-          {{- toYaml .Values.resources | nindent 12  }}
-        volumeMounts:
+          {{- toYaml . | nindent 10  }}
+        {{- end }}
         {{- with .Values.extraVolumeMounts }}
+        volumeMounts:
           {{- toYaml . | nindent 8 }}
         {{- end }}
       {{- with .Values.nodeSelector }}
@@ -63,8 +81,8 @@ spec:
       tolerations:
         {{- toYaml . | nindent 6 }}
       {{- end }}
-      volumes:
       {{- with .Values.extraVolumes }}
+      volumes:
         {{- toYaml . | nindent 6 }}
       {{- end }}
 {{- end -}}
\ No newline at end of file
diff --git a/charts/cf-runtime/templates/_components/runner/_helpers.tpl b/charts/cf-runtime/templates/_components/runner/_helpers.tpl
index 9c8d5e48..2608cb67 100644
--- a/charts/cf-runtime/templates/_components/runner/_helpers.tpl
+++ b/charts/cf-runtime/templates/_components/runner/_helpers.tpl
@@ -2,7 +2,7 @@
 Expand the name of the chart.
 */}}
 {{- define "runner.name" -}}
-    {{- printf "%s-%s" (include "cf-runtime.name" .) "runner" | trunc 63 | trimSuffix "-" }}
+  {{- printf "%s-%s" (include "cf-runtime.name" .) "runner" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
@@ -11,7 +11,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 If release name contains chart name it will be used as a full name.
 */}}
 {{- define "runner.fullname" -}}
-    {{- printf "%s-%s" (include "cf-runtime.fullname" .) "runner" | trunc 63 | trimSuffix "-" }}
+  {{- printf "%s-%s" (include "cf-runtime.fullname" .) "runner" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
@@ -30,34 +30,13 @@ Selector labels
 codefresh.io/application: runner
 {{- end }}
 
-{{/*
-Get the token secret.
-*/}}
-{{- define "runner.secretTokenName" -}}
-  {{- if .Values.global.agentToken }}
-valueFrom:
-  secretKeyRef:
-    name: {{ include "runner.fullname" . }}
-    key: codefresh-agent-token
-  {{- else if .Values.global.agentTokenSecretKeyRef  }}
-valueFrom:
-  secretKeyRef:
-  {{- .Values.global.agentTokenSecretKeyRef | toYaml | nindent 4 }}
-  {{- else if .Values.global.existingAgentToken }}
-valueFrom:
-  secretKeyRef:
-    name: {{ printf "%s" (tpl .Values.global.existingAgentToken .) }}
-    key: codefresh.token
-  {{- end }}
-{{- end }}
-
 {{/*
 Create the name of the service account to use
 */}}
 {{- define "runner.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "runner.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
+  {{- if .Values.serviceAccount.create }}
+    {{- default (include "runner.fullname" .) .Values.serviceAccount.name }}
+  {{- else }}
+    {{- default "default" .Values.serviceAccount.name }}
+  {{- end }}
 {{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/charts/cf-runtime/templates/_components/runner/_rbac.yaml b/charts/cf-runtime/templates/_components/runner/_rbac.yaml
index 563f0eaa..c61863a2 100644
--- a/charts/cf-runtime/templates/_components/runner/_rbac.yaml
+++ b/charts/cf-runtime/templates/_components/runner/_rbac.yaml
@@ -23,6 +23,12 @@ rules:
   - apiGroups: [ "" ]
     resources: [ "pods", "persistentvolumeclaims" ]
     verbs: [ "get", "create", "delete" ]
+  - apiGroups: [ "" ]
+    resources: [ "configmaps", "secrets" ]
+    verbs: [ "get", "create" ]
+  - apiGroups: [ "apps" ]
+    resources: [ "deployments" ]
+    verbs: [ "get" ]
 {{- with .Values.rbac.rules }}
   {{ toYaml . | nindent 2 }}
 {{- end }}
diff --git a/charts/cf-runtime/templates/_components/runner/_secret.yaml b/charts/cf-runtime/templates/_components/runner/_secret.yaml
deleted file mode 100644
index 0f53968b..00000000
--- a/charts/cf-runtime/templates/_components/runner/_secret.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-{{- define "runner.resources.secret" -}}
-apiVersion: v1
-kind: Secret
-type: Opaque
-metadata:
-  name: {{ include "runner.fullname" . }}
-  labels:
-    {{- include "runner.labels" . | nindent 4 }}
-data:
-  codefresh-agent-token: {{ .Values.global.agentToken | b64enc }}
-{{- end -}}
\ No newline at end of file
diff --git a/charts/cf-runtime/templates/_components/runner/environment-variables/_init-container.yaml b/charts/cf-runtime/templates/_components/runner/environment-variables/_init-container.yaml
new file mode 100644
index 00000000..6dda110f
--- /dev/null
+++ b/charts/cf-runtime/templates/_components/runner/environment-variables/_init-container.yaml
@@ -0,0 +1,30 @@
+{{- define "runner-init.environment-variables.defaults" }}
+HOME: /tmp
+{{- end }}
+
+{{- define "runner-init.environment-variables.calculated" }}
+AGENT_NAME: {{ include "runtime.runtime-environment-spec.agent-name" . }}
+API_HOST: {{ include "runtime.runtime-environment-spec.codefresh-host" . }}
+AGENT_CODEFRESH_TOKEN:
+  valueFrom:
+    secretKeyRef:
+      name: {{ include "runner.fullname" . }}
+      key: agent-codefresh-token
+      optional: true
+EXISTING_AGENT_CODEFRESH_TOKEN: {{ include "runtime.agent-token-env-var-value" . | nindent 2 }}
+KUBE_CONTEXT: {{ include "runtime.runtime-environment-spec.context-name" . }}
+KUBE_NAMESPACE: {{ .Release.Namespace }}
+OWNER_NAME: {{ include "runner.fullname" . }}
+RUNTIME_NAME: {{ include "runtime.runtime-environment-spec.runtime-name" . }}
+SECRET_NAME: {{ include "runner.fullname" . }}
+USER_CODEFRESH_TOKEN: {{ include "runtime.installation-token-env-var-value" . | nindent 2 }}
+{{- end }}
+
+{{- define "runner-init.environment-variables" }}
+  {{- $cfCommonTplSemver := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version }}
+  {{- $defaults := (include "runner-init.environment-variables.defaults" . | fromYaml) }}
+  {{- $calculated := (include "runner-init.environment-variables.calculated" . | fromYaml) }}
+  {{- $overrides := .Values.env }}
+  {{- $mergedValues := mergeOverwrite (merge $defaults $calculated) $overrides }}
+  {{- include (printf "%s.env-vars" $cfCommonTplSemver) (dict "Values" $mergedValues "context" .) }}
+{{- end }}
diff --git a/charts/cf-runtime/templates/_components/runner/_env-vars.yaml b/charts/cf-runtime/templates/_components/runner/environment-variables/_main-container.yaml
similarity index 74%
rename from charts/cf-runtime/templates/_components/runner/_env-vars.yaml
rename to charts/cf-runtime/templates/_components/runner/environment-variables/_main-container.yaml
index 5cf591ef..4d3f0304 100644
--- a/charts/cf-runtime/templates/_components/runner/_env-vars.yaml
+++ b/charts/cf-runtime/templates/_components/runner/environment-variables/_main-container.yaml
@@ -7,10 +7,14 @@ SELF_DEPLOYMENT_NAME:
 {{- end }}
 
 {{- define "runner.environment-variables.calculated" }}
-AGENT_ID: {{ .Values.global.agentName }}
-CODEFRESH_TOKEN: {{ include "runner.secretTokenName" . | nindent 2 }}
-CODEFRESH_IN_CLUSTER_RUNTIME: {{ .Values.global.runtimeName }}
+AGENT_ID: {{ include "runtime.runtime-environment-spec.agent-name" . }}
 CODEFRESH_HOST: {{ include "runtime.runtime-environment-spec.codefresh-host" . }}
+CODEFRESH_IN_CLUSTER_RUNTIME: {{ include "runtime.runtime-environment-spec.runtime-name" . }}
+CODEFRESH_TOKEN:
+  valueFrom:
+    secretKeyRef:
+      name: {{ include "runner.fullname" . }}
+      key: agent-codefresh-token
 DOCKER_REGISTRY: {{ .Values.global.imageRegistry }}
 {{- end }}
 
@@ -21,4 +25,4 @@ DOCKER_REGISTRY: {{ .Values.global.imageRegistry }}
 {{- $overrides := .Values.env }}
 {{- $mergedValues := mergeOverwrite (merge $defaults $calculated) $overrides }}
 {{- include (printf "%s.env-vars" $cfCommonTplSemver) (dict "Values" $mergedValues "context" .) }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/cf-runtime/templates/_components/volume-provisioner/_secret.yaml b/charts/cf-runtime/templates/_components/volume-provisioner/_secret.yaml
index fdeb0b58..9da7987b 100644
--- a/charts/cf-runtime/templates/_components/volume-provisioner/_secret.yaml
+++ b/charts/cf-runtime/templates/_components/volume-provisioner/_secret.yaml
@@ -7,15 +7,15 @@ metadata:
   name: {{ include "dind-volume-provisioner.fullname" . }}
   labels:
     {{- include "dind-volume-provisioner.labels" . | nindent 4 }}
-data:
+stringData:
   {{- with .Values.storage.gcedisk.serviceAccountJson }}
-  google-service-account.json: {{ .| b64enc }}
+  google-service-account.json: {{ . }}
   {{- end }}
   {{- with .Values.storage.ebs.accessKeyId }}
-  aws_access_key_id: {{ . | b64enc }}
+  aws_access_key_id: {{ . }}
   {{- end }}
   {{- with .Values.storage.ebs.secretAccessKey }}
-  aws_secret_access_key: {{ . | b64enc }}
+  aws_secret_access_key: {{ . }}
   {{- end }}
 {{- end }}
 {{- end -}}
diff --git a/charts/cf-runtime/templates/hooks/cm-update-runtime.yaml b/charts/cf-runtime/templates/hooks/post-install/cm-update-runtime.yaml
similarity index 100%
rename from charts/cf-runtime/templates/hooks/cm-update-runtime.yaml
rename to charts/cf-runtime/templates/hooks/post-install/cm-update-runtime.yaml
diff --git a/charts/cf-runtime/templates/hooks/job-gencerts-dind.yaml b/charts/cf-runtime/templates/hooks/post-install/job-gencerts-dind.yaml
similarity index 95%
rename from charts/cf-runtime/templates/hooks/job-gencerts-dind.yaml
rename to charts/cf-runtime/templates/hooks/post-install/job-gencerts-dind.yaml
index d835b8c4..8df0f6a0 100644
--- a/charts/cf-runtime/templates/hooks/job-gencerts-dind.yaml
+++ b/charts/cf-runtime/templates/hooks/post-install/job-gencerts-dind.yaml
@@ -1,6 +1,6 @@
 {{ $cfCommonTplSemver := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version }}
 {{ $values := .Values.runtime.gencerts }}
-{{- if and $values.enabled (not .Values.runtime.agent) }}
+{{- if and $values.enabled }}
 ---
 apiVersion: batch/v1
 kind: Job
@@ -11,7 +11,7 @@ metadata:
   annotations:
     helm.sh/hook: post-install,post-upgrade
     helm.sh/hook-weight: "3"
-    helm.sh/hook-delete-policy: before-hook-creation
+    helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
     {{- with $values.annotations }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
diff --git a/charts/cf-runtime/templates/runtime/job-update-runtime.yaml b/charts/cf-runtime/templates/hooks/post-install/job-update-runtime.yaml
similarity index 94%
rename from charts/cf-runtime/templates/runtime/job-update-runtime.yaml
rename to charts/cf-runtime/templates/hooks/post-install/job-update-runtime.yaml
index 1ac7866e..955e882d 100644
--- a/charts/cf-runtime/templates/runtime/job-update-runtime.yaml
+++ b/charts/cf-runtime/templates/hooks/post-install/job-update-runtime.yaml
@@ -11,7 +11,7 @@ metadata:
   annotations:
     helm.sh/hook: post-install,post-upgrade
     helm.sh/hook-weight: "5"
-    helm.sh/hook-delete-policy: before-hook-creation
+    helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
     {{- with $values.annotations }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -51,7 +51,7 @@ spec:
         - name: API_KEY
           {{- include "runtime.installation-token-env-var-value" . | indent 10}}
         - name: API_HOST
-          value: {{ .Values.global.codefreshHost }}
+          value: {{ include "runtime.runtime-environment-spec.codefresh-host" . }}
           {{- include (printf "%s.env-vars" $cfCommonTplSemver) (dict "Values" $values.env "context" .) | nindent 8 }}
         volumeMounts:
         - name: config
diff --git a/charts/cf-runtime/templates/hooks/rbac-gencerts-dind.yaml b/charts/cf-runtime/templates/hooks/post-install/rbac-gencerts-dind.yaml
similarity index 94%
rename from charts/cf-runtime/templates/hooks/rbac-gencerts-dind.yaml
rename to charts/cf-runtime/templates/hooks/post-install/rbac-gencerts-dind.yaml
index ac151895..4907dac3 100644
--- a/charts/cf-runtime/templates/hooks/rbac-gencerts-dind.yaml
+++ b/charts/cf-runtime/templates/hooks/post-install/rbac-gencerts-dind.yaml
@@ -1,6 +1,6 @@
 {{ $cfCommonTplSemver := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version }}
 {{ $values := .Values.runtime.gencerts }}
-{{- if and $values.enabled (not .Values.runtime.agent) }}
+{{- if and $values.enabled }}
 ---
 apiVersion: v1
 kind: ServiceAccount
diff --git a/charts/cf-runtime/templates/hooks/job-delete-runtime.yaml b/charts/cf-runtime/templates/hooks/pre-delete/job-cleanup-resources.yaml
similarity index 69%
rename from charts/cf-runtime/templates/hooks/job-delete-runtime.yaml
rename to charts/cf-runtime/templates/hooks/pre-delete/job-cleanup-resources.yaml
index 07f80fc4..9c9b48d5 100644
--- a/charts/cf-runtime/templates/hooks/job-delete-runtime.yaml
+++ b/charts/cf-runtime/templates/hooks/pre-delete/job-cleanup-resources.yaml
@@ -1,17 +1,16 @@
 {{ $cfCommonTplSemver := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version }}
 {{ $values := .Values.runtime.patch }}
-{{- if $values.enabled }}
+{{- if and $values.enabled }}
 ---
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: {{ include "runtime.fullname" . }}-delete
+  name: {{ include "runtime.fullname" . }}-cleanup
   labels:
     {{- include "runtime.labels" . | nindent 4 }}
   annotations:
     helm.sh/hook: pre-delete
-    helm.sh/hook-weight: "0"
-    helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
+    helm.sh/hook-delete-policy:  hook-succeeded,before-hook-creation
     {{- with $values.annotations }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -24,14 +23,17 @@ spec:
   {{- end }}
   template:
     metadata:
-      name: {{ include "runtime.fullname" . }}-delete
+      name: {{ include "runtime.fullname" . }}-cleanup
       labels:
         {{- include "runtime.labels" . | nindent 8 }}
     spec:
+      {{- if $values.rbac.enabled }}
+      serviceAccountName: {{ template "runtime.fullname" . }}-cleanup
+      {{- end }}
       securityContext:
         {{- toYaml $values.podSecurityContext | nindent 8 }}
       containers:
-      - name: delete-runtime
+      - name: cleanup
         image: {{ include (printf "%s.image.name" $cfCommonTplSemver ) (dict "image" $values.image "context" .) }}
         imagePullPolicy: {{ $values.image.pullPolicy | default "Always" }}
         command:
@@ -39,17 +41,18 @@ spec:
         args:
         - -ec
         - |
-          codefresh auth create-context --api-key $API_KEY --url $API_HOST
-{{- if .Values.runtime.agent }}
-          exit 0  # TO-DO
-{{- else }}
-          codefresh delete sys-re {{ .Values.global.runtimeName }} || true
-{{- end }}
+          {{ .Files.Get "files/cleanup-runtime.sh" | nindent 10 }}
         env:
-        - name: API_KEY
-          {{- include "runtime.installation-token-env-var-value" . | indent 10}}
+        - name: AGENT_NAME
+          value: {{ include "runtime.runtime-environment-spec.agent-name" . }}
+        - name: RUNTIME_NAME
+          value: {{ include "runtime.runtime-environment-spec.runtime-name" . }}
         - name: API_HOST
           value: {{ include "runtime.runtime-environment-spec.codefresh-host" . }}
+        - name: API_TOKEN
+          {{- include "runtime.installation-token-env-var-value" . | indent 10}}
+        - name: AGENT
+          value: {{ .Values.runtime.agent | quote }}
           {{- include (printf "%s.env-vars" $cfCommonTplSemver) (dict "Values" $values.env "context" .) | nindent 8 }}
       {{- with $values.nodeSelector }}
       nodeSelector:
diff --git a/charts/cf-runtime/templates/hooks/pre-delete/rbac-cleanup-resources.yaml b/charts/cf-runtime/templates/hooks/pre-delete/rbac-cleanup-resources.yaml
new file mode 100644
index 00000000..468ec221
--- /dev/null
+++ b/charts/cf-runtime/templates/hooks/pre-delete/rbac-cleanup-resources.yaml
@@ -0,0 +1,46 @@
+{{ $cfCommonTplSemver := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version }}
+{{ $values := .Values.runtime.patch }}
+{{- if and $values.enabled }}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "runtime.fullname" . }}-cleanup
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": pre-delete
+    "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation,hook-failed
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ include "runtime.fullname" . }}-cleanup
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": pre-delete
+    "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation,hook-failed
+rules:
+  - apiGroups:
+      - "*"
+    resources:
+      - "*"
+    verbs:
+      - "*"
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ include "runtime.fullname" . }}-cleanup
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    "helm.sh/hook": pre-delete
+    "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation,hook-failed
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ include "runtime.fullname" . }}-cleanup
+subjects:
+  - kind: ServiceAccount
+    name: {{ include "runtime.fullname" . }}-cleanup
+    namespace: {{ .Release.Namespace }}
+{{ end }}
\ No newline at end of file
diff --git a/charts/cf-runtime/templates/monitor/secret.yaml b/charts/cf-runtime/templates/monitor/secret.yaml
deleted file mode 100644
index f14c8a99..00000000
--- a/charts/cf-runtime/templates/monitor/secret.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-{{- $monitorContext := deepCopy . }}
-{{- $_ := set $monitorContext "Values" (get .Values "monitor") }}
-{{- $_ := set $monitorContext.Values "global" (get .Values "global") }}
-
-{{- if and $monitorContext.Values.enabled (not $monitorContext.Values.existingMonitorToken) }}
-{{- include "monitor.resources.secret" $monitorContext }}
-{{- end }}
diff --git a/charts/cf-runtime/templates/runner/secret.yaml b/charts/cf-runtime/templates/runner/secret.yaml
deleted file mode 100644
index acdc5484..00000000
--- a/charts/cf-runtime/templates/runner/secret.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-{{- $runnerContext := deepCopy . }}
-{{- $_ := set $runnerContext "Values" (get .Values "runner") }}
-{{- $_ := set $runnerContext.Values "global" (get .Values "global") }}
-
-{{- if and $runnerContext.Values.enabled (not (or $runnerContext.Values.global.existingAgentToken $runnerContext.Values.global.agentTokenSecretKeyRef)) .Values.runtime.agent }}
-{{- include "runner.resources.secret" $runnerContext }}
-{{- end }}
diff --git a/charts/cf-runtime/templates/runtime/_helpers.tpl b/charts/cf-runtime/templates/runtime/_helpers.tpl
index 4faf007c..6ba04fcc 100644
--- a/charts/cf-runtime/templates/runtime/_helpers.tpl
+++ b/charts/cf-runtime/templates/runtime/_helpers.tpl
@@ -58,6 +58,19 @@ valueFrom:
   {{- end }}
 {{- end }}
 
+{{/*
+Environment variable value of Codefresh agent token
+*/}}
+{{- define "runtime.agent-token-env-var-value" -}}
+  {{- if .Values.global.agentToken }}
+{{- printf "%s" .Values.global.agentToken | toYaml }}
+  {{- else if .Values.global.agentTokenSecretKeyRef  }}
+valueFrom:
+  secretKeyRef:
+  {{- .Values.global.agentTokenSecretKeyRef | toYaml | nindent 4 }}
+  {{- end }}
+{{- end }}
+
 {{/*
 Print Codefresh API token secret name
 */}}
@@ -65,25 +78,46 @@ Print Codefresh API token secret name
 {{- print "codefresh-user-token" }}
 {{- end }}
 
+{{/*
+Print Codefresh host
+*/}}
+{{- define "runtime.runtime-environment-spec.codefresh-host" }}
+{{- if and (not .Values.global.codefreshHost) }}
+  {{- fail "ERROR: .global.codefreshHost is required" }}
+{{- else }}
+  {{- printf "%s" (trimSuffix "/" .Values.global.codefreshHost) }}
+{{- end }}
+{{- end }}
+
 {{/*
 Print runtime-environment name
 */}}
-{{- define "runtime.runtime-environment-spec.name" }}
-{{- if and (not .Values.runtime.agent) }}
-  {{- if not (hasPrefix "system/" .Values.global.runtimeName) }}
-    {{- fail "ERROR: .runtime.agent is set to false! .global.runtimeName should start with system/ prefix" }}
-  {{- else }}
-    {{- printf "%s" (required ".global.runtimeName is required" .Values.global.runtimeName) }}
-  {{- end }}
+{{- define "runtime.runtime-environment-spec.runtime-name" }}
+{{- if and (not .Values.global.runtimeName) }}
+  {{- printf "%s/%s" .Values.global.context .Release.Namespace }}
 {{- else }}
-{{- printf "%s" (required ".global.runtimeName is required" .Values.global.runtimeName) }}
+  {{- printf "%s" .Values.global.runtimeName }}
 {{- end }}
 {{- end }}
 
-{{- define "runtime.runtime-environment-spec.codefresh-host" }}
-{{- if and (not .Values.global.codefreshHost) }}
-  {{- fail "ERROR: .global.codefreshHost is required" }}
+{{/*
+Print agent name
+*/}}
+{{- define "runtime.runtime-environment-spec.agent-name" }}
+{{- if and (not .Values.global.agentName) }}
+  {{- printf "%s_%s" .Values.global.context .Release.Namespace }}
 {{- else }}
-  {{- printf "%s" (trimSuffix "/" .Values.global.codefreshHost) }}
+  {{- printf "%s" .Values.global.agentName }}
+{{- end }}
+{{- end }}
+
+{{/*
+Print context
+*/}}
+{{- define "runtime.runtime-environment-spec.context-name" }}
+{{- if and (not .Values.global.context) }}
+  {{- fail "ERROR: .global.context is required" }}
+{{- else }}
+  {{- printf "%s" .Values.global.context }}
+{{- end }}
 {{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/charts/cf-runtime/templates/runtime/cm-dind-daemon.yaml b/charts/cf-runtime/templates/runtime/cm-dind-daemon.yaml
index 00e2d76f..fc7f9290 100644
--- a/charts/cf-runtime/templates/runtime/cm-dind-daemon.yaml
+++ b/charts/cf-runtime/templates/runtime/cm-dind-daemon.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  {{/* has to be a constant */}}
+  {{- /* has to be a constant */}}
   name: codefresh-dind-config
   labels:
     {{- include "runtime.labels" . | nindent 4 }}
diff --git a/charts/cf-runtime/templates/runtime/runtime-env-spec-tmpl.yaml b/charts/cf-runtime/templates/runtime/runtime-env-spec-tmpl.yaml
index 4a673ca7..82fc0a09 100644
--- a/charts/cf-runtime/templates/runtime/runtime-env-spec-tmpl.yaml
+++ b/charts/cf-runtime/templates/runtime/runtime-env-spec-tmpl.yaml
@@ -1,11 +1,11 @@
 {{- define "runtime.runtime-environment-spec.template" }}
 {{- $cfCommonTplSemver := printf "cf-common-%s" (index .Subcharts "cf-common").Chart.Version -}}
-{{- $kubeconfigFilePath := trimPrefix "system/" .Values.global.runtimeName -}}
-{{- $name := trimPrefix "system/" .Values.global.runtimeName -}}
+{{- $kubeconfigFilePath := (include "runtime.runtime-environment-spec.runtime-name" .) -}}
+{{- $name := (include "runtime.runtime-environment-spec.runtime-name" .) -}}
 {{- $engineContext := .Values.runtime.engine -}}
 {{- $dindContext := .Values.runtime.dind -}}
 metadata:
-  name: {{ include "runtime.runtime-environment-spec.name" . }}
+  name: {{ include "runtime.runtime-environment-spec.runtime-name" . }}
   agent: {{ .Values.runtime.agent }}
 extends: {{- toYaml .Values.runtime.runtimeExtends | nindent 2 }}
 {{- with .Values.runtime.description }}
@@ -49,7 +49,7 @@ runtimeScheduler:
     {{- if .Values.runtime.agent }}
     clusterProvider:
       accountId: {{ .Values.global.accountId }}
-      selector: {{ .Values.monitor.clusterId }}
+      selector: {{ include "runtime.runtime-environment-spec.context-name" . }}
     {{- else }}
       {{- if .Values.runtime.inCluster }}
     inCluster: true
@@ -95,7 +95,7 @@ dockerDaemonScheduler:
     {{- if .Values.runtime.agent }}
     clusterProvider:
       accountId: {{ .Values.global.accountId }}
-      selector: {{ .Values.monitor.clusterId }}
+      selector: {{ include "runtime.runtime-environment-spec.context-name" . }}
     {{- else }}
       {{- if .Values.runtime.inCluster }}
     inCluster: true
@@ -148,14 +148,14 @@ dockerDaemonScheduler:
   {{- if and (not .Values.runtime.agent)  }}
   clientCertPath: /etc/ssl/cf/
   volumeMounts:
-    cf-certs-dind:
-      name: cf-certs-dind
+    codefresh-certs-server:
+      name: codefresh-certs-server
       mountPath: /etc/ssl/cf
       readOnly: false
   volumes:
-    cf-certs-dind:
-      name: cf-certs-dind
+    codefresh-certs-server:
+      name: codefresh-certs-server
       secret:
-        secretName: cf-certs-dind
+        secretName: codefresh-certs-server
   {{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/charts/cf-runtime/templates/runtime/secret-dind-certs.yaml b/charts/cf-runtime/templates/runtime/secret-dind-certs.yaml
deleted file mode 100644
index cdfeaddc..00000000
--- a/charts/cf-runtime/templates/runtime/secret-dind-certs.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-{{- if .Values.runtime.agent }}
-{{- if not (or .Values.global.existingDindCertsSecret .Values.global.dindCertsSecretRef) }}
-apiVersion: v1
-type: Opaque
-kind: Secret
-metadata:
-  {{/* has to be a constant */}}
-  name: codefresh-certs-server
-  labels:
-    {{- include "runtime.labels" . | nindent 4 }}
-data:
-  server-cert.pem: {{ .Values.global.keys.serverCert | b64enc }}
-  server-key.pem: {{ .Values.global.keys.key | b64enc }}
-  ca.pem: {{ .Values.global.keys.ca | b64enc }}
-{{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/charts/cf-runtime/templates/runtime/secret.yaml b/charts/cf-runtime/templates/runtime/secret.yaml
index afe1022d..2366d3cc 100644
--- a/charts/cf-runtime/templates/runtime/secret.yaml
+++ b/charts/cf-runtime/templates/runtime/secret.yaml
@@ -6,6 +6,6 @@ metadata:
   name: {{ include "runtime.installation-token-secret-name" . }}
   labels:
     {{- include "runtime.labels" . | nindent 4 }}
-data:
-  codefresh-api-token: {{ .Values.global.codefreshToken | b64enc }}
+stringData:
+  codefresh-api-token: {{ .Values.global.codefreshToken }}
 {{- end }}
\ No newline at end of file
diff --git a/charts/cf-runtime/tests/generated_values.yaml b/charts/cf-runtime/tests/generated_values.yaml
deleted file mode 100644
index 5137fd1f..00000000
--- a/charts/cf-runtime/tests/generated_values.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "appProxy": {
-        "enabled": false,
-    },
-    "monitor": {
-        "enabled": false,
-        "clusterId": "my-context"
-    },
-    "global": {
-        "namespace": "codefresh",
-        "codefreshHost": "https://g.codefresh.io",
-        "agentToken": "123",
-        "agentId": "456",
-        "agentName": "my-context_codefresh",
-        "accountId": "7890",
-        "runtimeName": "my-context/codefresh",
-        "keys": {
-            "key": "key",
-            "csr": "csr",
-            "ca": "ca",
-            "serverCert": "server"
-        }
-    }
-}
\ No newline at end of file
diff --git a/charts/cf-runtime/tests/runner/runner_test.yaml b/charts/cf-runtime/tests/runner/runner_test.yaml
index d972bdc0..d7c7a7ce 100644
--- a/charts/cf-runtime/tests/runner/runner_test.yaml
+++ b/charts/cf-runtime/tests/runner/runner_test.yaml
@@ -1,7 +1,7 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/quintush/helm-unittest/master/schema/helm-testsuite.json
 suite: runner test
 values:
-  - ../generated_values.yaml
+  - ../values.yaml
 templates:
   - templates/runner/deployment.yaml
   - templates/runner/rbac.yaml
@@ -194,7 +194,7 @@ tests:
   - it: Test default runner agent token
     template: templates/runner/deployment.yaml
     values:
-      - ../generated_values.yaml
+      - ../values.yaml
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
@@ -204,24 +204,25 @@ tests:
             name: CODEFRESH_TOKEN
             valueFrom:
               secretKeyRef:
-                key: codefresh-agent-token
+                key: agent-codefresh-token
                 name: cf-runtime-runner
 
-  - it: Test runner agent token secret ref
-    template: templates/runner/deployment.yaml
-    set:
-      global.agentToken: ""
-      global.agentTokenSecretKeyRef:
-        name: my-secret
-        key: my-key
-    asserts:
-      - contains:
-          path: spec.template.spec.containers[0].env
-          count: 1
-          any: true
-          content:
-            name: CODEFRESH_TOKEN
-            valueFrom:
-              secretKeyRef:
-                name: my-secret
-                key: my-key
\ No newline at end of file
+  # DEPRECATED -- `global.agentToken` is deprecated
+  # - it: Test runner agent token secret ref
+  #   template: templates/runner/deployment.yaml
+  #   set:
+  #     global.agentToken: ""
+  #     global.agentTokenSecretKeyRef:
+  #       name: my-secret
+  #       key: my-key
+  #   asserts:
+  #     - contains:
+  #         path: spec.template.spec.containers[0].env
+  #         count: 1
+  #         any: true
+  #         content:
+  #           name: CODEFRESH_TOKEN
+  #           valueFrom:
+  #             secretKeyRef:
+  #               name: my-secret
+  #               key: my-key
\ No newline at end of file
diff --git a/charts/cf-runtime/tests/runtime/runtime_onprem_test.yaml b/charts/cf-runtime/tests/runtime/runtime_onprem_test.yaml
index 1a8f9e41..0bff051d 100644
--- a/charts/cf-runtime/tests/runtime/runtime_onprem_test.yaml
+++ b/charts/cf-runtime/tests/runtime/runtime_onprem_test.yaml
@@ -1,8 +1,8 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/quintush/helm-unittest/master/schema/helm-testsuite.json
 suite: runtime onprem test
 templates:
-  - templates/hooks/job-update-runtime.yaml
-  - templates/hooks/cm-update-runtime.yaml
+  - templates/hooks/post-install/job-update-runtime.yaml
+  - templates/hooks/post-install/cm-update-runtime.yaml
   - templates/runtime/secret.yaml
 release:
   name: cf-runtime
@@ -14,7 +14,7 @@ chart:
   appVersion: 1.0.0
 tests:
   - it: Test default runtime spec metadata
-    template: templates/hooks/cm-update-runtime.yaml
+    template: templates/hooks/post-install/cm-update-runtime.yaml
     values:
       - ./runtime_onprem_values.yaml
     asserts:
@@ -26,7 +26,7 @@ tests:
           path: data["runtime.yaml"]
 
   - it: Test runtime spec override
-    template: templates/hooks/cm-update-runtime.yaml
+    template: templates/hooks/post-install/cm-update-runtime.yaml
     values:
       - ./runtime_onprem_values.yaml
     asserts:
@@ -143,12 +143,12 @@ tests:
                     secretName: tls-secret
               clientCertPath: /etc/ssl/cf/
               volumeMounts:
-                cf-certs-dind:
-                  name: cf-certs-dind
+                codefresh-certs-server:
+                  name: codefresh-certs-server
                   mountPath: /etc/ssl/cf
                   readOnly: false
               volumes:
-                cf-certs-dind:
-                  name: cf-certs-dind
+                codefresh-certs-server:
+                  name: codefresh-certs-server
                   secret:
-                    secretName: cf-certs-dind
\ No newline at end of file
+                    secretName: codefresh-certs-server
\ No newline at end of file
diff --git a/charts/cf-runtime/tests/runtime/runtime_onprem_values.yaml b/charts/cf-runtime/tests/runtime/runtime_onprem_values.yaml
index 7f61cde8..0fd45143 100644
--- a/charts/cf-runtime/tests/runtime/runtime_onprem_values.yaml
+++ b/charts/cf-runtime/tests/runtime/runtime_onprem_values.yaml
@@ -21,7 +21,8 @@ runtime:
         cpu: 1000m
         memory: 2048Mi
     pvcs:
-      - name: dind
+      dind:
+        name: dind
         storageClassName: my-custom-storage-class
         volumeSize: 8Gi
         reuseVolumeSelector: 'codefresh-app,io.codefresh.accountName'
diff --git a/charts/cf-runtime/tests/runtime/runtime_test.yaml b/charts/cf-runtime/tests/runtime/runtime_test.yaml
index 2a8e306a..bc3da068 100644
--- a/charts/cf-runtime/tests/runtime/runtime_test.yaml
+++ b/charts/cf-runtime/tests/runtime/runtime_test.yaml
@@ -1,10 +1,10 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/quintush/helm-unittest/master/schema/helm-testsuite.json
 suite: runtime test
 values:
-  - ../generated_values.yaml
+  - ../values.yaml
 templates:
-  - templates/hooks/job-update-runtime.yaml
-  - templates/hooks/cm-update-runtime.yaml
+  - templates/hooks/post-install/job-update-runtime.yaml
+  - templates/hooks/post-install/cm-update-runtime.yaml
   - templates/runtime/secret.yaml
 release:
   name: cf-runtime
@@ -16,7 +16,7 @@ chart:
   appVersion: 1.0.0
 tests:
   - it: Test default runtime spec metadata
-    template: templates/hooks/cm-update-runtime.yaml
+    template: templates/hooks/post-install/cm-update-runtime.yaml
     asserts:
       - hasDocuments:
           count: 1
@@ -26,9 +26,9 @@ tests:
           path: data["runtime.yaml"]
 
   - it: Test runtime spec override
-    template: templates/hooks/cm-update-runtime.yaml
+    template: templates/hooks/post-install/cm-update-runtime.yaml
     values:
-      - ../generated_values.yaml
+      - ../values.yaml
       - ./runtime_values.yaml
     asserts:
       - equal:
diff --git a/charts/cf-runtime/tests/values.yaml b/charts/cf-runtime/tests/values.yaml
new file mode 100644
index 00000000..3c9c623c
--- /dev/null
+++ b/charts/cf-runtime/tests/values.yaml
@@ -0,0 +1,12 @@
+appProxy:
+  enabled: false
+
+monitor:
+  enabled: false
+
+global:
+  codefreshHost: "https://g.codefresh.io"
+  accountId: 7890
+  agentName: my-context_codefresh
+  runtimeName: my-context/codefresh
+  context: my-context
\ No newline at end of file
diff --git a/charts/cf-runtime/tests/volume-provisioner/cronjob_test.yaml b/charts/cf-runtime/tests/volume-provisioner/cronjob_test.yaml
index 945682bc..83a8fbb9 100644
--- a/charts/cf-runtime/tests/volume-provisioner/cronjob_test.yaml
+++ b/charts/cf-runtime/tests/volume-provisioner/cronjob_test.yaml
@@ -1,7 +1,7 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/quintush/helm-unittest/master/schema/helm-testsuite.json
 suite: dind-volume-cleanup test
 values:
-  - ../generated_values.yaml
+  - ../values.yaml
 templates:
   - templates/volume-provisioner/cronjob.yaml
   - templates/volume-provisioner/storageclass.yaml
diff --git a/charts/cf-runtime/tests/volume-provisioner/dind-lv-monitor_test.yaml b/charts/cf-runtime/tests/volume-provisioner/dind-lv-monitor_test.yaml
index 927d93bd..330040ff 100644
--- a/charts/cf-runtime/tests/volume-provisioner/dind-lv-monitor_test.yaml
+++ b/charts/cf-runtime/tests/volume-provisioner/dind-lv-monitor_test.yaml
@@ -1,7 +1,7 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/quintush/helm-unittest/master/schema/helm-testsuite.json
 suite: dind-lv-monitor test
 values:
-  - ../generated_values.yaml
+  - ../values.yaml
 templates:
   - templates/volume-provisioner/daemonset.yaml
 release:
diff --git a/charts/cf-runtime/tests/volume-provisioner/volume-provisioner_test.yaml b/charts/cf-runtime/tests/volume-provisioner/volume-provisioner_test.yaml
index 6b1c131e..19fb118f 100644
--- a/charts/cf-runtime/tests/volume-provisioner/volume-provisioner_test.yaml
+++ b/charts/cf-runtime/tests/volume-provisioner/volume-provisioner_test.yaml
@@ -1,7 +1,7 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/quintush/helm-unittest/master/schema/helm-testsuite.json
 suite: volume-provisioner test
 values:
-  - ../generated_values.yaml
+  - ../values.yaml
 templates:
   - templates/volume-provisioner/deployment.yaml
   - templates/volume-provisioner/rbac.yaml
@@ -232,12 +232,12 @@ tests:
                 key: aws_secret_access_key
         template: templates/volume-provisioner/deployment.yaml
       - equal:
-          path: data.aws_access_key_id
-          value: TVlLRVlJRA==
+          path: stringData.aws_access_key_id
+          value: MYKEYID
         template: templates/volume-provisioner/secret.yaml
       - equal:
-          path: data.aws_secret_access_key
-          value: TVlBQ0NFU1NLRVk=
+          path: stringData.aws_secret_access_key
+          value: MYACCESSKEY
         template: templates/volume-provisioner/secret.yaml
       - equal:
           path: parameters.volumeBackend
diff --git a/charts/cf-runtime/values.yaml b/charts/cf-runtime/values.yaml
index e9665690..b1ef71cf 100644
--- a/charts/cf-runtime/values.yaml
+++ b/charts/cf-runtime/values.yaml
@@ -4,7 +4,6 @@ nameOverride: ""
 fullNameOverride: ""
 
 # -- Global parameters
-# Global values are in generated_values.yaml. Run `codefresh runner init --generate-helm-values-file`!
 # @default -- See below
 global:
   # -- Global Docker image registry
@@ -12,55 +11,50 @@ global:
   # -- Global Docker registry secret names as array
   imagePullSecrets: []
 
-  # NOTE!
-  # The following values are generated from `codefresh runner init --generate-helm-values-file` output
-
-  # -- Runner namespace
-  namespace: ""
-  # -- URL of Codefresh Platform
+  # -- URL of Codefresh Platform (required!)
   codefreshHost: "https://g.codefresh.io"
-  # -- User token in plain text.
+  # -- User token in plain text (required if `global.codefreshTokenSecretKeyRef` is omitted!)
   # Ref: https://g.codefresh.io/user/settings (see API Keys)
   codefreshToken: ""
-  # -- User token that references an existing secret containing API key.
+  # -- User token that references an existing secret containing API key (required if `global.codefreshToken` is omitted!)
   codefreshTokenSecretKeyRef: {}
+
   # E.g.
   # codefreshTokenSecretKeyRef:
   #   name: my-codefresh-api-token
   #   key: codefresh-api-token
 
-  # -- Agent token in plain text.
-  agentToken: ""
-  # -- Agent token that references an existing secret containing API key.
-  agentTokenSecretKeyRef: {}
+  # -- Account ID (required!)
+  # Can be obtained here https://g.codefresh.io/2.0/account-settings/account-information
+  accountId: ""
+
+  # -- K8s context name (required!)
+  context: ""
   # E.g.
-  # agentTokenSecretKeyRef:
-  #   name: my-codefresh-agent-secret
-  #   key: codefresh-agent-token
+  # context: prod-ue1-runtime-1
 
-  # -- Agent ID
-  agentId: ""
-  # -- Agent Name
+  # -- Agent Name (optional!)
+  # If omitted, the following format will be used `{{ .Values.global.context }}_{{ .Release.Namespace }}`
   agentName: ""
-  # -- Account ID
-  accountId: ""
-  # -- Runtime name
+  # E.g.
+  # agentName: prod-ue1-runtime-1
+
+  # -- Runtime name (optional!)
+  # If omitted, the following format will be used `{{ .Values.global.context }}/{{ .Release.Namespace }}`
   runtimeName: ""
-  # -- Certs for Dind docker daemon
-  keys:
-    key: ""
-    ca: ""
-    serverCert: ""
-  # -- Certs for Dind docker daemon that references an existing secret
-  dindCertsSecretRef: {}
   # E.g.
-  # dindCertsSecretRef:
-  #   name: codefresh-certs-server # name has to be `codefresh-certs-server` (secret must contain `server-cert.pem` `server-key.pem` and `ca.pem` keys)
+  # runtimeName: prod-ue1-runtime-1/namespace
 
-  # DEPRECATED -- Use `.Values.global.agentTokenSecretKeyRef` instead
-  existingAgentToken: ""
-  # DEPRECATED -- Use `.Values.global.existingDindCertsSecret` instead
-  existingDindCertsSecret: ""
+  # -- DEPRECATED Agent token in plain text.
+  # !!! MUST BE provided if migrating from < 6.x chart version
+  agentToken: ""
+  # -- DEPRECATED Agent token that references an existing secret containing API key.
+  # !!! MUST BE provided if migrating from < 6.x chart version
+  agentTokenSecretKeyRef: {}
+  # E.g.
+  # agentTokenSecretKeyRef:
+  #   name: my-codefresh-agent-secret
+  #   key: codefresh-agent-token
 
 # DEPRECATED -- Use `.Values.global.imageRegistry` instead
 dockerRegistry: ""
@@ -86,6 +80,21 @@ runner:
     registry: quay.io
     repository: codefresh/venona
     tag: 1.9.17
+
+  init:
+    image:
+      registry: quay.io
+      repository: codefresh/cli
+      tag: 0.85.0-rootless
+
+    resources:
+      limits:
+        memory: 512Mi
+        cpu: '1'
+      requests:
+        memory: 256Mi
+        cpu: '0.2'
+
   # -- Add additional env vars
   env: {}
 
@@ -402,7 +411,7 @@ runtime:
     image:
       registry: quay.io
       repository: codefresh/dind
-      tag: 20.10.18-1.25.7  # use `latest-rootless/rootless/20.10.24-1.27.0-rootless` tags for rootless-dind
+      tag: 20.10.24-1.27.0  # use `latest-rootless/rootless/20.10.24-1.27.0-rootless` tags for rootless-dind
     # -- Set dind resources.
     resources:
       requests: null
@@ -468,7 +477,7 @@ runtime:
     image:
       registry: quay.io
       repository: codefresh/engine
-      tag: 1.164.11
+      tag: 1.165.2
     # -- Set container command.
     command:
       - npm
@@ -486,15 +495,15 @@ runtime:
     # @default -- See below.
     runtimeImages:
       COMPOSE_IMAGE: quay.io/codefresh/compose:1.3.0
-      CONTAINER_LOGGER_IMAGE: quay.io/codefresh/cf-container-logger:1.10.2
+      CONTAINER_LOGGER_IMAGE: quay.io/codefresh/cf-container-logger:1.10.3
       DOCKER_BUILDER_IMAGE: quay.io/codefresh/cf-docker-builder:1.3.6
-      DOCKER_PULLER_IMAGE: quay.io/codefresh/cf-docker-puller:8.0.12
+      DOCKER_PULLER_IMAGE: quay.io/codefresh/cf-docker-puller:8.0.14
       DOCKER_PUSHER_IMAGE: quay.io/codefresh/cf-docker-pusher:6.0.13
       DOCKER_TAG_PUSHER_IMAGE: quay.io/codefresh/cf-docker-tag-pusher:1.3.11
-      FS_OPS_IMAGE: quay.io/codefresh/fs-ops:1.2.5
+      FS_OPS_IMAGE: quay.io/codefresh/fs-ops:1.2.3
       GIT_CLONE_IMAGE: quay.io/codefresh/cf-git-cloner:10.1.21
-      KUBE_DEPLOY: quay.io/codefresh/cf-deploy-kubernetes:16.2.5
-      PIPELINE_DEBUGGER_IMAGE: quay.io/codefresh/cf-debugger:1.3.3
+      KUBE_DEPLOY: quay.io/codefresh/cf-deploy-kubernetes:16.1.11
+      PIPELINE_DEBUGGER_IMAGE: quay.io/codefresh/cf-debugger:1.3.0
       TEMPLATE_ENGINE: quay.io/codefresh/pikolo:0.13.8
     # -- Set additional env vars.
     env: {}
@@ -527,7 +536,9 @@ runtime:
     image:
       registry: quay.io
       repository: codefresh/cli
-      tag: 0.84.8-rootless
+      tag: 0.85.0-rootless
+    rbac:
+      enabled: true
     annotations: {}
     affinity: {}
     nodeSelector: {}
@@ -664,16 +675,6 @@ monitor:
   # Ref: https://codefresh.io/docs/docs/installation/codefresh-runner/#install-monitoring-component
   enabled: false
 
-  # -- Cluster name as it registered in account
-  # Generated from `codefresh runner init --generate-helm-values-file` output
-  clusterId: ""
-  # -- API token from Codefresh
-  # Generated from `codefresh runner init --generate-helm-values-file` output
-  token: ""
-  # -- Set Existing secret (name-of-existing-secret) with API token from Codefresh
-  # supersedes value of monitor.token; secret must contain `codefresh.token` key
-  existingMonitorToken: ""
-
   # -- Set number of pods
   replicasCount: 1
   # -- Upgrade strategy
diff --git a/scripts/update_re_images.sh b/scripts/update_re_images.sh
new file mode 100755
index 00000000..311377e0
--- /dev/null
+++ b/scripts/update_re_images.sh
@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+
+MYDIR=$(dirname $0)
+CHARTDIR="${MYDIR}/../charts/cf-runtime"
+
+<<COMMENT
+Script updates runtime images from system/root runtime on SAAS to codefresh/values.yaml
+yq (https://github.com/mikefarah/yq/) version 4.23.1
+COMMENT
+
+set -ue
+
+DEBUG=${DEBUG:-false}
+
+if [ ${DEBUG} == "true" ]; then
+    set -x
+fi
+
+msg() { echo -e "\e[32mINFO ---> $1\e[0m"; }
+err() { echo -e "\e[31mERR ---> $1\e[0m" ; return 1; }
+
+runtimeJson=$(mktemp)
+codefresh get sys-re system/root --extend -o json > $runtimeJson
+
+RUNTIME_IMAGES=(
+    ENGINE_IMAGE
+    DIND_IMAGE
+    CONTAINER_LOGGER_IMAGE
+    DOCKER_PUSHER_IMAGE
+    DOCKER_TAG_PUSHER_IMAGE
+    DOCKER_PULLER_IMAGE
+    DOCKER_BUILDER_IMAGE
+    GIT_CLONE_IMAGE
+    COMPOSE_IMAGE
+    KUBE_DEPLOY
+    FS_OPS_IMAGE
+    TEMPLATE_ENGINE
+    PIPELINE_DEBUGGER_IMAGE
+)
+
+filename=$CHARTDIR/values.yaml
+
+for k in ${RUNTIME_IMAGES[@]}; do
+    image="$(jq -er .runtimeScheduler.envVars.$k $runtimeJson)"
+    patch "$filename" <<< $(diff -U0 -w -b --ignore-blank-lines $filename <(yq eval ".runtime.engine.runtimeImages.\"$k\" = \"$image\"" $filename)) || true
+done
+
+msg "The list of updated runtime images:\n"
+echo -e "\e[33m$(cat $CHARTDIR/values.yaml)\e[0m"
\ No newline at end of file
diff --git a/venona/cover/cover.out b/venona/cover/cover.out
new file mode 100644
index 00000000..db8532f2
--- /dev/null
+++ b/venona/cover/cover.out
@@ -0,0 +1,336 @@
+mode: atomic
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:104.41,105.43 1 4
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:105.43,107.3 1 4
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:109.2,116.25 7 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:116.25,118.3 1 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:120.2,140.8 3 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:144.50,145.15 1 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:145.15,147.3 1 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:149.2,160.12 7 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:164.30,165.16 1 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:165.16,167.3 1 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:169.2,176.12 8 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:180.33,182.2 1 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:184.61,185.6 1 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:185.6,186.10 1 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:187.21,189.10 2 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:190.31,194.30 2 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:194.30,196.5 1 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:199.4,199.29 1 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:199.29,201.5 1 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:203.4,206.55 4 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:206.55,212.5 1 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:214.4,214.61 1 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:219.65,220.6 1 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:220.6,221.10 1 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:222.21,224.10 2 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:225.33,227.14 2 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:227.14,232.5 2 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:237.81,239.16 2 2
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:239.16,241.3 1 1
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:244.82,247.2 2 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:249.59,254.16 4 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:254.16,257.3 2 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:259.2,259.21 1 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:259.21,261.3 1 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:263.2,263.14 1 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:266.81,272.23 4 1
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:272.23,274.17 2 3
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:275.27,277.38 2 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:278.87,280.11 2 3
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:280.11,283.5 2 1
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:285.4,286.18 2 3
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:286.18,288.5 1 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:289.11,290.115 1 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:295.2,295.51 1 1
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:295.51,298.3 2 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:300.2,301.27 2 1
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:301.27,306.3 3 1
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:309.2,309.50 1 1
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:309.50,312.3 2 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:313.2,313.30 1 1
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:316.47,319.12 3 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:319.12,325.17 5 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:325.17,328.4 2 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:333.54,336.16 3 3
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:336.16,338.3 1 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:340.2,341.55 2 3
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:341.55,343.3 1 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:345.2,346.9 2 3
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:346.9,348.3 1 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:350.2,359.12 5 3
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:362.63,366.17 4 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:366.17,368.3 1 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:370.2,371.15 2 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:371.15,373.3 1 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:375.2,378.16 3 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:378.16,380.3 1 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:382.2,382.17 1 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:382.17,384.3 1 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:386.2,387.16 2 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:387.16,389.3 1 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:391.2,399.16 7 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:399.16,401.3 1 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:403.2,407.12 4 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:410.57,412.29 2 1
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:412.29,414.17 2 3
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:414.17,418.4 1 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:420.3,420.52 1 3
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:423.2,423.19 1 1
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:426.40,427.17 1 4
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:427.17,429.3 1 1
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:431.2,431.19 1 3
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:431.19,433.3 1 1
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:435.2,435.29 1 2
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:435.29,437.3 1 1
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:439.2,439.24 1 1
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:439.24,441.3 1 1
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:443.2,443.12 1 0
+github.com/codefresh-io/go/venona/pkg/agent/agent.go:446.13,449.2 2 1
+github.com/codefresh-io/go/venona/pkg/config/loader.go:51.88,53.16 2 2
+github.com/codefresh-io/go/venona/pkg/config/loader.go:53.16,55.3 1 0
+github.com/codefresh-io/go/venona/pkg/config/loader.go:57.2,58.73 2 2
+github.com/codefresh-io/go/venona/pkg/config/loader.go:58.73,60.3 1 0
+github.com/codefresh-io/go/venona/pkg/config/loader.go:62.2,62.38 1 2
+github.com/codefresh-io/go/venona/pkg/config/loader.go:65.85,66.62 1 2
+github.com/codefresh-io/go/venona/pkg/config/loader.go:66.62,67.17 1 2
+github.com/codefresh-io/go/venona/pkg/config/loader.go:67.17,70.4 2 0
+github.com/codefresh-io/go/venona/pkg/config/loader.go:72.3,72.19 1 2
+github.com/codefresh-io/go/venona/pkg/config/loader.go:72.19,75.4 2 0
+github.com/codefresh-io/go/venona/pkg/config/loader.go:77.3,77.35 1 2
+github.com/codefresh-io/go/venona/pkg/config/loader.go:77.35,80.4 2 1
+github.com/codefresh-io/go/venona/pkg/config/loader.go:82.3,83.13 2 1
+github.com/codefresh-io/go/venona/pkg/config/loader.go:87.51,89.51 2 1
+github.com/codefresh-io/go/venona/pkg/config/loader.go:89.51,91.3 1 0
+github.com/codefresh-io/go/venona/pkg/config/loader.go:93.2,93.17 1 1
+github.com/codefresh-io/go/venona/pkg/config/loader.go:96.86,98.29 2 2
+github.com/codefresh-io/go/venona/pkg/config/loader.go:98.29,100.17 2 1
+github.com/codefresh-io/go/venona/pkg/config/loader.go:100.17,102.12 2 0
+github.com/codefresh-io/go/venona/pkg/config/loader.go:105.3,106.17 2 1
+github.com/codefresh-io/go/venona/pkg/config/loader.go:106.17,108.12 2 0
+github.com/codefresh-io/go/venona/pkg/config/loader.go:111.3,111.21 1 1
+github.com/codefresh-io/go/venona/pkg/config/loader.go:114.2,114.20 1 2
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes.go:71.82,77.2 2 0
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes.go:80.44,81.28 1 2
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes.go:81.28,83.3 1 1
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes.go:85.2,89.8 2 1
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes.go:92.95,95.16 3 3
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes.go:95.16,97.3 1 0
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes.go:99.2,100.16 2 3
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes.go:100.16,102.3 1 0
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes.go:104.2,105.27 2 3
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes.go:106.33,109.17 3 1
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes.go:109.17,111.4 1 0
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes.go:112.15,115.17 3 1
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes.go:115.17,117.4 1 0
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes.go:118.10,119.99 1 1
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes.go:122.2,130.12 4 2
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes.go:133.77,135.19 2 5
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes.go:136.26,138.17 2 1
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes.go:138.17,140.4 1 0
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes.go:141.26,143.17 2 3
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes.go:143.17,145.4 1 2
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes.go:146.10,147.70 1 1
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes.go:150.2,158.12 4 2
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes.go:161.130,163.14 2 1
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes.go:163.14,167.3 1 0
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes.go:167.8,171.3 1 1
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes.go:173.2,179.4 1 1
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes.go:182.79,184.16 2 0
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes.go:184.16,186.3 1 0
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes.go:188.2,190.40 3 0
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes_mock.go:35.61,37.2 1 0
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes_mock.go:40.107,44.84 3 0
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes_mock.go:44.84,46.3 1 0
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes_mock.go:46.8,48.3 1 0
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes_mock.go:50.2,50.11 1 0
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes_mock.go:62.144,64.2 1 0
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes_mock.go:66.156,67.40 1 0
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes_mock.go:67.40,69.3 1 0
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes_mock.go:70.2,70.11 1 0
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes_mock.go:73.101,76.2 2 0
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes_mock.go:78.153,81.2 2 0
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes_mock.go:84.89,88.75 3 0
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes_mock.go:88.75,90.3 1 0
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes_mock.go:90.8,92.3 1 0
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes_mock.go:94.2,94.11 1 0
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes_mock.go:105.122,107.2 1 0
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes_mock.go:109.138,110.40 1 0
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes_mock.go:110.40,112.3 1 0
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes_mock.go:113.2,113.11 1 0
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes_mock.go:116.101,119.2 2 0
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes_mock.go:121.144,124.2 2 0
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes_mock.go:131.20,135.19 3 0
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes_mock.go:135.19,135.49 1 0
+github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes_mock.go:137.2,137.13 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:65.34,67.16 2 2
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:67.16,69.3 1 1
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:71.2,77.3 1 2
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:81.60,83.16 2 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:83.16,85.3 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:87.2,88.16 2 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:88.16,90.3 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:92.2,92.19 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:96.27,98.2 1 4
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:101.73,103.16 2 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:103.16,105.3 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:107.2,108.16 2 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:108.16,110.3 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:112.2,112.12 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:115.67,120.2 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:122.59,124.16 2 3
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:124.16,126.3 1 1
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:128.2,131.26 3 2
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:131.26,134.3 2 3
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:136.2,138.15 3 2
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:141.98,143.16 2 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:143.16,145.3 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:147.2,148.16 2 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:148.16,150.3 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:152.2,153.19 2 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:153.19,155.3 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:157.2,158.17 2 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:161.107,163.16 2 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:163.16,165.3 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:167.2,168.16 2 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:168.16,170.3 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:172.2,174.16 3 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:174.16,176.3 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:178.2,178.28 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:178.28,180.3 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go:182.2,182.18 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:35.59,37.2 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:40.40,44.46 3 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:44.46,46.3 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:46.8,48.3 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:50.2,50.11 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:59.67,61.2 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:63.77,64.40 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:64.40,66.3 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:67.2,67.11 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:70.80,73.2 2 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:75.93,78.2 2 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:81.86,85.73 3 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:85.73,87.3 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:87.8,89.3 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:91.2,91.11 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:102.118,104.2 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:106.132,107.40 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:107.40,109.3 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:110.2,110.11 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:113.95,116.2 2 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:118.136,121.2 2 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:124.73,129.74 4 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:129.74,131.3 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:132.2,132.65 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:132.65,134.3 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:134.8,135.24 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:135.24,137.4 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:140.2,140.60 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:140.60,142.3 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:142.8,144.3 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:146.2,146.15 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:156.84,158.2 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:160.98,161.40 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:161.40,163.3 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:164.2,164.11 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:167.97,170.2 2 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:172.123,175.2 2 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:182.19,186.19 3 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:186.19,186.49 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go:188.2,188.13 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/error.go:27.31,29.2 1 0
+github.com/codefresh-io/go/venona/pkg/codefresh/status.go:27.49,29.2 1 0
+github.com/codefresh-io/go/venona/pkg/queue/queue.go:66.39,77.2 1 4
+github.com/codefresh-io/go/venona/pkg/queue/queue.go:80.52,82.39 2 4
+github.com/codefresh-io/go/venona/pkg/queue/queue.go:82.39,88.3 5 6
+github.com/codefresh-io/go/venona/pkg/queue/queue.go:92.32,93.39 1 4
+github.com/codefresh-io/go/venona/pkg/queue/queue.go:93.39,95.3 1 6
+github.com/codefresh-io/go/venona/pkg/queue/queue.go:99.36,101.2 1 0
+github.com/codefresh-io/go/venona/pkg/queue/queue.go:104.56,106.2 1 14
+github.com/codefresh-io/go/venona/pkg/queue/queue.go:108.88,112.6 3 6
+github.com/codefresh-io/go/venona/pkg/queue/queue.go:112.6,113.10 1 26
+github.com/codefresh-io/go/venona/pkg/queue/queue.go:114.19,116.23 2 6
+github.com/codefresh-io/go/venona/pkg/queue/queue.go:117.26,119.62 2 14
+github.com/codefresh-io/go/venona/pkg/queue/queue.go:119.62,125.13 5 0
+github.com/codefresh-io/go/venona/pkg/queue/queue.go:128.4,135.22 7 14
+github.com/codefresh-io/go/venona/pkg/queue/queue.go:136.11,137.20 1 6
+github.com/codefresh-io/go/venona/pkg/queue/queue.go:137.20,140.5 2 6
+github.com/codefresh-io/go/venona/pkg/queue/queue.go:142.4,142.38 1 0
+github.com/codefresh-io/go/venona/pkg/queue/queue.go:147.84,155.9 7 14
+github.com/codefresh-io/go/venona/pkg/queue/queue.go:155.9,159.3 3 0
+github.com/codefresh-io/go/venona/pkg/queue/queue.go:161.2,161.26 1 14
+github.com/codefresh-io/go/venona/pkg/queue/queue.go:161.26,163.17 2 31
+github.com/codefresh-io/go/venona/pkg/queue/queue.go:163.17,166.4 2 0
+github.com/codefresh-io/go/venona/pkg/queue/queue.go:169.2,177.77 3 14
+github.com/codefresh-io/go/venona/pkg/runtime/runtime.go:43.32,47.2 1 0
+github.com/codefresh-io/go/venona/pkg/runtime/runtime.go:49.70,52.16 2 8
+github.com/codefresh-io/go/venona/pkg/runtime/runtime.go:53.46,55.17 2 3
+github.com/codefresh-io/go/venona/pkg/runtime/runtime.go:55.17,57.4 1 1
+github.com/codefresh-io/go/venona/pkg/runtime/runtime.go:58.46,62.17 4 4
+github.com/codefresh-io/go/venona/pkg/runtime/runtime.go:62.17,64.4 1 0
+github.com/codefresh-io/go/venona/pkg/runtime/runtime.go:66.3,66.50 1 4
+github.com/codefresh-io/go/venona/pkg/runtime/runtime.go:66.50,68.4 1 1
+github.com/codefresh-io/go/venona/pkg/runtime/runtime.go:70.3,70.59 1 3
+github.com/codefresh-io/go/venona/pkg/runtime/runtime.go:70.59,72.4 1 1
+github.com/codefresh-io/go/venona/pkg/runtime/runtime.go:73.10,74.56 1 1
+github.com/codefresh-io/go/venona/pkg/runtime/runtime.go:77.2,77.12 1 4
+github.com/codefresh-io/go/venona/cmd/cmdutils.go:22.28,23.16 1 28
+github.com/codefresh-io/go/venona/cmd/cmdutils.go:23.16,26.3 2 0
+github.com/codefresh-io/go/venona/cmd/root.go:33.16,36.2 2 0
+github.com/codefresh-io/go/venona/cmd/start.go:82.52,83.54 1 0
+github.com/codefresh-io/go/venona/cmd/start.go:83.54,85.4 1 0
+github.com/codefresh-io/go/venona/cmd/start.go:87.3,87.58 1 0
+github.com/codefresh-io/go/venona/cmd/start.go:87.58,89.4 1 0
+github.com/codefresh-io/go/venona/cmd/start.go:91.3,91.39 1 0
+github.com/codefresh-io/go/venona/cmd/start.go:91.39,93.4 1 0
+github.com/codefresh-io/go/venona/cmd/start.go:95.3,95.38 1 0
+github.com/codefresh-io/go/venona/cmd/start.go:95.38,97.4 1 0
+github.com/codefresh-io/go/venona/cmd/start.go:99.3,99.31 1 0
+github.com/codefresh-io/go/venona/cmd/start.go:99.31,101.4 1 0
+github.com/codefresh-io/go/venona/cmd/start.go:103.3,103.33 1 0
+github.com/codefresh-io/go/venona/cmd/start.go:103.33,105.4 1 0
+github.com/codefresh-io/go/venona/cmd/start.go:107.3,107.13 1 0
+github.com/codefresh-io/go/venona/cmd/start.go:109.42,111.3 1 0
+github.com/codefresh-io/go/venona/cmd/start.go:114.13,161.48 44 1
+github.com/codefresh-io/go/venona/cmd/start.go:161.48,162.59 1 16
+github.com/codefresh-io/go/venona/cmd/start.go:162.59,164.4 1 9
+github.com/codefresh-io/go/venona/cmd/start.go:167.2,171.30 4 1
+github.com/codefresh-io/go/venona/cmd/start.go:174.32,180.36 3 0
+github.com/codefresh-io/go/venona/cmd/start.go:180.36,182.3 1 0
+github.com/codefresh-io/go/venona/cmd/start.go:184.2,188.36 4 0
+github.com/codefresh-io/go/venona/cmd/start.go:188.36,190.3 1 0
+github.com/codefresh-io/go/venona/cmd/start.go:190.8,192.3 1 0
+github.com/codefresh-io/go/venona/cmd/start.go:194.2,197.38 3 0
+github.com/codefresh-io/go/venona/cmd/start.go:197.38,202.17 2 0
+github.com/codefresh-io/go/venona/cmd/start.go:202.17,204.4 1 0
+github.com/codefresh-io/go/venona/cmd/start.go:204.9,206.4 1 0
+github.com/codefresh-io/go/venona/cmd/start.go:207.8,209.3 1 0
+github.com/codefresh-io/go/venona/cmd/start.go:211.2,212.2 2 0
+github.com/codefresh-io/go/venona/cmd/start.go:212.2,214.37 2 0
+github.com/codefresh-io/go/venona/cmd/start.go:214.37,222.4 3 0
+github.com/codefresh-io/go/venona/cmd/start.go:224.3,227.3 3 0
+github.com/codefresh-io/go/venona/cmd/start.go:227.3,229.4 1 0
+github.com/codefresh-io/go/venona/cmd/start.go:231.3,237.5 1 0
+github.com/codefresh-io/go/venona/cmd/start.go:240.2,264.12 7 0
+github.com/codefresh-io/go/venona/cmd/start.go:264.12,264.44 1 0
+github.com/codefresh-io/go/venona/cmd/start.go:265.2,265.12 1 0
+github.com/codefresh-io/go/venona/cmd/start.go:265.12,265.42 1 0
+github.com/codefresh-io/go/venona/cmd/start.go:267.2,267.14 1 0
+github.com/codefresh-io/go/venona/cmd/start.go:270.104,277.2 4 0
+github.com/codefresh-io/go/venona/cmd/start.go:279.101,283.36 4 0
+github.com/codefresh-io/go/venona/cmd/start.go:283.36,294.17 2 0
+github.com/codefresh-io/go/venona/cmd/start.go:294.17,296.12 2 0
+github.com/codefresh-io/go/venona/cmd/start.go:299.3,302.29 2 0
+github.com/codefresh-io/go/venona/cmd/start.go:305.2,305.17 1 0
+github.com/codefresh-io/go/venona/cmd/start.go:313.19,320.12 5 3
+github.com/codefresh-io/go/venona/cmd/start.go:320.12,321.7 1 3
+github.com/codefresh-io/go/venona/cmd/start.go:321.7,323.44 2 6
+github.com/codefresh-io/go/venona/cmd/start.go:323.44,328.5 3 1
+github.com/codefresh-io/go/venona/cmd/start.go:330.4,330.14 1 3
+github.com/codefresh-io/go/venona/cmd/start.go:330.14,333.39 2 3
+github.com/codefresh-io/go/venona/cmd/start.go:333.39,335.6 1 0
+github.com/codefresh-io/go/venona/cmd/start.go:337.5,337.43 1 3
+github.com/codefresh-io/go/venona/cmd/start.go:337.43,339.6 1 0
+github.com/codefresh-io/go/venona/cmd/start.go:341.5,341.13 1 3
+github.com/codefresh-io/go/venona/cmd/start.go:346.2,346.12 1 3
diff --git a/venona/cover/coverage.html b/venona/cover/coverage.html
new file mode 100644
index 00000000..fe5b8ae8
--- /dev/null
+++ b/venona/cover/coverage.html
@@ -0,0 +1,2149 @@
+
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+		<title>cmd: Go Coverage Report</title>
+		<style>
+			body {
+				background: black;
+				color: rgb(80, 80, 80);
+			}
+			body, pre, #legend span {
+				font-family: Menlo, monospace;
+				font-weight: bold;
+			}
+			#topbar {
+				background: black;
+				position: fixed;
+				top: 0; left: 0; right: 0;
+				height: 42px;
+				border-bottom: 1px solid rgb(80, 80, 80);
+			}
+			#content {
+				margin-top: 50px;
+			}
+			#nav, #legend {
+				float: left;
+				margin-left: 10px;
+			}
+			#legend {
+				margin-top: 12px;
+			}
+			#nav {
+				margin-top: 10px;
+			}
+			#legend span {
+				margin: 0 5px;
+			}
+			.cov0 { color: rgb(192, 0, 0) }
+.cov1 { color: rgb(128, 128, 128) }
+.cov2 { color: rgb(116, 140, 131) }
+.cov3 { color: rgb(104, 152, 134) }
+.cov4 { color: rgb(92, 164, 137) }
+.cov5 { color: rgb(80, 176, 140) }
+.cov6 { color: rgb(68, 188, 143) }
+.cov7 { color: rgb(56, 200, 146) }
+.cov8 { color: rgb(44, 212, 149) }
+.cov9 { color: rgb(32, 224, 152) }
+.cov10 { color: rgb(20, 236, 155) }
+
+		</style>
+	</head>
+	<body>
+		<div id="topbar">
+			<div id="nav">
+				<select id="files">
+				
+				<option value="file0">github.com/codefresh-io/go/venona/cmd/cmdutils.go (33.3%)</option>
+				
+				<option value="file1">github.com/codefresh-io/go/venona/cmd/root.go (0.0%)</option>
+				
+				<option value="file2">github.com/codefresh-io/go/venona/cmd/start.go (48.2%)</option>
+				
+				<option value="file3">github.com/codefresh-io/go/venona/pkg/agent/agent.go (31.2%)</option>
+				
+				<option value="file4">github.com/codefresh-io/go/venona/pkg/codefresh/codefresh.go (29.1%)</option>
+				
+				<option value="file5">github.com/codefresh-io/go/venona/pkg/codefresh/codefresh_mock.go (0.0%)</option>
+				
+				<option value="file6">github.com/codefresh-io/go/venona/pkg/codefresh/error.go (0.0%)</option>
+				
+				<option value="file7">github.com/codefresh-io/go/venona/pkg/codefresh/status.go (0.0%)</option>
+				
+				<option value="file8">github.com/codefresh-io/go/venona/pkg/config/loader.go (68.6%)</option>
+				
+				<option value="file9">github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes.go (73.1%)</option>
+				
+				<option value="file10">github.com/codefresh-io/go/venona/pkg/kubernetes/kubernetes_mock.go (0.0%)</option>
+				
+				<option value="file11">github.com/codefresh-io/go/venona/pkg/queue/queue.go (77.8%)</option>
+				
+				<option value="file12">github.com/codefresh-io/go/venona/pkg/runtime/runtime.go (88.2%)</option>
+				
+				</select>
+			</div>
+			<div id="legend">
+				<span>not tracked</span>
+			
+				<span class="cov0">no coverage</span>
+				<span class="cov1">low coverage</span>
+				<span class="cov2">*</span>
+				<span class="cov3">*</span>
+				<span class="cov4">*</span>
+				<span class="cov5">*</span>
+				<span class="cov6">*</span>
+				<span class="cov7">*</span>
+				<span class="cov8">*</span>
+				<span class="cov9">*</span>
+				<span class="cov10">high coverage</span>
+			
+			</div>
+		</div>
+		<div id="content">
+		
+		<pre class="file" id="file0" style="display: none">// Copyright 2020 The Codefresh Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cmd
+
+import (
+        "fmt"
+        "os"
+)
+
+func dieOnError(err error) <span class="cov10" title="28">{
+        if err != nil </span><span class="cov0" title="0">{
+                fmt.Println(err.Error())
+                os.Exit(1)
+        }</span>
+}
+</pre>
+		
+		<pre class="file" id="file1" style="display: none">// Copyright 2020 The Codefresh Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cmd
+
+import "github.com/spf13/cobra"
+
+const (
+        // AppName holds the name of the application, to be used in monitoring tools
+        AppName = "Codefresh-Runner"
+)
+
+var version string
+
+var rootCmd = &amp;cobra.Command{
+        Use:     "venona",
+        Version: version,
+        Long:    "Codefresh agent process",
+}
+
+// Execute - execute the root command
+func Execute() <span class="cov0" title="0">{
+        err := rootCmd.Execute()
+        dieOnError(err)
+}</span>
+</pre>
+		
+		<pre class="file" id="file2" style="display: none">// Copyright 2020 The Codefresh Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cmd
+
+import (
+        "context"
+        "crypto/tls"
+        "errors"
+        "fmt"
+        "net/http"
+        "os"
+        "os/signal"
+        "syscall"
+        "time"
+
+        "github.com/codefresh-io/go/venona/pkg/agent"
+        "github.com/codefresh-io/go/venona/pkg/codefresh"
+        "github.com/codefresh-io/go/venona/pkg/config"
+        "github.com/codefresh-io/go/venona/pkg/kubernetes"
+        "github.com/codefresh-io/go/venona/pkg/logger"
+        "github.com/codefresh-io/go/venona/pkg/monitoring"
+        "github.com/codefresh-io/go/venona/pkg/monitoring/newrelic"
+        "github.com/codefresh-io/go/venona/pkg/runtime"
+        "github.com/codefresh-io/go/venona/pkg/server"
+
+        nr "github.com/newrelic/go-agent/v3/newrelic"
+        "github.com/prometheus/client_golang/prometheus"
+        "github.com/spf13/cobra"
+        "github.com/spf13/pflag"
+        "github.com/spf13/viper"
+)
+
+type startOptions struct {
+        codefreshToken                 string
+        codefreshHost                  string
+        verbose                        bool
+        rejectTLSUnauthorized          bool
+        agentID                        string
+        taskPullingSecondsInterval     int64
+        statusReportingSecondsInterval int64
+        concurrency                    int
+        bufferSize                     int
+        configDir                      string
+        serverPort                     string
+        newrelicLicenseKey             string
+        newrelicAppname                string
+        inClusterRuntime               string
+        qps                            float32
+        burst                          int
+}
+
+const (
+        defaultCodefreshHost           = "https://g.codefresh.io"
+        defaultTaskPullingInterval     = 3
+        defaultStatusReportingInterval = 10
+        defaultWorkflowConcurrency     = 50
+        defaultWorkflowBufferSize      = 1000
+        defaultK8sClientQPS            = 50
+        defaultK8sClientBurst          = 100
+)
+
+var (
+        startCmdOptions startOptions
+        handleSignal    = signal.Notify
+)
+
+var startCmd = &amp;cobra.Command{
+        Use:  "start",
+        Long: "Start venona process",
+        PreRunE: func(_ *cobra.Command, _ []string) error <span class="cov0" title="0">{
+                if startCmdOptions.taskPullingSecondsInterval &lt;= 0 </span><span class="cov0" title="0">{
+                        return errors.New("--task-pulling-interval must be a positive number")
+                }</span>
+
+                <span class="cov0" title="0">if startCmdOptions.statusReportingSecondsInterval &lt;= 0 </span><span class="cov0" title="0">{
+                        return errors.New("--status-reporting-interval must be a positive number")
+                }</span>
+
+                <span class="cov0" title="0">if startCmdOptions.concurrency &lt;= 0 </span><span class="cov0" title="0">{
+                        return errors.New("--workflow-concurrency must be a positive number")
+                }</span>
+
+                <span class="cov0" title="0">if startCmdOptions.bufferSize &lt;= 0 </span><span class="cov0" title="0">{
+                        return errors.New("--workflow-buffer-size must be a positive number")
+                }</span>
+
+                <span class="cov0" title="0">if startCmdOptions.qps &lt;= 0 </span><span class="cov0" title="0">{
+                        return errors.New("--k8s-client-qps must be a positive number")
+                }</span>
+
+                <span class="cov0" title="0">if startCmdOptions.burst &lt;= 0 </span><span class="cov0" title="0">{
+                        return errors.New("--k8s-client-burst must be a positive number")
+                }</span>
+
+                <span class="cov0" title="0">return nil</span>
+        },
+        Run: func(_ *cobra.Command, _ []string) <span class="cov0" title="0">{
+                run(startCmdOptions)
+        }</span>,
+}
+
+func init() <span class="cov1" title="1">{
+        dieOnError(viper.BindEnv("codefresh-token", "CODEFRESH_TOKEN"))
+        dieOnError(viper.BindEnv("codefresh-host", "CODEFRESH_HOST"))
+        dieOnError(viper.BindEnv("in-cluster-runtime", "CODEFRESH_IN_CLUSTER_RUNTIME"))
+        dieOnError(viper.BindEnv("agent-id", "AGENT_ID"))
+        dieOnError(viper.BindEnv("config-dir", "VENONA_CONFIG_DIR"))
+        dieOnError(viper.BindEnv("port", "PORT"))
+        dieOnError(viper.BindEnv("NODE_TLS_REJECT_UNAUTHORIZED"))
+        dieOnError(viper.BindEnv("verbose", "VERBOSE"))
+        dieOnError(viper.BindEnv("newrelic-license-key", "NEWRELIC_LICENSE_KEY"))
+        dieOnError(viper.BindEnv("newrelic-appname", "NEWRELIC_APPNAME"))
+        dieOnError(viper.BindEnv("task-pulling-interval", "TASK_PULLING_INTERVAL"))
+        dieOnError(viper.BindEnv("status-reporting-interval", "STATUS_REPORTING_INTERVAL"))
+        dieOnError(viper.BindEnv("workflow-concurrency", "WORKFLOW_CONCURRENCY"))
+        dieOnError(viper.BindEnv("workflow-buffer-size", "WORKFLOW_BUFFER_SIZE"))
+        dieOnError(viper.BindEnv("k8s-client-qps", "K8S_CLIENT_QPS"))
+        dieOnError(viper.BindEnv("k8s-client-burst", "K8S_CLIENT_BURST"))
+
+        viper.SetDefault("codefresh-host", defaultCodefreshHost)
+        viper.SetDefault("port", "8080")
+        viper.SetDefault("NODE_TLS_REJECT_UNAUTHORIZED", "1")
+        viper.SetDefault("in-cluster-runtime", "")
+        viper.SetDefault("newrelic-appname", AppName)
+        viper.SetDefault("task-pulling-interval", defaultTaskPullingInterval)
+        viper.SetDefault("status-reporting-interval", defaultStatusReportingInterval)
+        viper.SetDefault("workflow-concurrency", defaultWorkflowConcurrency)
+        viper.SetDefault("workflow-buffer-size", defaultWorkflowBufferSize)
+        viper.SetDefault("k8s-client-qps", defaultK8sClientQPS)
+        viper.SetDefault("k8s-client-burst", defaultK8sClientBurst)
+
+        startCmd.Flags().BoolVar(&amp;startCmdOptions.verbose, "verbose", viper.GetBool("verbose"), "Show more logs")
+        startCmd.Flags().BoolVar(&amp;startCmdOptions.rejectTLSUnauthorized, "tls-reject-unauthorized", viper.GetBool("NODE_TLS_REJECT_UNAUTHORIZED"), "Disable certificate validation for TLS connections")
+        startCmd.Flags().StringVar(&amp;startCmdOptions.inClusterRuntime, "in-cluster-runtime", viper.GetString("in-cluster-runtime"), "Runtime name to run agent in cluster mode [$CODEFRESH_IN_CLUSTER_RUNTIME]")
+        startCmd.Flags().StringVar(&amp;startCmdOptions.agentID, "agent-id", viper.GetString("agent-id"), "ID of the agent [$AGENT_ID]")
+        startCmd.Flags().StringVar(&amp;startCmdOptions.configDir, "config-dir", viper.GetString("config-dir"), "path to configuration folder [$CONFIG_DIR]")
+        startCmd.Flags().StringVar(&amp;startCmdOptions.codefreshToken, "codefresh-token", viper.GetString("codefresh-token"), "Codefresh API token [$CODEFRESH_TOKEN]")
+        startCmd.Flags().StringVar(&amp;startCmdOptions.serverPort, "port", viper.GetString("port"), "The port to start the server [$PORT]")
+        startCmd.Flags().StringVar(&amp;startCmdOptions.codefreshHost, "codefresh-host", viper.GetString("codefresh-host"), "Codefresh API host default [$CODEFRESH_HOST]")
+        startCmd.Flags().Int64Var(&amp;startCmdOptions.taskPullingSecondsInterval, "task-pulling-interval", viper.GetInt64("task-pulling-interval"), "The interval (seconds) to pull new tasks from Codefresh [$TASK_PULLING_INTERVAL]")
+        startCmd.Flags().Int64Var(&amp;startCmdOptions.statusReportingSecondsInterval, "status-reporting-interval", viper.GetInt64("status-reporting-interval"), "The interval (seconds) to report status back to Codefresh [$STATUS_REPORTING_INTERVAL]")
+        startCmd.Flags().IntVar(&amp;startCmdOptions.concurrency, "workflow-concurrency", viper.GetInt("workflow-concurrency"), "How many workflow tasks to handle concurrently [$WORKFLOW_CONCURRENCY]")
+        startCmd.Flags().IntVar(&amp;startCmdOptions.bufferSize, "workflow-buffer-size", viper.GetInt("workflow-cbuffer-sizeoncurrency"), "The size of the workflow channel buffer [$WORKFLOW_BUFFER_SIZE]")
+        startCmd.Flags().StringVar(&amp;startCmdOptions.newrelicLicenseKey, "newrelic-license-key", viper.GetString("newrelic-license-key"), "New-Relic license key [$NEWRELIC_LICENSE_KEY]")
+        startCmd.Flags().StringVar(&amp;startCmdOptions.newrelicAppname, "newrelic-appname", viper.GetString("newrelic-appname"), "New-Relic application name [$NEWRELIC_APPNAME]")
+        startCmd.Flags().Float32Var(&amp;startCmdOptions.qps, "k8s-client-qps", float32(viper.GetFloat64("k8s-client-qps")), "the maximum QPS to the master from this client [$K8S_CLIENT_QPS]")
+        startCmd.Flags().IntVar(&amp;startCmdOptions.burst, "k8s-client-burst", viper.GetInt("k8s-client-burst"), "k8s client maximum burst for throttle [$K8S_CLIENT_BURST]")
+
+        startCmd.Flags().VisitAll(func(f *pflag.Flag) </span><span class="cov10" title="16">{
+                if viper.IsSet(f.Name) &amp;&amp; viper.GetString(f.Name) != "" </span><span class="cov8" title="9">{
+                        dieOnError(startCmd.Flags().Set(f.Name, viper.GetString(f.Name)))
+                }</span>
+        })
+
+        <span class="cov1" title="1">dieOnError(startCmd.MarkFlagRequired("codefresh-token"))
+        dieOnError(startCmd.MarkFlagRequired("agent-id"))
+        dieOnError(startCmd.MarkFlagRequired("port"))
+
+        rootCmd.AddCommand(startCmd)</span>
+}
+
+func run(options startOptions) <span class="cov0" title="0">{
+        log := logger.New(logger.Options{
+                Verbose: options.verbose,
+        })
+
+        log.Debug("Starting", "pid", os.Getpid(), "version", version)
+        if !options.rejectTLSUnauthorized </span><span class="cov0" title="0">{
+                log.Warn("Running in insecure mode", "NODE_TLS_REJECT_UNAUTHORIZED", options.rejectTLSUnauthorized)
+        }</span>
+
+        <span class="cov0" title="0">reg := prometheus.NewRegistry()
+
+        var runtimes map[string]runtime.Runtime
+        k8sLog := log.New("module", "k8s")
+        if options.inClusterRuntime != "" </span><span class="cov0" title="0">{
+                runtimes = inClusterRuntimeConfiguration(options, k8sLog)
+        }</span> else<span class="cov0" title="0"> {
+                runtimes = remoteRuntimeConfiguration(options, k8sLog)
+        }</span>
+
+        <span class="cov0" title="0">var monitor monitoring.Monitor = monitoring.NewEmpty()
+        var err error
+
+        if options.newrelicLicenseKey != "" </span><span class="cov0" title="0">{
+                monitor, err = newrelic.New(
+                        nr.ConfigAppName(options.newrelicAppname),
+                        nr.ConfigLicense(options.newrelicLicenseKey),
+                )
+                if err != nil </span><span class="cov0" title="0">{
+                        log.Warn("Failed to create monitor", "error", err)
+                }</span> else<span class="cov0" title="0"> {
+                        log.Info("Using New Relic monitor", "app-name", options.newrelicAppname, "license-key", options.newrelicLicenseKey)
+                }</span>
+        } else<span class="cov0" title="0"> {
+                log.Warn("New Relic not starting without license key!")
+        }</span>
+
+        <span class="cov0" title="0">var cf codefresh.Codefresh
+        </span><span class="cov0" title="0">{
+                var httpClient http.Client
+                if !options.rejectTLSUnauthorized </span><span class="cov0" title="0">{
+                        customTransport := http.DefaultTransport.(*http.Transport).Clone()
+                        // #nosec
+                        customTransport.TLSClientConfig = &amp;tls.Config{InsecureSkipVerify: true}
+
+                        httpClient = http.Client{
+                                Transport: customTransport,
+                        }
+                }</span>
+
+                <span class="cov0" title="0">httpClient.Transport = monitor.NewRoundTripper(httpClient.Transport)
+
+                httpHeaders := http.Header{}
+                </span><span class="cov0" title="0">{
+                        httpHeaders.Add("User-Agent", fmt.Sprintf("codefresh-runner-%s", version))
+                }</span>
+
+                <span class="cov0" title="0">cf = codefresh.New(codefresh.Options{
+                        Host:       options.codefreshHost,
+                        Token:      options.codefreshToken,
+                        AgentID:    options.agentID,
+                        HTTPClient: &amp;httpClient,
+                        Headers:    httpHeaders,
+                })</span>
+        }
+
+        <span class="cov0" title="0">agent, err := agent.New(&amp;agent.Options{
+                Codefresh:                      cf,
+                Logger:                         log.New("module", "agent"),
+                Runtimes:                       runtimes,
+                ID:                             options.agentID,
+                TaskPullingSecondsInterval:     time.Duration(options.taskPullingSecondsInterval) * time.Second,
+                StatusReportingSecondsInterval: time.Duration(options.statusReportingSecondsInterval) * time.Second,
+                Monitor:                        monitor,
+                Concurrency:                    options.concurrency,
+                BufferSize:                     options.bufferSize,
+        })
+        dieOnError(err)
+
+        server, err := server.New(&amp;server.Options{
+                Port:            fmt.Sprintf(":%s", options.serverPort),
+                Logger:          log.New("module", "server"),
+                Monitor:         monitor,
+                MetricsRegistry: reg,
+        })
+        dieOnError(err)
+
+        ctx := context.Background()
+
+        ctx = withSignals(ctx, server.Stop, agent.Stop, log)
+        go func() </span><span class="cov0" title="0">{ dieOnError(agent.Start(ctx)) }</span>()
+        <span class="cov0" title="0">go func() </span><span class="cov0" title="0">{ dieOnError(server.Start()) }</span>()
+
+        <span class="cov0" title="0">&lt;-ctx.Done()</span>
+}
+
+func inClusterRuntimeConfiguration(options startOptions, log logger.Logger) map[string]runtime.Runtime <span class="cov0" title="0">{
+        k, err := kubernetes.NewInCluster(log, options.qps, options.burst)
+        dieOnError(err)
+        re := runtime.New(runtime.Options{
+                Kubernetes: k,
+        })
+        return map[string]runtime.Runtime{options.inClusterRuntime: re}
+}</span>
+
+func remoteRuntimeConfiguration(options startOptions, log logger.Logger) map[string]runtime.Runtime <span class="cov0" title="0">{
+        configs, err := config.Load(options.configDir, ".*.runtime.yaml", log.New("module", "config-loader"))
+        dieOnError(err)
+        runtimes := map[string]runtime.Runtime{}
+        for name, config := range configs </span><span class="cov0" title="0">{
+                k, err := kubernetes.New(kubernetes.Options{
+                        Logger:   log,
+                        Token:    config.Token,
+                        Type:     config.Type,
+                        Host:     config.Host,
+                        Cert:     config.Cert,
+                        Insecure: !options.rejectTLSUnauthorized,
+                        QPS:      options.qps,
+                        Burst:    options.burst,
+                })
+                if err != nil </span><span class="cov0" title="0">{
+                        log.Error("Failed to load kubernetes", "error", err.Error(), "file", name, "name", config.Name)
+                        continue</span>
+                }
+
+                <span class="cov0" title="0">re := runtime.New(runtime.Options{
+                        Kubernetes: k,
+                })
+                runtimes[config.Name] = re</span>
+        }
+
+        <span class="cov0" title="0">return runtimes</span>
+}
+
+func withSignals(
+        ctx context.Context,
+        stopServer func(context.Context) error,
+        stopAgent func() error,
+        log logger.Logger,
+) context.Context <span class="cov4" title="3">{
+        var terminationReq int32 = 0
+        ctx, cancel := context.WithCancel(ctx)
+        sigChan := make(chan os.Signal, 10)
+
+        handleSignal(sigChan, syscall.SIGTERM, syscall.SIGINT)
+
+        go func() </span><span class="cov4" title="3">{
+                for </span><span class="cov6" title="6">{
+                        &lt;-sigChan
+                        if terminationReq++; terminationReq &gt; 1 </span><span class="cov1" title="1">{
+                                // signal received more than once, forcing termination
+                                log.Warn("Forcing termination!")
+                                cancel()
+                                return
+                        }</span>
+
+                        <span class="cov4" title="3">go func() </span><span class="cov4" title="3">{
+                                log.Warn("Received shutdown request, stopping agent and server...")
+                                // order matters, the process will exit as soon as server is stopped
+                                if err := stopAgent(); err != nil </span><span class="cov0" title="0">{
+                                        log.Error(err.Error())
+                                }</span>
+
+                                <span class="cov4" title="3">if err := stopServer(ctx); err != nil </span><span class="cov0" title="0">{
+                                        log.Error(err.Error())
+                                }</span>
+
+                                <span class="cov4" title="3">cancel()</span> // done
+                        }()
+                }
+        }()
+
+        <span class="cov4" title="3">return ctx</span>
+}
+</pre>
+		
+		<pre class="file" id="file3" style="display: none">// Copyright 2020 The Codefresh Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package agent
+
+import (
+        "bytes"
+        "context"
+        "encoding/json"
+        "errors"
+        "fmt"
+        "io"
+        "sort"
+        "sync"
+        "time"
+
+        "github.com/codefresh-io/go/venona/pkg/codefresh"
+        "github.com/codefresh-io/go/venona/pkg/logger"
+        "github.com/codefresh-io/go/venona/pkg/metrics"
+        "github.com/codefresh-io/go/venona/pkg/monitoring"
+        "github.com/codefresh-io/go/venona/pkg/queue"
+        "github.com/codefresh-io/go/venona/pkg/runtime"
+        "github.com/codefresh-io/go/venona/pkg/task"
+        "github.com/codefresh-io/go/venona/pkg/workflow"
+
+        retryablehttp "github.com/hashicorp/go-retryablehttp"
+        "github.com/stretchr/objx"
+)
+
+type (
+        // Options for creating a new Agent instance
+        Options struct {
+                ID                             string
+                Codefresh                      codefresh.Codefresh
+                Runtimes                       map[string]runtime.Runtime
+                Logger                         logger.Logger
+                TaskPullingSecondsInterval     time.Duration
+                StatusReportingSecondsInterval time.Duration
+                Monitor                        monitoring.Monitor
+                Concurrency                    int
+                BufferSize                     int
+        }
+
+        // Agent holds all the references from Codefresh
+        // in order to run the process
+        Agent struct {
+                id                 string
+                cf                 codefresh.Codefresh
+                log                logger.Logger
+                taskPullerTicker   *time.Ticker
+                reportStatusTicker *time.Ticker
+                wfQueue            queue.WorkflowQueue
+                running            bool
+                lastStatus         Status
+                wg                 *sync.WaitGroup
+                monitor            monitoring.Monitor
+        }
+
+        // Status of the agent
+        Status struct {
+                Message string    `json:"message"`
+                Time    time.Time `json:"time"`
+        }
+)
+
+const (
+        defaultProxyRequestTimeout = time.Second * 30
+        defaultProxyRequestRetries = 3
+)
+
+var (
+        // internal errors
+        errAlreadyRunning           = errors.New("Agent already running")
+        errAlreadyStopped           = errors.New("Agent already stopped")
+        errOptionsRequired          = errors.New("Options are required")
+        errIDRequired               = errors.New("ID options is required")
+        errRuntimesRequired         = errors.New("Runtimes options is required")
+        errLoggerRequired           = errors.New("Logger options is required")
+        errFailedToParseAgentTask   = errors.New("Failed to parse agent task spec")
+        errUknownAgentTaskType      = errors.New("Agent task has unknown type")
+        errAgentTaskMalformedParams = errors.New("failed to marshal agent task params")
+        errProxyTaskWithoutURL      = errors.New(`url not provided for task of type "proxy"`)
+        errProxyTaskWithoutToken    = errors.New(`token not provided for task of type "proxy"`)
+
+        httpClient = retryablehttp.NewClient()
+
+        agentTaskExecutors = map[string]func(t *task.AgentTask, log logger.Logger) error{
+                "proxy": proxyRequest,
+        }
+)
+
+// New creates a new Agent instance
+func New(opts *Options) (*Agent, error) <span class="cov10" title="4">{
+        if err := checkOptions(opts); err != nil </span><span class="cov10" title="4">{
+                return nil, err
+        }</span>
+
+        <span class="cov0" title="0">id := opts.ID
+        cf := opts.Codefresh
+        log := opts.Logger
+        taskPullerTicker := time.NewTicker(opts.TaskPullingSecondsInterval)
+        reportStatusTicker := time.NewTicker(opts.StatusReportingSecondsInterval)
+        wg := &amp;sync.WaitGroup{}
+
+        if opts.Monitor == nil </span><span class="cov0" title="0">{
+                opts.Monitor = monitoring.NewEmpty()
+        }</span>
+
+        <span class="cov0" title="0">httpClient.HTTPClient.Transport = opts.Monitor.NewRoundTripper(httpClient.HTTPClient.Transport)
+        wfq := queue.New(&amp;queue.Options{
+                Runtimes:    opts.Runtimes,
+                Log:         log,
+                WG:          wg,
+                Monitor:     opts.Monitor,
+                Concurrency: opts.Concurrency,
+                BufferSize:  opts.BufferSize,
+        })
+        return &amp;Agent{
+                id:                 id,
+                cf:                 cf,
+                log:                log,
+                taskPullerTicker:   taskPullerTicker,
+                reportStatusTicker: reportStatusTicker,
+                wfQueue:            wfq,
+                running:            false,
+                lastStatus:         Status{},
+                wg:                 wg,
+                monitor:            opts.Monitor,
+        }, nil</span>
+}
+
+// Start starting the agent process
+func (a *Agent) Start(ctx context.Context) error <span class="cov0" title="0">{
+        if a.running </span><span class="cov0" title="0">{
+                return errAlreadyRunning
+        }</span>
+
+        <span class="cov0" title="0">a.running = true
+        a.log.Info("Starting agent")
+
+        go a.startTaskPullerRoutine(ctx)
+        go a.startStatusReporterRoutine(ctx)
+        a.wfQueue.Start(ctx)
+
+        a.reportStatus(ctx, codefresh.AgentStatus{
+                Message: "All good",
+        })
+
+        return nil</span>
+}
+
+// Stop stops the agents work and blocks until all leftover tasks are finished
+func (a *Agent) Stop() error <span class="cov0" title="0">{
+        if !a.running </span><span class="cov0" title="0">{
+                return errAlreadyStopped
+        }</span>
+
+        <span class="cov0" title="0">a.running = false
+        a.log.Warn("Received graceful termination request, stopping tasks...")
+        a.reportStatusTicker.Stop()
+        a.taskPullerTicker.Stop()
+        a.wfQueue.Stop()
+        a.log.Warn("stopped both tickers")
+        a.wg.Wait()
+        return nil</span>
+}
+
+// Status returns the last knows status of the agent and related runtimes
+func (a *Agent) Status() Status <span class="cov0" title="0">{
+        return a.lastStatus
+}</span>
+
+func (a *Agent) startTaskPullerRoutine(ctx context.Context) <span class="cov0" title="0">{
+        for </span><span class="cov0" title="0">{
+                select </span>{
+                case &lt;-ctx.Done():<span class="cov0" title="0">
+                        a.log.Info("stopping task puller routine")
+                        return</span>
+                case &lt;-a.taskPullerTicker.C:<span class="cov0" title="0">
+                        agentTasks, workflows := a.getTasks(ctx)
+
+                        // perform all agentTasks (in goroutine)
+                        for i := range agentTasks </span><span class="cov0" title="0">{
+                                a.handleAgentTask(&amp;agentTasks[i])
+                        }</span>
+
+                        // send all wfTasks to tasksQueue
+                        <span class="cov0" title="0">for i := range workflows </span><span class="cov0" title="0">{
+                                a.wfQueue.Enqueue(workflows[i])
+                        }</span>
+
+                        <span class="cov0" title="0">size := a.wfQueue.Size()
+                        agentTasksLen := len(agentTasks)
+                        wfTasksLen := len(workflows)
+                        if agentTasksLen &gt; 0 || wfTasksLen &gt; 0 || size &gt; 0 </span><span class="cov0" title="0">{
+                                a.log.Info("done pulling tasks",
+                                        "agentTasks", agentTasksLen,
+                                        "workflows", wfTasksLen,
+                                        "queueSize", size,
+                                )
+                        }</span>
+
+                        <span class="cov0" title="0">metrics.UpdateQueueSizes(agentTasksLen, wfTasksLen, size)</span>
+                }
+        }
+}
+
+func (a *Agent) startStatusReporterRoutine(ctx context.Context) <span class="cov0" title="0">{
+        for </span><span class="cov0" title="0">{
+                select </span>{
+                case &lt;-ctx.Done():<span class="cov0" title="0">
+                        a.log.Info("stopping status reporter routine")
+                        return</span>
+                case &lt;-a.reportStatusTicker.C:<span class="cov0" title="0">
+                        a.wg.Add(1)
+                        go func() </span><span class="cov0" title="0">{
+                                defer a.wg.Done()
+                                a.reportStatus(ctx, codefresh.AgentStatus{
+                                        Message: "All good",
+                                })
+                        }</span>()
+                }
+        }
+}
+
+func (a *Agent) reportStatus(ctx context.Context, status codefresh.AgentStatus) <span class="cov5" title="2">{
+        err := a.cf.ReportStatus(ctx, status)
+        if err != nil </span><span class="cov1" title="1">{
+                a.log.Error("Failed reporting status", "error", err)
+        }</span>
+}
+
+func (a *Agent) getTasks(ctx context.Context) (task.Tasks, []*workflow.Workflow) <span class="cov0" title="0">{
+        tasks := a.pullTasks(ctx)
+        return a.splitTasks(tasks)
+}</span>
+
+func (a *Agent) pullTasks(ctx context.Context) task.Tasks <span class="cov0" title="0">{
+        start := time.Now()
+        tasks, err := a.cf.Tasks(ctx)
+        metrics.ObserveGetTasks(start)
+
+        if err != nil </span><span class="cov0" title="0">{
+                a.log.Error("Failed pulling tasks", "error", err)
+                return task.Tasks{}
+        }</span>
+
+        <span class="cov0" title="0">if len(tasks) == 0 </span><span class="cov0" title="0">{
+                return task.Tasks{}
+        }</span>
+
+        <span class="cov0" title="0">return tasks</span>
+}
+
+func (a *Agent) splitTasks(tasks task.Tasks) (task.Tasks, []*workflow.Workflow) <span class="cov1" title="1">{
+        pullTime := time.Now()
+        agentTasks := task.Tasks{}
+        wfMap := map[string]*workflow.Workflow{}
+
+        // divide tasks by types
+        for i := range tasks </span><span class="cov8" title="3">{
+                t := tasks[i]
+                switch t.Type </span>{
+                case task.TypeAgentTask:<span class="cov0" title="0">
+                        t.Timeline.Pulled = pullTime
+                        agentTasks = append(agentTasks, t)</span>
+                case task.TypeCreatePod, task.TypeCreatePVC, task.TypeDeletePod, task.TypeDeletePVC:<span class="cov8" title="3">
+                        wf, ok := wfMap[t.Metadata.Workflow]
+                        if !ok </span><span class="cov1" title="1">{
+                                wf = workflow.New(t.Metadata)
+                                wfMap[t.Metadata.Workflow] = wf
+                        }</span>
+
+                        <span class="cov8" title="3">err := wf.AddTask(&amp;t)
+                        if err != nil </span><span class="cov0" title="0">{
+                                a.log.Error("failed adding task to workflow", "error", err)
+                        }</span>
+                default:<span class="cov0" title="0">
+                        a.log.Error("unrecognized task type", "type", t.Type, "tid", t.Metadata.Workflow, "runtime", t.Metadata.ReName)</span>
+                }
+        }
+
+        // sort agentTasks by creationDate
+        <span class="cov1" title="1">sort.SliceStable(agentTasks, func(i, j int) bool </span><span class="cov0" title="0">{
+                task1, task2 := agentTasks[i], tasks[j]
+                return task.Less(task1, task2)
+        }</span>)
+
+        <span class="cov1" title="1">workflows := []*workflow.Workflow{}
+        for _, wf := range wfMap </span><span class="cov1" title="1">{
+                wf.Timeline.Pulled = pullTime
+
+                task.SortByType(wf.Tasks)
+                workflows = append(workflows, wf)
+        }</span>
+
+        // sort workflows by creationDate
+        <span class="cov1" title="1">sort.SliceStable(workflows, func(i, j int) bool </span><span class="cov0" title="0">{
+                wf1, wf2 := workflows[i], workflows[j]
+                return workflow.Less(*wf1, *wf2)
+        }</span>)
+        <span class="cov1" title="1">return agentTasks, workflows</span>
+}
+
+func (a *Agent) handleAgentTask(t *task.Task) <span class="cov0" title="0">{
+        a.log.Info("executing agent task", "tid", t.Metadata.Workflow)
+        a.wg.Add(1)
+        go func() </span><span class="cov0" title="0">{
+                defer a.wg.Done()
+                txn := task.NewTaskTransaction(a.monitor, t.Metadata)
+                defer txn.End()
+                err := a.executeAgentTask(t)
+
+                if err != nil </span><span class="cov0" title="0">{
+                        a.log.Error(err.Error())
+                        txn.NoticeError(err)
+                }</span>
+
+        }()
+}
+
+func (a *Agent) executeAgentTask(t *task.Task) error <span class="cov8" title="3">{
+        t.Timeline.Started = time.Now()
+        specJSON, err := json.Marshal(t.Spec)
+        if err != nil </span><span class="cov0" title="0">{
+                return errFailedToParseAgentTask
+        }</span>
+
+        <span class="cov8" title="3">spec := task.AgentTask{}
+        if err = json.Unmarshal(specJSON, &amp;spec); err != nil </span><span class="cov0" title="0">{
+                return errFailedToParseAgentTask
+        }</span>
+
+        <span class="cov8" title="3">e, ok := agentTaskExecutors[spec.Type]
+        if !ok </span><span class="cov0" title="0">{
+                return errUknownAgentTaskType
+        }</span>
+
+        <span class="cov8" title="3">err = e(&amp;spec, a.log)
+        sinceCreation, inRunner, processed := t.GetLatency()
+        a.log.Info("Done handling agent task",
+                "tid", t.Metadata.Workflow,
+                "time since creation", sinceCreation,
+                "time in runner", inRunner,
+                "processing time", processed,
+        )
+        metrics.ObserveAgentTaskMetrics(spec.Type, sinceCreation, inRunner, processed)
+        return err</span>
+}
+
+func proxyRequest(t *task.AgentTask, log logger.Logger) error <span class="cov0" title="0">{
+        spec := objx.Map(t.Params)
+        vars := objx.Map(spec.Get("runtimeContext.context.variables").MSI())
+        token := spec.Get("runtimeContext.context.eventReporting.token").Str()
+        if token == "" </span><span class="cov0" title="0">{
+                return errProxyTaskWithoutToken
+        }</span>
+
+        <span class="cov0" title="0">url := vars.Get("proxyUrl").Str()
+        if url == "" </span><span class="cov0" title="0">{
+                return errProxyTaskWithoutURL
+        }</span>
+
+        <span class="cov0" title="0">method := vars.Get("method").Str("POST")
+
+        json, err := json.Marshal(t.Params)
+        if err != nil </span><span class="cov0" title="0">{
+                return errAgentTaskMalformedParams
+        }</span>
+
+        <span class="cov0" title="0">if json == nil </span><span class="cov0" title="0">{
+                json = []byte{}
+        }</span>
+
+        <span class="cov0" title="0">req, err := retryablehttp.NewRequest(method, url, bytes.NewReader(json))
+        if err != nil </span><span class="cov0" title="0">{
+                return fmt.Errorf("failed creating new request: %w", err)
+        }</span>
+
+        <span class="cov0" title="0">req.Header.Add("x-req-type", "workflow-request")
+        req.Header.Add("x-access-token", token)
+        req.Header.Add("Content-Type", "application/json")
+        req.Header.Add("Content-Length", fmt.Sprintf("%v", len(json)))
+
+        log.Info("executing proxy task", "url", url, "method", method)
+
+        resp, err := httpClient.Do(req)
+        if err != nil </span><span class="cov0" title="0">{
+                return fmt.Errorf("failed sending request: %w", err)
+        }</span>
+
+        <span class="cov0" title="0">defer resp.Body.Close()
+        body, _ := io.ReadAll(resp.Body)
+        log.Info("finished proxy task", "url", url, "method", method, "status", resp.Status, "body", string(body))
+
+        return nil</span>
+}
+
+func groupTasks(tasks task.Tasks) map[string]task.Tasks <span class="cov1" title="1">{
+        candidates := map[string]task.Tasks{}
+        for _, task := range tasks </span><span class="cov8" title="3">{
+                name := task.Metadata.Workflow
+                if name == "" </span><span class="cov0" title="0">{
+                        // If for some reason the task is not related to any workflow
+                        // Might heppen in older versions on Codefresh
+                        name = "_"
+                }</span>
+
+                <span class="cov8" title="3">candidates[name] = append(candidates[name], task)</span>
+        }
+
+        <span class="cov1" title="1">return candidates</span>
+}
+
+func checkOptions(opts *Options) error <span class="cov10" title="4">{
+        if opts == nil </span><span class="cov1" title="1">{
+                return errOptionsRequired
+        }</span>
+
+        <span class="cov8" title="3">if opts.ID == "" </span><span class="cov1" title="1">{
+                return errIDRequired
+        }</span>
+
+        <span class="cov5" title="2">if len(opts.Runtimes) == 0 </span><span class="cov1" title="1">{
+                return errRuntimesRequired
+        }</span>
+
+        <span class="cov1" title="1">if opts.Logger == nil </span><span class="cov1" title="1">{
+                return errLoggerRequired
+        }</span>
+
+        <span class="cov0" title="0">return nil</span>
+}
+
+func init() <span class="cov1" title="1">{
+        httpClient.RetryMax = defaultProxyRequestRetries
+        httpClient.HTTPClient.Timeout = defaultProxyRequestTimeout
+}</span>
+</pre>
+		
+		<pre class="file" id="file4" style="display: none">// Copyright 2020 The Codefresh Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package codefresh
+
+import (
+        "bytes"
+        "context"
+        "fmt"
+        "io"
+        "net/http"
+        "net/url"
+        "path"
+
+        "github.com/codefresh-io/go/venona/pkg/task"
+)
+
+const (
+        defaultHost = "https://g.codefresh.io"
+)
+
+type (
+        // Codefresh API client
+        Codefresh interface {
+                Tasks(ctx context.Context) (task.Tasks, error)
+                ReportStatus(ctx context.Context, status AgentStatus) error
+                Host() string
+        }
+
+        // RequestDoer runs HTTP request
+        RequestDoer interface {
+                Do(*http.Request) (*http.Response, error)
+        }
+
+        // Options for codefresh
+        Options struct {
+                Host       string
+                Token      string
+                AgentID    string
+                HTTPClient RequestDoer
+                Headers    http.Header
+        }
+
+        cf struct {
+                host       string
+                token      string
+                agentID    string
+                httpClient RequestDoer
+                headers    http.Header
+        }
+)
+
+// New build Codefresh client from options
+func New(opts Options) Codefresh <span class="cov5" title="2">{
+        host := opts.Host
+        if host == "" </span><span class="cov1" title="1">{
+                host = defaultHost
+        }</span>
+
+        <span class="cov5" title="2">return &amp;cf{
+                agentID:    opts.AgentID,
+                httpClient: opts.HTTPClient,
+                host:       host,
+                token:      opts.Token,
+                headers:    opts.Headers,
+        }</span>
+}
+
+// Tasks get from Codefresh all latest tasks
+func (c cf) Tasks(ctx context.Context) (task.Tasks, error) <span class="cov0" title="0">{
+        res, err := c.doRequest(ctx, "GET", nil, "api", "agent", c.agentID, "tasks")
+        if err != nil </span><span class="cov0" title="0">{
+                return nil, err
+        }</span>
+
+        <span class="cov0" title="0">tasks, err := task.UnmarshalTasks(res)
+        if err != nil </span><span class="cov0" title="0">{
+                return nil, err
+        }</span>
+
+        <span class="cov0" title="0">return tasks, nil</span>
+}
+
+// Host returns the host
+func (c cf) Host() string <span class="cov10" title="4">{
+        return c.host
+}</span>
+
+// ReportStatus updates the agent entity with given status
+func (c cf) ReportStatus(ctx context.Context, status AgentStatus) error <span class="cov0" title="0">{
+        s, err := status.Marshal()
+        if err != nil </span><span class="cov0" title="0">{
+                return fmt.Errorf("failed marshalling when reporting status: %w", err)
+        }</span>
+
+        <span class="cov0" title="0">_, err = c.doRequest(ctx, "PUT", bytes.NewBuffer(s), "api", "agent", c.agentID, "status")
+        if err != nil </span><span class="cov0" title="0">{
+                return fmt.Errorf("failed sending request when reporting status: %w", err)
+        }</span>
+
+        <span class="cov0" title="0">return nil</span>
+}
+
+func (c cf) buildErrorFromResponse(status int, body []byte) error <span class="cov0" title="0">{
+        return Error{
+                APIStatusCode: status,
+                Message:       string(body),
+        }
+}</span>
+
+func (c cf) prepareURL(paths ...string) (*url.URL, error) <span class="cov8" title="3">{
+        u, err := url.Parse(c.host)
+        if err != nil </span><span class="cov1" title="1">{
+                return nil, err
+        }</span>
+
+        <span class="cov5" title="2">accPath := []string{}
+        accRawPath := []string{}
+
+        for _, p := range paths </span><span class="cov8" title="3">{
+                accRawPath = append(accRawPath, url.PathEscape(p))
+                accPath = append(accPath, p)
+        }</span>
+
+        <span class="cov5" title="2">u.Path = path.Join(accPath...)
+        u.RawPath = path.Join(accRawPath...)
+        return u, nil</span>
+}
+
+func (c cf) prepareRequest(method string, data io.Reader, apis ...string) (*http.Request, error) <span class="cov0" title="0">{
+        u, err := c.prepareURL(apis...)
+        if err != nil </span><span class="cov0" title="0">{
+                return nil, err
+        }</span>
+
+        <span class="cov0" title="0">req, err := http.NewRequest(method, u.String(), data)
+        if err != nil </span><span class="cov0" title="0">{
+                return nil, err
+        }</span>
+
+        <span class="cov0" title="0">req.Header = c.headers.Clone()
+        if c.token != "" </span><span class="cov0" title="0">{
+                req.Header.Add("Authorization", c.token)
+        }</span>
+
+        <span class="cov0" title="0">req.Header.Add("Content-Type", "application/json")
+        return req, nil</span>
+}
+
+func (c cf) doRequest(ctx context.Context, method string, body io.Reader, apis ...string) ([]byte, error) <span class="cov0" title="0">{
+        req, err := c.prepareRequest(method, body, apis...)
+        if err != nil </span><span class="cov0" title="0">{
+                return nil, err
+        }</span>
+
+        <span class="cov0" title="0">resp, err := c.httpClient.Do(req.WithContext(ctx))
+        if err != nil </span><span class="cov0" title="0">{
+                return nil, err
+        }</span>
+
+        <span class="cov0" title="0">defer resp.Body.Close()
+        data, err := io.ReadAll(resp.Body)
+        if err != nil </span><span class="cov0" title="0">{
+                return nil, err
+        }</span>
+
+        <span class="cov0" title="0">if resp.StatusCode &gt;= 400 </span><span class="cov0" title="0">{
+                return nil, c.buildErrorFromResponse(resp.StatusCode, data)
+        }</span>
+
+        <span class="cov0" title="0">return data, nil</span>
+}
+</pre>
+		
+		<pre class="file" id="file5" style="display: none">// Copyright 2023 The Codefresh Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by mockery v2.32.0. DO NOT EDIT.
+
+package codefresh
+
+import (
+        context "context"
+
+        task "github.com/codefresh-io/go/venona/pkg/task"
+        mock "github.com/stretchr/testify/mock"
+)
+
+// MockCodefresh is an autogenerated mock type for the Codefresh type
+type MockCodefresh struct {
+        mock.Mock
+}
+
+type MockCodefresh_Expecter struct {
+        mock *mock.Mock
+}
+
+func (_m *MockCodefresh) EXPECT() *MockCodefresh_Expecter <span class="cov0" title="0">{
+        return &amp;MockCodefresh_Expecter{mock: &amp;_m.Mock}
+}</span>
+
+// Host provides a mock function with given fields:
+func (_m *MockCodefresh) Host() string <span class="cov0" title="0">{
+        ret := _m.Called()
+
+        var r0 string
+        if rf, ok := ret.Get(0).(func() string); ok </span><span class="cov0" title="0">{
+                r0 = rf()
+        }</span> else<span class="cov0" title="0"> {
+                r0 = ret.Get(0).(string)
+        }</span>
+
+        <span class="cov0" title="0">return r0</span>
+}
+
+// MockCodefresh_Host_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Host'
+type MockCodefresh_Host_Call struct {
+        *mock.Call
+}
+
+// Host is a helper method to define mock.On call
+func (_e *MockCodefresh_Expecter) Host() *MockCodefresh_Host_Call <span class="cov0" title="0">{
+        return &amp;MockCodefresh_Host_Call{Call: _e.mock.On("Host")}
+}</span>
+
+func (_c *MockCodefresh_Host_Call) Run(run func()) *MockCodefresh_Host_Call <span class="cov0" title="0">{
+        _c.Call.Run(func(args mock.Arguments) </span><span class="cov0" title="0">{
+                run()
+        }</span>)
+        <span class="cov0" title="0">return _c</span>
+}
+
+func (_c *MockCodefresh_Host_Call) Return(_a0 string) *MockCodefresh_Host_Call <span class="cov0" title="0">{
+        _c.Call.Return(_a0)
+        return _c
+}</span>
+
+func (_c *MockCodefresh_Host_Call) RunAndReturn(run func() string) *MockCodefresh_Host_Call <span class="cov0" title="0">{
+        _c.Call.Return(run)
+        return _c
+}</span>
+
+// ReportStatus provides a mock function with given fields: ctx, status
+func (_m *MockCodefresh) ReportStatus(ctx context.Context, status AgentStatus) error <span class="cov0" title="0">{
+        ret := _m.Called(ctx, status)
+
+        var r0 error
+        if rf, ok := ret.Get(0).(func(context.Context, AgentStatus) error); ok </span><span class="cov0" title="0">{
+                r0 = rf(ctx, status)
+        }</span> else<span class="cov0" title="0"> {
+                r0 = ret.Error(0)
+        }</span>
+
+        <span class="cov0" title="0">return r0</span>
+}
+
+// MockCodefresh_ReportStatus_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ReportStatus'
+type MockCodefresh_ReportStatus_Call struct {
+        *mock.Call
+}
+
+// ReportStatus is a helper method to define mock.On call
+//   - ctx context.Context
+//   - status AgentStatus
+func (_e *MockCodefresh_Expecter) ReportStatus(ctx interface{}, status interface{}) *MockCodefresh_ReportStatus_Call <span class="cov0" title="0">{
+        return &amp;MockCodefresh_ReportStatus_Call{Call: _e.mock.On("ReportStatus", ctx, status)}
+}</span>
+
+func (_c *MockCodefresh_ReportStatus_Call) Run(run func(ctx context.Context, status AgentStatus)) *MockCodefresh_ReportStatus_Call <span class="cov0" title="0">{
+        _c.Call.Run(func(args mock.Arguments) </span><span class="cov0" title="0">{
+                run(args[0].(context.Context), args[1].(AgentStatus))
+        }</span>)
+        <span class="cov0" title="0">return _c</span>
+}
+
+func (_c *MockCodefresh_ReportStatus_Call) Return(_a0 error) *MockCodefresh_ReportStatus_Call <span class="cov0" title="0">{
+        _c.Call.Return(_a0)
+        return _c
+}</span>
+
+func (_c *MockCodefresh_ReportStatus_Call) RunAndReturn(run func(context.Context, AgentStatus) error) *MockCodefresh_ReportStatus_Call <span class="cov0" title="0">{
+        _c.Call.Return(run)
+        return _c
+}</span>
+
+// Tasks provides a mock function with given fields: ctx
+func (_m *MockCodefresh) Tasks(ctx context.Context) (task.Tasks, error) <span class="cov0" title="0">{
+        ret := _m.Called(ctx)
+
+        var r0 task.Tasks
+        var r1 error
+        if rf, ok := ret.Get(0).(func(context.Context) (task.Tasks, error)); ok </span><span class="cov0" title="0">{
+                return rf(ctx)
+        }</span>
+        <span class="cov0" title="0">if rf, ok := ret.Get(0).(func(context.Context) task.Tasks); ok </span><span class="cov0" title="0">{
+                r0 = rf(ctx)
+        }</span> else<span class="cov0" title="0"> {
+                if ret.Get(0) != nil </span><span class="cov0" title="0">{
+                        r0 = ret.Get(0).(task.Tasks)
+                }</span>
+        }
+
+        <span class="cov0" title="0">if rf, ok := ret.Get(1).(func(context.Context) error); ok </span><span class="cov0" title="0">{
+                r1 = rf(ctx)
+        }</span> else<span class="cov0" title="0"> {
+                r1 = ret.Error(1)
+        }</span>
+
+        <span class="cov0" title="0">return r0, r1</span>
+}
+
+// MockCodefresh_Tasks_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Tasks'
+type MockCodefresh_Tasks_Call struct {
+        *mock.Call
+}
+
+// Tasks is a helper method to define mock.On call
+//   - ctx context.Context
+func (_e *MockCodefresh_Expecter) Tasks(ctx interface{}) *MockCodefresh_Tasks_Call <span class="cov0" title="0">{
+        return &amp;MockCodefresh_Tasks_Call{Call: _e.mock.On("Tasks", ctx)}
+}</span>
+
+func (_c *MockCodefresh_Tasks_Call) Run(run func(ctx context.Context)) *MockCodefresh_Tasks_Call <span class="cov0" title="0">{
+        _c.Call.Run(func(args mock.Arguments) </span><span class="cov0" title="0">{
+                run(args[0].(context.Context))
+        }</span>)
+        <span class="cov0" title="0">return _c</span>
+}
+
+func (_c *MockCodefresh_Tasks_Call) Return(_a0 task.Tasks, _a1 error) *MockCodefresh_Tasks_Call <span class="cov0" title="0">{
+        _c.Call.Return(_a0, _a1)
+        return _c
+}</span>
+
+func (_c *MockCodefresh_Tasks_Call) RunAndReturn(run func(context.Context) (task.Tasks, error)) *MockCodefresh_Tasks_Call <span class="cov0" title="0">{
+        _c.Call.Return(run)
+        return _c
+}</span>
+
+// NewMockCodefresh creates a new instance of MockCodefresh. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewMockCodefresh(t interface {
+        mock.TestingT
+        Cleanup(func())
+}) *MockCodefresh <span class="cov0" title="0">{
+        mock := &amp;MockCodefresh{}
+        mock.Mock.Test(t)
+
+        t.Cleanup(func() </span><span class="cov0" title="0">{ mock.AssertExpectations(t) }</span>)
+
+        <span class="cov0" title="0">return mock</span>
+}
+</pre>
+		
+		<pre class="file" id="file6" style="display: none">// Copyright 2020 The Codefresh Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package codefresh
+
+import "fmt"
+
+type (
+        // Error is an error that may be thrown from Codefresh API
+        Error struct {
+                Message       string
+                APIStatusCode int
+        }
+)
+
+func (c Error) Error() string <span class="cov0" title="0">{
+        return fmt.Sprintf("HTTP request to Codefresh API rejected. Status-Code: %d. Message: %s", c.APIStatusCode, c.Message)
+}</span>
+</pre>
+		
+		<pre class="file" id="file7" style="display: none">// Copyright 2020 The Codefresh Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package codefresh
+
+import "encoding/json"
+
+type (
+        // AgentStatus is the latest status of the agent
+        AgentStatus struct {
+                Message string `json:"message"`
+        }
+)
+
+// Marshal status
+func (r *AgentStatus) Marshal() ([]byte, error) <span class="cov0" title="0">{
+        return json.Marshal(r)
+}</span>
+</pre>
+		
+		<pre class="file" id="file8" style="display: none">// Copyright 2020 The Codefresh Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package config
+
+import (
+        "os"
+        "path/filepath"
+        "regexp"
+
+        "github.com/codefresh-io/go/venona/pkg/logger"
+
+        "gopkg.in/yaml.v2"
+)
+
+var (
+        readfile     = os.ReadFile
+        walkFilePath = filepath.Walk
+)
+
+type (
+        // Config used to define the connectivity to remote clusters
+        Config struct {
+                Type  string `yaml:"type" json:"type"`
+                Cert  string `yaml:"crt" json:"crt"`
+                Token string `yaml:"token" json:"token"`
+                Host  string `yaml:"host" json:"host"`
+                Name  string `yaml:"name" json:"name"`
+        }
+
+        // Options to load the config
+        Options struct {
+                Logger logger.Logger
+                Dir    string
+        }
+)
+
+// Load read the dir and load all the matching files matchig to the config
+// In case of conflict, the first matching is used
+func Load(dir string, pattern string, logger logger.Logger) (map[string]Config, error) <span class="cov10" title="2">{
+        regexp, err := regexp.Compile(pattern)
+        if err != nil </span><span class="cov0" title="0">{
+                return nil, err
+        }</span>
+
+        <span class="cov10" title="2">var files []string
+        if err := walkFilePath(dir, visit(&amp;files, regexp, logger)); err != nil </span><span class="cov0" title="0">{
+                return nil, err
+        }</span>
+
+        <span class="cov10" title="2">return buildConfigMap(files, logger)</span>
+}
+
+func visit(files *[]string, re *regexp.Regexp, log logger.Logger) filepath.WalkFunc <span class="cov10" title="2">{
+        return func(path string, info os.FileInfo, err error) error </span><span class="cov10" title="2">{
+                if err != nil </span><span class="cov0" title="0">{
+                        log.Error("Failed to visit", "path", path, "err", err.Error())
+                        return nil
+                }</span>
+
+                <span class="cov10" title="2">if info.IsDir() </span><span class="cov0" title="0">{
+                        log.Debug("Directory ignored, Venona loading only files that are mached to regexp", "regexp", re.String(), "dir", info.Name())
+                        return nil
+                }</span>
+
+                <span class="cov10" title="2">if !re.MatchString(info.Name()) </span><span class="cov1" title="1">{
+                        log.Debug("File ignored, regexp does not match", "regexp", re.String(), "file", info.Name())
+                        return nil
+                }</span>
+
+                <span class="cov1" title="1">*files = append(*files, path)
+                return nil</span>
+        }
+}
+
+func unmarshalConfig(data []byte) (Config, error) <span class="cov1" title="1">{
+        cnf := Config{}
+        if err := yaml.Unmarshal(data, &amp;cnf); err != nil </span><span class="cov0" title="0">{
+                return cnf, err
+        }</span>
+
+        <span class="cov1" title="1">return cnf, nil</span>
+}
+
+func buildConfigMap(files []string, logger logger.Logger) (map[string]Config, error) <span class="cov10" title="2">{
+        result := map[string]Config{}
+        for _, file := range files </span><span class="cov1" title="1">{
+                b, err := readfile(file)
+                if err != nil </span><span class="cov0" title="0">{
+                        logger.Error("Failed to read file content", "file", file, "err", err.Error())
+                        continue</span>
+                }
+
+                <span class="cov1" title="1">cnf, err := unmarshalConfig(b)
+                if err != nil </span><span class="cov0" title="0">{
+                        logger.Error("Failed to unmarshal file content into struct", "file", file, "err", err.Error())
+                        continue</span>
+                }
+
+                <span class="cov1" title="1">result[file] = cnf</span>
+        }
+
+        <span class="cov10" title="2">return result, nil</span>
+}
+</pre>
+		
+		<pre class="file" id="file9" style="display: none">// Copyright 2020 The Codefresh Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package kubernetes
+
+import (
+        "context"
+        "encoding/json"
+        "errors"
+        "fmt"
+        "time"
+
+        "github.com/codefresh-io/go/venona/pkg/logger"
+        "github.com/codefresh-io/go/venona/pkg/metrics"
+        "github.com/codefresh-io/go/venona/pkg/task"
+
+        v1 "k8s.io/api/core/v1"
+        metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+        "k8s.io/client-go/kubernetes"
+        "k8s.io/client-go/kubernetes/scheme"
+        "k8s.io/client-go/rest"
+)
+
+var errNotValidType = errors.New("not a valid type")
+var kubeDecode = scheme.Codecs.UniversalDeserializer().Decode
+
+type (
+        // Kubernetes API client
+        Kubernetes interface {
+                CreateResource(ctx context.Context, taskType task.Type, spec interface{}) error
+                DeleteResource(ctx context.Context, opts DeleteOptions) error
+        }
+
+        // Options for Kubernetes
+        Options struct {
+                Logger   logger.Logger
+                Type     string
+                Cert     string
+                Token    string
+                Host     string
+                Insecure bool
+                QPS      float32
+                Burst    int
+        }
+
+        // DeleteOptions to delete resource from the cluster
+        DeleteOptions struct {
+                Name      string
+                Namespace string
+                Kind      task.Type
+        }
+
+        kube struct {
+                client kubernetes.Interface
+                log    logger.Logger
+        }
+)
+
+// NewInCluster build Kubernetes API based on local in cluster runtime
+func NewInCluster(log logger.Logger, qps float32, burst int) (Kubernetes, error) <span class="cov0" title="0">{
+        client, err := buildKubeInCluster(qps, burst)
+        return &amp;kube{
+                client: client,
+                log:    log,
+        }, err
+}</span>
+
+// New build Kubernetes API
+func New(opts Options) (Kubernetes, error) <span class="cov4" title="2">{
+        if opts.Type != "runtime" </span><span class="cov1" title="1">{
+                return nil, errNotValidType
+        }</span>
+
+        <span class="cov1" title="1">client, err := buildKubeClient(opts.Host, opts.Token, opts.Cert, opts.Insecure, opts.QPS, opts.Burst)
+        return &amp;kube{
+                client: client,
+                log:    opts.Logger,
+        }, err</span>
+}
+
+func (k kube) CreateResource(ctx context.Context, taskType task.Type, spec interface{}) error <span class="cov7" title="3">{
+        start := time.Now()
+        bytes, err := json.Marshal(spec)
+        if err != nil </span><span class="cov0" title="0">{
+                return fmt.Errorf("failed marshalling when creating resource: %w", err)
+        }</span>
+
+        <span class="cov7" title="3">obj, _, err := kubeDecode(bytes, nil, nil)
+        if err != nil </span><span class="cov0" title="0">{
+                return fmt.Errorf("failed decoding when creating resource: %w", err)
+        }</span>
+
+        <span class="cov7" title="3">var namespace, name string
+        switch obj := obj.(type) </span>{
+        case *v1.PersistentVolumeClaim:<span class="cov1" title="1">
+                namespace, name = obj.Namespace, obj.Name
+                _, err = k.client.CoreV1().PersistentVolumeClaims(namespace).Create(ctx, obj, metav1.CreateOptions{})
+                if err != nil </span><span class="cov0" title="0">{
+                        return fmt.Errorf("failed creating persistent volume claims \"%s\\%s\": %w", namespace, obj.Name, err)
+                }</span>
+        case *v1.Pod:<span class="cov1" title="1">
+                namespace, name = obj.Namespace, obj.Name
+                _, err = k.client.CoreV1().Pods(namespace).Create(ctx, obj, metav1.CreateOptions{})
+                if err != nil </span><span class="cov0" title="0">{
+                        return fmt.Errorf("failed creating pod \"%s\\%s\": %w", namespace, obj.Name, err)
+                }</span>
+        default:<span class="cov1" title="1">
+                return fmt.Errorf("failed creating resource of type %s", obj.GetObjectKind().GroupVersionKind())</span>
+        }
+
+        <span class="cov4" title="2">processed := time.Since(start)
+        k.log.Info("Done handling k8s task",
+                "type", taskType,
+                "namespace", namespace,
+                "name", name,
+                "processing time", processed,
+        )
+        metrics.ObserveK8sMetrics(taskType, processed)
+        return nil</span>
+}
+
+func (k kube) DeleteResource(ctx context.Context, opts DeleteOptions) error <span class="cov10" title="5">{
+        start := time.Now()
+        switch opts.Kind </span>{
+        case task.TypeDeletePVC:<span class="cov1" title="1">
+                err := k.client.CoreV1().PersistentVolumeClaims(opts.Namespace).Delete(ctx, opts.Name, metav1.DeleteOptions{})
+                if err != nil </span><span class="cov0" title="0">{
+                        return fmt.Errorf("failed deleting persistent volume claim \"%s\\%s\": %w", opts.Namespace, opts.Name, err)
+                }</span>
+        case task.TypeDeletePod:<span class="cov7" title="3">
+                err := k.client.CoreV1().Pods(opts.Namespace).Delete(ctx, opts.Name, metav1.DeleteOptions{})
+                if err != nil </span><span class="cov4" title="2">{
+                        return fmt.Errorf("failed deleting pod \"%s\\%s\": %w", opts.Namespace, opts.Name, err)
+                }</span>
+        default:<span class="cov1" title="1">
+                return fmt.Errorf("failed deleting resource of type %s", opts.Kind)</span>
+        }
+
+        <span class="cov4" title="2">processed := time.Since(start)
+        k.log.Info("Done handling k8s task",
+                "type", opts.Kind,
+                "namespace", opts.Namespace,
+                "name", opts.Name,
+                "processing time", processed,
+        )
+        metrics.ObserveK8sMetrics(opts.Kind, processed)
+        return nil</span>
+}
+
+func buildKubeClient(host string, token string, crt string, insecure bool, qps float32, burst int) (kubernetes.Interface, error) <span class="cov1" title="1">{
+        var tlsconf rest.TLSClientConfig
+        if insecure </span><span class="cov0" title="0">{
+                tlsconf = rest.TLSClientConfig{
+                        Insecure: true,
+                }
+        }</span> else<span class="cov1" title="1"> {
+                tlsconf = rest.TLSClientConfig{
+                        CAData: []byte(crt),
+                }
+        }</span>
+
+        <span class="cov1" title="1">return kubernetes.NewForConfig(&amp;rest.Config{
+                Host:            host,
+                BearerToken:     token,
+                TLSClientConfig: tlsconf,
+                QPS:             qps,
+                Burst:           burst,
+        })</span>
+}
+
+func buildKubeInCluster(qps float32, burst int) (kubernetes.Interface, error) <span class="cov0" title="0">{
+        config, err := rest.InClusterConfig()
+        if err != nil </span><span class="cov0" title="0">{
+                return nil, err
+        }</span>
+
+        <span class="cov0" title="0">config.QPS = qps
+        config.Burst = burst
+        return kubernetes.NewForConfig(config)</span>
+}
+</pre>
+		
+		<pre class="file" id="file10" style="display: none">// Copyright 2023 The Codefresh Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Code generated by mockery v2.32.0. DO NOT EDIT.
+
+package kubernetes
+
+import (
+        context "context"
+
+        task "github.com/codefresh-io/go/venona/pkg/task"
+        mock "github.com/stretchr/testify/mock"
+)
+
+// MockKubernetes is an autogenerated mock type for the Kubernetes type
+type MockKubernetes struct {
+        mock.Mock
+}
+
+type MockKubernetes_Expecter struct {
+        mock *mock.Mock
+}
+
+func (_m *MockKubernetes) EXPECT() *MockKubernetes_Expecter <span class="cov0" title="0">{
+        return &amp;MockKubernetes_Expecter{mock: &amp;_m.Mock}
+}</span>
+
+// CreateResource provides a mock function with given fields: ctx, taskType, spec
+func (_m *MockKubernetes) CreateResource(ctx context.Context, taskType task.Type, spec interface{}) error <span class="cov0" title="0">{
+        ret := _m.Called(ctx, taskType, spec)
+
+        var r0 error
+        if rf, ok := ret.Get(0).(func(context.Context, task.Type, interface{}) error); ok </span><span class="cov0" title="0">{
+                r0 = rf(ctx, taskType, spec)
+        }</span> else<span class="cov0" title="0"> {
+                r0 = ret.Error(0)
+        }</span>
+
+        <span class="cov0" title="0">return r0</span>
+}
+
+// MockKubernetes_CreateResource_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'CreateResource'
+type MockKubernetes_CreateResource_Call struct {
+        *mock.Call
+}
+
+// CreateResource is a helper method to define mock.On call
+//   - ctx context.Context
+//   - taskType task.Type
+//   - spec interface{}
+func (_e *MockKubernetes_Expecter) CreateResource(ctx interface{}, taskType interface{}, spec interface{}) *MockKubernetes_CreateResource_Call <span class="cov0" title="0">{
+        return &amp;MockKubernetes_CreateResource_Call{Call: _e.mock.On("CreateResource", ctx, taskType, spec)}
+}</span>
+
+func (_c *MockKubernetes_CreateResource_Call) Run(run func(ctx context.Context, taskType task.Type, spec interface{})) *MockKubernetes_CreateResource_Call <span class="cov0" title="0">{
+        _c.Call.Run(func(args mock.Arguments) </span><span class="cov0" title="0">{
+                run(args[0].(context.Context), args[1].(task.Type), args[2].(interface{}))
+        }</span>)
+        <span class="cov0" title="0">return _c</span>
+}
+
+func (_c *MockKubernetes_CreateResource_Call) Return(_a0 error) *MockKubernetes_CreateResource_Call <span class="cov0" title="0">{
+        _c.Call.Return(_a0)
+        return _c
+}</span>
+
+func (_c *MockKubernetes_CreateResource_Call) RunAndReturn(run func(context.Context, task.Type, interface{}) error) *MockKubernetes_CreateResource_Call <span class="cov0" title="0">{
+        _c.Call.Return(run)
+        return _c
+}</span>
+
+// DeleteResource provides a mock function with given fields: ctx, opts
+func (_m *MockKubernetes) DeleteResource(ctx context.Context, opts DeleteOptions) error <span class="cov0" title="0">{
+        ret := _m.Called(ctx, opts)
+
+        var r0 error
+        if rf, ok := ret.Get(0).(func(context.Context, DeleteOptions) error); ok </span><span class="cov0" title="0">{
+                r0 = rf(ctx, opts)
+        }</span> else<span class="cov0" title="0"> {
+                r0 = ret.Error(0)
+        }</span>
+
+        <span class="cov0" title="0">return r0</span>
+}
+
+// MockKubernetes_DeleteResource_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'DeleteResource'
+type MockKubernetes_DeleteResource_Call struct {
+        *mock.Call
+}
+
+// DeleteResource is a helper method to define mock.On call
+//   - ctx context.Context
+//   - opts DeleteOptions
+func (_e *MockKubernetes_Expecter) DeleteResource(ctx interface{}, opts interface{}) *MockKubernetes_DeleteResource_Call <span class="cov0" title="0">{
+        return &amp;MockKubernetes_DeleteResource_Call{Call: _e.mock.On("DeleteResource", ctx, opts)}
+}</span>
+
+func (_c *MockKubernetes_DeleteResource_Call) Run(run func(ctx context.Context, opts DeleteOptions)) *MockKubernetes_DeleteResource_Call <span class="cov0" title="0">{
+        _c.Call.Run(func(args mock.Arguments) </span><span class="cov0" title="0">{
+                run(args[0].(context.Context), args[1].(DeleteOptions))
+        }</span>)
+        <span class="cov0" title="0">return _c</span>
+}
+
+func (_c *MockKubernetes_DeleteResource_Call) Return(_a0 error) *MockKubernetes_DeleteResource_Call <span class="cov0" title="0">{
+        _c.Call.Return(_a0)
+        return _c
+}</span>
+
+func (_c *MockKubernetes_DeleteResource_Call) RunAndReturn(run func(context.Context, DeleteOptions) error) *MockKubernetes_DeleteResource_Call <span class="cov0" title="0">{
+        _c.Call.Return(run)
+        return _c
+}</span>
+
+// NewMockKubernetes creates a new instance of MockKubernetes. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewMockKubernetes(t interface {
+        mock.TestingT
+        Cleanup(func())
+}) *MockKubernetes <span class="cov0" title="0">{
+        mock := &amp;MockKubernetes{}
+        mock.Mock.Test(t)
+
+        t.Cleanup(func() </span><span class="cov0" title="0">{ mock.AssertExpectations(t) }</span>)
+
+        <span class="cov0" title="0">return mock</span>
+}
+</pre>
+		
+		<pre class="file" id="file11" style="display: none">// Copyright 2020 The Codefresh Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package queue
+
+import (
+        "context"
+        "errors"
+        "sync"
+        "time"
+
+        "github.com/codefresh-io/go/venona/pkg/logger"
+        "github.com/codefresh-io/go/venona/pkg/metrics"
+        "github.com/codefresh-io/go/venona/pkg/monitoring"
+        "github.com/codefresh-io/go/venona/pkg/runtime"
+        "github.com/codefresh-io/go/venona/pkg/task"
+        "github.com/codefresh-io/go/venona/pkg/workflow"
+)
+
+type (
+        // WorkflowQueue handles incoming workflow batch tasks
+        WorkflowQueue interface {
+                Start(ctx context.Context)
+                Stop()
+                Size() int
+                Enqueue(wf *workflow.Workflow)
+        }
+
+        // Options to create a new WorkflowQueue
+        Options struct {
+                Runtimes    map[string]runtime.Runtime
+                Log         logger.Logger
+                WG          *sync.WaitGroup
+                Monitor     monitoring.Monitor
+                Concurrency int
+                BufferSize  int
+        }
+
+        wfQueueImpl struct {
+                runtimes        map[string]runtime.Runtime
+                log             logger.Logger
+                wg              *sync.WaitGroup
+                monitor         monitoring.Monitor
+                queue           chan *workflow.Workflow
+                concurrency     int
+                stop            []chan bool
+                activeWorkflows map[string]struct{}
+                mutex           sync.Mutex
+        }
+)
+
+var errRuntimeNotFound = errors.New("Runtime environment not found")
+
+// New creates a new TaskQueue instance
+func New(opts *Options) WorkflowQueue <span class="cov4" title="4">{
+        return &amp;wfQueueImpl{
+                runtimes:        opts.Runtimes,
+                log:             opts.Log,
+                wg:              opts.WG,
+                monitor:         opts.Monitor,
+                queue:           make(chan *workflow.Workflow, opts.BufferSize),
+                concurrency:     opts.Concurrency,
+                stop:            make([]chan bool, opts.Concurrency),
+                activeWorkflows: make(map[string]struct{}),
+        }
+}</span>
+
+// Start creates the workflow handlers that will handle the incoming Workflows
+func (wfq *wfQueueImpl) Start(ctx context.Context) <span class="cov4" title="4">{
+        wfq.log.Info("starting workflow queue", "concurrency", wfq.concurrency)
+        for i := 0; i &lt; wfq.concurrency; i++ </span><span class="cov5" title="6">{
+                stopChan := make(chan bool, 1)
+                wfq.stop[i] = stopChan
+                handlerID := i
+                wfq.wg.Add(1)
+                go wfq.handleChannel(ctx, stopChan, handlerID)
+        }</span>
+}
+
+// Stop sends a signal to each of the handler to notify it to stop once the queue is empty
+func (wfq *wfQueueImpl) Stop() <span class="cov4" title="4">{
+        for i := 0; i &lt; wfq.concurrency; i++ </span><span class="cov5" title="6">{
+                wfq.stop[i] &lt;- true
+        }</span>
+}
+
+// Size returns the current size of the queue (used for logs)
+func (wfq *wfQueueImpl) Size() int <span class="cov0" title="0">{
+        return len(wfq.queue)
+}</span>
+
+// Enqueue adds another task to be handled, internally using or creating a channel for the task's workflow
+func (wfq *wfQueueImpl) Enqueue(wf *workflow.Workflow) <span class="cov7" title="14">{
+        wfq.queue &lt;- wf
+}</span>
+
+func (wfq *wfQueueImpl) handleChannel(ctx context.Context, stopChan chan bool, id int) <span class="cov5" title="6">{
+        ctxCancelled := false
+
+        defer wfq.wg.Done()
+        for </span><span class="cov9" title="26">{
+                select </span>{
+                case &lt;-stopChan:<span class="cov5" title="6">
+                        wfq.log.Info("stopping workflow handler", "handlerId", id)
+                        ctxCancelled = true</span>
+                case wf := &lt;-wfq.queue:<span class="cov7" title="14">
+                        wfq.mutex.Lock()
+                        if _, ok := wfq.activeWorkflows[wf.Metadata.Workflow]; ok </span><span class="cov0" title="0">{
+                                // Workflow is already being handled, enqueue it again and skip processing
+                                wfq.mutex.Unlock()
+                                wfq.log.Info("Workflow", wf.Metadata.Workflow, " is already being handled, enqueue it again and skip processing")
+                                time.Sleep(100 * time.Millisecond)
+                                wfq.Enqueue(wf)
+                                continue</span>
+                        }
+                        // Mark the workflow as active
+                        <span class="cov7" title="14">wfq.activeWorkflows[wf.Metadata.Workflow] = struct{}{}
+                        wfq.mutex.Unlock()
+
+                        wfq.log.Info("handling workflow", "handlerId", id, "workflow", wf.Metadata.Workflow)
+                        wfq.handleWorkflow(ctx, wf)
+                        wfq.mutex.Lock()
+                        delete(wfq.activeWorkflows, wf.Metadata.Workflow)
+                        wfq.mutex.Unlock()</span>
+                default:<span class="cov5" title="6">
+                        if ctxCancelled </span><span class="cov5" title="6">{
+                                wfq.log.Info("stopped workflow handler", "handlerId", id)
+                                return
+                        }</span>
+
+                        <span class="cov0" title="0">time.Sleep(100 * time.Millisecond)</span>
+                }
+        }
+}
+
+func (wfq *wfQueueImpl) handleWorkflow(ctx context.Context, wf *workflow.Workflow) <span class="cov7" title="14">{
+        wf.Timeline.Started = time.Now()
+        txn := task.NewTaskTransaction(wfq.monitor, wf.Metadata)
+        defer txn.End()
+
+        workflow := wf.Metadata.Workflow
+        reName := wf.Metadata.ReName
+        runtime, ok := wfq.runtimes[reName]
+        if !ok </span><span class="cov0" title="0">{
+                wfq.log.Error("failed handling task", "error", errRuntimeNotFound, "workflow", workflow)
+                txn.NoticeError(errRuntimeNotFound)
+                return
+        }</span>
+
+        <span class="cov7" title="14">for i := range wf.Tasks </span><span class="cov10" title="31">{
+                err := runtime.HandleTask(ctx, wf.Tasks[i])
+                if err != nil </span><span class="cov0" title="0">{
+                        wfq.log.Error("failed handling task", "error", err, "workflow", workflow)
+                        txn.NoticeError(errRuntimeNotFound)
+                }</span>
+        }
+
+        <span class="cov7" title="14">sinceCreation, inRunner, processed := wf.GetLatency()
+        wfq.log.Info("Done handling workflow",
+                "workflow", wf.Metadata.Workflow,
+                "runtime", wf.Metadata.ReName,
+                "time since creation", sinceCreation,
+                "time in runner", inRunner,
+                "processing time", processed,
+        )
+        metrics.ObserveWorkflowMetrics(wf.Type, sinceCreation, inRunner, processed)</span>
+}
+</pre>
+		
+		<pre class="file" id="file12" style="display: none">// Copyright 2020 The Codefresh Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package runtime
+
+import (
+        "context"
+        "encoding/json"
+        "fmt"
+
+        "github.com/codefresh-io/go/venona/pkg/kubernetes"
+        "github.com/codefresh-io/go/venona/pkg/task"
+)
+
+type (
+        // Runtime API client
+        Runtime interface {
+                HandleTask(ctx context.Context, t *task.Task) error
+        }
+
+        // Options for runtime
+        Options struct {
+                Kubernetes kubernetes.Kubernetes
+        }
+
+        runtime struct {
+                client kubernetes.Kubernetes
+        }
+)
+
+// New creates new Runtime client
+func New(opts Options) Runtime <span class="cov0" title="0">{
+        return &amp;runtime{
+                client: opts.Kubernetes,
+        }
+}</span>
+
+func (r runtime) HandleTask(ctx context.Context, t *task.Task) error <span class="cov10" title="8">{
+        var err error
+
+        switch t.Type </span>{
+        case task.TypeCreatePVC, task.TypeCreatePod:<span class="cov5" title="3">
+                err = r.client.CreateResource(ctx, t.Type, t.Spec)
+                if err != nil </span><span class="cov1" title="1">{
+                        return fmt.Errorf("failed creating resource: %w", err) // TODO: Return already executed tasks in order to terminate them
+                }</span>
+        case task.TypeDeletePVC, task.TypeDeletePod:<span class="cov7" title="4">
+                opts := kubernetes.DeleteOptions{}
+                opts.Kind = t.Type
+                b, err := json.Marshal(t.Spec)
+                if err != nil </span><span class="cov0" title="0">{
+                        return fmt.Errorf("failed to marshal task spec: %w", err)
+                }</span>
+
+                <span class="cov7" title="4">if err := json.Unmarshal(b, &amp;opts); err != nil </span><span class="cov1" title="1">{
+                        return fmt.Errorf("failed to unmarshal task spec: %w", err)
+                }</span>
+
+                <span class="cov5" title="3">if err = r.client.DeleteResource(ctx, opts); err != nil </span><span class="cov1" title="1">{
+                        return fmt.Errorf("failed deleting resource: %w", err)
+                }</span>
+        default:<span class="cov1" title="1">
+                return fmt.Errorf("unknown task type \"%s\"", t.Type)</span>
+        }
+
+        <span class="cov7" title="4">return nil</span>
+}
+</pre>
+		
+		</div>
+	</body>
+	<script>
+	(function() {
+		var files = document.getElementById('files');
+		var visible;
+		files.addEventListener('change', onChange, false);
+		function select(part) {
+			if (visible)
+				visible.style.display = 'none';
+			visible = document.getElementById(part);
+			if (!visible)
+				return;
+			files.value = part;
+			visible.style.display = 'block';
+			location.hash = part;
+		}
+		function onChange() {
+			select(files.value);
+			window.scrollTo(0, 0);
+		}
+		if (location.hash != "") {
+			select(location.hash.substr(1));
+		}
+		if (!visible) {
+			select("file0");
+		}
+	})();
+	</script>
+</html>
diff --git a/venonactl/pkg/templates/kubernetes/secret.dind-volume-provisioner.vp.yaml b/venonactl/pkg/templates/kubernetes/secret.dind-volume-provisioner.vp.yaml
index 4ecb54fa..f1dcc47f 100644
--- a/venonactl/pkg/templates/kubernetes/secret.dind-volume-provisioner.vp.yaml
+++ b/venonactl/pkg/templates/kubernetes/secret.dind-volume-provisioner.vp.yaml
@@ -6,13 +6,13 @@ metadata:
   namespace: {{ .Namespace }}
   labels:
     app: dind-volume-provisioner
-data:
+stringData:
 {{- if .Storage.GoogleServiceAccount }}
-  google-service-account.json: {{ .Storage.GoogleServiceAccount | b64enc }}
+  google-service-account.json: {{ .Storage.GoogleServiceAccount }}
 {{- end }}
 {{- if .Storage.AwsAccessKeyId }}
-  aws_access_key_id: {{ .Storage.AwsAccessKeyId | b64enc }}
+  aws_access_key_id: {{ .Storage.AwsAccessKeyId }}
 {{- end }}
 {{- if .Storage.AwsSecretAccessKey }}
-  aws_secret_access_key: {{ .Storage.AwsSecretAccessKey | b64enc }}
+  aws_secret_access_key: {{ .Storage.AwsSecretAccessKey }}
 {{- end }}
\ No newline at end of file
diff --git a/venonactl/pkg/templates/kubernetes/secret.venona.yaml b/venonactl/pkg/templates/kubernetes/secret.venona.yaml
index be572eda..640b275f 100644
--- a/venonactl/pkg/templates/kubernetes/secret.venona.yaml
+++ b/venonactl/pkg/templates/kubernetes/secret.venona.yaml
@@ -4,5 +4,5 @@ type: Opaque
 metadata:
   name: {{ .AppName }}
   namespace: {{ .Namespace }}
-data:
-  codefresh.token: {{ .AgentToken | b64enc }}
\ No newline at end of file
+stringData:
+  codefresh.token: {{ .AgentToken }}
\ No newline at end of file
diff --git a/venonactl/pkg/templates/kubernetes/templates.go b/venonactl/pkg/templates/kubernetes/templates.go
index 071b3aed..72868a92 100644
--- a/venonactl/pkg/templates/kubernetes/templates.go
+++ b/venonactl/pkg/templates/kubernetes/templates.go
@@ -177,11 +177,10 @@ spec:
         - key: 'codefresh/dind'
           operator: 'Exists'
           effect: 'NoSchedule'
+        
+{{ toYaml .Tolerations | indent 8 | unescape}}
       securityContext:
         fsGroup: 1000
-
-{{ toYaml .Tolerations | indent 8 | unescape}}
-
       initContainers:
       - command:
         - chown