diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index 524b5dc..b18929b 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -1196,7 +1196,6 @@ pipelines:
               - export DOCKERFILE='Dockerfile'
               - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
               - export MAC_PRODUCT_KEY='confluence'
-              - export APP_TEST_VERSION='8.9.4' # remove it after 9.0.0 is out
               - py.test -v tests/
               - py.test -v shared-components/tests/
 
@@ -1213,7 +1212,6 @@ pipelines:
               - export DOCKERFILE='Dockerfile.ubi'
               - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
               - export MAC_PRODUCT_KEY='confluence'
-              - export APP_TEST_VERSION='8.9.4' # remove it after 9.0.0 is out
               - py.test -v tests/
 
         - step:
@@ -1224,7 +1222,6 @@ pipelines:
               - apk add --no-cache git docker-compose jq curl
               - git submodule update --init --recursive
               - export CONFLUENCE_VERSION=`curl -s https://marketplace.atlassian.com/rest/2/products/key/confluence/versions | jq -r '._embedded.versions | .[0].name'`
-              - export CONFLUENCE_VERSION="8.9.4" # remove it after 9.0.0 is out
               - docker build --build-arg CONFLUENCE_VERSION=${CONFLUENCE_VERSION} -t test-image .
               - export IS_RELEASE=false
               - /usr/src/app/post_build.sh test-image $IS_RELEASE
@@ -1237,7 +1234,6 @@ pipelines:
               - apk add --no-cache git docker-compose jq curl
               - git submodule update --init --recursive
               - export CONFLUENCE_VERSION=`curl -s https://marketplace.atlassian.com/rest/2/products/key/confluence/versions | jq -r '._embedded.versions | .[0].name'`
-              - export CONFLUENCE_VERSION="8.9.4" # remove it after 9.0.0 is out
               - docker build --build-arg CONFLUENCE_VERSION=${CONFLUENCE_VERSION} -t test-image-ubi . -f Dockerfile.ubi
               - export IS_RELEASE=false
               - export SEV_THRESHOLD=critical
diff --git a/bitbucket-pipelines.yml.j2 b/bitbucket-pipelines.yml.j2
index 46767ac..0590359 100644
--- a/bitbucket-pipelines.yml.j2
+++ b/bitbucket-pipelines.yml.j2
@@ -97,7 +97,6 @@ pipelines:
               - export DOCKERFILE='Dockerfile'
               - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
               - export MAC_PRODUCT_KEY='confluence'
-              - export APP_TEST_VERSION='8.9.4' # remove it after 9.0.0 is out
               - py.test -v tests/
               - py.test -v shared-components/tests/
 
@@ -114,7 +113,6 @@ pipelines:
               - export DOCKERFILE='Dockerfile.ubi'
               - export DOCKERFILE_VERSION_ARG='CONFLUENCE_VERSION'
               - export MAC_PRODUCT_KEY='confluence'
-              - export APP_TEST_VERSION='8.9.4' # remove it after 9.0.0 is out
               - py.test -v tests/
 
         - step:
@@ -125,7 +123,6 @@ pipelines:
               - apk add --no-cache git docker-compose jq curl
               - git submodule update --init --recursive
               - export CONFLUENCE_VERSION=`curl -s https://marketplace.atlassian.com/rest/2/products/key/confluence/versions | jq -r '._embedded.versions | .[0].name'`
-              - export CONFLUENCE_VERSION="8.9.4" # remove it after 9.0.0 is out
               - docker build --build-arg CONFLUENCE_VERSION=${CONFLUENCE_VERSION} -t test-image .
               - export IS_RELEASE=false
               - /usr/src/app/post_build.sh test-image $IS_RELEASE
@@ -138,7 +135,6 @@ pipelines:
               - apk add --no-cache git docker-compose jq curl
               - git submodule update --init --recursive
               - export CONFLUENCE_VERSION=`curl -s https://marketplace.atlassian.com/rest/2/products/key/confluence/versions | jq -r '._embedded.versions | .[0].name'`
-              - export CONFLUENCE_VERSION="8.9.4" # remove it after 9.0.0 is out
               - docker build --build-arg CONFLUENCE_VERSION=${CONFLUENCE_VERSION} -t test-image-ubi . -f Dockerfile.ubi
               - export IS_RELEASE=false
               - export SEV_THRESHOLD=critical