diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index 586cccc..ac487c7 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -3,19 +3,6 @@ image: atlassian/docker-release-maker:latest
 pipelines:
   custom:
     new-releases:
-      - step:
-          name: Confluence Ubuntu
-          services:
-            - docker
-          script:
-            - export BASE_VERSION='6'
-            - export DEFAULT_RELEASE='true'
-            - export DOCKER_REPO='atlassian/confluence-server'
-            - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-            - export MAC_PRODUCT_KEY='confluence'
-            - export TAG_SUFFIXES='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8'
-            - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-            - python /usr/src/app/run.py --create
       - step:
           name: Confluence Alpine
           services:
@@ -30,6 +17,19 @@ pipelines:
             - export TAG_SUFFIXES='alpine,alpine-adoptopenjdk8'
             - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
             - python /usr/src/app/run.py --create
+      - step:
+          name: Confluence Ubuntu
+          services:
+            - docker
+          script:
+            - export BASE_VERSION='6'
+            - export DEFAULT_RELEASE='true'
+            - export DOCKER_REPO='atlassian/confluence-server'
+            - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
+            - export MAC_PRODUCT_KEY='confluence'
+            - export TAG_SUFFIXES='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8'
+            - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+            - python /usr/src/app/run.py --create
     ubuntu-custom-release:
       - variables:
           - name: CONFLUENCE_VERSION
@@ -59,19 +59,6 @@ pipelines:
             - docker push atlassian/confluence-server:${DOCKER_TAG}
   branches:
     master:
-      - step:
-          name: Confluence Ubuntu
-          services:
-            - docker
-          script:
-            - export BASE_VERSION='6'
-            - export DEFAULT_RELEASE='true'
-            - export DOCKER_REPO='atlassian/confluence-server'
-            - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
-            - export MAC_PRODUCT_KEY='confluence'
-            - export TAG_SUFFIXES='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8'
-            - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
-            - python /usr/src/app/run.py --update
       - step:
           name: Confluence Alpine
           services:
@@ -86,6 +73,19 @@ pipelines:
             - export TAG_SUFFIXES='alpine,alpine-adoptopenjdk8'
             - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
             - python /usr/src/app/run.py --update
+      - step:
+          name: Confluence Ubuntu
+          services:
+            - docker
+          script:
+            - export BASE_VERSION='6'
+            - export DEFAULT_RELEASE='true'
+            - export DOCKER_REPO='atlassian/confluence-server'
+            - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
+            - export MAC_PRODUCT_KEY='confluence'
+            - export TAG_SUFFIXES='adoptopenjdk8,jdk8,ubuntu,ubuntu-18.04-adoptopenjdk8'
+            - echo ${DOCKER_PASSWORD} | docker login --username ${DOCKER_USERNAME} --password-stdin
+            - python /usr/src/app/run.py --update
   pull-requests:
     '**':
       - step: