diff --git a/Dockerfile b/Dockerfile
index c3321f7..c2a99f3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8-jdk-alpine
+FROM adoptopenjdk/openjdk8:x86_64-ubuntu-jdk8u192-b12
 MAINTAINER Atlassian Confluence
 
 ENV RUN_USER            daemon
@@ -19,10 +19,8 @@ WORKDIR $CONFLUENCE_HOME
 CMD ["/entrypoint.sh", "-fg"]
 ENTRYPOINT ["/sbin/tini", "--"]
 
-RUN apk update -qq \
-    && update-ca-certificates \
-    && apk add ca-certificates wget curl openssh bash procps openssl perl ttf-dejavu tini libc6-compat \
-    && rm -rf /var/lib/{apt,dpkg,cache,log}/ /tmp/* /var/tmp/*
+RUN apt-get update && apt-get install -y wget curl bash procps perl fontconfig && apt-get clean -y && apt-get autoremove -y
+RUN wget https://github.com/krallin/tini/releases/download/v0.18.0/tini -O /sbin/tini && chmod a+x /sbin/tini
 
 COPY entrypoint.sh              /entrypoint.sh
 
diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index 2e5d26d..2c37b31 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -4,28 +4,32 @@ clone:
 
 pipelines:
   custom:
-    create-release-base-6:
+    create-release-base-6-adoptopenjdk8:
       - step:
           script:
             - git fetch --all
-            - export BASE_BRANCH=base-6
+            - export BASE_BRANCH=base-6-adoptopenjdk8
             - export BASE_VERSION=6
             - export DOCKER_REPO=atlassian/confluence-server
             - export DOCKERFILE_VERSION_STRING=CONFLUENCE_VERSION
             - export GIT_USER=pipelinesagent
             - export GIT_EMAIL=pipelines-agent@atlassian.com
             - export MAC_PRODUCT_KEY=confluence
+            - export TAG_SUFFIX=ubuntu-18.04-adoptopenjdk8
+            - export SHOULD_CREATE_LATEST_TAG=true
             - python /usr/src/app/create_release.py
   branches:
-    base-6:
+    base-6-adoptopenjdk8:
       - step:
           script:
             - git fetch --all
-            - export BASE_BRANCH=base-6
+            - export BASE_BRANCH=base-6-adoptopenjdk8
             - export BASE_VERSION=6
             - export DOCKER_REPO=atlassian/confluence-server
             - export DOCKERFILE_VERSION_STRING=CONFLUENCE_VERSION
             - export GIT_USER=pipelinesagent
             - export GIT_EMAIL=pipelines-agent@atlassian.com
             - export MAC_PRODUCT_KEY=confluence
+            - export TAG_SUFFIX=ubuntu-18.04-adoptopenjdk8
+            - export SHOULD_CREATE_LATEST_TAG=true
             - python /usr/src/app/update_release.py
\ No newline at end of file