diff --git a/datascience-notebook/hooks/apply_tags b/datascience-notebook/hooks/apply_tags
index 6e7645f8..4df13756 100644
--- a/datascience-notebook/hooks/apply_tags
+++ b/datascience-notebook/hooks/apply_tags
@@ -7,9 +7,9 @@ GIT_SHA_TAG=${SOURCE_COMMIT:0:12}
 docker tag $IMAGE_NAME "$DOCKER_REPO:$GIT_SHA_TAG"
 PY_VERSION_TAG="python-$(docker run --rm ${IMAGE_NAME} python --version 2>&1 | awk '{print $2}')"
 docker tag $IMAGE_NAME "$DOCKER_REPO:$PY_VERSION_TAG"
-R_VERSION_TAG=="hub-$(docker run --rm -a STDOUT ${IMAGE_NAME} R --version | tr -d '\r')"
+R_VERSION_TAG=="hub-$(docker run --rm -a STDOUT ${IMAGE_NAME} R --version |  sed -n 1p | awk '{print $3}')"
 docker tag $IMAGE_NAME "$DOCKER_REPO:${R_VERSION_TAG%%\r}"
-JULIA_VERSION_TAG=="hub-$(docker run --rm -a STDOUT ${IMAGE_NAME} julia --version | tr -d '\r' | tr -d '[a-z| ]')"
+JULIA_VERSION_TAG=="hub-$(docker run --rm -a STDOUT ${IMAGE_NAME} julia --version | tr -d '\r' | awk '{print $3}')"
 docker tag $IMAGE_NAME "$DOCKER_REPO:${JULIA_VERSION_TAG%%\r}"
 NB_VERSION_TAG="notebook-$(docker run --rm -a STDOUT ${IMAGE_NAME} jupyter-notebook --version | tr -d '\r')"
 docker tag $IMAGE_NAME "$DOCKER_REPO:${NB_VERSION_TAG%% }"
diff --git a/datascience-notebook/hooks/post_push b/datascience-notebook/hooks/post_push
index 1f9f1914..220afebe 100755
--- a/datascience-notebook/hooks/post_push
+++ b/datascience-notebook/hooks/post_push
@@ -1,6 +1,10 @@
 #!/bin/bash
 set -e
 
+# Apply and push all tags
+source hooks/apply_tags
+docker push $DOCKER_REPO
+
 # Tag the latest build with the short git sha. Push the tag in addition
 # to the "latest" tag already pushed.
 GIT_SHA_TAG=${SOURCE_COMMIT:0:12}
@@ -48,4 +52,4 @@ set +e
 for url in $(echo $NEXT_BUILD_TRIGGERS | sed "s/,/ /g")
 do
     curl -X POST $url
-done
\ No newline at end of file
+done