diff --git a/test/docker/Dockerfile.ubt.20.04 b/test/docker/Dockerfile.ubt.20.04
index 34b4051..bf2b01b 100644
--- a/test/docker/Dockerfile.ubt.20.04
+++ b/test/docker/Dockerfile.ubt.20.04
@@ -1,4 +1,4 @@
-FROM evernode/hotpocket:0.6.4-ubt.20.04
+FROM evernode/hotpocket:test-ubt.20.04
 
 RUN apt-get update \
     && apt-get install --no-install-recommends -y unzip jq \
diff --git a/test/docker/Dockerfile.ubt.20.04-njs b/test/docker/Dockerfile.ubt.20.04-njs
index 2d740a3..e54428c 100644
--- a/test/docker/Dockerfile.ubt.20.04-njs
+++ b/test/docker/Dockerfile.ubt.20.04-njs
@@ -1,4 +1,4 @@
-FROM evernode/hotpocket:0.6.4-ubt.20.04-njs.20
+FROM evernode/hotpocket:test-ubt.20.04-njs.20
 
 RUN apt-get update \
     && apt-get install --no-install-recommends -y unzip jq \
diff --git a/test/docker/build.sh b/test/docker/build.sh
index 37b2c47..e38b676 100755
--- a/test/docker/build.sh
+++ b/test/docker/build.sh
@@ -2,5 +2,5 @@
 
 img=evernode/sashimono
 
-docker build -t $img:hp.latest-ubt.20.04 -t $img:hp.0.6.4-ubt.20.04 -f ./Dockerfile.ubt.20.04 .
-docker build -t $img:hp.latest-ubt.20.04-njs.20 -t $img:hp.0.6.4-ubt.20.04-njs.20 -f ./Dockerfile.ubt.20.04-njs .
+docker build -t $img:hp.test-ubt.20.04 -f ./Dockerfile.ubt.20.04 .
+docker build -t $img:hp.test-ubt.20.04-njs.20 -f ./Dockerfile.ubt.20.04-njs .
diff --git a/test/docker/push.sh b/test/docker/push.sh
index 487adfe..c800efd 100755
--- a/test/docker/push.sh
+++ b/test/docker/push.sh
@@ -2,4 +2,5 @@
 
 img=evernode/sashimono
 
-docker image push --all-tags $img
\ No newline at end of file
+docker image push "$img:hp.test-ubt.20.04"
+docker image push "$img:hp.test-ubt.20.04-njs.20"
\ No newline at end of file