diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1218e2a..fec98bc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -25,4 +25,4 @@ workflows:
               ignore: /.*/
             # only act on version tags
             tags:
-              only: /v[1-9]+(\.[0-9]+)*/
\ No newline at end of file
+              only: /v.+/
\ No newline at end of file
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 6627ca0..13d3ada 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -1,8 +1,16 @@
 #!/bin/bash
 set -euo pipefail
 
+[ -f /etc/apache2/conf-enabled/servername.conf ] && rm /etc/apache2/conf-enabled/servername.conf
 if [ ! -z $WOOCOMMERCE_HOST ]; then
-    echo "ServerName $WOOCOMMERCE_HOST" > /etc/apache2/conf-enabled/servername.conf
+    echo "ServerName $WOOCOMMERCE_HOST" >> /etc/apache2/conf-enabled/servername.conf
+fi
+
+if [[ "${WOOCOMMERCE_HIDDENSERVICE_HOSTNAME_FILE}" ]]; then
+	echo "Waiting $WOOCOMMERCE_HIDDENSERVICE_HOSTNAME_FILE to be created by tor..."
+	while [ ! -f "$WOOCOMMERCE_HIDDENSERVICE_HOSTNAME_FILE" ]; do sleep 1; done
+	HIDDENSERVICE_ONION="$(head -n 1 "$WOOCOMMERCE_HIDDENSERVICE_HOSTNAME_FILE")"
+	echo "ServerName $WOOCOMMERCE_HOST" >> /etc/apache2/conf-enabled/servername.conf
 fi
 
 # usage: file_env VAR [DEFAULT]