diff --git a/.travis.yml b/.travis.yml
index 53f052a6..ce12e9d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,13 +32,25 @@ after_success:
         echo $QUAY_PASSWORD | docker login -u=$QUAY_USERNAME --password-stdin quay.io;
         docker push quay.io/$DOCKER_NS/gateway:$TRAVIS_TAG;
 
-        docker tag $DOCKER_NS/watchdog:latest-dev $DOCKER_NS/watchdog:$TRAVIS_TAG;
+        docker tag $DOCKER_NS/classic-watchdog:latest-dev-armhf $DOCKER_NS/classic-watchdog:$TRAVIS_TAG-armhf;
+        docker tag $DOCKER_NS/classic-watchdog:latest-dev-arm64 $DOCKER_NS/classic-watchdog:$TRAVIS_TAG-arm64;
+        docker tag $DOCKER_NS/classic-watchdog:latest-dev-windows $DOCKER_NS/classic-watchdog:$TRAVIS_TAG-windows;
+        docker tag $DOCKER_NS/classic-watchdog:latest-dev-x86_64 $DOCKER_NS/classic-watchdog:$TRAVIS_TAG-x86_64;
         echo $DOCKER_PASSWORD | docker login -u=$DOCKER_USERNAME --password-stdin;
-        docker push $DOCKER_NS/watchdog:$TRAVIS_TAG;
+        docker push $DOCKER_NS/classic-watchdog:$TRAVIS_TAG-armhf;
+        docker push $DOCKER_NS/classic-watchdog:$TRAVIS_TAG-arm64;
+        docker push $DOCKER_NS/classic-watchdog:$TRAVIS_TAG-windows; 
+        docker push $DOCKER_NS/classic-watchdog:$TRAVIS_TAG-x86_64;
 
-        docker tag $DOCKER_NS/watchdog:latest-dev quay.io/$DOCKER_NS/watchdog:$TRAVIS_TAG;
+        docker tag $DOCKER_NS/classic-watchdog:latest-dev-armhf quay.io/$DOCKER_NS/classic-watchdog:$TRAVIS_TAG-armhf;
+        docker tag $DOCKER_NS/classic-watchdog:latest-dev-arm64 quay.io/$DOCKER_NS/classic-watchdog:$TRAVIS_TAG-arm64;
+        docker tag $DOCKER_NS/classic-watchdog:latest-dev-windows quay.io/$DOCKER_NS/classic-watchdog:$TRAVIS_TAG-windows;
+        docker tag $DOCKER_NS/classic-watchdog:latest-dev-x86_64 quay.io/$DOCKER_NS/classic-watchdog:$TRAVIS_TAG-x86_64;
         echo $QUAY_PASSWORD | docker login -u=$QUAY_USERNAME --password-stdin quay.io;
-        docker push quay.io/$DOCKER_NS/watchdog:$TRAVIS_TAG;
+        docker push quay.io/$DOCKER_NS/classic-watchdog:$TRAVIS_TAG-armhf;
+        docker push quay.io/$DOCKER_NS/classic-watchdog:$TRAVIS_TAG-arm64;
+        docker push quay.io/$DOCKER_NS/classic-watchdog:$TRAVIS_TAG-windows; 
+        docker push quay.io/$DOCKER_NS/classic-watchdog:$TRAVIS_TAG-x86_64;
 
         fi
 
diff --git a/watchdog/Dockerfile.packager b/watchdog/Dockerfile.packager
index 3e228f4e..6df22c49 100644
--- a/watchdog/Dockerfile.packager
+++ b/watchdog/Dockerfile.packager
@@ -1,7 +1,6 @@
 FROM openfaas/watchdog:build as build
 FROM scratch
 
-COPY --from=build /go/src/github.com/openfaas/faas/watchdog/watchdog ./fwatchdog
-COPY --from=build /go/src/github.com/openfaas/faas/watchdog/watchdog-armhf ./fwatchdog-armhf
-COPY --from=build /go/src/github.com/openfaas/faas/watchdog/watchdog-arm64 ./fwatchdog-arm64
-COPY --from=build /go/src/github.com/openfaas/faas/watchdog/watchdog.exe ./fwatchdog.exe
+ARG PLATFORM
+
+COPY --from=build /go/src/github.com/openfaas/faas/watchdog/watchdog$PLATFORM ./fwatchdog
\ No newline at end of file
diff --git a/watchdog/build.sh b/watchdog/build.sh
index 0de6c1ef..67244ab1 100755
--- a/watchdog/build.sh
+++ b/watchdog/build.sh
@@ -22,7 +22,10 @@ else
     docker build --no-cache --build-arg VERSION=$VERSION --build-arg GIT_COMMIT=$GIT_COMMIT -t openfaas/watchdog:build .
 fi
 
-docker build --no-cache -t openfaas/watchdog:latest-dev . -f Dockerfile.packager
+docker build --no-cache --build-arg PLATFORM="-armhf" -t openfaas/classic-watchdog:latest-dev-armhf . -f Dockerfile.packager
+docker build --no-cache --build-arg PLATFORM="-arm64" -t openfaas/classic-watchdog:latest-dev-arm64 . -f Dockerfile.packager
+docker build --no-cache --build-arg PLATFORM=".exe" -t openfaas/classic-watchdog:latest-dev-windows . -f Dockerfile.packager
+docker build --no-cache --build-arg PLATFORM="" -t openfaas/classic-watchdog:latest-dev-x86_64 . -f Dockerfile.packager
 
 docker create --name buildoutput openfaas/watchdog:build echo