diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 8f0795d1c0..04f91bff55 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -17,7 +17,7 @@ on:
     inputs:
       version:
         name: Version Tag
-        default: latest
+        default: nightly
         required: true
 jobs:
   docker-build:
diff --git a/.travis.yml b/.travis.yml
index c7a6074d6e..8c95f5d1db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -353,7 +353,9 @@ jobs:
       after_failure: post_message "TRAVIS_MESSAGE" "<!here> Draft release submission failed"
 
     - name: Trigger Docker image build and publish
-      script: .travis/trigger_docker_build.sh "${GITHUB_TOKEN}" "${BUILD_VERSION}"
+      script:
+        - git checkout "${TRAVIS_BRANCH}" && export BUILD_VERSION="$(cat packaging/version | cut -d'-' -f1)"
+        - .travis/trigger_docker_build.sh "${GITHUB_TOKEN}" "${BUILD_VERSION}"
       after_failure: post_message "TRAVIS_MESSAGE" "<!here> Failed to trigger docker build during release" "${NOTIF_CHANNEL}"
 
     - stage: Trigger deb and rpm package build (release)