diff --git a/_docs/deployments/kubernetes/custom-kubectl-commands.md b/_docs/deployments/kubernetes/custom-kubectl-commands.md
index 620506055..aa0df83a8 100644
--- a/_docs/deployments/kubernetes/custom-kubectl-commands.md
+++ b/_docs/deployments/kubernetes/custom-kubectl-commands.md
@@ -20,26 +20,6 @@ In the current Codefresh implementation, this expands to `/codefresh/volume/sens
 
 When you use custom `kubectl` commands, it is your responsibility to template your manifests using any of the available options. To employ Codefresh for templating, it is better to use the dedicated [cf-deploy-kubernetes step]({{site.baseurl}}/docs/ci-cd-guides/kubernetes-templating/), which provides simple templating capabilities.
 
-## Using the Codefresh kubectl image
-
-Codefresh already offers a public Docker image with `kubectl` at [https://hub.docker.com/r/codefresh/kubectl/tags](https://hub.docker.com/r/codefresh/kubectl/tags){:target="\_blank"}. You can choose a specific version of `kubectl` with the appropriate tag or just select `latest` for the most up-to-date version.
-
-`YAML`
-{% highlight yaml %}
-{% raw %}
-version: '1.0'
-steps:
-  MyCustomKubectlCommands:
-    title: Running Kubectl
-    image: codefresh/kubectl:1.13.3
-    commands: 
-      - echo $CF_KUBECONFIG_PATH
-      - kubectl help
-{% endraw %}
-{% endhighlight %}
-
-If you run the pipeline, you can see the help options for `kubectl`.
-
 ## Getting a config context
 
 The important thing to know when running custom `kubectl` commands is that Codefresh automatically sets up
@@ -183,4 +163,4 @@ In the example above, we select one of the clusters in each deployment step, and
 
 
 
- 
\ No newline at end of file
+ 
diff --git a/_docs/pipelines/what-is-the-codefresh-yaml.md b/_docs/pipelines/what-is-the-codefresh-yaml.md
index 0a26540d5..45f87e5e3 100644
--- a/_docs/pipelines/what-is-the-codefresh-yaml.md
+++ b/_docs/pipelines/what-is-the-codefresh-yaml.md
@@ -234,10 +234,13 @@ steps:
 Notice that Codefresh also provides the following variables that allow you change your script/applications according to the retry attempts:
 
 * `CF_CURRENT_ATTEMPT` contains the number of current retry attempt.
+
 * `CF_MAX_ATTEMPTS` contains all the number of total attempts defined.
 
 The retry mechanism is available for all kinds of [steps]({{site.baseurl}}/docs/pipelines/steps/).
 
+> **Note:** `CF_CURRENT_ATTEMPT` variable is always contextual to the exact step and does not reflect the parent state
+
 ## Escaping strings
 
 If you want to use strings inside your pipeline that create conflicts with the Codefresh syntax parser (for example they are YAML themselves) you need