diff --git a/templates/drupal-cron/default.Dockerfile b/templates/drupal-cron/default.Dockerfile
new file mode 100644
index 0000000..7c4fb72
--- /dev/null
+++ b/templates/drupal-cron/default.Dockerfile
@@ -0,0 +1,9 @@
+ARG BASE_TAG=8-dev
+FROM wodby/drupal-php:${BASE_TAG}
+
+ARG COPY_FROM=.
+ARG COPY_TO=.
+COPY --chown=1000:1000 ${COPY_FROM} ${COPY_TO}
+
+# Copy the required crontab file
+COPY ${COPY_FROM}/infrastructure/docker/cron/www-data.crontab /etc/crontabs/www-data
diff --git a/templates/drupal-cron/default.dockerignore b/templates/drupal-cron/default.dockerignore
new file mode 100644
index 0000000..244aa66
--- /dev/null
+++ b/templates/drupal-cron/default.dockerignore
@@ -0,0 +1,13 @@
+.git/
+.ddev/
+.docker/
+
+.github/
+.idea/
+.travis/
+
+/docker-compose*.yml
+
+/deploy/*
+/infrastructure/terraform/
+/logs/*
diff --git a/templates/drupal-php/default.Dockerfile b/templates/drupal-php/default.Dockerfile
index dad5a69..38afceb 100644
--- a/templates/drupal-php/default.Dockerfile
+++ b/templates/drupal-php/default.Dockerfile
@@ -1,10 +1,6 @@
-ARG BASE_IMAGE
-FROM ${BASE_IMAGE}
-
-ARG COPY_FROM
-ARG COPY_TO
+ARG BASE_TAG=8-dev
+FROM wodby/drupal-php:${BASE_TAG}
 
+ARG COPY_FROM=.
+ARG COPY_TO=.
 COPY --chown=1000:1000 ${COPY_FROM} ${COPY_TO}
-
-# Copy the required crontab file
-COPY ${COPY_FROM}/infrastructure/docker/cron/www-data.crontab /etc/crontabs/www-data
diff --git a/templates/drupal-sshd/default.Dockerfile b/templates/drupal-sshd/default.Dockerfile
new file mode 100644
index 0000000..2350a3c
--- /dev/null
+++ b/templates/drupal-sshd/default.Dockerfile
@@ -0,0 +1,21 @@
+ARG BASE_TAG=8-dev
+FROM wodby/drupal-php:${BASE_TAG}
+
+ARG COPY_FROM=.
+ARG COPY_TO=.
+COPY --chown=1000:1000 ${COPY_FROM} ${COPY_TO}
+
+USER root
+
+# Copy Tailscale binaries from the tailscale image on Docker Hub.
+COPY --from=docker.io/tailscale/tailscale:stable /usr/local/bin/tailscaled /var/runtime/tailscaled
+COPY --from=docker.io/tailscale/tailscale:stable /usr/local/bin/tailscale /var/runtime/tailscale
+RUN mkdir -p /var/run && ln -s /tmp/tailscale /var/run/tailscale && \
+    mkdir -p /var/cache && ln -s /tmp/tailscale /var/cache/tailscale && \
+    mkdir -p /var/lib && ln -s /tmp/tailscale /var/lib/tailscale && \
+    mkdir -p /var/task && ln -s /tmp/tailscale /var/task/tailscale
+
+
+COPY ${COPY_FROM}/infrastructure/docker/sshd/init-tailscale /docker-entrypoint-init.d/
+
+USER wodby
diff --git a/templates/drupal-sshd/init-tailscale b/templates/drupal-sshd/init-tailscale
new file mode 100644
index 0000000..a67f105
--- /dev/null
+++ b/templates/drupal-sshd/init-tailscale
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+mkdir -p /tmp/tailscale
+/var/runtime/tailscaled --tun=userspace-networking --socks5-server=localhost:1055 &
+/var/runtime/tailscale up --ssh --authkey=${TAILSCALE_AUTHKEY} --hostname=${TAILSCALE_NAME}
+echo "Tailscale started!"
diff --git a/templates/nginx/default.Dockerfile b/templates/nginx/default.Dockerfile
index 8b1b342..a528e6b 100644
--- a/templates/nginx/default.Dockerfile
+++ b/templates/nginx/default.Dockerfile
@@ -1,9 +1,8 @@
-ARG BASE_IMAGE
-FROM ${BASE_IMAGE}
-
-ARG COPY_FROM
-ARG COPY_TO
+ARG BASE_TAG=8-dev
+FROM wodby/nginx:${BASE_TAG}
 
+ARG COPY_FROM=.
+ARG COPY_TO=.
 COPY --chown=1000:1000 ${COPY_FROM} ${COPY_TO}
 
 # Copy error template