diff --git a/class/defaults.yml b/class/defaults.yml
index 1f63814..7678886 100644
--- a/class/defaults.yml
+++ b/class/defaults.yml
@@ -12,5 +12,11 @@ parameters:
 
     images:
       metrics_server:
-        image: registry.k8s.io/metrics-server/metrics-server
-        tag: v0.6.1
+        registry: registry.k8s.io
+        repository: metrics-server/metrics-server
+        tag: v0.9.0
+
+    helm_values:
+      image:
+        repository: ${metrics_server:images:metrics_server:registry}/${metrics_server:images:metrics_server:repository}
+        tag: ${metrics_server:images:metrics_server:tag}
diff --git a/class/metrics-server.yml b/class/metrics-server.yml
index bef8535..448ca3b 100644
--- a/class/metrics-server.yml
+++ b/class/metrics-server.yml
@@ -5,24 +5,21 @@ parameters:
         source: ${metrics_server:charts:metrics-server:source}
         chart_name: metrics-server
         version: ${metrics_server:charts:metrics-server:version}
-        output_path: dependencies/metrics-server/helmcharts/metrics-server/${metrics_server:charts:metrics-server:version}/
+        output_path: ${_base_directory}/helmcharts/metrics-server/${metrics_server:charts:metrics-server:version}/
     compile:
       - input_paths:
-          - metrics-server/component/app.jsonnet
+          - ${_base_directory}/component/app.jsonnet
         input_type: jsonnet
         output_path: .
       - input_paths:
-          - metrics-server/component/main.jsonnet
+          - ${_base_directory}/component/main.jsonnet
         input_type: jsonnet
-        output_path: metrics-server/
+        output_path: ${_instance}/
       - output_path: metrics-server/01_helmchart
         input_type: helm
         input_paths:
-          - metrics-server/helmcharts/metrics-server/${metrics_server:charts:metrics-server:version}
-        helm_values:
-          image:
-            repository: ${metrics_server:images:metrics_server:image}
-            tag: ${metrics_server:images:metrics_server:tag}
+          - ${_base_directory}/helmcharts/metrics-server/${metrics_server:charts:metrics-server:version}
+        helm_values: ${metrics_server:helm_values}
         helm_params:
           release_name: metrics-server
           namespace: ${metrics_server:namespace}
diff --git a/tests/defaults.yml b/tests/defaults.yml
index c53f145..d5624b7 100644
--- a/tests/defaults.yml
+++ b/tests/defaults.yml
@@ -1,2 +1 @@
-parameters:
-  metrics_server: {}
+# params here
diff --git a/tests/golden/defaults/metrics-server/metrics-server/01_helmchart/metrics-server/templates/deployment.yaml b/tests/golden/defaults/metrics-server/metrics-server/01_helmchart/metrics-server/templates/deployment.yaml
index 20fac29..4f630ad 100644
--- a/tests/golden/defaults/metrics-server/metrics-server/01_helmchart/metrics-server/templates/deployment.yaml
+++ b/tests/golden/defaults/metrics-server/metrics-server/01_helmchart/metrics-server/templates/deployment.yaml
@@ -28,7 +28,7 @@ spec:
             - --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname
             - --kubelet-use-node-status-port
             - --metric-resolution=15s
-          image: registry.k8s.io/metrics-server/metrics-server:v0.6.1
+          image: registry.k8s.io/metrics-server/metrics-server:v0.9.0
           imagePullPolicy: IfNotPresent
           livenessProbe:
             failureThreshold: 3