diff --git a/.travis.yml b/.travis.yml
index 50142fb..e5ae44b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,13 +10,13 @@ install:
 
 before_script:
   - env | sort
-  - cd "$VERSION"
-  - image="rabbitmq:$VERSION-$VARIANT"
+  - cd "$VERSION/$VARIANT"
+  - image="$(awk 'toupper($1) == "FROM" { print $2; exit }' management/Dockerfile)"
 
 script:
-  - travis_retry docker build -t "$image" "$VARIANT"
+  - travis_retry docker build -t "$image" .
   - ~/official-images/test/run.sh "$image"
-  - travis_retry docker build -t "${image}-management" "$VARIANT/management"
+  - travis_retry docker build -t "${image}-management" management
   - ~/official-images/test/run.sh "${image}-management"
 
 after_script:
diff --git a/3.6/alpine/management/Dockerfile b/3.6/alpine/management/Dockerfile
index dee2389..578f07c 100644
--- a/3.6/alpine/management/Dockerfile
+++ b/3.6/alpine/management/Dockerfile
@@ -1,4 +1,4 @@
-FROM rabbitmq:alpine
+FROM rabbitmq:3.6-alpine
 
 RUN rabbitmq-plugins enable --offline rabbitmq_management
 
diff --git a/3.6/debian/management/Dockerfile b/3.6/debian/management/Dockerfile
index 4a6837c..dcb3d0a 100644
--- a/3.6/debian/management/Dockerfile
+++ b/3.6/debian/management/Dockerfile
@@ -1,4 +1,4 @@
-FROM rabbitmq
+FROM rabbitmq:3.6
 
 RUN rabbitmq-plugins enable --offline rabbitmq_management