 
 	knex('config').select('value').where(key: 'uuid').then ([ uuid ]) ->
 		uuid = uuid.value
-		channel = "device-#{uuid}-"
+		channel = "device-#{uuid}-logs"
 
 		# Redefine original function
-		publish = (message, channelPrefix="logs") ->
-			pubnub.publish({ channel + channelPrefix, message })
+		publish = (message) ->
+			pubnub.publish({ channel, message })
 
 		# Replay queue now that we have initialised the publish function
 		publish(args...) for args in publishQueue
 
 	return -> publishQueue.push(arguments)
 
-exports.logSupervisorEvent = logSupervisorEvent = (message) ->
-	publish(message, "meta-logs")
-
-exports.kill = kill = (app) ->	
-	logSupervisorEvent( 'Killing application ' + app.imageId )
+exports.logSystemEvent = logSystemEvent = (message) ->
+	publish("[system] " + message)
+
+exports.kill = kill = (app) ->
+	logSystemEvent('Killing application ' + app.imageId)
 	utils.mixpanelTrack('Application kill', app)
 	updateDeviceInfo(status: 'Stopping')
 	container = docker.getContainer(app.containerId)

			docker.getImage(app.imageId).inspectAsync()
			.catch (error) ->
				utils.mixpanelTrack('Application install', app)
				logSupervisorEvent('Installing application ' + app.imageId)
				updateDeviceInfo(status: 'Downloading')
				docker.createImageAsync(fromImage: app.imageId)
				.then (stream) ->

					localApp = apps[imageId]
					app = remoteApps[imageId]
					utils.mixpanelTrack('Application update', app)
					logSystemEvent('Updating application')
					kill(localApp)
					.then ->
						start(app)
