diff --git a/WixInstaller/XenCenter.wxs b/WixInstaller/XenCenter.wxs
index a823b0f1e..746ea627a 100644
--- a/WixInstaller/XenCenter.wxs
+++ b/WixInstaller/XenCenter.wxs
@@ -123,8 +123,6 @@
                             </ProgId>
                         </Component>
                         <Component Id="UpdateFiles" Guid="$(var.UpdateFilesGuid)">
-                            <File Id="hotfixDundee" Source="$(env.RepoRoot)\Branding\Hotfixes\RPU003.$(var.FileExtUpdate)" />
-                            <File Id="hotfixEly" Source="$(env.RepoRoot)\Branding\Hotfixes\RPU004.iso" />
                             <File Id="hotfixStockholm" Source="$(env.RepoRoot)\Branding\Hotfixes\RPU005.iso" />
                         </Component>
                         <Directory Id="ja" Name="ja">
diff --git a/XenAdmin/Diagnostics/Hotfixing/HotfixFactory.cs b/XenAdmin/Diagnostics/Hotfixing/HotfixFactory.cs
index 700ac9894..b370d8f6f 100644
--- a/XenAdmin/Diagnostics/Hotfixing/HotfixFactory.cs
+++ b/XenAdmin/Diagnostics/Hotfixing/HotfixFactory.cs
@@ -39,23 +39,9 @@ namespace XenAdmin.Diagnostics.Hotfixing
     {
         public enum HotfixableServerVersion
         {
-            Dundee,
-            ElyLima,
             Stockholm
         }
 
-        private static readonly Hotfix dundeeHotfix = new SingleHotfix
-        {
-            Filename = "RPU003",
-            UUID = "b651dd22-df7d-45a4-8c0a-6be037bc1714"
-        };
-
-        private static readonly Hotfix elyLimaHotfix = new SingleHotfix
-        {
-            Filename = "RPU004",
-            UUID = "1821854d-0171-4696-a9c4-01daf75a45a0"
-        };
-
         private static readonly Hotfix stockholmHotfix = new SingleHotfix
         {
             Filename = "RPU005",
@@ -66,10 +52,6 @@ namespace XenAdmin.Diagnostics.Hotfixing
         {
             if (Helpers.StockholmOrGreater(host) && !Helpers.PostStockholm(host))
                 return Hotfix(HotfixableServerVersion.Stockholm);
-            if (Helpers.ElyOrGreater(host) && !Helpers.NaplesOrGreater(host))
-                return Hotfix(HotfixableServerVersion.ElyLima);
-            if (Helpers.DundeeOrGreater(host) && !Helpers.ElyOrGreater(host))
-                return Hotfix(HotfixableServerVersion.Dundee);
             return null;
         }
 
@@ -77,10 +59,6 @@ namespace XenAdmin.Diagnostics.Hotfixing
         {
             if (version == HotfixableServerVersion.Stockholm)
                 return stockholmHotfix;
-            if (version == HotfixableServerVersion.ElyLima)
-                return elyLimaHotfix;
-            if (version == HotfixableServerVersion.Dundee)
-                return dundeeHotfix;
 
             throw new ArgumentException("A version was provided for which there is no hotfix filename");
         }
diff --git a/scripts/hotfix-map.json b/scripts/hotfix-map.json
index e08eb87ae..52584e8d5 100644
--- a/scripts/hotfix-map.json
+++ b/scripts/hotfix-map.json
@@ -1,15 +1,5 @@
 {
   "files": [
-    {
-      "pattern": "builds/xs/hotfixes/trunk/RPU003/9.0/RPU003.xsupdate",
-      "target": "xenadmin.git/Branding/Hotfixes/RPU003.xsupdate",
-      "flat": "true"
-    },
-    {
-      "pattern": "builds/xs/hotfixes/trunk/RPU004/8.0/RPU004.iso",
-      "target": "xenadmin.git/Branding/Hotfixes/RPU004.iso",
-      "flat": "true"
-    },
     {
       "pattern": "builds/xs/hotfixes/trunk/RPU005/2.0/RPU005.iso",
       "target": "xenadmin.git/Branding/Hotfixes/RPU005.iso",