diff --git a/badhouseplants/helmfile.yaml b/badhouseplants/helmfile.yaml
index e69de29..c53ba68 100644
--- a/badhouseplants/helmfile.yaml
+++ b/badhouseplants/helmfile.yaml
@@ -0,0 +1,12 @@
+---
+{{ readFile "../releases.yaml" }}
+
+releases:
+  - <<: *drone
+    installed: true
+    namespace: drone-service
+    createNamespace: false
+
+bases:
+  - ../environments.yaml
+  - ../repositories.yaml
diff --git a/helmfile.yaml b/helmfile.yaml
index 60f69ce..76299d8 100644
--- a/helmfile.yaml
+++ b/helmfile.yaml
@@ -31,10 +31,5 @@ releases:
     namespace: cert-manager
     createNamespace: false
 
-  - <<: *drone
-    installed: true
-    namespace: drone-service
-    createNamespace: false
-
 helmfiles:
   - path: {{.Environment.Name }}/helmfile.yaml
diff --git a/releases.yaml b/releases.yaml
index 4414bb1..d740c8a 100644
--- a/releases.yaml
+++ b/releases.yaml
@@ -55,7 +55,7 @@ templates:
     name: istio-gateway
     chart: istio/gateway
     values:
-      - "{{ .Environment.Name }}/values/values.{{ .Release.Name }}.yaml"
+      - "{{ requiredEnv \"PWD\" }}/{{ .Environment.Name }}/values/values.{{ .Release.Name }}.yaml"
     inherit:
       - template: istio-version
 
@@ -63,7 +63,7 @@ templates:
     name: istiod
     chart: istio/istiod
     values:
-      - "{{ .Environment.Name }}/values/values.{{ .Release.Name }}.yaml"
+      - "{{ requiredEnv \"PWD\" }}/{{ .Environment.Name }}/values/values.{{ .Release.Name }}.yaml"
     inherit:
       - template: istio-version
   
@@ -75,15 +75,15 @@ templates:
     chart: allanger-charts/openvpn
     version: 1.0.1
     values: 
-      - "{{ .Environment.Name }}/values/values.{{ .Release.Name }}.yaml"
+      - "{{ requiredEnv \"PWD\" }}/{{ .Environment.Name }}/values/values.{{ .Release.Name }}.yaml"
 
   drone: &drone
     name: drone
     chart: drone/drone
     version: 0.6.4
     values: 
-      - "{{ .Environment.Name }}/values/values.{{ .Release.Name }}.yaml"
+      - "{{ requiredEnv \"PWD\" }}/{{ .Environment.Name }}/values/values.{{ .Release.Name }}.yaml"
     secrets: 
-      - "{{ .Environment.Name }}/values/secrets.{{ .Release.Name }}.yaml"
+      - "{{ requiredEnv \"PWD\" }}/{{ .Environment.Name }}/values/secrets.{{ .Release.Name }}.yaml"