diff --git a/lib/facter/is_gitlab.rb b/lib/facter/is_gitlab.rb
new file mode 100644
index 0000000..aa1dc4f
--- /dev/null
+++ b/lib/facter/is_gitlab.rb
@@ -0,0 +1,9 @@
+#is_gitlab.rb
+
+Facter.add("is_gitlab") do
+     setcode do
+         FileTest.exists?("/usr/bin/X11/gitlab-ctl")
+     end
+end
+
+
diff --git a/lib/facter/is_xymonclient.rb b/lib/facter/is_xymonclient.rb
new file mode 100644
index 0000000..e4be52c
--- /dev/null
+++ b/lib/facter/is_xymonclient.rb
@@ -0,0 +1,9 @@
+#is_xymonclient.rb
+
+Facter.add("is_xymonclient") do
+     setcode do
+         FileTest.exists?("/usr/lib/xymon/client/bin/xymonclient.sh")
+     end
+end
+
+
diff --git a/lib/facter/is_xymonserver.rb b/lib/facter/is_xymonserver.rb
new file mode 100644
index 0000000..38f213a
--- /dev/null
+++ b/lib/facter/is_xymonserver.rb
@@ -0,0 +1,9 @@
+#is_xymonserver.rb
+
+Facter.add("is_xymonserver") do
+     setcode do
+         FileTest.exists?("/usr/lib/xymon/server/bin/xymon")
+     end
+end
+
+
diff --git a/templates/client/apt_no_repo_accept.erb b/templates/client/apt_no_repo_accept.erb
index 3fd25cf..e784536 100644
--- a/templates/client/apt_no_repo_accept.erb
+++ b/templates/client/apt_no_repo_accept.erb
@@ -1,3 +1,14 @@
+<%# If Xymon-client service is available -%>
+<%- if scope.lookupvar('::is_xymonclient') == 'true' -%>
 xymon-client
 hobbit-plugins
+<% end -%>
+<%# If Xymon-server service is available -%>
+<%- if scope.lookupvar('::is_xymonserver') == 'true' -%>
 xymon
+<% end -%>
+<%# If Gitlab service is available -%>
+<%- if scope.lookupvar('::is_gitlab') == 'true' -%>
+gitlab
+<% end -%>
+