diff --git a/files/releng/fedmsg/endpoints.py b/files/releng/fedmsg/endpoints.py
index f8bc91d34a..189187a225 100644
--- a/files/releng/fedmsg/endpoints.py
+++ b/files/releng/fedmsg/endpoints.py
@@ -60,12 +60,12 @@ config = dict(
             "tcp://fas01.%s:300%i" % (suffix, i)
             for i in range(8)
         ],
-        "fedoratagger.packages01": [
-            "tcp://packages01.%s:300%i" % (suffix, i)
+        "fedoratagger.tagger01": [
+            "tcp://tagger01.%s:300%i" % (suffix, i)
             for i in range(8)
         ],
-        "fedoratagger.packages02": [
-            "tcp://packages02.%s:300%i" % (suffix, i)
+        "fedoratagger.tagger02": [
+            "tcp://tagger02.%s:300%i" % (suffix, i)
             for i in range(8)
         ],
         "busmon.app01": [
diff --git a/roles/fedmsg/base/templates/endpoints.py.j2 b/roles/fedmsg/base/templates/endpoints.py.j2
index 7d78d6e456..4c85c13ada 100644
--- a/roles/fedmsg/base/templates/endpoints.py.j2
+++ b/roles/fedmsg/base/templates/endpoints.py.j2
@@ -87,19 +87,6 @@ config = dict(
             for i in range(40)
         ],
 {% endif %}
-        # TODO -- these are the old tagger endpoints that should eventually be
-        # removed.
-        "fedoratagger.packages01": [
-            "tcp://packages01.%s:30%02i" % (suffix, i)
-            for i in range(32)
-        ],
-{% if env != 'staging' %}
-        "fedoratagger.packages02": [
-            "tcp://packages02.%s:30%02i" % (suffix, i)
-            for i in range(32)
-        ],
-{% endif %}
-        # These are the new endpoints, on the new tagger01,2 nodes.
         # fedoratagger needs 32 endpoints too, just like FAS.
         "fedoratagger.tagger01": [
             "tcp://tagger01.%s:30%02i" % (suffix, i)
diff --git a/roles/fedmsg/base/templates/policy.py.j2 b/roles/fedmsg/base/templates/policy.py.j2
index 33af4ad5f8..9aa72b9d08 100644
--- a/roles/fedmsg/base/templates/policy.py.j2
+++ b/roles/fedmsg/base/templates/policy.py.j2
@@ -172,16 +172,15 @@ config = dict(
         ],
 
         # Tagger messages
-        # TODO -- the old packages01,2 entries here can eventually be removed.
         topic_prefix + "fedoratagger.tag.update": [
             "fedoratagger-tagger0%i.%s" % (i, suffix) for i in range(1, 3)
-        ] + ["fedoratagger-packages0%i.%s" % (i, suffix) for i in range(1, 3)],
+        ],
         topic_prefix + "fedoratagger.tag.create": [
             "fedoratagger-tagger0%i.%s" % (i, suffix) for i in range(1, 3)
-        ] + ["fedoratagger-packages0%i.%s" % (i, suffix) for i in range(1, 3)],
+        ],
         topic_prefix + "fedoratagger.user.rank.update": [
             "fedoratagger-tagger0%i.%s" % (i, suffix) for i in range(1, 3)
-        ] + ["fedoratagger-packages0%i.%s" % (i, suffix) for i in range(1, 3)],
+        ],
 
         # Mediawiki messages
         topic_prefix + "wiki.article.edit": [
diff --git a/roles/fedmsg/base/templates/ssl.py.j2 b/roles/fedmsg/base/templates/ssl.py.j2
index 146c67387a..2c7478f8d0 100644
--- a/roles/fedmsg/base/templates/ssl.py.j2
+++ b/roles/fedmsg/base/templates/ssl.py.j2
@@ -52,12 +52,7 @@ config = dict(
         for i in range(1, 4)
     ] + [
         ("shell.packages0%i" % i, "shell-packages0%i.%s" % (i, suffix))
-        for i in range(1, 5)
-    ] + [
-        # TODO -- this one can be delete eventually once we retired tagger off
-        # of packages01,2
-        ("fedoratagger.packages0%i" % i, "fedoratagger-packages0%i.%s" % (i, suffix))
-        for i in range(1, 3)
+        for i in range(3, 5)
     ] + [
         ("fedoratagger.tagger0%i" % i, "fedoratagger-tagger0%i.%s" % (i, suffix))
         for i in range(1, 3)