diff --git a/playbooks/roles/rsyslog_client/defaults/main.yml b/playbooks/roles/rsyslog_client/defaults/main.yml
index 34e78e98f4..1b15e05d9c 100644
--- a/playbooks/roles/rsyslog_client/defaults/main.yml
+++ b/playbooks/roles/rsyslog_client/defaults/main.yml
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-rsyslog_client_apt_repos:
-  - { repo: "ppa:adiscon/v8-stable", state: "present" }
+# rsyslog_client_apt_repos:
+#   - { repo: "ppa:adiscon/v8-stable", state: "present" }
 
 rsyslog_client_apt_packages:
   - rsyslog
diff --git a/playbooks/roles/rsyslog_client/tasks/rsyslog_client_install.yml b/playbooks/roles/rsyslog_client/tasks/rsyslog_client_install.yml
index bb8820ab5f..12d875b5e8 100644
--- a/playbooks/roles/rsyslog_client/tasks/rsyslog_client_install.yml
+++ b/playbooks/roles/rsyslog_client/tasks/rsyslog_client_install.yml
@@ -18,6 +18,7 @@
     repo: "{{ item.repo }}"
     state: "{{ item.state }}"
   with_items: rsyslog_client_apt_repos
+  when: rsyslog_client_apt_repos is defined
   register: add_repos
   until: add_repos|success
   retries: 5
diff --git a/playbooks/roles/rsyslog_server/defaults/main.yml b/playbooks/roles/rsyslog_server/defaults/main.yml
index 5e9598998f..3310e44b41 100644
--- a/playbooks/roles/rsyslog_server/defaults/main.yml
+++ b/playbooks/roles/rsyslog_server/defaults/main.yml
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-rsyslog_server_apt_repos:
-  - { repo: "ppa:adiscon/v8-stable", state: "present" }
+# rsyslog_server_apt_repos:
+#   - { repo: "ppa:adiscon/v8-stable", state: "present" }
 
 rsyslog_server_apt_packages:
   - rsyslog
diff --git a/playbooks/roles/rsyslog_server/tasks/rsyslog_server_install.yml b/playbooks/roles/rsyslog_server/tasks/rsyslog_server_install.yml
index 10159cdff6..2238e2cd26 100644
--- a/playbooks/roles/rsyslog_server/tasks/rsyslog_server_install.yml
+++ b/playbooks/roles/rsyslog_server/tasks/rsyslog_server_install.yml
@@ -18,6 +18,7 @@
     repo: "{{ item.repo }}"
     state: "{{ item.state }}"
   with_items: rsyslog_server_apt_repos
+  when: rsyslog_server_apt_repos is defined
   register: add_repos
   until: add_repos|success
   retries: 5