diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 8e33febce6..f8e9912e0e 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: examples/k3s-docker-demo-app
+        working-directory: tests/k3s-docker-demo-app
     steps:
       - uses: actions/checkout@v2
       - name: Deploy cluster
@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: examples/k3s-docker-demo-app
+        working-directory: tests/k3s-docker-demo-app
     steps:
       - uses: actions/checkout@v2
         with:
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 1e52d35f1d..4601be7a55 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: examples/k3s-docker-demo-app
+        working-directory: tests/k3s-docker-demo-app
     steps:
       - uses: actions/checkout@v2
       - name: Deploy cluster
diff --git a/.gitignore b/.gitignore
index d9edebaba2..cb902a2338 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,6 @@ package-lock.json
 examples/*/terraform/dev.log
 examples/*/terraform/kubeconfig.yaml
 examples/*/terraform/terraform.tfstate*
+tests/*/terraform/dev.log
+tests/*/terraform/kubeconfig.yaml
+tests/*/terraform/terraform.tfstate*
diff --git a/argocd/app-of-apps/Chart.yaml b/argocd/app-of-apps/Chart.yaml
new file mode 100644
index 0000000000..21cfe49977
--- /dev/null
+++ b/argocd/app-of-apps/Chart.yaml
@@ -0,0 +1,4 @@
+---
+apiVersion: "v2"
+name: "app-of-apps"
+version: "0"
diff --git a/argocd/app-of-apps/templates/apps.yaml b/argocd/app-of-apps/templates/apps.yaml
new file mode 100644
index 0000000000..6817725529
--- /dev/null
+++ b/argocd/app-of-apps/templates/apps.yaml
@@ -0,0 +1,23 @@
+---
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  annotations:
+    argocd.argoproj.io/sync-wave: "5"
+  name: apps
+  namespace: argocd
+spec:
+  project: default
+  source:
+    path: argocd/apps
+    repoURL: {{ .Values.spec.source.repoURL }}
+    targetRevision: {{ .Values.spec.source.targetRevision }}
+    helm:
+      values: |
+        {{ toYaml .Values | nindent 8 }}
+  destination:
+    namespace: default
+    server: {{ .Values.spec.destination.server }}
+  syncPolicy:
+    automated:
+      selfHeal: true
diff --git a/argocd/app-of-apps/values.yaml b/argocd/app-of-apps/values.yaml
new file mode 100644
index 0000000000..ec6a7ca8a6
--- /dev/null
+++ b/argocd/app-of-apps/values.yaml
@@ -0,0 +1,7 @@
+---
+spec:
+  destination:
+    server: https://kubernetes.default.svc
+  source:
+    repoURL: ...
+    targetRevision: HEAD
diff --git a/examples/k3s-docker-demo-app/terraform/main.tf b/examples/k3s-docker-demo-app/terraform/main.tf
index 5ee00547f4..48ae163323 100644
--- a/examples/k3s-docker-demo-app/terraform/main.tf
+++ b/examples/k3s-docker-demo-app/terraform/main.tf
@@ -20,11 +20,14 @@ module "cluster" {
   target_revision = local.target_revision
 }
 
-provider "kubernetes-alpha" {
-  host                   = local.kubernetes_host
-  username               = local.kubernetes_username
-  password               = local.kubernetes_password
-  cluster_ca_certificate = local.kubernetes_cluster_ca_certificate
+provider "helm" {
+  kubernetes {
+    insecure         = true
+    host             = local.kubernetes_host
+    username         = local.kubernetes_username
+    password         = local.kubernetes_password
+    load_config_file = false
+  }
 }
 
 provider "vault" {
@@ -33,27 +36,15 @@ provider "vault" {
   skip_tls_verify = true
 }
 
-resource "kubernetes_manifest" "project_apps" {
-  provider = kubernetes-alpha
-
-  manifest = {
-    "apiVersion" = "argoproj.io/v1alpha1"
-    "kind"       = "Application"
-    "metadata" = {
-      "name"      = "project-apps"
-      "namespace" = "argocd"
-      "annotations" = {
-        "argocd.argoproj.io/sync-wave" = "15"
-      }
-    }
-    "spec" = {
-      "project" = "default"
-      "source" = {
-        "path"           = "examples/k3s-docker-demo-app/argocd/project-apps"
-        "repoURL"        = local.repo_url
-        "targetRevision" = local.target_revision
-        "helm" = {
-          "values" = <<EOT
+resource "helm_release" "project_apps" {
+  name              = "project-apps"
+  chart             = "${path.module}/../argocd/project-apps"
+  namespace         = "argocd"
+  dependency_update = true
+  create_namespace  = true
+
+  values = [
+    <<EOT
 ---
 spec:
   source:
@@ -62,25 +53,11 @@ spec:
 
 baseDomain: ${local.base_domain}
           EOT
-        }
-      }
-      "destination" = {
-        "namespace" = "default"
-        "server"    = "https://kubernetes.default.svc"
-      }
-      "syncPolicy" = {
-        "automated" = {
-          "selfHeal" = true
-        }
-      }
-    }
-  }
+  ]
 
-  lifecycle {
-    ignore_changes = [
-      object,
-    ]
-  }
+  depends_on = [
+    module.cluster,
+  ]
 }
 
 resource "random_password" "superdupersecret" {
diff --git a/modules/k3s-docker/main.tf b/modules/k3s-docker/main.tf
index 274b1ee7c4..d27326c7c8 100644
--- a/modules/k3s-docker/main.tf
+++ b/modules/k3s-docker/main.tf
@@ -1,4 +1,3 @@
-
 locals {
   base_domain                       = format("%s.nip.io", replace(module.cluster.ingress_ip_address, ".", "-"))
   context                           = yamldecode(module.cluster.kubeconfig)
@@ -18,20 +17,6 @@ provider "helm" {
   }
 }
 
-provider "kubernetes" {
-  host                   = local.kubernetes_host
-  username               = local.kubernetes_username
-  password               = local.kubernetes_password
-  cluster_ca_certificate = local.kubernetes_cluster_ca_certificate
-}
-
-provider "kubernetes-alpha" {
-  host                   = local.kubernetes_host
-  username               = local.kubernetes_username
-  password               = local.kubernetes_password
-  cluster_ca_certificate = local.kubernetes_cluster_ca_certificate
-}
-
 provider "vault" {
   address         = format("https://vault.apps.%s", local.base_domain)
   token           = "root"
@@ -83,48 +68,24 @@ server:
   ]
 }
 
-resource "kubernetes_manifest" "app_of_apps" {
-  provider = kubernetes-alpha
-
-  manifest = {
-    "apiVersion" = "argoproj.io/v1alpha1"
-    "kind"       = "Application"
-    "metadata" = {
-      "name"      = "apps"
-      "namespace" = "argocd"
-      "annotations" = {
-        "argocd.argoproj.io/sync-wave" = "5"
-      }
-    }
-    "spec" = {
-      "project" = "default"
-      "source" = {
-        "path"           = "argocd/apps"
-        "repoURL"        = var.repo_url
-        "targetRevision" = var.target_revision
-        "helm" = {
-          "parameters" = var.app_of_apps_parameters
-          "values" = templatefile("${path.module}/values.tmpl.yaml",
-            {
-              cluster_name    = var.cluster_name,
-              base_domain     = local.base_domain,
-              repo_url        = var.repo_url,
-              target_revision = var.target_revision,
-            }
-          )
-        }
-      }
-      "destination" = {
-        "namespace" = "default"
-        "server"    = "https://kubernetes.default.svc"
-      }
-      "syncPolicy" = {
-        "automated" = {
-          "selfHeal" = true
-        }
+resource "helm_release" "app_of_apps" {
+  name              = "app-of-apps"
+  chart             = "${path.module}/../../argocd/app-of-apps"
+  namespace         = "argocd"
+  dependency_update = true
+  create_namespace  = true
+
+  values = [
+    templatefile("${path.module}/values.tmpl.yaml",
+      {
+        cluster_name    = var.cluster_name,
+        base_domain     = local.base_domain,
+        repo_url        = var.repo_url,
+        target_revision = var.target_revision,
       }
-    }
-  }
+    ),
+    var.app_of_apps_values_overrides,
+  ]
 
   depends_on = [
     helm_release.argocd,
@@ -133,7 +94,7 @@ resource "kubernetes_manifest" "app_of_apps" {
 
 resource "null_resource" "wait_for_vault" {
   depends_on = [
-    kubernetes_manifest.app_of_apps,
+    helm_release.app_of_apps,
   ]
 
   provisioner "local-exec" {
diff --git a/modules/k3s-docker/variables.tf b/modules/k3s-docker/variables.tf
index 7043e87381..648d27f526 100644
--- a/modules/k3s-docker/variables.tf
+++ b/modules/k3s-docker/variables.tf
@@ -25,12 +25,8 @@ variable "target_revision" {
   type        = string
 }
 
-variable "app_of_apps_parameters" {
-  description = "App of apps parameters overrides."
-  type = list(object({
-    name        = string
-    value       = string
-    forceString = bool
-  }))
-  default = []
+variable "app_of_apps_values_overrides" {
+  description = "App of apps values overrides."
+  type        = string
+  default     = ""
 }
diff --git a/modules/k3s-docker/versions.tf b/modules/k3s-docker/versions.tf
index c0739f78b5..8e47b3975a 100644
--- a/modules/k3s-docker/versions.tf
+++ b/modules/k3s-docker/versions.tf
@@ -20,14 +20,6 @@ terraform {
       source  = "hashicorp/null"
       version = "3.0.0"
     }
-    kubernetes = {
-      source  = "hashicorp/kubernetes"
-      version = "1.13.2"
-    }
-    kubernetes-alpha = {
-      source  = "hashicorp/kubernetes-alpha"
-      version = "0.2.1"
-    }
     vault = {
       source  = "hashicorp/vault"
       version = "2.15.0"
diff --git a/scripts/provision.sh b/scripts/provision.sh
index f4a20bc40b..51b520a6bf 100755
--- a/scripts/provision.sh
+++ b/scripts/provision.sh
@@ -4,13 +4,6 @@ cd terraform || exit
 terraform init -upgrade
 terraform workspace select "$CLUSTER_NAME" || terraform workspace new "$CLUSTER_NAME"
 terraform init -upgrade
-terraform apply --auto-approve \
-	-target module.cluster.module.cluster \
-	-target module.cluster.helm_release.argocd \
-	-target module.cluster.module.iam_assumable_role_cert_manager \
-	-target module.cluster.aws_cognito_user_pool_client.client \
-	-target module.cluster.random_password.oauth2_cookie_secret
-terraform apply --auto-approve -target module.cluster.kubernetes_manifest.app_of_apps
 terraform apply --auto-approve -target module.cluster.null_resource.wait_for_vault
 terraform apply --auto-approve
 terraform plan --detailed-exitcode
diff --git a/tests/k3s-docker-demo-app/Makefile b/tests/k3s-docker-demo-app/Makefile
new file mode 100644
index 0000000000..f2ccd15f1d
--- /dev/null
+++ b/tests/k3s-docker-demo-app/Makefile
@@ -0,0 +1,28 @@
+CLUSTER_NAME := default
+
+ifneq ($(CI_PROJECT_URL),)
+TF_VAR_repo_url = $(CI_PROJECT_URL)
+TF_VAR_target_revision = $(CI_COMMIT_REF_NAME)
+else
+ifneq ($(GITHUB_SERVER_URL),)
+TF_VAR_repo_url = "$(GITHUB_SERVER_URL)/$(GITHUB_REPOSITORY).git"
+TF_VAR_target_revision = $(shell echo $(GITHUB_REF) | rev | cut -f1 -d/ | rev)
+else
+REMOTE := $(shell git status -sb|sed -Ene's@.. ([^\.]*)\.\.\.([^/]*)/(.*)@\2@p')
+TF_VAR_target_revision := $(shell git status -sb|sed -Ene's@.. ([^\.]*)\.\.\.([^/]*)/(.*)@\3@p'|cut -f1 -d' ')
+REMOTE_URL := $(shell git remote get-url $(REMOTE))
+ifeq ($(findstring "https",$(REMOTE_URL)),)
+TF_VAR_repo_url = "https://github.com/$(shell echo $(REMOTE_URL) | sed -Ene's|git@github.com:([^/]*)/(.*).git|\1/\2|p').git"
+else
+TF_VAR_repo_url = $(REMOTE_URL)
+endif
+endif
+endif
+
+.PHONY: provision clean
+
+provision: terraform/*.tf
+	CLUSTER_NAME=$(CLUSTER_NAME) TF_VAR_repo_url=$(TF_VAR_repo_url) TF_VAR_target_revision=$(TF_VAR_target_revision) ../../scripts/provision.sh
+
+clean:
+	CLUSTER_NAME=$(CLUSTER_NAME) TF_VAR_repo_url=$(TF_VAR_repo_url) TF_VAR_target_revision=$(TF_VAR_target_revision) ../../scripts/destroy.sh
diff --git a/tests/k3s-docker-demo-app/argocd/demo-app/.helmignore b/tests/k3s-docker-demo-app/argocd/demo-app/.helmignore
new file mode 100644
index 0000000000..0e8a0eb36f
--- /dev/null
+++ b/tests/k3s-docker-demo-app/argocd/demo-app/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/tests/k3s-docker-demo-app/argocd/demo-app/Chart.yaml b/tests/k3s-docker-demo-app/argocd/demo-app/Chart.yaml
new file mode 100644
index 0000000000..aabb8288d2
--- /dev/null
+++ b/tests/k3s-docker-demo-app/argocd/demo-app/Chart.yaml
@@ -0,0 +1,23 @@
+apiVersion: v2
+name: demo-app
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.1.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+appVersion: "1.8"
diff --git a/tests/k3s-docker-demo-app/argocd/demo-app/templates/NOTES.txt b/tests/k3s-docker-demo-app/argocd/demo-app/templates/NOTES.txt
new file mode 100644
index 0000000000..46689a5b73
--- /dev/null
+++ b/tests/k3s-docker-demo-app/argocd/demo-app/templates/NOTES.txt
@@ -0,0 +1,21 @@
+1. Get the application URL by running these commands:
+{{- if .Values.ingress.enabled }}
+{{- range $host := .Values.ingress.hosts }}
+  {{- range .paths }}
+  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }}
+  {{- end }}
+{{- end }}
+{{- else if contains "NodePort" .Values.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "demo-app.fullname" . }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "demo-app.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "demo-app.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+  echo http://$SERVICE_IP:{{ .Values.service.port }}
+{{- else if contains "ClusterIP" .Values.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "demo-app.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:80
+{{- end }}
diff --git a/tests/k3s-docker-demo-app/argocd/demo-app/templates/_helpers.tpl b/tests/k3s-docker-demo-app/argocd/demo-app/templates/_helpers.tpl
new file mode 100644
index 0000000000..b82e7ddafc
--- /dev/null
+++ b/tests/k3s-docker-demo-app/argocd/demo-app/templates/_helpers.tpl
@@ -0,0 +1,62 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "demo-app.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "demo-app.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "demo-app.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "demo-app.labels" -}}
+helm.sh/chart: {{ include "demo-app.chart" . }}
+{{ include "demo-app.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "demo-app.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "demo-app.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "demo-app.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "demo-app.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
diff --git a/tests/k3s-docker-demo-app/argocd/demo-app/templates/deployment.yaml b/tests/k3s-docker-demo-app/argocd/demo-app/templates/deployment.yaml
new file mode 100644
index 0000000000..9a8eefde50
--- /dev/null
+++ b/tests/k3s-docker-demo-app/argocd/demo-app/templates/deployment.yaml
@@ -0,0 +1,78 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "demo-app.fullname" . }}
+  labels:
+    {{- include "demo-app.labels" . | nindent 4 }}
+spec:
+{{- if not .Values.autoscaling.enabled }}
+  replicas: {{ .Values.replicaCount }}
+{{- end }}
+  selector:
+    matchLabels:
+      {{- include "demo-app.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+    {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
+      labels:
+        {{- include "demo-app.selectorLabels" . | nindent 8 }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "demo-app.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: FOO
+              valueFrom:
+                secretKeyRef:
+                  name: demo-app-secrets-store-csi-secret
+                  key: foo
+          ports:
+            - name: http
+              containerPort: 8080
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /
+              port: http
+          readinessProbe:
+            httpGet:
+              path: /
+              port: http
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+          volumeMounts:
+            - name: secrets-store-inline
+              mountPath: "/mnt/secrets-store"
+              readOnly: true
+      volumes:
+        - name: secrets-store-inline
+          csi:
+            driver: secrets-store.csi.k8s.io
+            readOnly: true
+            volumeAttributes:
+              secretProviderClass: "vault-demo-app"
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/tests/k3s-docker-demo-app/argocd/demo-app/templates/hpa.yaml b/tests/k3s-docker-demo-app/argocd/demo-app/templates/hpa.yaml
new file mode 100644
index 0000000000..8522e04466
--- /dev/null
+++ b/tests/k3s-docker-demo-app/argocd/demo-app/templates/hpa.yaml
@@ -0,0 +1,28 @@
+{{- if .Values.autoscaling.enabled }}
+apiVersion: autoscaling/v2beta1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "demo-app.fullname" . }}
+  labels:
+    {{- include "demo-app.labels" . | nindent 4 }}
+spec:
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "demo-app.fullname" . }}
+  minReplicas: {{ .Values.autoscaling.minReplicas }}
+  maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  metrics:
+  {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: cpu
+        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+  {{- end }}
+  {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
+    - type: Resource
+      resource:
+        name: memory
+        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+  {{- end }}
+{{- end }}
diff --git a/tests/k3s-docker-demo-app/argocd/demo-app/templates/ingress.yaml b/tests/k3s-docker-demo-app/argocd/demo-app/templates/ingress.yaml
new file mode 100644
index 0000000000..ba0896fae7
--- /dev/null
+++ b/tests/k3s-docker-demo-app/argocd/demo-app/templates/ingress.yaml
@@ -0,0 +1,41 @@
+{{- if .Values.ingress.enabled -}}
+{{- $fullName := include "demo-app.fullname" . -}}
+{{- $svcPort := .Values.service.port -}}
+{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: {{ $fullName }}
+  labels:
+    {{- include "demo-app.labels" . | nindent 4 }}
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if .Values.ingress.tls }}
+  tls:
+    {{- range .Values.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
+  rules:
+    {{- range .Values.ingress.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ . }}
+            backend:
+              serviceName: {{ $fullName }}
+              servicePort: {{ $svcPort }}
+          {{- end }}
+    {{- end }}
+  {{- end }}
diff --git a/tests/k3s-docker-demo-app/argocd/demo-app/templates/secretproviderclass.yaml b/tests/k3s-docker-demo-app/argocd/demo-app/templates/secretproviderclass.yaml
new file mode 100644
index 0000000000..afe73ec138
--- /dev/null
+++ b/tests/k3s-docker-demo-app/argocd/demo-app/templates/secretproviderclass.yaml
@@ -0,0 +1,23 @@
+---
+apiVersion: secrets-store.csi.x-k8s.io/v1alpha1
+kind: SecretProviderClass
+metadata:
+  name: vault-demo-app
+spec:
+  provider: vault
+  parameters:
+    roleName: "demo-app"
+    vaultAddress: "http://vault-internal.vault.svc:8200"
+    vaultSkipTLSVerify: "true"
+    objects:  |
+      array:
+        - |
+          objectPath: "/demo-app"
+          objectName: "foo"
+          objectVersion: ""
+  secretObjects:
+    - data:
+        - key: foo
+          objectName: demo-app
+      secretName: demo-app-secrets-store-csi-secret
+      type: Opaque
diff --git a/tests/k3s-docker-demo-app/argocd/demo-app/templates/service.yaml b/tests/k3s-docker-demo-app/argocd/demo-app/templates/service.yaml
new file mode 100644
index 0000000000..87706e7175
--- /dev/null
+++ b/tests/k3s-docker-demo-app/argocd/demo-app/templates/service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "demo-app.fullname" . }}
+  labels:
+    {{- include "demo-app.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    {{- include "demo-app.selectorLabels" . | nindent 4 }}
diff --git a/tests/k3s-docker-demo-app/argocd/demo-app/templates/serviceaccount.yaml b/tests/k3s-docker-demo-app/argocd/demo-app/templates/serviceaccount.yaml
new file mode 100644
index 0000000000..073bf3f6ef
--- /dev/null
+++ b/tests/k3s-docker-demo-app/argocd/demo-app/templates/serviceaccount.yaml
@@ -0,0 +1,12 @@
+{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "demo-app.serviceAccountName" . }}
+  labels:
+    {{- include "demo-app.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}
diff --git a/tests/k3s-docker-demo-app/argocd/demo-app/templates/tests/test-connection.yaml b/tests/k3s-docker-demo-app/argocd/demo-app/templates/tests/test-connection.yaml
new file mode 100644
index 0000000000..01382a2612
--- /dev/null
+++ b/tests/k3s-docker-demo-app/argocd/demo-app/templates/tests/test-connection.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ include "demo-app.fullname" . }}-test-connection"
+  labels:
+    {{- include "demo-app.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": test-success
+spec:
+  containers:
+    - name: wget
+      image: busybox
+      command: ['wget']
+      args: ['{{ include "demo-app.fullname" . }}:{{ .Values.service.port }}']
+  restartPolicy: Never
diff --git a/tests/k3s-docker-demo-app/argocd/demo-app/values.yaml b/tests/k3s-docker-demo-app/argocd/demo-app/values.yaml
new file mode 100644
index 0000000000..898c60165d
--- /dev/null
+++ b/tests/k3s-docker-demo-app/argocd/demo-app/values.yaml
@@ -0,0 +1,82 @@
+# Default values for demo-app.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+image:
+  repository: paulbouwer/hello-kubernetes
+  pullPolicy: IfNotPresent
+  # Overrides the image tag whose default is the chart appVersion.
+  tag: "1.8"
+
+imagePullSecrets: []
+nameOverride: ""
+fullnameOverride: ""
+
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Annotations to add to the service account
+  annotations: {}
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name: ""
+
+podAnnotations:
+  vault.hashicorp.com/agent-inject: "true"
+  vault.hashicorp.com/agent-inject-secret-demo-app: /secret/demo-app
+  vault.hashicorp.com/role: demo-app
+
+podSecurityContext: {}
+  # fsGroup: 2000
+
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+service:
+  type: ClusterIP
+  port: 80
+
+ingress:
+  enabled: false
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+  hosts:
+    - host: chart-example.local
+      paths: []
+  tls: []
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - chart-example.local
+
+resources: {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+autoscaling:
+  enabled: false
+  minReplicas: 1
+  maxReplicas: 100
+  targetCPUUtilizationPercentage: 80
+  # targetMemoryUtilizationPercentage: 80
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
diff --git a/tests/k3s-docker-demo-app/argocd/project-apps/Chart.yaml b/tests/k3s-docker-demo-app/argocd/project-apps/Chart.yaml
new file mode 100644
index 0000000000..f60a09292b
--- /dev/null
+++ b/tests/k3s-docker-demo-app/argocd/project-apps/Chart.yaml
@@ -0,0 +1,4 @@
+---
+apiVersion: "v2"
+name: "project-apps"
+version: "0"
diff --git a/tests/k3s-docker-demo-app/argocd/project-apps/templates/demo-app.yaml b/tests/k3s-docker-demo-app/argocd/project-apps/templates/demo-app.yaml
new file mode 100644
index 0000000000..d92d6ca21f
--- /dev/null
+++ b/tests/k3s-docker-demo-app/argocd/project-apps/templates/demo-app.yaml
@@ -0,0 +1,38 @@
+---
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: demo-app
+  namespace: argocd
+spec:
+  project: default
+  source:
+    path: examples/k3s-docker-demo-app/argocd/demo-app
+    repoURL: {{ .Values.spec.source.repoURL }}
+    targetRevision: {{ .Values.spec.source.targetRevision }}
+    helm:
+      values: |
+        ingress:
+          enabled: true
+          annotations:
+            cert-manager.io/cluster-issuer: selfsigned-issuer
+            traefik.ingress.kubernetes.io/router.entrypoints: websecure
+            traefik.ingress.kubernetes.io/router.tls: "true"
+          hosts:
+            - host: demo-app.apps.{{ .Values.baseDomain }}
+              paths:
+                - /
+          tls:
+            - secretName: demo-app-secret
+              hosts:
+                - demo-app.apps.{{ .Values.baseDomain }}
+        autoscaling:
+          enabled: true
+          minReplicas: 2
+          maxReplicas: 3
+  destination:
+    namespace: demo-app
+    server: {{ .Values.spec.destination.server }}
+  syncPolicy:
+    automated:
+      selfHeal: true
diff --git a/tests/k3s-docker-demo-app/argocd/project-apps/values.yaml b/tests/k3s-docker-demo-app/argocd/project-apps/values.yaml
new file mode 100644
index 0000000000..ec6a7ca8a6
--- /dev/null
+++ b/tests/k3s-docker-demo-app/argocd/project-apps/values.yaml
@@ -0,0 +1,7 @@
+---
+spec:
+  destination:
+    server: https://kubernetes.default.svc
+  source:
+    repoURL: ...
+    targetRevision: HEAD
diff --git a/tests/k3s-docker-demo-app/terraform/main.tf b/tests/k3s-docker-demo-app/terraform/main.tf
new file mode 100644
index 0000000000..0fdac533d3
--- /dev/null
+++ b/tests/k3s-docker-demo-app/terraform/main.tf
@@ -0,0 +1,100 @@
+locals {
+  base_domain                        = module.cluster.base_domain
+  kubernetes_host                    = module.cluster.kubernetes_host
+  kubernetes_username                = module.cluster.kubernetes_username
+  kubernetes_password                = module.cluster.kubernetes_password
+  kubernetes_cluster_ca_certificate  = module.cluster.kubernetes_cluster_ca_certificate
+  kubernetes_vault_auth_backend_path = module.cluster.kubernetes_vault_auth_backend_path
+}
+
+module "cluster" {
+  source = "../../../modules/k3s-docker"
+
+  cluster_name = terraform.workspace
+  node_count   = 1
+
+  repo_url        = var.repo_url
+  target_revision = var.target_revision
+}
+
+provider "helm" {
+  kubernetes {
+    insecure         = true
+    host             = local.kubernetes_host
+    username         = local.kubernetes_username
+    password         = local.kubernetes_password
+    load_config_file = false
+  }
+}
+
+provider "vault" {
+  address         = format("https://vault.apps.%s", local.base_domain)
+  token           = "root"
+  skip_tls_verify = true
+}
+
+resource "helm_release" "project_apps" {
+  name              = "project-apps"
+  chart             = "${path.module}/../argocd/project-apps"
+  namespace         = "argocd"
+  dependency_update = true
+  create_namespace  = true
+
+  values = [
+    <<EOT
+---
+spec:
+  source:
+    repoURL: ${var.repo_url}
+    targetRevision: ${var.target_revision}
+
+baseDomain: ${local.base_domain}
+          EOT
+  ]
+
+  depends_on = [
+    module.cluster,
+  ]
+}
+
+resource "random_password" "superdupersecret" {
+  length           = 128
+  special          = true
+  override_special = "_%@"
+}
+
+resource "vault_generic_secret" "demo_app" {
+  path = "secret/demo-app"
+
+  data_json = <<EOT
+{
+  "foo":   "${random_password.superdupersecret.result}",
+  "pizza": "cheese"
+}
+EOT
+}
+
+resource "vault_policy" "demo_app" {
+  name = "demo-app"
+
+  policy = <<EOT
+path "secret/data/demo-app" {
+  capabilities = ["read", "list"]
+}
+path "sys/renew/*" {
+  capabilities = ["update"]
+}
+path "sys/mounts" {
+  capabilities = ["read"]
+}
+EOT
+}
+
+resource "vault_kubernetes_auth_backend_role" "demo_app" {
+  backend                          = local.kubernetes_vault_auth_backend_path
+  role_name                        = "demo-app"
+  bound_service_account_names      = ["demo-app", "secrets-store-csi-driver"]
+  bound_service_account_namespaces = ["demo-app", "secrets-store-csi-driver"]
+  token_ttl                        = 3600
+  token_policies                   = ["default", vault_policy.demo_app.name]
+}