diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000000000000000000000000000000000..c8bc96e467ab4ea095832065f1d396bbb1aa3c5f
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "library/shore"]
+	path = library/shore
+	url = https://www.shore.co.il/git/ansible-modules
diff --git a/defaults/main.yml b/defaults/main.yml
index 55eb10254e025524d8f0e1605db608f3c5896c94..4c2d9ac3fc2c8798bdcab62606c7870408d52cbe 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -2,3 +2,5 @@
 # defaults file for syslog-forward
 
 syslog_server:
+syslog_key_file: /etc/ssl/private/ssl-cert-snakeoil.key
+syslog_cert_file: /etc/ssl/certs/ssl-cert-snakeoil.pem
diff --git a/library/shore b/library/shore
new file mode 160000
index 0000000000000000000000000000000000000000..2efdc7b0a7d963ca5f2d7887530776906b319486
--- /dev/null
+++ b/library/shore
@@ -0,0 +1 @@
+Subproject commit 2efdc7b0a7d963ca5f2d7887530776906b319486
diff --git a/meta/main.yml b/meta/main.yml
index e66997bc351bb6d5564634e123e428d1c596eebe..3ba621b75c065c4c9b309e16501db280eaf7ea13 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -13,4 +13,6 @@ galaxy_info:
     versions:
     - jessie
   galaxy_tags: [ syslog ]
-dependencies: []
+dependencies:
+- src: adarnimrod.ca-store
+  name: ca-store
diff --git a/templates/forwarding.conf.j2 b/templates/forwarding.conf.j2
index 9a4062e8ca63b610385401399d725cf351525d59..018b459edd78360ba20f5859a451a3e67858411d 100644
--- a/templates/forwarding.conf.j2
+++ b/templates/forwarding.conf.j2
@@ -1,8 +1,8 @@
 {#
 $DefaultNetstreamDriver gtls
-$DefaultNetstreamDriverCAFile {{ tls_ca_cert_path }}
-$DefaultNetstreamDriverCertFile {{ tls_cert_path }}
-$DefaultNetstreamDriverKeyFile {{ tls_key_path }}
+$DefaultNetstreamDriverCAFile /etc/ssl/certs/ca-certificates.crt
+$DefaultNetstreamDriverCertFile {{ syslog_cert_file }}
+$DefaultNetstreamDriverKeyFile {{ syslog_key_file }}
 $ActionSendStreamDriverAuthMode x509/name
 #}
 
diff --git a/tests/playbook.yml b/tests/playbook.yml
index a740c9b6b40792e61997a4262c9d223c63019e06..ddad6860d66fe54807cc66199eac11e22498f3c5 100644
--- a/tests/playbook.yml
+++ b/tests/playbook.yml
@@ -1,11 +1,11 @@
 ---
 - hosts: syslog-forward-openbsd
   gather_facts: false
-  roles: [adarnimrod.openbsd-bootstrap]
+  roles: [openbsd-bootstrap]
 
 - hosts: syslog-forward-xenial
   gather_facts: false
-  roles: [adarnimrod.debian-bootstrap]
+  roles: [debian-bootstrap]
 
 - hosts: all
   strategy: free
diff --git a/tests/requirements.yml b/tests/requirements.yml
index cdc294cd67e8c5b70eed5178580e6edde25e10bb..70716f60b9e624bc5a09442517a08667363949f4 100644
--- a/tests/requirements.yml
+++ b/tests/requirements.yml
@@ -1,3 +1,5 @@
 ---
 - src: adarnimrod.openbsd-bootstrap
+  name: openbsd-bootstrap
 - src: adarnimrod.debian-bootstrap
+  name: debian-bootstrap