diff --git a/charts/appmanager/Chart.yaml b/charts/appmanager/Chart.yaml
index a37113d..e7ff245 100644
--- a/charts/appmanager/Chart.yaml
+++ b/charts/appmanager/Chart.yaml
@@ -2,5 +2,5 @@
 name: welcome
 description: A Helm chart for PCloud App Manager
 type: application
-version: 0.0.1
-appVersion: "0.0.1"
+version: 0.0.2
+appVersion: "0.0.2"
diff --git a/charts/appmanager/templates/install.yaml b/charts/appmanager/templates/install.yaml
index 96d6b08..ba50e10 100644
--- a/charts/appmanager/templates/install.yaml
+++ b/charts/appmanager/templates/install.yaml
@@ -90,6 +90,7 @@
         - appmanager
         - --repo-addr={{ .Values.repoAddr }}
         - --ssh-key=/pcloud/ssh-key/private
+        - --headscale-api-addr={{ .Values.headscaleAPIAddr }}
         - --port=8080
         {{- if .Values.appRepoAddr }}
         - --app-repo-addr={{ .Values.appRepoAddr }}
diff --git a/charts/appmanager/values.yaml b/charts/appmanager/values.yaml
index b1a2a5d..d570f51 100644
--- a/charts/appmanager/values.yaml
+++ b/charts/appmanager/values.yaml
@@ -11,3 +11,4 @@
 clusterRoleName: example-welcome
 appRepoAddr: ""
 portName: http
+headscaleAPIAddr: ""
diff --git a/charts/virtual-machine/templates/service-code-server.yaml b/charts/virtual-machine/templates/service-code-server.yaml
index cbc0cb6..3be8855 100644
--- a/charts/virtual-machine/templates/service-code-server.yaml
+++ b/charts/virtual-machine/templates/service-code-server.yaml
@@ -1,13 +1,14 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Values.name }}-code-server
-spec:
-  type: ClusterIP
-  selector:
-    app: {{ .Values.name }}
-  ports:
-  - name: http
-    port: 80
-    targetPort: 8080 # TODO(gio): add to values.yaml
-    protocol: TCP
+# TODO(gio): enable
+# apiVersion: v1
+# kind: Service
+# metadata:
+#   name: {{ .Values.name }}-code-server
+# spec:
+#   type: ClusterIP
+#   selector:
+#     app: {{ .Values.name }}
+#   ports:
+#   - name: http
+#     port: 80
+#     targetPort: 8080 # TODO(gio): add to values.yaml
+#     protocol: TCP
diff --git a/charts/virtual-machine/templates/vm.yaml b/charts/virtual-machine/templates/vm.yaml
index ba10015..d66da80 100644
--- a/charts/virtual-machine/templates/vm.yaml
+++ b/charts/virtual-machine/templates/vm.yaml
@@ -21,8 +21,8 @@
             memory: {{ .Values.memory }}
         devices:
           interfaces:
-            - masquerade: {}
-              name: default
+            - name: default
+              masquerade: {}
               ports:
                 {{- range .Values.ports }}
                 - port: {{ . }}