diff --git a/api/src/com/cloud/event/EventTypes.java b/api/src/com/cloud/event/EventTypes.java
index 870c7e7f1f4..9a264a50e82 100644
--- a/api/src/com/cloud/event/EventTypes.java
+++ b/api/src/com/cloud/event/EventTypes.java
@@ -63,10 +63,8 @@ import com.cloud.storage.snapshot.SnapshotPolicy;
 import com.cloud.template.VirtualMachineTemplate;
 import com.cloud.user.Account;
 import com.cloud.user.User;
-import com.cloud.vm.ConsoleProxy;
 import com.cloud.vm.Nic;
 import com.cloud.vm.NicSecondaryIp;
-import com.cloud.vm.SecondaryStorageVm;
 import com.cloud.vm.VirtualMachine;
 import org.apache.cloudstack.config.Configuration;
 import org.apache.cloudstack.usage.Usage;
@@ -557,13 +555,13 @@ public class EventTypes {
         entityEventDetails.put(EVENT_ROUTER_HA, VirtualRouter.class);
         entityEventDetails.put(EVENT_ROUTER_UPGRADE, VirtualRouter.class);
 
-        entityEventDetails.put(EVENT_PROXY_CREATE, ConsoleProxy.class);
-        entityEventDetails.put(EVENT_PROXY_DESTROY, ConsoleProxy.class);
-        entityEventDetails.put(EVENT_PROXY_START, ConsoleProxy.class);
-        entityEventDetails.put(EVENT_PROXY_STOP, ConsoleProxy.class);
-        entityEventDetails.put(EVENT_PROXY_REBOOT, ConsoleProxy.class);
-        entityEventDetails.put(EVENT_ROUTER_HA, ConsoleProxy.class);
-        entityEventDetails.put(EVENT_PROXY_HA, ConsoleProxy.class);
+        entityEventDetails.put(EVENT_PROXY_CREATE, VirtualMachine.class);
+        entityEventDetails.put(EVENT_PROXY_DESTROY, VirtualMachine.class);
+        entityEventDetails.put(EVENT_PROXY_START, VirtualMachine.class);
+        entityEventDetails.put(EVENT_PROXY_STOP, VirtualMachine.class);
+        entityEventDetails.put(EVENT_PROXY_REBOOT, VirtualMachine.class);
+        entityEventDetails.put(EVENT_ROUTER_HA, VirtualMachine.class);
+        entityEventDetails.put(EVENT_PROXY_HA, VirtualMachine.class);
 
         entityEventDetails.put(EVENT_VNC_CONNECT, "VNC");
         entityEventDetails.put(EVENT_VNC_DISCONNECT, "VNC");
@@ -668,12 +666,12 @@ public class EventTypes {
         entityEventDetails.put(EVENT_ISO_UPLOAD, "Iso");
 
         // SSVM
-        entityEventDetails.put(EVENT_SSVM_CREATE, SecondaryStorageVm.class);
-        entityEventDetails.put(EVENT_SSVM_DESTROY, SecondaryStorageVm.class);
-        entityEventDetails.put(EVENT_SSVM_START, SecondaryStorageVm.class);
-        entityEventDetails.put(EVENT_SSVM_STOP, SecondaryStorageVm.class);
-        entityEventDetails.put(EVENT_SSVM_REBOOT, SecondaryStorageVm.class);
-        entityEventDetails.put(EVENT_SSVM_HA, SecondaryStorageVm.class);
+        entityEventDetails.put(EVENT_SSVM_CREATE, VirtualMachine.class);
+        entityEventDetails.put(EVENT_SSVM_DESTROY, VirtualMachine.class);
+        entityEventDetails.put(EVENT_SSVM_START, VirtualMachine.class);
+        entityEventDetails.put(EVENT_SSVM_STOP, VirtualMachine.class);
+        entityEventDetails.put(EVENT_SSVM_REBOOT, VirtualMachine.class);
+        entityEventDetails.put(EVENT_SSVM_HA, VirtualMachine.class);
 
         // Service Offerings
         entityEventDetails.put(EVENT_SERVICE_OFFERING_CREATE, ServiceOffering.class);
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 84830182e35..25071a2b28f 100644
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -3250,7 +3250,6 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
     }
 
     @Override
-    @ActionEvent(eventType = EventTypes.EVENT_PROXY_REBOOT, eventDescription = "", async = true)
     public VMInstanceVO rebootSystemVM(final RebootSystemVmCmd cmd) {
         final VMInstanceVO systemVm = _vmInstanceDao.findByIdTypes(cmd.getId(), VirtualMachine.Type.ConsoleProxy, VirtualMachine.Type.SecondaryStorageVm);