diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index 2c37b31..1ccad10 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -7,29 +7,23 @@ pipelines:
     create-release-base-6-adoptopenjdk8:
       - step:
           script:
+            - git remote set-url origin ${BITBUCKET_GIT_HTTP_ORIGIN}
             - git fetch --all
-            - 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
+            - export BASE_BRANCH='base-6-adoptopenjdk8'
+            - export MAC_PRODUCT_KEY='confluence'
+            - export DOCKERFILE_VERSION_STRING='CONFLUENCE_VERSION'
+            - export DEFAULT_RELEASE='true'
+            - export ADDITIONAL_TAG_SUFFIXES='jdk8,ubuntu'
+            - python /usr/src/app/run.py --create
   branches:
     base-6-adoptopenjdk8:
       - step:
           script:
+            - git remote set-url origin ${BITBUCKET_GIT_HTTP_ORIGIN}
             - git fetch --all
-            - 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
+            - export BASE_BRANCH='base-6-adoptopenjdk8'
+            - export MAC_PRODUCT_KEY='confluence'
+            - export DOCKERFILE_VERSION_STRING='CONFLUENCE_VERSION'
+            - export DEFAULT_RELEASE='true'
+            - export ADDITIONAL_TAG_SUFFIXES='jdk8,ubuntu'
+            - python /usr/src/app/run.py --update
\ No newline at end of file