diff --git a/docker-compose.yml b/docker-compose.yml
index d2fd26b..50126ac 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -72,4 +72,18 @@ services:
     - da1
     - da2
     - da3
+ hs:
+  image: antitree/private-tor
+  expose:
+    - "80"
+  environment:
+    ROLE: HS
+    TOR_HS_PORT: "80"
+    TOR_HS_ADDR: "127.0.0.1"
+  volumes:
+    - ./tor:/tor
+  depends_on:
+    - da1
+    - da2
+    - da3
 
diff --git a/scripts/docker-entrypoint b/scripts/docker-entrypoint
index 3a88ad6..d11b077 100755
--- a/scripts/docker-entrypoint
+++ b/scripts/docker-entrypoint
@@ -61,12 +61,23 @@ if [ ! -e /tor-config-done ]; then
         echo -e "OrPort ${TOR_ORPORT}" >> /etc/tor/torrc
         echo -e "Dirport ${TOR_DIRPORT}" >> /etc/tor/torrc
         echo -e "ExitPolicy accept *:*" >> /etc/tor/torrc
-	 echo "Waiting for other DA's to come up..."
+	echo "Waiting for other DA's to come up..."
         ;;
       CLIENT)
         echo "Setting role to CLIENT"
 	echo -e "SOCKSPort 0.0.0.0:9050" >> /etc/tor/torrc
         ;;
+      HS)
+	echo "Setting role to HIDDENSERVICE"
+	echo -e "HiddenServiceDir ${TOR_DIR}/${TOR_NICKNAME}/hs" >> /etc/tor/torrc
+	if [  -z "${TOR_HS_PORT}" ]; then
+	  TOR_HS_PORT=80
+	fi
+	if [ -z "${TOR_HS_ADDR}" ]; then
+	  TOR_HS_ADDR=127.0.0.1
+	fi
+	echo -e "HiddenServicePort ${TOR_HS_PORT} ${TOR_HS_ADDR}:${TOR_HS_PORT}" >> /etc/tor/torrc
+	;;
       *)
         echo "Role variable missing"
         exit 1