diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index e5ec9e8..8397263 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -27,7 +27,7 @@ jobs:
       matrix:
         refs:
           - 'master'
-          - '0.36'
+          - '0.37'
     steps:
 
       # ------------------------------------------------------------
diff --git a/Dockerfile b/Dockerfile
index 6abdda9..c9c9ef0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,15 +22,15 @@ ENV BUILD_DEPS \
 
 ENV RUN_DEPS \
 	ca-certificates \
-	python-yaml \
+	python3-yaml \
 	supervisor
 
 
 ###
 ### Runtime arguments
 ###
-ENV MY_USER=daemon
-ENV MY_GROUP=daemon
+ENV MY_USER=www-data
+ENV MY_GROUP=www-data
 ENV HTTPD_START="httpd-foreground"
 ENV HTTPD_RELOAD="/usr/local/apache2/bin/httpd -k stop"
 
@@ -127,6 +127,13 @@ RUN set -x \
 	&& chown ${MY_USER}:${MY_GROUP} /shared/httpd
 
 
+###
+### Symlink Python3 to Python
+###
+RUN set -x \
+	&& ln -sf /usr/bin/python3 /usr/bin/python
+
+
 ###
 ### Copy files
 ###
diff --git a/README.md b/README.md
index cd40dcb..005b8a7 100644
--- a/README.md
+++ b/README.md
@@ -264,11 +264,11 @@ It allows any of the following combinations:
 ## Version
 
 ```
-Server version: Apache/2.4.46 (Unix)
-Server built:   Dec 11 2020 12:17:58
-Server's Module Magic Number: 20120211:93
-Server loaded:  APR 1.6.5, APR-UTIL 1.6.1
-Compiled using: APR 1.6.5, APR-UTIL 1.6.1
+Server version: Apache/2.4.52 (Unix)
+Server built:   Dec 21 2021 01:34:45
+Server's Module Magic Number: 20120211:121
+Server loaded:  APR 1.7.0, APR-UTIL 1.6.1
+Compiled using: APR 1.7.0, APR-UTIL 1.6.1
 Architecture:   64-bit
 Server MPM:     event
   threaded:     yes (fixed thread count)
@@ -277,7 +277,7 @@ Server compiled with....
  -D APR_HAS_SENDFILE
  -D APR_HAS_MMAP
  -D APR_HAVE_IPV6 (IPv4-mapped addresses enabled)
- -D APR_USE_SYSVSEM_SERIALIZE
+ -D APR_USE_PROC_PTHREAD_SERIALIZE
  -D APR_USE_PTHREAD_SERIALIZE
  -D SINGLE_LISTEN_UNSERIALIZED_ACCEPT
  -D APR_HAS_OTHER_CHILD