diff --git a/NEWS.rst b/NEWS.rst
index c3a64f43f5326350b6a919f16bd4e1313c0fb845_TkVXUy5yc3Q=..c46a84dad9bf578a6eb188bc6c3614f2be58ef58_TkVXUy5yc3Q= 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -2,6 +2,11 @@
 History
 =======
 
+16.8.1
+------
+
+Stop tagging with tip.
+
 16.8.0
 ------
 
diff --git a/odoo_scripts/docker_build.py b/odoo_scripts/docker_build.py
index c3a64f43f5326350b6a919f16bd4e1313c0fb845_b2Rvb19zY3JpcHRzL2RvY2tlcl9idWlsZC5weQ==..c46a84dad9bf578a6eb188bc6c3614f2be58ef58_b2Rvb19zY3JpcHRzL2RvY2tlcl9idWlsZC5weQ== 100644
--- a/odoo_scripts/docker_build.py
+++ b/odoo_scripts/docker_build.py
@@ -215,8 +215,9 @@
         call(["rm", dockerfile])
     # retag
     for tag in tags:
-        _logger.info("Docker with tag %s", tag)
-        docker_client.images.get(repository).tag(repository, tag=tag)
+        if tag != "tip":
+            _logger.info("Docker with tag %s", tag)
+            docker_client.images.get(repository).tag(repository, tag=tag)
 
     if push:
         _logger.info("Docker push %s", repository)