diff --git a/awx/ui/static/js/system-tracking/data-services/get-module-options.factory.js b/awx/ui/static/js/system-tracking/data-services/get-module-options.factory.js
index 94f1dd1be8..c82848015d 100644
--- a/awx/ui/static/js/system-tracking/data-services/get-module-options.factory.js
+++ b/awx/ui/static/js/system-tracking/data-services/get-module-options.factory.js
@@ -4,18 +4,13 @@ var moduleConfig =
                 nameKey: 'name',
                 displayType: 'flat',
                 sortKey: 1,
-                factTemplate: function(fact) {
-                    if (fact.source === 'deb') {
-                        return "{{version}}-{{architecture}}";
-                    } else if (fact.source === 'rpm') {
-                        return "{{epoch|append:':'}}{{version}}-{{release}}.{{arch}}";
-                    }
-                }
+                factTemplate: "{{epoch|append:':'}}{{version}}-{{release}}{{arch|prepend:'.'}}"
             },
         'services':
             {   compareKey: ['state', 'source'],
                 nameKey: 'name',
                 displayType: 'flat',
+                factTemplate: '{{state}} ({{source}})',
                 sortKey: 2
             },
         'files':