diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index 51ba5f1..d205a36 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -19,8 +19,8 @@ pipelines:
         - step:
             name: Build and Test
             script:
-              - docker build . --file docker/coturn/Dockerfile --tag coturn-${BITBUCKET_REPO_SLUG}
-              - docker build . --file docker/coturn-dns/Dockerfile --tag coturn-dns-${BITBUCKET_REPO_SLUG}
+              - docker build . --file docker/coturn/Dockerfile --tag coturn
+              - docker build . --file docker/coturn-dns/Dockerfile --tag coturn-dns
             services:
               - docker
             caches:
@@ -36,10 +36,10 @@ pipelines:
       - step:
           name: Build and Test
           script:
-            - docker build . --file docker/coturn/Dockerfile --tag coturn-dns-${BITBUCKET_REPO_SLUG}
-            - docker build . --file docker/coturn-dns/Dockerfile --tag coturn-dns-${BITBUCKET_REPO_SLUG}
-            - docker save coturn-${BITBUCKET_REPO_SLUG} --output "coturn-${BITBUCKET_REPO_SLUG}.tar"
-            - docker save coturn-dns-${BITBUCKET_REPO_SLUG} --output "coturn-dns-${BITBUCKET_REPO_SLUG}.tar"
+            - docker build . --file docker/coturn/Dockerfile --tag coturn-dns
+            - docker build . --file docker/coturn-dns/Dockerfile --tag coturn-dns
+            - docker save coturn --output "coturn.tar"
+            - docker save coturn-dns --output "coturn-dns.tar"
           services:
             - docker
           caches:
@@ -57,8 +57,8 @@ pipelines:
             - docker load --input "coturn-${BITBUCKET_REPO_SLUG}.tar"
             - docker load --input "coturn-dns-${BITBUCKET_REPO_SLUG}.tar"
             - VERSION="latest" #VERSION="prod-0.1.${BITBUCKET_BUILD_NUMBER}"
-            - docker tag "coturn-${BITBUCKET_REPO_SLUG}" "gcr.io/${GCLOUD_PROJECT}/coturn:${VERSION}"
-            - docker tag "coturn-dns-${BITBUCKET_REPO_SLUG}" "gcr.io/${GCLOUD_PROJECT}/coturn-dns:${VERSION}"
+            - docker tag "coturn" "gcr.io/${GCLOUD_PROJECT}/coturn:${VERSION}"
+            - docker tag "coturn-dns" "gcr.io/${GCLOUD_PROJECT}/coturn-dns:${VERSION}"
             # Login to google docker hub
             - cat ./gcloud-api-key.json | docker login -u _json_key --password-stdin https://gcr.io
             - docker push "gcr.io/${GCLOUD_PROJECT}/coturn:${VERSION}"