diff --git a/.travis.yml b/.travis.yml
index a12e257..91887c8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,8 +16,7 @@ jobs:
         - bash -c 'shopt -s globstar; shellcheck **/*.sh'
     - &build
       stage: build
-      # set EXTRA_TAG to latest,stable when no more experimental versions for 0.17 come out
-      env: VERSION_SHORT=0.17 EXTRA_TAG=latest
+      env: VERSION_SHORT=0.17 EXTRA_TAG=latest,stable
       script:
         - ./build.sh $VERSION_SHORT
     - <<: *build
diff --git a/build.sh b/build.sh
index e215df5..93a9e20 100755
--- a/build.sh
+++ b/build.sh
@@ -38,7 +38,7 @@ else
   if [[ -n ${EXTRA_TAG:-} ]]; then
     IFS=","
     for TAG in $EXTRA_TAG; do
-      TAGS+=" -t $DOCKER_REPO:$EXTRA_TAG"
+      TAGS+=" -t $DOCKER_REPO:$TAG"
     done
   fi
 fi
@@ -55,7 +55,7 @@ fi
 # latest changes where made in the folder corosponding to the version we build, we are on master and don#t build a PR.
 if [[ $(dirname "$(git diff --name-only HEAD^)") =~ $VERSION_SHORT ]] && [[ $TRAVIS_BRANCH == master ]] && [[ $TRAVIS_PULL_REQUEST_BRANCH == "" ]] ||
   # we build a tag and we are not on master
-  [[ $VERSION == "${TRAVIS_BRANCH_VERSION:-}" ]] && [[ $TRAVIS_PULL_REQUEST_BRANCH == "" ]] ||
+  [[ $VERSION == "${TRAVIS_BRANCH_VERSION:-}" ]] && [[ ${TRAVIS_PULL_REQUEST_BRANCH:-} == "" ]] ||
   # we are not in CI
   [[ -z ${CI:-} ]]; then