diff --git a/modules/libvirt/suse_manager/main.tf b/modules/libvirt/suse_manager/main.tf
index 482c308d6..3d7a8ed82 100644
--- a/modules/libvirt/suse_manager/main.tf
+++ b/modules/libvirt/suse_manager/main.tf
@@ -52,6 +52,8 @@ disable_firewall: ${var.disable_firewall}
 allow_postgres_connections: ${var.allow_postgres_connections}
 unsafe_postgres: ${var.unsafe_postgres}
 java_debugging: ${var.java_debugging}
+salt_logging: ${var.salt_logging}
+python_logging: ${var.python_logging}
 skip_changelog_import: ${var.skip_changelog_import}
 browser_side_less: ${var.browser_side_less}
 create_first_user: ${var.create_first_user}
diff --git a/modules/libvirt/suse_manager/variables.tf b/modules/libvirt/suse_manager/variables.tf
index 42394bdf6..a3c7395d4 100644
--- a/modules/libvirt/suse_manager/variables.tf
+++ b/modules/libvirt/suse_manager/variables.tf
@@ -79,6 +79,16 @@ variable "java_debugging" {
   default = true
 }
 
+variable "salt_logging" {
+  description = "set all salt logging to 'info', 'debug' or 'trace'"
+  default = "info"
+}
+
+variable "python_logging" {
+  description = "set python backend to loglevel 0 - 10"
+  default = 0
+}
+
 variable "skip_changelog_import" {
   description = "import RPMs without changelog data, this speeds up spacewalk-repo-sync"
   default = true
diff --git a/modules/openstack/suse_manager/main.tf b/modules/openstack/suse_manager/main.tf
index ec25b5ed8..f52e99915 100644
--- a/modules/openstack/suse_manager/main.tf
+++ b/modules/openstack/suse_manager/main.tf
@@ -46,6 +46,8 @@ disable_firewall: ${var.disable_firewall}
 allow_postgres_connections: ${var.allow_postgres_connections}
 unsafe_postgres: ${var.unsafe_postgres}
 java_debugging: ${var.java_debugging}
+salt_logging: ${var.salt_logging}
+python_logging: ${var.python_logging}
 skip_changelog_import: ${var.skip_changelog_import}
 browser_side_less: ${var.browser_side_less}
 create_first_user: ${var.create_first_user}
diff --git a/modules/openstack/suse_manager/variables.tf b/modules/openstack/suse_manager/variables.tf
index 11f8b7eb1..7251a7f32 100644
--- a/modules/openstack/suse_manager/variables.tf
+++ b/modules/openstack/suse_manager/variables.tf
@@ -79,6 +79,16 @@ variable "java_debugging" {
   default = true
 }
 
+variable "salt_logging" {
+  description = "set all salt logging to 'info', 'debug' or 'trace'"
+  default = "info"
+}
+
+variable "python_logging" {
+  description = "set python backend to loglevel 0 - 10"
+  default = 0
+}
+
 variable "skip_changelog_import" {
   description = "import RPMs without changelog data, this speeds up spacewalk-repo-sync"
   default = true
diff --git a/salt/suse_manager_server/master-custom.conf b/salt/suse_manager_server/master-custom.conf
index bef25b51e..28ac0473c 100644
--- a/salt/suse_manager_server/master-custom.conf
+++ b/salt/suse_manager_server/master-custom.conf
@@ -3,4 +3,6 @@ auto_accept: True
 {% endif %}
 ssh_minion_opts:
     log_file: ../../../../../var/log/salt-ssh.log
-    log_level: debug
+    log_level: {{ grains.get('salt_logging') | default('info', true) }}
+
+log_level: {{ grains.get('salt_logging') | default('info', true) }}
diff --git a/salt/suse_manager_server/rhn.sls b/salt/suse_manager_server/rhn.sls
index 56e8b4d95..200e1955a 100644
--- a/salt/suse_manager_server/rhn.sls
+++ b/salt/suse_manager_server/rhn.sls
@@ -89,6 +89,13 @@ rhn_conf_prometheus:
 
 {% endif %}
 
+rhn_conf_debug:
+  file.append:
+    - name: /etc/rhn/rhn.conf
+    - text: debug = {{ grains.get('python_logging') | default(0, true) }}
+    - require:
+      - sls: suse_manager_server
+
 # catch-all to ensure we always have at least one state covering /etc/rhn/rhn.conf
 rhn_conf_present:
   file.touch: