diff --git a/docs/reference/argocd.md b/docs/reference/argocd.md
index 4ebc5a03..40241cf5 100644
--- a/docs/reference/argocd.md
+++ b/docs/reference/argocd.md
@@ -16,17 +16,28 @@ Create an ArgoCD application
 
 ### argocd.#App Inputs
 
-| Name               | Type                                             | Description                    |
-| -------------      |:-------------:                                   |:-------------:                 |
-|*config.version*    | `*"v2.0.5" \| string`                            |ArgoCD CLI binary version       |
-|*config.server*     | `string`                                         |ArgoCD server                   |
-|*config.project*    | `*"default" \| string`                           |ArgoCD project                  |
-|*config.token*      | `dagger.#Secret`                                 |ArgoCD authentication token     |
-|*name*              | `string`                                         |App name                        |
-|*repo*              | `string`                                         |Repository url (git or helm)    |
-|*path*              | `string`                                         |Folder to deploy                |
-|*server*            | `*"https://kubernetes.default.svc" \| string`    |Destination server              |
-|*namespace*         | `*"default" \| string`                           |Destination namespace           |
+| Name                          | Type                                             | Description                    |
+| -------------                 |:-------------:                                   |:-------------:                 |
+|*config.version*               | `*"v2.0.5" \| string`                            |ArgoCD CLI binary version       |
+|*config.server*                | `string`                                         |ArgoCD server                   |
+|*config.project*               | `*"default" \| string`                           |ArgoCD project                  |
+|*config.username*              | `string`                                         |Username                        |
+|*config.password*              | `dagger.#Secret`                                 |Password                        |
+|*name*                         | `string`                                         |App name                        |
+|*repo*                         | `string`                                         |Repository url (git or helm)    |
+|*path*                         | `string`                                         |Folder to deploy                |
+|*server*                       | `*"https://kubernetes.default.svc" \| string`    |Destination server              |
+|*namespace*                    | `*"default" \| string`                           |Destination namespace           |
+|*ctr.image.config.version*     | `*"v2.0.5" \| string`                            |ArgoCD CLI binary version       |
+|*ctr.image.config.server*      | `string`                                         |ArgoCD server                   |
+|*ctr.image.config.project*     | `*"default" \| string`                           |ArgoCD project                  |
+|*ctr.image.config.username*    | `string`                                         |Username                        |
+|*ctr.image.config.password*    | `dagger.#Secret`                                 |Password                        |
+|*ctr.env.APP_NAME*             | `string`                                         |-                               |
+|*ctr.env.APP_REPO*             | `string`                                         |-                               |
+|*ctr.env.APP_PATH*             | `string`                                         |-                               |
+|*ctr.env.APP_SERVER*           | `*"https://kubernetes.default.svc" \| string`    |-                               |
+|*ctr.env.APP_NAMESPACE*        | `*"default" \| string`                           |-                               |
 
 ### argocd.#App Outputs
 
@@ -38,12 +49,13 @@ Re-usable CLI component
 
 ### argocd.#CLI Inputs
 
-| Name               | Type                      | Description                   |
-| -------------      |:-------------:            |:-------------:                |
-|*config.version*    | `*"v2.0.5" \| string`     |ArgoCD CLI binary version      |
-|*config.server*     | `string`                  |ArgoCD server                  |
-|*config.project*    | `*"default" \| string`    |ArgoCD project                 |
-|*config.token*      | `dagger.#Secret`          |ArgoCD authentication token    |
+| Name                | Type                      | Description                 |
+| -------------       |:-------------:            |:-------------:              |
+|*config.version*     | `*"v2.0.5" \| string`     |ArgoCD CLI binary version    |
+|*config.server*      | `string`                  |ArgoCD server                |
+|*config.project*     | `*"default" \| string`    |ArgoCD project               |
+|*config.username*    | `string`                  |Username                     |
+|*config.password*    | `dagger.#Secret`          |Password                     |
 
 ### argocd.#CLI Outputs
 
@@ -55,12 +67,13 @@ ArgoCD configuration
 
 ### argocd.#Config Inputs
 
-| Name             | Type                      | Description                   |
-| -------------    |:-------------:            |:-------------:                |
-|*version*         | `*"v2.0.5" \| string`     |ArgoCD CLI binary version      |
-|*server*          | `string`                  |ArgoCD server                  |
-|*project*         | `*"default" \| string`    |ArgoCD project                 |
-|*token*           | `dagger.#Secret`          |ArgoCD authentication token    |
+| Name             | Type                      | Description                 |
+| -------------    |:-------------:            |:-------------:              |
+|*version*         | `*"v2.0.5" \| string`     |ArgoCD CLI binary version    |
+|*server*          | `string`                  |ArgoCD server                |
+|*project*         | `*"default" \| string`    |ArgoCD project               |
+|*username*        | `string`                  |Username                     |
+|*password*        | `dagger.#Secret`          |Password                     |
 
 ### argocd.#Config Outputs
 
@@ -72,13 +85,14 @@ Get application's status
 
 ### argocd.#Status Inputs
 
-| Name               | Type                      | Description                   |
-| -------------      |:-------------:            |:-------------:                |
-|*config.version*    | `*"v2.0.5" \| string`     |ArgoCD CLI binary version      |
-|*config.server*     | `string`                  |ArgoCD server                  |
-|*config.project*    | `*"default" \| string`    |ArgoCD project                 |
-|*config.token*      | `dagger.#Secret`          |ArgoCD authentication token    |
-|*name*              | `string`                  |ArgoCD application             |
+| Name                | Type                      | Description                 |
+| -------------       |:-------------:            |:-------------:              |
+|*config.version*     | `*"v2.0.5" \| string`     |ArgoCD CLI binary version    |
+|*config.server*      | `string`                  |ArgoCD server                |
+|*config.project*     | `*"default" \| string`    |ArgoCD project               |
+|*config.username*    | `string`                  |Username                     |
+|*config.password*    | `dagger.#Secret`          |Password                     |
+|*name*               | `string`                  |ArgoCD application           |
 
 ### argocd.#Status Outputs
 
@@ -97,14 +111,21 @@ Sync an application to its targer state
 
 ### argocd.#Sync Inputs
 
-| Name               | Type                      | Description                              |
-| -------------      |:-------------:            |:-------------:                           |
-|*config.version*    | `*"v2.0.5" \| string`     |ArgoCD CLI binary version                 |
-|*config.server*     | `string`                  |ArgoCD server                             |
-|*config.project*    | `*"default" \| string`    |ArgoCD project                            |
-|*config.token*      | `dagger.#Secret`          |ArgoCD authentication token               |
-|*application*       | `string`                  |ArgoCD application                        |
-|*wait*              | `*false \| bool`          |Wait the application to sync correctly    |
+| Name                          | Type                      | Description                              |
+| -------------                 |:-------------:            |:-------------:                           |
+|*config.version*               | `*"v2.0.5" \| string`     |ArgoCD CLI binary version                 |
+|*config.server*                | `string`                  |ArgoCD server                             |
+|*config.project*               | `*"default" \| string`    |ArgoCD project                            |
+|*config.username*              | `string`                  |Username                                  |
+|*config.password*              | `dagger.#Secret`          |Password                                  |
+|*application*                  | `string`                  |ArgoCD application                        |
+|*wait*                         | `*false \| bool`          |Wait the application to sync correctly    |
+|*ctr.image.config.version*     | `*"v2.0.5" \| string`     |ArgoCD CLI binary version                 |
+|*ctr.image.config.server*      | `string`                  |ArgoCD server                             |
+|*ctr.image.config.project*     | `*"default" \| string`    |ArgoCD project                            |
+|*ctr.image.config.username*    | `string`                  |Username                                  |
+|*ctr.image.config.password*    | `dagger.#Secret`          |Password                                  |
+|*ctr.env.APPLICATION*          | `string`                  |-                                         |
 
 ### argocd.#Sync Outputs
 
diff --git a/stdlib/argocd/status.cue b/stdlib/argocd/status.cue
index 0fe5f639..890645e8 100644
--- a/stdlib/argocd/status.cue
+++ b/stdlib/argocd/status.cue
@@ -47,9 +47,7 @@ import (
 					argocd app get "$APPLICATION" --output json | jq '{health:.status.health.status,sync:.status.sync.status,namespace:.spec.destination.namespace,server:.spec.destination.server,urls:(.status.summary.externalURLs//[]|join(",")),state:.status.operationState.message}' > /output.json
 					"""#,
 			]
-			env: {
-				APPLICATION: name
-			}
+			env: APPLICATION: name
 		},
 
 		op.#Export & {
diff --git a/stdlib/helpers.bash b/stdlib/helpers.bash
index dbea6b8b..bf9b7325 100644
--- a/stdlib/helpers.bash
+++ b/stdlib/helpers.bash
@@ -74,7 +74,7 @@ skip_unless_local_localstack() {
 #
 # This is need to do kubernetes test in the CI.
 skip_unless_local_kube() {
-    if [ -f ~/.kube/config ] && grep -q "user: kind-kind" ~/.kube/config &> /dev/null && grep -q "127.0.0.1" ~/.kube/config &> /dev/null; then
+    if [ -f ~/.kube/config ] && grep -q "127.0.0.1" ~/.kube/config &> /dev/null; then
         echo "Kubernetes available"
     else
         skip "local kubernetes cluster not available"
diff --git a/stdlib/universe.bats b/stdlib/universe.bats
index b0d7d4e6..f7717afd 100644
--- a/stdlib/universe.bats
+++ b/stdlib/universe.bats
@@ -224,7 +224,6 @@ setup() {
 
   # Forward port
   kubectl port-forward svc/argocd-server -n argocd 8080:443 >/dev/null 2>/dev/null &
-  pid=$!
   sleep 3
 
   # Run test