diff --git a/roles/anitya/fedmsg/templates/base.py.j2 b/roles/anitya/fedmsg/templates/base.py.j2
index 8a9bcee4c3..9f24fecd06 100644
--- a/roles/anitya/fedmsg/templates/base.py.j2
+++ b/roles/anitya/fedmsg/templates/base.py.j2
@@ -48,8 +48,13 @@ try:
     pid = os.getpid()
     proc = [p for p in psutil.process_iter() if p.pid == pid][0]
 
+    # proc.name is a method on modern versions of psutil.
+    name = proc.name
+    if callable(name):
+        name = name()
+
     config['moksha.monitoring.socket'] = \
-        'ipc:///var/run/fedmsg/monitoring-%s.socket' % proc.name
+        'ipc:///var/run/fedmsg/monitoring-%s.socket' % name
     config['moksha.monitoring.socket.mode'] = '770'
 except (OSError, ImportError):
     # We run into issues when trying to import psutil from mod_wsgi on rhel7
diff --git a/roles/anitya/fedmsg/templates/logging.py.j2 b/roles/anitya/fedmsg/templates/logging.py.j2
index 00a107f2c8..947a370ef0 100644
--- a/roles/anitya/fedmsg/templates/logging.py.j2
+++ b/roles/anitya/fedmsg/templates/logging.py.j2
@@ -42,7 +42,13 @@ class ContextInjector(logging.Filter):
         record.proc = current_process
         record.pid = current_process.pid
         record.proc_name = current_process.name
-        record.command_line = " ".join(current_process.cmdline)
+        record.command_line = current_process.cmdline
+        # These are callabls on more modern versions of psutil.
+        if callable(record.proc_name):
+            record.proc_name = record.proc_name()
+        if callable(record.command_line):
+            record.command_line = record.command_line()
+        record.command_line = " ".join(record.command_line)
         record.callstack = self.format_callstack()
         return True
 
diff --git a/roles/fedmsg/base/templates/base.py.j2 b/roles/fedmsg/base/templates/base.py.j2
index 57dbddac2e..0da211b506 100644
--- a/roles/fedmsg/base/templates/base.py.j2
+++ b/roles/fedmsg/base/templates/base.py.j2
@@ -92,8 +92,13 @@ try:
     pid = os.getpid()
     proc = [p for p in psutil.process_iter() if p.pid == pid][0]
 
+    # proc.name is a method on modern versions of psutil.
+    name = proc.name
+    if callable(name):
+        name = name()
+
     config['moksha.monitoring.socket'] = \
-        'ipc:///var/run/fedmsg/monitoring-%s.socket' % proc.name
+        'ipc:///var/run/fedmsg/monitoring-%s.socket' % name
     config['moksha.monitoring.socket.mode'] = '770'
 except (OSError, ImportError):
     # We run into issues when trying to import psutil from mod_wsgi on rhel7
diff --git a/roles/fedmsg/base/templates/logging.py.j2 b/roles/fedmsg/base/templates/logging.py.j2
index bc403a1bd5..5eaf87d459 100644
--- a/roles/fedmsg/base/templates/logging.py.j2
+++ b/roles/fedmsg/base/templates/logging.py.j2
@@ -54,7 +54,13 @@ class ContextInjector(logging.Filter):
         record.proc = current_process
         record.pid = current_process.pid
         record.proc_name = current_process.name
-        record.command_line = " ".join(current_process.cmdline)
+        record.command_line = current_process.cmdline
+        # These are callabls on more modern versions of psutil.
+        if callable(record.proc_name):
+            record.proc_name = record.proc_name()
+        if callable(record.command_line):
+            record.command_line = record.command_line()
+        record.command_line = " ".join(record.command_line)
         record.callstack = self.format_callstack()
         record.farewell = ""
 
diff --git a/roles/fedmsg/gateway/slave/templates/fedmsg-gateway-slave.py.j2 b/roles/fedmsg/gateway/slave/templates/fedmsg-gateway-slave.py.j2
index f64911b8e1..68e449eaed 100644
--- a/roles/fedmsg/gateway/slave/templates/fedmsg-gateway-slave.py.j2
+++ b/roles/fedmsg/gateway/slave/templates/fedmsg-gateway-slave.py.j2
@@ -24,8 +24,13 @@ try:
     pid = os.getpid()
     proc = [p for p in psutil.process_iter() if p.pid == pid][0]
 
+    # proc.name is a method on modern versions of psutil.
+    name = proc.name
+    if callable(name):
+        name = name()
+
     config['moksha.monitoring.socket'] = \
-        'ipc:///var/run/fedmsg/monitoring-%s.socket' % proc.name
+        'ipc:///var/run/fedmsg/monitoring-%s.socket' % name
     config['moksha.monitoring.socket.mode'] = '770'
 except (OSError, ImportError):
     # We run into issues when trying to import psutil from mod_wsgi on rhel7
diff --git a/roles/pagure/fedmsg/templates/base.py.j2 b/roles/pagure/fedmsg/templates/base.py.j2
index 18b9e26afc..31a8e93da1 100644
--- a/roles/pagure/fedmsg/templates/base.py.j2
+++ b/roles/pagure/fedmsg/templates/base.py.j2
@@ -53,8 +53,13 @@ try:
     pid = os.getpid()
     proc = [p for p in psutil.process_iter() if p.pid == pid][0]
 
+    # proc.name is a method on modern versions of psutil.
+    name = proc.name
+    if callable(name):
+        name = name()
+
     config['moksha.monitoring.socket'] = \
-        'ipc:///var/run/fedmsg/monitoring-%s.socket' % proc.name
+        'ipc:///var/run/fedmsg/monitoring-%s.socket' % name
     config['moksha.monitoring.socket.mode'] = '770'
 except (OSError, ImportError):
     # We run into issues when trying to import psutil from mod_wsgi on rhel7
diff --git a/roles/pagure/fedmsg/templates/logging.py.j2 b/roles/pagure/fedmsg/templates/logging.py.j2
index 5d5a3fb6f4..eb198ebdd6 100644
--- a/roles/pagure/fedmsg/templates/logging.py.j2
+++ b/roles/pagure/fedmsg/templates/logging.py.j2
@@ -42,7 +42,13 @@ class ContextInjector(logging.Filter):
         record.proc = current_process
         record.pid = current_process.pid
         record.proc_name = current_process.name
-        record.command_line = " ".join(current_process.cmdline)
+        record.command_line = current_process.cmdline
+        # These are callabls on more modern versions of psutil.
+        if callable(record.proc_name):
+            record.proc_name = record.proc_name()
+        if callable(record.command_line):
+            record.command_line = record.command_line()
+        record.command_line = " ".join(record.command_line)
         record.callstack = self.format_callstack()
         return True