diff --git a/xos/services/vpn/templates/connect.vpn.j2 b/xos/services/vpn/templates/connect.vpn.j2
new file mode 100644
index 0000000..d1e56a4
--- /dev/null
+++ b/xos/services/vpn/templates/connect.vpn.j2
@@ -0,0 +1,36 @@
+printf "%b" "
+client\n
+dev tun\n
+remote-cert-tls server\n
+resolv-retry 60\n
+nobind\n
+ca ca.crt\n
+cert {{ client_name }}.crt\n
+key {{ client_name }}.key\n
+verb 3
+{% for tenant in remotes %}
+remote {{ tenant.nat_ip }} {{ tenant.port_number }} {{ tenant.protocol }}\n
+{% endfor %}
+{% if is_persistent %}
+persist-tun\n
+persist-key\n
+{% endif %}
+" > client.conf
+printf "%b" "
+{% for line in ca_crt %}
+{{ line }}\n
+{% endfor %}
+" > ca.crt
+printf "%b" "
+{% for line in client_crt %}
+{{ line }}\n
+{% endfor %}
+" > {{ client_name }}.crt
+printf "%b" "
+{% for line in client_key %}
+{{ line }}\n
+{% endfor %}
+" > {{ client_name }}.key
+apt-get update
+apt-get install openvpn -y
+openvpn client.conf
diff --git a/xos/synchronizers/vpn/templates/server.conf.j2 b/xos/synchronizers/vpn/templates/server.conf.j2
new file mode 100644
index 0000000..09957e4
--- /dev/null
+++ b/xos/synchronizers/vpn/templates/server.conf.j2
@@ -0,0 +1,24 @@
+# This file autogenerated by VPNTenant observer
+# It contains the OPENVPN config file for the server
+script-security 3 system
+port {{ port_number }}
+proto {{ protocol }}
+dev tun
+writepid {{ pki_dir }}/pid
+ca {{ pki_dir }}/ca.crt
+cert {{ pki_dir }}/server.crt
+key {{ pki_dir }}/server.key
+dh {{ pki_dir }}/dh.pem
+crl-verify {{ pki_dir }}/crl.pem
+server {{ server_network }} {{ vpn_subnet }}
+ifconfig-pool-persist {{ pki_dir }}/ipp.txt
+status {{ pki_dir }}/openvpn-status.log
+verb 3
+{% if is_persistent %}
+keepalive 10 60
+persist-tun
+persist-key
+{% endif %}
+{% if clients_can_see_each_other %}
+client-to-client
+{% endif %}