diff --git a/controllers/hosts.go b/controllers/hosts.go
index 4a27a0cd..57a775fb 100644
--- a/controllers/hosts.go
+++ b/controllers/hosts.go
@@ -2,6 +2,7 @@ package controller
 
 import (
 	"encoding/json"
+	"fmt"
 	"net/http"
 
 	"github.com/gorilla/mux"
@@ -21,6 +22,8 @@ func hostHandlers(r *mux.Router) {
 	r.HandleFunc("/api/hosts/{hostid}", logic.SecurityCheck(true, http.HandlerFunc(updateHost))).Methods("PUT")
 	r.HandleFunc("/api/hosts/{hostid}", logic.SecurityCheck(true, http.HandlerFunc(deleteHost))).Methods("DELETE")
 	r.HandleFunc("/api/hosts/{hostid}/networks", logic.SecurityCheck(true, http.HandlerFunc(updateHostNetworks))).Methods("PUT")
+	r.HandleFunc("/api/hosts/{hostid}/createrelay", authorize(false, true, "user", http.HandlerFunc(createHostRelay))).Methods(http.MethodPost)
+	r.HandleFunc("/api/hosts/{hostid}/deleterelay", authorize(false, true, "user", http.HandlerFunc(deleteHostRelay))).Methods(http.MethodDelete)
 }
 
 // swagger:route GET /api/hosts hosts getHosts
@@ -188,3 +191,88 @@ func updateHostNetworks(w http.ResponseWriter, r *http.Request) {
 	w.WriteHeader(http.StatusOK)
 	json.NewEncoder(w).Encode(payload)
 }
+
+// swagger:route POST /api/hosts/{hostid}/createrelay hosts createHostRelay
+//
+// Create a relay.
+//
+//			Schemes: https
+//
+//			Security:
+//	  		oauth
+//
+//			Responses:
+//				200: nodeResponse
+func createHostRelay(w http.ResponseWriter, r *http.Request) {
+	var relay models.HostRelayRequest
+	var params = mux.Vars(r)
+	w.Header().Set("Content-Type", "application/json")
+	err := json.NewDecoder(r.Body).Decode(&relay)
+	if err != nil {
+		logger.Log(0, r.Header.Get("user"), "error decoding request body: ", err.Error())
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
+		return
+	}
+	relay.HostID = params["hostid"]
+	relayHost, relayedHosts, err := logic.CreateHostRelay(relay)
+	if err != nil {
+		logger.Log(0, r.Header.Get("user"),
+			fmt.Sprintf("failed to create relay on host [%s]: %v", relay.HostID, err))
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "internal"))
+		return
+	}
+
+	logger.Log(1, r.Header.Get("user"), "created relay on host", relay.HostID)
+	for _, relayedHost := range relayedHosts {
+
+		err = mq.PublishSingleHostUpdate(&relayedHost)
+		if err != nil {
+			logger.Log(1, "error sending update to relayed host ", relayedHost.ID.String(), ": ", err.Error())
+		}
+	}
+	// publish host update for relayhost
+	err = mq.PublishSingleHostUpdate(relayHost)
+	if err != nil {
+		logger.Log(1, "error sending update to relay host ", relayHost.ID.String(), ": ", err.Error())
+	}
+
+	w.WriteHeader(http.StatusOK)
+	json.NewEncoder(w).Encode(relayHost)
+}
+
+// swagger:route DELETE /api/hosts/{hostid}/createrelay hosts deleteHostRelay
+//
+// Remove a relay.
+//
+//			Schemes: https
+//
+//			Security:
+//	  		oauth
+//
+//			Responses:
+//				200: nodeResponse
+func deleteHostRelay(w http.ResponseWriter, r *http.Request) {
+	w.Header().Set("Content-Type", "application/json")
+	var params = mux.Vars(r)
+	hostid := params["hostid"]
+	relayHost, relayedHosts, err := logic.DeleteHostRelay(hostid)
+	if err != nil {
+		logger.Log(0, r.Header.Get("user"), "error decoding request body: ", err.Error())
+		logic.ReturnErrorResponse(w, r, logic.FormatError(err, "badrequest"))
+		return
+	}
+	logger.Log(1, r.Header.Get("user"), "deleted relay host", hostid)
+	for _, relayedHost := range relayedHosts {
+		err = mq.PublishSingleHostUpdate(&relayedHost)
+		if err != nil {
+			logger.Log(1, "error sending update to relayed host ", relayedHost.ID.String(), ": ", err.Error())
+		}
+	}
+	err = mq.PublishSingleHostUpdate(relayHost)
+	if err != nil {
+		logger.Log(1, "error sending update to relayed host ", relayHost.ID.String(), ": ", err.Error())
+	}
+
+	w.WriteHeader(http.StatusOK)
+	json.NewEncoder(w).Encode(relayHost)
+}
diff --git a/logic/relay.go b/logic/relay.go
index e46b4457..a0eb8a16 100644
--- a/logic/relay.go
+++ b/logic/relay.go
@@ -48,6 +48,47 @@ func CreateRelay(relay models.RelayRequest) ([]models.Node, models.Node, error)
 	return returnnodes, node, nil
 }
 
+func CreateHostRelay(relay models.HostRelayRequest) (relayHost *models.Host, relayedHosts []models.Host, err error) {
+
+	relayHost, err = GetHost(relay.HostID)
+	if err != nil {
+		return
+	}
+	err = ValidateHostRelay(relay)
+	if err != nil {
+		return
+	}
+	relayHost.IsRelay = true
+	relayHost.RelayedHosts = relay.RelayedHosts
+	err = UpsertHost(relayHost)
+	if err != nil {
+		return
+	}
+	relayedHosts = SetRelayedHosts(true, relay.HostID, relay.RelayedHosts)
+	return
+}
+
+func SetRelayedHosts(setRelayed bool, relayHostID string, relayedHostIDs []string) []models.Host {
+	var relayedHosts []models.Host
+	for _, relayedHostID := range relayedHostIDs {
+		host, err := GetHost(relayedHostID)
+		if err == nil {
+			if setRelayed {
+				host.IsRelayed = true
+				host.RelayedBy = relayHostID
+			} else {
+				host.IsRelayed = false
+				host.RelayedBy = ""
+			}
+			err = UpsertHost(host)
+			if err == nil {
+				relayedHosts = append(relayedHosts, *host)
+			}
+		}
+	}
+	return relayedHosts
+}
+
 // SetRelayedNodes- set relayed nodes
 func SetRelayedNodes(setRelayed bool, networkName string, addrs []string) ([]models.Node, error) {
 	var returnnodes []models.Node
@@ -90,6 +131,18 @@ func GetRelayedNodes(relayNode *models.Node) ([]models.Node, error) {
 	return returnnodes, nil
 }
 
+func GetRelayedHosts(relayHost *models.Host) []models.Host {
+	relayedHosts := []models.Host{}
+
+	for _, hostID := range relayHost.RelayedHosts {
+		relayedHost, err := GetHost(hostID)
+		if err == nil {
+			relayedHosts = append(relayedHosts, *relayedHost)
+		}
+	}
+	return relayedHosts
+}
+
 // ValidateRelay - checks if relay is valid
 func ValidateRelay(relay models.RelayRequest) error {
 	var err error
@@ -101,6 +154,11 @@ func ValidateRelay(relay models.RelayRequest) error {
 	return err
 }
 
+// TODO
+func ValidateHostRelay(relay models.HostRelayRequest) error {
+	return nil
+}
+
 // UpdateRelay - updates a relay
 func UpdateRelay(network string, oldAddrs []string, newAddrs []string) []models.Node {
 	var returnnodes []models.Node
@@ -141,3 +199,18 @@ func DeleteRelay(network, nodeid string) ([]models.Node, models.Node, error) {
 	}
 	return returnnodes, node, nil
 }
+
+func DeleteHostRelay(relayHostID string) (relayHost *models.Host, relayedHosts []models.Host, err error) {
+	relayHost, err = GetHost(relayHostID)
+	if err != nil {
+		return
+	}
+	relayedHosts = SetRelayedHosts(false, relayHostID, relayHost.RelayedHosts)
+	relayHost.IsRelay = false
+	relayHost.RelayedHosts = []string{}
+	err = UpsertHost(relayHost)
+	if err != nil {
+		return
+	}
+	return
+}