diff --git a/CHANGELOG-0.3.md b/CHANGELOG-0.3.md
index be8dcba995..01bbd5bc7c 100644
--- a/CHANGELOG-0.3.md
+++ b/CHANGELOG-0.3.md
@@ -23,4 +23,4 @@
 ### Known issues
 
 - Deployment/Application role fails because Kubernetes cluster is not ready after reboot. More info [here](https://github.com/epiphany-platform/epiphany/issues/407)
-- Node_exporter ports are not present in defaults resulting in Prometheus not beeing able to scrape data with minimal cluster data.yaml. More info [here](https://github.com/epiphany-platform/epiphany/issues/410)
\ No newline at end of file
+- Node_exporter ports are not present in defaults resulting in Prometheus not beeing able to scrape data with minimal cluster data.yaml. More info [here](https://github.com/epiphany-platform/epiphany/issues/410)
diff --git a/CHANGELOG-0.5.md b/CHANGELOG-0.5.md
index 447d76d127..85ab731e39 100644
--- a/CHANGELOG-0.5.md
+++ b/CHANGELOG-0.5.md
@@ -1,5 +1,11 @@
 # Changelog 0.5
 
+## [0.5.5] 2020-XX-XX
+
+### Fixed
+
+- [#1350](https://github.com/epiphany-platform/epiphany/issues/1350) - Cannot deploy a non-k8s cluster with load\_balancer vm
+
 ## [0.5.4] 2020-04-14
 
 ### Added
diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/haproxy/templates/haproxy_Debian.cfg.j2 b/core/src/epicli/data/common/ansible/playbooks/roles/haproxy/templates/haproxy_Debian.cfg.j2
index be0d06182d..8b3c31ff78 100644
--- a/core/src/epicli/data/common/ansible/playbooks/roles/haproxy/templates/haproxy_Debian.cfg.j2
+++ b/core/src/epicli/data/common/ansible/playbooks/roles/haproxy/templates/haproxy_Debian.cfg.j2
@@ -19,7 +19,7 @@ global
 
    ssl-dh-param-file /etc/haproxy/dhparam
 
- 
+
 defaults
    log global
    mode http
@@ -73,7 +73,7 @@ backend {{ back.name }}
   option tcp-check
   mode tcp
   {%- endif %}
-  {%- if back.server_groups is defined %}
+  {%- if back.server_groups is defined and back.server_groups is subset(groups) %}
   {%- for server_group in back.server_groups %}
   {%- for server in groups[server_group] %}
   {%- if back.https is defined and back.https == True %}
diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/haproxy/templates/haproxy_RedHat.cfg.j2 b/core/src/epicli/data/common/ansible/playbooks/roles/haproxy/templates/haproxy_RedHat.cfg.j2
index 90567af333..b1a6cff0ff 100644
--- a/core/src/epicli/data/common/ansible/playbooks/roles/haproxy/templates/haproxy_RedHat.cfg.j2
+++ b/core/src/epicli/data/common/ansible/playbooks/roles/haproxy/templates/haproxy_RedHat.cfg.j2
@@ -19,7 +19,7 @@ global
 
    ssl-dh-param-file /etc/opt/rh/rh-haproxy18/haproxy/dhparam
 
- 
+
 defaults
    log global
    mode http
@@ -74,7 +74,7 @@ backend {{ back.name }}
   option tcp-check
   mode tcp
   {%- endif %}
-  {%- if back.server_groups is defined %}
+  {%- if back.server_groups is defined and back.server_groups is subset(groups) %}
   {%- for server_group in back.server_groups %}
   {%- for server in groups[server_group] %}
   {%- if back.https is defined and back.https == True %}