diff --git a/docker-compose.yml b/docker-compose.yml
index 65121d7..3b4da0c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -57,7 +57,7 @@ services:
       context: kiwiirc/
       args:
         - BLD_IMG=${KI_BLD_IMG:-node}
-        - BLD_TAG=${KI_BLD_TAG:-15-alpine}
+        - BLD_TAG=${KI_BLD_TAG:-19-alpine}
         - BLD_REPO=${KI_BLD_REPO:-https://github.com/kiwiirc/kiwiirc.git}
         - BLD_VER=${KI_BLD_VER:-master}
         - FNL_IMG=${KI_FNL_IMG:-nginx}
@@ -74,10 +74,10 @@ services:
     environment:
       - TZ=${TZ}
 
-networks:    
+networks:
   default:
     internal: true
   znc-internet:
   main-webservices:
-    external:
-      name: ${NETWORK}
+    external: true
+    name: ${NETWORK}
diff --git a/kiwiirc/Dockerfile b/kiwiirc/Dockerfile
index f6b8d3b..c70576c 100644
--- a/kiwiirc/Dockerfile
+++ b/kiwiirc/Dockerfile
@@ -1,7 +1,7 @@
 # If you are wondering why the default args are set in the Dockerfile and in the
 # docker-compose.yml see this: https://github.com/docker/compose/issues/3608
 ARG BLD_IMG=${BLD_IMG:-node}
-ARG BLD_TAG=${BLD_TAG:-15-alpine}
+ARG BLD_TAG=${BLD_TAG:-19-alpine}
 ARG BLD_REPO=${BLD_REPO:-https://github.com/kiwiirc/kiwiirc.git}
 ARG BLD_VER=${BLD_VER:-master}
 ARG FNL_IMG=${FNL_IMG:-nginx}
diff --git a/znc/Dockerfile b/znc/Dockerfile
index 779046c..40ebb93 100644
--- a/znc/Dockerfile
+++ b/znc/Dockerfile
@@ -7,10 +7,10 @@ FROM linuxserver/znc:latest
 # So we need to compile it for ourserlves
 
 RUN wget https://raw.githubusercontent.com/znc/znc/8d309bbb3dc6bef558a2ffe4f523a0467dda8057/modules/q.cpp && \
-    apk add --no-cache g++ openssl-dev icu-dev tcl-dev && \
+    apk add --no-cache g++ openssl-dev icu-dev tcl-dev python3 make cmake && \
     znc-buildmod q.cpp && \
     rm q.cpp && \
-    mv q.so /usr/lib/znc/q.so
+    mv q.so /usr/local/lib/znc/q.so
 
 RUN apk add --no-cache \
            proxychains-ng
diff --git a/znc/root/etc/services.d/znc/run b/znc/root/etc/s6-overlay/s6-rc.d/svc-znc/run
similarity index 71%
rename from znc/root/etc/services.d/znc/run
rename to znc/root/etc/s6-overlay/s6-rc.d/svc-znc/run
index fa8ada6..6ec4d94 100644
--- a/znc/root/etc/services.d/znc/run
+++ b/znc/root/etc/s6-overlay/s6-rc.d/svc-znc/run
@@ -2,6 +2,6 @@
 
 umask 022
 
-exec s6-setuidgid abc proxychains /usr/bin/znc \
+exec s6-setuidgid abc proxychains /usr/local/bin/znc \
                                     -d /config \
                                     --foreground