diff --git a/.github/workflows/main-tag.yml b/.github/workflows/main-tag.yml
index 5265c67..6e0b7c0 100644
--- a/.github/workflows/main-tag.yml
+++ b/.github/workflows/main-tag.yml
@@ -3,8 +3,9 @@ name: Build multiarch image - tag
 on:
   push:
     tags:
-      - '[0-9]+.[0-9]+.[0-9]+.[0-9]+'
-    
+      - '[0-9]+-[0-9]+-[0-9]+-[0-9]+'
+      - '[0-9]+-[0-9]+-[0-9]+-[0-9]+-r[0-9]+'
+      - '[0-9]+-[0-9]+-[0-9]+-[0-9]+-rc[0-9]+'
   workflow_dispatch:
   
 jobs:
diff --git a/Dockerfile b/Dockerfile
index 2e37460..de4487c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -70,10 +70,11 @@ COPY --from=tor-builder /tor/src/config/geoip6 /usr/local/share/tor/.
 # install transports
 COPY --from=obfs-builder /out/obfs4proxy /usr/local/bin/.
 
+# create service dir (we don't define VOLUME because https://github.com/docker-library/mysql/issues/255
+# and other issues when running as non-root user)
+RUN mkdir -p /run/tor/service && chown -R 1001 /run/tor
+
 # change to non root
 USER 1001
 
-# create service dir
-VOLUME /run/tor/service
-
 ENTRYPOINT ["/usr/local/bin/tor"]
diff --git a/Dockerfile.quick b/Dockerfile.quick
index 9e0ca49..ba05e6b 100644
--- a/Dockerfile.quick
+++ b/Dockerfile.quick
@@ -35,10 +35,11 @@ RUN ln -s /usr/bin/tor /usr/local/bin/tor
 # install transports
 COPY --from=obfs-builder /out/obfs4proxy /usr/local/bin/.
 
+# create service dir (we don't define VOLUME because https://github.com/docker-library/mysql/issues/255
+# and other issues when running as non-root user)
+RUN mkdir -p /run/tor/service && chown -R 1001 /run/tor
+
 # change to non root
 USER 1001
 
-# create service dir
-VOLUME /run/tor/service
-
 ENTRYPOINT ["/usr/local/bin/tor"]